Make request attributes serializable

.gitignore

@@ -1,6 +1,7 @@
 # Ignore for Rust
 target/
 Cargo.lock
+launch.json
 
 .DS_Store
 node_modules

java/examples/VaasExample/build.gradle

@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     implementation 'org.slf4j:slf4j-nop:2.0.7'
-    implementation 'de.gdata:vaas:4.1.0'
+    implementation 'de.gdata:vaas:4.2.0'
 }
 
 task fileScan(type: JavaExec) {

java/examples/VaasExample/src/main/java/de/gdata/vaasexample/Main.java

@@ -3,6 +3,7 @@
 import de.gdata.vaas.ClientCredentialsGrantAuthenticator;
 import de.gdata.vaas.Vaas;
 import de.gdata.vaas.VaasConfig;
+import de.gdata.vaas.messages.VerdictRequestAttributes;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -16,13 +17,14 @@ public static void main(String[] args) throws Exception {
         var authenticator = new ClientCredentialsGrantAuthenticator(clientId, clientSecret,
                 "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token");
         var config = new VaasConfig(
-                new URI("https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"),
                 new URI("wss://gateway.production.vaas.gdatasecurity.de"));
         var vaas = new Vaas(config, authenticator);
         vaas.connect();
 
         var file = Path.of(scanPath);
-        var verdict = vaas.forFile(file);
+        var verdictRequestAttributes = new VerdictRequestAttributes();
+        verdictRequestAttributes.setTenantId("fileTenant");
+        var verdict = vaas.forFile(file, verdictRequestAttributes);
         vaas.disconnect();
         System.out.printf("File %s was detected as %s", verdict.getSha256(), verdict.getVerdict());
     }

java/examples/VaasExample/src/main/java/de/gdata/vaasexample/UrlScan.java

@@ -3,6 +3,7 @@
 import de.gdata.vaas.ClientCredentialsGrantAuthenticator;
 import de.gdata.vaas.Vaas;
 import de.gdata.vaas.VaasConfig;
+import de.gdata.vaas.messages.VerdictRequestAttributes;
 
 import java.net.URI;
 import java.net.URL;
@@ -15,13 +16,16 @@ public static void main(String[] args) throws Exception {
         var authenticator = new ClientCredentialsGrantAuthenticator(clientId, clientSecret,
                 "https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token");
         var config = new VaasConfig(
-                new URI("https://account.gdata.de/realms/vaas-production/protocol/openid-connect/token"),
                 new URI("wss://gateway.production.vaas.gdatasecurity.de"));
         var vaas = new Vaas(config, authenticator);
         vaas.connect();
 
         var url = new URL("https://secure.eicar.org/eicar.com");
-        var verdict = vaas.forUrl(url);
+
+        var verdictRequestAttributes = new VerdictRequestAttributes();
+        verdictRequestAttributes.setTenantId("urlTenant");
+        var verdict = vaas.forUrl(url, verdictRequestAttributes);
+
         vaas.disconnect();
         System.out.printf("File %s was detected as %s", verdict.getSha256(), verdict.getVerdict());
     }

java/src/main/java/de/gdata/vaas/messages/VerdictRequestAttributes.java

@@ -1,12 +1,27 @@
 package de.gdata.vaas.messages;
 
+import com.beust.jcommander.internal.Nullable;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
 import lombok.Getter;
 import lombok.Setter;
 
 public class VerdictRequestAttributes {
   @Getter
   @Setter
+  @Nullable
   @SerializedName("tenantId")
   String tenantId;
+
+  public VerdictRequestAttributes() {
+  }
+
+  public String toJson() {
+    return new GsonBuilder().serializeNulls().create().toJson(this);
+  }
+
+  public static MessageType fromJson(String json) {
+    return new Gson().fromJson(json, MessageType.class);
+  }
 }

java/src/main/java/de/gdata/vaas/messages/VerdictRequestForUrl.java

@@ -24,6 +24,7 @@ public class VerdictRequestForUrl extends MessageType {
     String guid;
     @Getter
     @Setter
+    @SerializedName("verdict_request_attributes")
     VerdictRequestAttributes verdictRequestAttributes;
 
     public VerdictRequestForUrl(URL url, String sessionId) throws MalformedURLException {

java/src/test/java/de/gdata/test/integration/RealApiIntegrationTests.java

@@ -5,6 +5,7 @@
 import de.gdata.vaas.exceptions.VaasConnectionClosedException;
 import de.gdata.vaas.exceptions.VaasInvalidStateException;
 import de.gdata.vaas.messages.Verdict;
+import de.gdata.vaas.messages.VerdictRequest;
 import de.gdata.vaas.messages.VerdictRequestAttributes;
 import io.github.cdimascio.dotenv.Dotenv;
 import org.jetbrains.annotations.NotNull;
@@ -20,6 +21,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.testng.AssertJUnit.assertEquals;
@@ -338,6 +340,18 @@ public void fromUrlMultipleCleanUrls() throws Exception {
         assertEquals(Verdict.CLEAN, verdict_3.getVerdict());
     }
 
+    @Test
+    public void serializationTest() {
+        var sha256 = new Sha256("3A78F382E8E2968EC201B33178102E06DB72E4F2D1505E058A4613C1E977825C");
+        var verdictRequestAttributes = new VerdictRequestAttributes();
+        verdictRequestAttributes.setTenantId("Test");
+        var verdictRequest = new VerdictRequest(sha256, "myid", verdictRequestAttributes);
+        var json1 = verdictRequest.toJson();
+        var json2 = verdictRequestAttributes.toJson();
+        assertNotNull(json1, "");
+        assertNotNull(json2, "");
+    }
+
     private @NotNull String getRandomString(int size) {
         String AlphaNumericString = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvxyz0123456789";
         StringBuilder sb = new StringBuilder(size);