Merge pull request #437 from GDATASoftwareAG/single-deteciton

java: Single detection; Flatten libmagic object
GDATASoftwareAG · Apr 29, 2024 · de85f49 · de85f49
2 parents 63c2caa + b980663
commit de85f49
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/java/src/main/java/de/gdata/vaas/messages/LibMagic.java b/java/src/main/java/de/gdata/vaas/messages/LibMagic.java
diff --git a/java/src/main/java/de/gdata/vaas/messages/VaasVerdict.java b/java/src/main/java/de/gdata/vaas/messages/VaasVerdict.java
@@ -13,14 +13,17 @@ public class VaasVerdict {
     @NonNull
     Verdict verdict;
     @Getter
-    ArrayList<Detection> detections;
+    String detection;
     @Getter
-    LibMagic libMagic;
+    String fileType;
+    @Getter
+    String mimeType;
 
     public VaasVerdict(VerdictResponse verdictResponse) {
         this.sha256 = verdictResponse.sha256;
         this.verdict = verdictResponse.verdict;
-        this.detections = verdictResponse.detections;
-        this.libMagic = verdictResponse.libMagic;
+        this.detection = verdictResponse.detection;
+        this.fileType = verdictResponse.fileType;
+        this.mimeType = verdictResponse.mimeType;
     }
 }
diff --git a/java/src/main/java/de/gdata/vaas/messages/VerdictResponse.java b/java/src/main/java/de/gdata/vaas/messages/VerdictResponse.java
@@ -27,11 +27,14 @@ public class VerdictResponse extends MessageType {
     @SerializedName("upload_token")
     String uploadToken;
     @Getter
-    @SerializedName("detections")
-    ArrayList<Detection> detections;
+    @SerializedName("detection")
+    String detection;
     @Getter
-    @SerializedName("lib_magic")
-    LibMagic libMagic;
+    @SerializedName("file_type")
+    String fileType;
+    @Getter
+    @SerializedName("mime_type")
+    String mimeType;
 
     private VerdictResponse() {
         super(Kind.VerdictResponse);

diff --git a/java/src/test/java/de/gdata/test/integration/RealApiIntegrationTests.java b/java/src/test/java/de/gdata/test/integration/RealApiIntegrationTests.java
@@ -524,9 +524,9 @@ public void forStream_WithEicarFile_ReturnsMaliciousVerdictWithDetections() thro
         var vaas = this.getVaasWithCredentials();
         var verdict = vaas.forStream(inputStream, contentLength);
 
-        assertNotNull(verdict.getDetections());
+        assertNotNull(verdict.getDetection());
         assertEquals(Verdict.MALICIOUS, verdict.getVerdict());
-        assertEquals("EICAR virus test files", verdict.getLibMagic().getFileType());
-        assertEquals("text/plain", verdict.getLibMagic().getMimeType());
+        assertEquals("EICAR virus test files", verdict.getFileType());
+        assertEquals("text/plain", verdict.getMimeType());
     }
 }