fix: add java_outer_classname to intoto protos to fix java client gen…

…eration issues due to name collisions PiperOrigin-RevId: 414718329 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Dec 7 07:23:02 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: 297bfd86f13acc8e06251bc0b23207f91bcba081 Source-Link: googleapis/googleapis@297bfd8
googleapis · Dec 7, 2021 · 6804bd8 · 6804bd8
1 parent e84ee6a
commit 6804bd8
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 58 deletions.
diff --git a/src/main/java/io/grafeas/v1/Build.java b/src/main/java/io/grafeas/v1/Build.java
@@ -62,8 +62,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              io.grafeas.v1.IntotoProvenance.getDescriptor(),
-              io.grafeas.v1.IntotoStatement.getDescriptor(),
+              io.grafeas.v1.InTotoProvenanceProto.getDescriptor(),
+              io.grafeas.v1.InTotoStatementProto.getDescriptor(),
               io.grafeas.v1.Provenance.getDescriptor(),
             });
     internal_static_grafeas_v1_BuildNote_descriptor = getDescriptor().getMessageTypes().get(0);
@@ -81,8 +81,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Provenance", "ProvenanceBytes", "IntotoProvenance", "IntotoStatement",
             });
-    io.grafeas.v1.IntotoProvenance.getDescriptor();
-    io.grafeas.v1.IntotoStatement.getDescriptor();
+    io.grafeas.v1.InTotoProvenanceProto.getDescriptor();
+    io.grafeas.v1.InTotoStatementProto.getDescriptor();
     io.grafeas.v1.Provenance.getDescriptor();
   }
 

diff --git a/src/main/java/io/grafeas/v1/BuilderConfig.java b/src/main/java/io/grafeas/v1/BuilderConfig.java
@@ -90,13 +90,13 @@ private BuilderConfig(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_BuilderConfig_descriptor;
+    return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_BuilderConfig_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.IntotoProvenance
+    return io.grafeas.v1.InTotoProvenanceProto
         .internal_static_grafeas_v1_BuilderConfig_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.BuilderConfig.class, io.grafeas.v1.BuilderConfig.Builder.class);
@@ -302,13 +302,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.BuilderConfig)
       io.grafeas.v1.BuilderConfigOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_BuilderConfig_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto
+          .internal_static_grafeas_v1_BuilderConfig_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.IntotoProvenance
+      return io.grafeas.v1.InTotoProvenanceProto
           .internal_static_grafeas_v1_BuilderConfig_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.BuilderConfig.class, io.grafeas.v1.BuilderConfig.Builder.class);
@@ -338,7 +339,8 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_BuilderConfig_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto
+          .internal_static_grafeas_v1_BuilderConfig_descriptor;
     }
 
     @java.lang.Override

diff --git a/src/main/java/io/grafeas/v1/Completeness.java b/src/main/java/io/grafeas/v1/Completeness.java
@@ -105,13 +105,14 @@ private Completeness(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Completeness_descriptor;
+    return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Completeness_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Completeness_fieldAccessorTable
+    return io.grafeas.v1.InTotoProvenanceProto
+        .internal_static_grafeas_v1_Completeness_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.Completeness.class, io.grafeas.v1.Completeness.Builder.class);
   }
@@ -363,13 +364,13 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.Completeness)
       io.grafeas.v1.CompletenessOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Completeness_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Completeness_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.IntotoProvenance
+      return io.grafeas.v1.InTotoProvenanceProto
           .internal_static_grafeas_v1_Completeness_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.Completeness.class, io.grafeas.v1.Completeness.Builder.class);
@@ -403,7 +404,7 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Completeness_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Completeness_descriptor;
     }
 
     @java.lang.Override

diff --git a/src/main/java/io/grafeas/v1/DsseAttestation.java b/src/main/java/io/grafeas/v1/DsseAttestation.java
@@ -66,7 +66,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              io.grafeas.v1.Common.getDescriptor(), io.grafeas.v1.IntotoStatement.getDescriptor(),
+              io.grafeas.v1.Common.getDescriptor(),
+              io.grafeas.v1.InTotoStatementProto.getDescriptor(),
             });
     internal_static_grafeas_v1_DSSEAttestationNote_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -93,7 +94,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Envelope", "Statement", "DecodedPayload",
             });
     io.grafeas.v1.Common.getDescriptor();
-    io.grafeas.v1.IntotoStatement.getDescriptor();
+    io.grafeas.v1.InTotoStatementProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

diff --git a/src/main/java/io/grafeas/v1/InTotoProvenance.java b/src/main/java/io/grafeas/v1/InTotoProvenance.java
@@ -140,13 +140,14 @@ private InTotoProvenance(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_InTotoProvenance_descriptor;
+    return io.grafeas.v1.InTotoProvenanceProto
+        .internal_static_grafeas_v1_InTotoProvenance_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.IntotoProvenance
+    return io.grafeas.v1.InTotoProvenanceProto
         .internal_static_grafeas_v1_InTotoProvenance_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.InTotoProvenance.class, io.grafeas.v1.InTotoProvenance.Builder.class);
@@ -566,13 +567,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.InTotoProvenance)
       io.grafeas.v1.InTotoProvenanceOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_InTotoProvenance_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto
+          .internal_static_grafeas_v1_InTotoProvenance_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.IntotoProvenance
+      return io.grafeas.v1.InTotoProvenanceProto
           .internal_static_grafeas_v1_InTotoProvenance_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.InTotoProvenance.class, io.grafeas.v1.InTotoProvenance.Builder.class);
@@ -620,7 +622,8 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_InTotoProvenance_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto
+          .internal_static_grafeas_v1_InTotoProvenance_descriptor;
     }
 
     @java.lang.Override

diff --git a/.../java/io/grafeas/v1/IntotoProvenance.java → .../io/grafeas/v1/InTotoProvenanceProto.java b/.../java/io/grafeas/v1/IntotoProvenance.java → .../io/grafeas/v1/InTotoProvenanceProto.java
@@ -19,8 +19,8 @@
 
 package io.grafeas.v1;
 
-public final class IntotoProvenance {
-  private IntotoProvenance() {}
+public final class InTotoProvenanceProto {
+  private InTotoProvenanceProto() {}
 
   public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
 
@@ -76,9 +76,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "grafeas.v1.BuilderConfig\022\"\n\006recipe\030\002 \001(\013"
           + "2\022.grafeas.v1.Recipe\022&\n\010metadata\030\003 \001(\0132\024"
           + ".grafeas.v1.Metadata\022\021\n\tmaterials\030\004 \003(\tB"
-          + "Q\n\rio.grafeas.v1P\001Z8google.golang.org/ge"
-          + "nproto/googleapis/grafeas/v1;grafeas\242\002\003G"
-          + "RAb\006proto3"
+          + "h\n\rio.grafeas.v1B\025InTotoProvenanceProtoP"
+          + "\001Z8google.golang.org/genproto/googleapis"
+          + "/grafeas/v1;grafeas\242\002\003GRAb\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

diff --git a/src/main/java/io/grafeas/v1/InTotoStatement.java b/src/main/java/io/grafeas/v1/InTotoStatement.java
@@ -153,13 +153,13 @@ private InTotoStatement(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.IntotoStatement.internal_static_grafeas_v1_InTotoStatement_descriptor;
+    return io.grafeas.v1.InTotoStatementProto.internal_static_grafeas_v1_InTotoStatement_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.IntotoStatement
+    return io.grafeas.v1.InTotoStatementProto
         .internal_static_grafeas_v1_InTotoStatement_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.InTotoStatement.class, io.grafeas.v1.InTotoStatement.Builder.class);
@@ -633,13 +633,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.InTotoStatement)
       io.grafeas.v1.InTotoStatementOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.IntotoStatement.internal_static_grafeas_v1_InTotoStatement_descriptor;
+      return io.grafeas.v1.InTotoStatementProto
+          .internal_static_grafeas_v1_InTotoStatement_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.IntotoStatement
+      return io.grafeas.v1.InTotoStatementProto
           .internal_static_grafeas_v1_InTotoStatement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.InTotoStatement.class, io.grafeas.v1.InTotoStatement.Builder.class);
@@ -681,7 +682,8 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.IntotoStatement.internal_static_grafeas_v1_InTotoStatement_descriptor;
+      return io.grafeas.v1.InTotoStatementProto
+          .internal_static_grafeas_v1_InTotoStatement_descriptor;
     }
 
     @java.lang.Override

diff --git a/...n/java/io/grafeas/v1/IntotoStatement.java → ...a/io/grafeas/v1/InTotoStatementProto.java b/...n/java/io/grafeas/v1/IntotoStatement.java → ...a/io/grafeas/v1/InTotoStatementProto.java
@@ -19,8 +19,8 @@
 
 package io.grafeas.v1;
 
-public final class IntotoStatement {
-  private IntotoStatement() {}
+public final class InTotoStatementProto {
+  private InTotoStatementProto() {}
 
   public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
 
@@ -60,15 +60,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "nanceH\000B\013\n\tpredicate\"w\n\007Subject\022\014\n\004name\030"
           + "\001 \001(\t\022/\n\006digest\030\002 \003(\0132\037.grafeas.v1.Subje"
           + "ct.DigestEntry\032-\n\013DigestEntry\022\013\n\003key\030\001 \001"
-          + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001BQ\n\rio.grafeas.v1P\001"
-          + "Z8google.golang.org/genproto/googleapis/"
-          + "grafeas/v1;grafeas\242\002\003GRAb\006proto3"
+          + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001Bg\n\rio.grafeas.v1B\024"
+          + "InTotoStatementProtoP\001Z8google.golang.or"
+          + "g/genproto/googleapis/grafeas/v1;grafeas"
+          + "\242\002\003GRAb\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              io.grafeas.v1.IntotoProvenance.getDescriptor(),
+              io.grafeas.v1.InTotoProvenanceProto.getDescriptor(),
               io.grafeas.v1.SlsaProvenanceOuterClass.getDescriptor(),
             });
     internal_static_grafeas_v1_InTotoStatement_descriptor =
@@ -94,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Key", "Value",
             });
-    io.grafeas.v1.IntotoProvenance.getDescriptor();
+    io.grafeas.v1.InTotoProvenanceProto.getDescriptor();
     io.grafeas.v1.SlsaProvenanceOuterClass.getDescriptor();
   }
 

diff --git a/src/main/java/io/grafeas/v1/Metadata.java b/src/main/java/io/grafeas/v1/Metadata.java
@@ -148,13 +148,14 @@ private Metadata(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Metadata_descriptor;
+    return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Metadata_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Metadata_fieldAccessorTable
+    return io.grafeas.v1.InTotoProvenanceProto
+        .internal_static_grafeas_v1_Metadata_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.Metadata.class, io.grafeas.v1.Metadata.Builder.class);
   }
@@ -598,13 +599,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.Metadata)
       io.grafeas.v1.MetadataOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Metadata_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Metadata_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Metadata_fieldAccessorTable
+      return io.grafeas.v1.InTotoProvenanceProto
+          .internal_static_grafeas_v1_Metadata_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.Metadata.class, io.grafeas.v1.Metadata.Builder.class);
     }
@@ -653,7 +655,7 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Metadata_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Metadata_descriptor;
     }
 
     @java.lang.Override

diff --git a/src/main/java/io/grafeas/v1/Recipe.java b/src/main/java/io/grafeas/v1/Recipe.java
@@ -142,13 +142,13 @@ private Recipe(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Recipe_descriptor;
+    return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Recipe_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Recipe_fieldAccessorTable
+    return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Recipe_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.Recipe.class, io.grafeas.v1.Recipe.Builder.class);
   }
@@ -672,13 +672,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.Recipe)
       io.grafeas.v1.RecipeOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Recipe_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Recipe_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Recipe_fieldAccessorTable
+      return io.grafeas.v1.InTotoProvenanceProto
+          .internal_static_grafeas_v1_Recipe_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.Recipe.class, io.grafeas.v1.Recipe.Builder.class);
     }
@@ -726,7 +727,7 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.IntotoProvenance.internal_static_grafeas_v1_Recipe_descriptor;
+      return io.grafeas.v1.InTotoProvenanceProto.internal_static_grafeas_v1_Recipe_descriptor;
     }
 
     @java.lang.Override