fix: Set the transport of grafeas back to grpc only

pom.xml

@@ -76,6 +76,10 @@
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
+    </dependency>
+      <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax-httpjson</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -113,12 +117,24 @@
       <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
+   <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
       <classifier>testlib</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+    <groupId>com.google.api</groupId>
+      <artifactId>gax-httpjson</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>

src/main/java/io/grafeas/v1/CVSS.java

@@ -25,10 +25,8 @@
  * <pre>
  * Common Vulnerability Scoring System.
  * For details, see https://www.first.org/cvss/specification-document
- * This is a message we will try to use for storing multiple versions of
- * CVSS. The intention is that as new versions of CVSS scores get added, we
- * will be able to modify this message rather than adding new protos for each
- * new version of the score.
+ * This is a message we will try to use for storing various versions of CVSS
+ * rather than making a separate proto for storing a specific version.
  * </pre>
  *
  * Protobuf type {@code grafeas.v1.CVSS}
@@ -184,13 +182,13 @@ private CVSS(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_descriptor;
+    return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
+    return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.CVSS.class, io.grafeas.v1.CVSS.Builder.class);
   }
@@ -1480,10 +1478,8 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * <pre>
    * Common Vulnerability Scoring System.
    * For details, see https://www.first.org/cvss/specification-document
-   * This is a message we will try to use for storing multiple versions of
-   * CVSS. The intention is that as new versions of CVSS scores get added, we
-   * will be able to modify this message rather than adding new protos for each
-   * new version of the score.
+   * This is a message we will try to use for storing various versions of CVSS
+   * rather than making a separate proto for storing a specific version.
    * </pre>
    *
    * Protobuf type {@code grafeas.v1.CVSS}
@@ -1493,13 +1489,13 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.CVSS)
       io.grafeas.v1.CVSSOrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_descriptor;
+      return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
+      return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.CVSS.class, io.grafeas.v1.CVSS.Builder.class);
     }
@@ -1550,7 +1546,7 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSS_descriptor;
+      return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSS_descriptor;
     }
 
     @java.lang.Override

src/main/java/io/grafeas/v1/CvssProto.java → src/main/java/io/grafeas/v1/CVSSProto.java

@@ -19,8 +19,8 @@
 
 package io.grafeas.v1;
 
-public final class CvssProto {
-  private CvssProto() {}
+public final class CVSSProto {
+  private CVSSProto() {}
 
   public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {}
 
@@ -111,7 +111,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "PECIFIED\020\000\022\023\n\017SCOPE_UNCHANGED\020\001\022\021\n\rSCOPE"
           + "_CHANGED\020\002\"R\n\006Impact\022\026\n\022IMPACT_UNSPECIFI"
           + "ED\020\000\022\017\n\013IMPACT_HIGH\020\001\022\016\n\nIMPACT_LOW\020\002\022\017\n"
-          + "\013IMPACT_NONE\020\003B\\\n\rio.grafeas.v1B\tCvssPro"
+          + "\013IMPACT_NONE\020\003B\\\n\rio.grafeas.v1B\tCVSSPro"
           + "toP\001Z8google.golang.org/genproto/googlea"
           + "pis/grafeas/v1;grafeas\242\002\003GRAb\006proto3"
     };

src/main/java/io/grafeas/v1/CVSSv3.java

@@ -172,13 +172,13 @@ private CVSSv3(
   }
 
   public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-    return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_descriptor;
+    return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_descriptor;
   }
 
   @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
-    return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
+    return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
         .ensureFieldAccessorsInitialized(
             io.grafeas.v1.CVSSv3.class, io.grafeas.v1.CVSSv3.Builder.class);
   }
@@ -1338,13 +1338,13 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3
       // @@protoc_insertion_point(builder_implements:grafeas.v1.CVSSv3)
       io.grafeas.v1.CVSSv3OrBuilder {
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_descriptor;
+      return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
+      return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               io.grafeas.v1.CVSSv3.class, io.grafeas.v1.CVSSv3.Builder.class);
     }
@@ -1393,7 +1393,7 @@ public Builder clear() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-      return io.grafeas.v1.CvssProto.internal_static_grafeas_v1_CVSSv3_descriptor;
+      return io.grafeas.v1.CVSSProto.internal_static_grafeas_v1_CVSSv3_descriptor;
     }
 
     @java.lang.Override

src/main/java/io/grafeas/v1/Common.java

@@ -44,6 +44,18 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_grafeas_v1_EnvelopeSignature_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_grafeas_v1_EnvelopeSignature_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_grafeas_v1_FileLocation_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_grafeas_v1_FileLocation_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_grafeas_v1_License_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_grafeas_v1_License_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_grafeas_v1_Digest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_grafeas_v1_Digest_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
@@ -60,14 +72,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\001(\014\022\024\n\014payload_type\030\002 \001(\t\0221\n\nsignatures\030"
           + "\003 \003(\0132\035.grafeas.v1.EnvelopeSignature\"/\n\021"
           + "EnvelopeSignature\022\013\n\003sig\030\001 \001(\014\022\r\n\005keyid\030"
-          + "\002 \001(\t*\276\001\n\010NoteKind\022\031\n\025NOTE_KIND_UNSPECIF"
-          + "IED\020\000\022\021\n\rVULNERABILITY\020\001\022\t\n\005BUILD\020\002\022\t\n\005I"
-          + "MAGE\020\003\022\013\n\007PACKAGE\020\004\022\016\n\nDEPLOYMENT\020\005\022\r\n\tD"
-          + "ISCOVERY\020\006\022\017\n\013ATTESTATION\020\007\022\013\n\007UPGRADE\020\010"
-          + "\022\016\n\nCOMPLIANCE\020\t\022\024\n\020DSSE_ATTESTATION\020\nBQ"
-          + "\n\rio.grafeas.v1P\001Z8google.golang.org/gen"
-          + "proto/googleapis/grafeas/v1;grafeas\242\002\003GR"
-          + "Ab\006proto3"
+          + "\002 \001(\t\"!\n\014FileLocation\022\021\n\tfile_path\030\001 \001(\t"
+          + "\"/\n\007License\022\022\n\nexpression\030\001 \001(\t\022\020\n\010comme"
+          + "nts\030\002 \001(\t\",\n\006Digest\022\014\n\004algo\030\001 \001(\t\022\024\n\014dig"
+          + "est_bytes\030\002 \001(\014*\276\001\n\010NoteKind\022\031\n\025NOTE_KIN"
+          + "D_UNSPECIFIED\020\000\022\021\n\rVULNERABILITY\020\001\022\t\n\005BU"
+          + "ILD\020\002\022\t\n\005IMAGE\020\003\022\013\n\007PACKAGE\020\004\022\016\n\nDEPLOYM"
+          + "ENT\020\005\022\r\n\tDISCOVERY\020\006\022\017\n\013ATTESTATION\020\007\022\013\n"
+          + "\007UPGRADE\020\010\022\016\n\nCOMPLIANCE\020\t\022\024\n\020DSSE_ATTES"
+          + "TATION\020\nBQ\n\rio.grafeas.v1P\001Z8google.gola"
+          + "ng.org/genproto/googleapis/grafeas/v1;gr"
+          + "afeas\242\002\003GRAb\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -101,6 +116,27 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Sig", "Keyid",
             });
+    internal_static_grafeas_v1_FileLocation_descriptor = getDescriptor().getMessageTypes().get(4);
+    internal_static_grafeas_v1_FileLocation_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_grafeas_v1_FileLocation_descriptor,
+            new java.lang.String[] {
+              "FilePath",
+            });
+    internal_static_grafeas_v1_License_descriptor = getDescriptor().getMessageTypes().get(5);
+    internal_static_grafeas_v1_License_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_grafeas_v1_License_descriptor,
+            new java.lang.String[] {
+              "Expression", "Comments",
+            });
+    internal_static_grafeas_v1_Digest_descriptor = getDescriptor().getMessageTypes().get(6);
+    internal_static_grafeas_v1_Digest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_grafeas_v1_Digest_descriptor,
+            new java.lang.String[] {
+              "Algo", "DigestBytes",
+            });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

src/main/java/io/grafeas/v1/Compliance.java

@@ -67,15 +67,16 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\021scan_instructions\030\007 \001(\014\032M\n\014CisBenchmark"
           + "\022\025\n\rprofile_level\030\001 \001(\005\022&\n\010severity\030\002 \001("
           + "\0162\024.grafeas.v1.SeverityB\021\n\017compliance_ty"
-          + "pe\"5\n\021ComplianceVersion\022\017\n\007cpe_uri\030\001 \001(\t"
-          + "\022\017\n\007version\030\002 \001(\t\"p\n\024ComplianceOccurrenc"
-          + "e\0229\n\023non_compliant_files\030\002 \003(\0132\034.grafeas"
-          + ".v1.NonCompliantFile\022\035\n\025non_compliance_r"
-          + "eason\030\003 \001(\t\"I\n\020NonCompliantFile\022\014\n\004path\030"
-          + "\001 \001(\t\022\027\n\017display_command\030\002 \001(\t\022\016\n\006reason"
-          + "\030\003 \001(\tBQ\n\rio.grafeas.v1P\001Z8google.golang"
-          + ".org/genproto/googleapis/grafeas/v1;graf"
-          + "eas\242\002\003GRAb\006proto3"
+          + "pe\"Q\n\021ComplianceVersion\022\017\n\007cpe_uri\030\001 \001(\t"
+          + "\022\032\n\022benchmark_document\030\003 \001(\t\022\017\n\007version\030"
+          + "\002 \001(\t\"p\n\024ComplianceOccurrence\0229\n\023non_com"
+          + "pliant_files\030\002 \003(\0132\034.grafeas.v1.NonCompl"
+          + "iantFile\022\035\n\025non_compliance_reason\030\003 \001(\t\""
+          + "I\n\020NonCompliantFile\022\014\n\004path\030\001 \001(\t\022\027\n\017dis"
+          + "play_command\030\002 \001(\t\022\016\n\006reason\030\003 \001(\tBQ\n\rio"
+          + ".grafeas.v1P\001Z8google.golang.org/genprot"
+          + "o/googleapis/grafeas/v1;grafeas\242\002\003GRAb\006p"
+          + "roto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -111,7 +112,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_grafeas_v1_ComplianceVersion_descriptor,
             new java.lang.String[] {
-              "CpeUri", "Version",
+              "CpeUri", "BenchmarkDocument", "Version",
             });
     internal_static_grafeas_v1_ComplianceOccurrence_descriptor =
         getDescriptor().getMessageTypes().get(2);