Fix remote generation usage conflicts (#13)

Locally generating and packaging protovalidate protos in this repo.

Fixes: bufbuild/protovalidate#62

---------

Co-authored-by: Philip K. Warren <[email protected]>

Author: buildbreaker

.gitattributes

@@ -0,0 +1,7 @@
+# This is similar to the git option core.autocrlf but it applies to all
+# users of the repository and therefore doesn't depend on a developers
+# local configuration.
+* text=auto
+
+src/main/java/build/buf/validate/**/*.java linguist-generated=true
+conformance/src/main/java/build/buf/validate/**/*.java linguist-generated=true

.github/workflows/ci.yaml

@@ -24,6 +24,10 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
           cache: 'gradle'
+      - uses: actions/checkout@v3
+      - uses: bufbuild/buf-setup-action@v1
+        with:
+          github_token: ${{ github.token }}
       - name: Lint
         run: make lint
       - name: Generate

Makefile

@@ -60,6 +60,8 @@ help:  ## Describe useful make targets
 
 .PHONY: generate
 generate: generate-license  ## Regenerate code and license headers
+	buf generate --template buf.gen.yaml buf.build/bufbuild/protovalidate
+	buf generate --template conformance/buf.gen.yaml -o conformance/ buf.build/bufbuild/protovalidate-testing
 
 .PHONY: lint
 lint: ## Lint code

buf.gen.yaml

@@ -0,0 +1,6 @@
+version: v1
+managed:
+  enabled: false
+plugins:
+  - plugin: buf.build/protocolbuffers/java:v23.4
+    out: src/main/java

build.gradle.kts

@@ -47,6 +47,13 @@ buildscript {
     }
 }
 
+apply(plugin = "com.diffplug.spotless")
+configure<SpotlessExtension> {
+    java {
+        targetExclude("src/main/java/build/buf/validate/**/*.java")
+    }
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -120,15 +127,13 @@ mavenPublishing {
 dependencies {
     annotationProcessor(libs.nullaway)
     api(libs.protobuf.java)
-    api(libs.protovalidate)
     implementation(enforcedPlatform(libs.cel))
     implementation(libs.cel.core)
     implementation(libs.guava)
     implementation(libs.jakarta.mail.api)
 
     testImplementation(libs.assertj)
     testImplementation(libs.junit)
-    testImplementation(libs.protovalidate.testing)
 
     errorprone(libs.errorprone)
 }

conformance/buf.gen.yaml

@@ -0,0 +1,7 @@
+version: v1
+managed:
+  enabled: true
+  java_package_prefix: "build"
+plugins:
+  - plugin: buf.build/protocolbuffers/java:v23.4
+    out: src/main/java

conformance/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.diffplug.gradle.spotless.SpotlessExtension
+
 plugins {
     `version-catalog`
 
@@ -27,12 +29,20 @@ tasks {
     }
 }
 
+apply(plugin = "com.diffplug.spotless")
+configure<SpotlessExtension> {
+    java {
+        targetExclude("src/main/java/build/buf/validate/**/*.java")
+    }
+}
+
 dependencies {
     implementation(project(":"))
     implementation(libs.guava)
     implementation(libs.protobuf.java)
-    implementation(libs.protovalidate)
-    implementation(libs.protovalidate.testing)
+
+    implementation(libs.assertj)
+    implementation(libs.junit)
 
     errorprone(libs.errorprone)
 }

conformance/src/main/java/build/buf/Main.java

@@ -14,16 +14,17 @@
 
 package build.buf;
 
-import build.buf.gen.buf.validate.ValidateProto;
-import build.buf.gen.buf.validate.Violations;
-import build.buf.gen.buf.validate.conformance.harness.TestConformanceRequest;
-import build.buf.gen.buf.validate.conformance.harness.TestConformanceResponse;
-import build.buf.gen.buf.validate.conformance.harness.TestResult;
 import build.buf.protovalidate.Config;
 import build.buf.protovalidate.ValidationResult;
 import build.buf.protovalidate.Validator;
 import build.buf.protovalidate.exceptions.CompilationException;
 import build.buf.protovalidate.exceptions.ExecutionException;
+import build.buf.validate.ValidateProto;
+import build.buf.validate.Violation;
+import build.buf.validate.Violations;
+import build.buf.validate.conformance.harness.TestConformanceRequest;
+import build.buf.validate.conformance.harness.TestConformanceResponse;
+import build.buf.validate.conformance.harness.TestResult;
 import com.google.common.base.Splitter;
 import com.google.errorprone.annotations.FormatMethod;
 import com.google.protobuf.Any;
@@ -88,14 +89,12 @@ static TestResult testCase(
   private static TestResult validate(Validator validator, DynamicMessage dynamicMessage) {
     try {
       ValidationResult result = validator.validate(dynamicMessage);
-      if (result.getViolations().isEmpty()) {
+      List<Violation> violations = result.getViolations();
+      if (violations.isEmpty()) {
         return TestResult.newBuilder().setSuccess(true).build();
-      } else {
-        return TestResult.newBuilder()
-            .setValidationError(
-                Violations.newBuilder().addAllViolations(result.getViolations()).build())
-            .build();
       }
+      Violations error = Violations.newBuilder().addAllViolations(violations).build();
+      return TestResult.newBuilder().setValidationError(error).build();
     } catch (CompilationException e) {
       return TestResult.newBuilder().setCompilationError(e.getMessage()).build();
     } catch (ExecutionException e) {