Process uploader requests without file count

Author: Dpross

pom.xml

@@ -22,6 +22,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
         <junit.version>5.10.0</junit.version>
+        <org.springframework.version>5.2.8.RELEASE</org.springframework.version>
     </properties>
 
     <dependencies>
@@ -41,6 +42,13 @@
             <artifactId>jersey-media-json-jackson</artifactId>
             <version>3.1.3</version>
         </dependency>
+        <!-- Source: https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+            <version>3.1.3</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-cdi2-se</artifactId>
@@ -98,6 +106,34 @@
             <artifactId>jakarta.mail-api</artifactId>
             <version>2.2.0-M1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webflux</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/de/dktk/dd/rpb/uploaderbasicwebservices/DicomwebResource.java

@@ -1,25 +1,37 @@
 package de.dktk.dd.rpb.uploaderbasicwebservices;
 
-import jakarta.servlet.annotation.MultipartConfig;
+import de.dktk.dd.rpb.uploaderbasicwebservices.util.Counter;
+import de.dktk.dd.rpb.uploaderbasicwebservices.util.ICounter;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import jakarta.mail.internet.MimeMultipart;
+import org.glassfish.jersey.media.multipart.BodyPart;
+import org.glassfish.jersey.media.multipart.MultiPart;
 
 import java.io.IOException;
+import java.util.List;
 
 @Path("/api/v1/dicomweb")
 public class DicomwebResource {
 
+    //@Inject private Counter counter;
+    private Counter counter = new Counter();
+
     @POST
     @Path("/studies/{dicomStudyIdentifier}")
-    @Consumes("multipart/related")
+    @Consumes({"multipart/mixed","multipart/related", "multipart/*"})
     public Response storeDicomStudy(@Context HttpHeaders headers,
                                     @PathParam("dicomStudyIdentifier") String dicomStudyIdentifier,
-                                    MimeMultipart multi){
+                                    MultiPart multipart) throws IOException {
+
+
+        List<BodyPart> parts = multipart.getBodyParts();
+        this.counter.setCount(this.counter.getCount() + parts.size());
+        System.out.println("count: " + this.counter.getCount());
 
         return Response.status(200).build();
     }

src/main/java/de/dktk/dd/rpb/uploaderbasicwebservices/GenerateUIDResource.java

@@ -18,6 +18,7 @@
 
 @Path("/api/v1/pacs/generateuids")
 public class GenerateUIDResource {
+
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public Response generateDicomUids(@Context HttpHeaders headers,

src/main/java/de/dktk/dd/rpb/uploaderbasicwebservices/PacsSubjectResource.java

@@ -1,5 +1,7 @@
 package de.dktk.dd.rpb.uploaderbasicwebservices;
 
+import de.dktk.dd.rpb.uploaderbasicwebservices.util.Counter;
+import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
@@ -8,19 +10,47 @@
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+import org.json.JSONObject;
 
-@Path("/v1/pacs")
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Path("/api/v1/pacs")
 public class PacsSubjectResource {
 
+    //private final Counter counter;
+
+    //@Inject
+    //public PacsSubjectResource(Counter counter) {
+    //    this.counter = counter;
+    //}
+
     @GET
     @Path("/subjects/{subjectid}/studies/{study}/series/{series}")
     @Produces(MediaType.APPLICATION_JSON)
     public Response getDicomSeriesData(@Context HttpHeaders headers,
                                        @PathParam("subjectid") String dicomPatientId,
                                        @PathParam("study") String studyInstanceUid,
                                        @PathParam("series") String seriesInstanceUid){
-        //return Response.ok().build();
-        return jakarta.ws.rs.core.Response.status(200).entity("28").build();
+
+        int count = 34;
+        List<String> imageArray = new ArrayList<>();
+        for (int i=0; i<count; i++){
+                imageArray.add("0");
+        }
+
+        Map<String,List> seriesImages = new HashMap<>();
+        seriesImages.put("Images",imageArray);
+
+        List<Map> seriesData = new ArrayList<>();
+        seriesData.add(seriesImages);
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("Series", seriesData);
+
+        return Response.status(200).entity(jsonObject.toString()).build();
     }
 
 }

src/main/java/de/dktk/dd/rpb/uploaderbasicwebservices/util/Counter.java

@@ -0,0 +1,16 @@
+package de.dktk.dd.rpb.uploaderbasicwebservices.util;
+
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class Counter implements ICounter {
+    private int count =0;
+
+    public int getCount() {
+        return count;
+    }
+    public void setCount(int count) {
+        this.count = count;
+    }
+}

src/main/java/de/dktk/dd/rpb/uploaderbasicwebservices/util/ICounter.java

@@ -0,0 +1,7 @@
+package de.dktk.dd.rpb.uploaderbasicwebservices.util;
+
+public interface ICounter {
+    public int getCount();
+    public void setCount(int count);
+
+}