Merge branch 'refs/heads/main' into development

qbicsoftware · Apr 4, 2024 · 8eeb365 · 8eeb365
2 parents 6963df9 + 97c75f9
commit 8eeb365
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-For API documentation see
+For the API documentation run the server and visit
 http://localhost:8080/swagger-ui/index.html
diff --git a/measurement-provider/pom.xml b/measurement-provider/pom.xml
@@ -6,19 +6,14 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>data-download-server</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.1.0</version>
   </parent>
 
   <groupId>life.qbic.data-download</groupId>
   <artifactId>measurement-provider</artifactId>
+  <version>0.1.0</version>
   <packaging>jar</packaging>
 
-  <properties>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

diff --git a/openbis-connector/pom.xml b/openbis-connector/pom.xml
@@ -7,25 +7,20 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>data-download-server</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.1.0</version>
   </parent>
 
   <groupId>life.qbic.data-download</groupId>
   <artifactId>openbis-connector</artifactId>
   <packaging>jar</packaging>
-
-  <properties>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+  <version>0.1.0</version>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.2.4</version>
+        <version>${spring.boot.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -71,7 +66,7 @@
     <dependency>
       <groupId>life.qbic.data-download</groupId>
       <artifactId>measurement-provider</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>0.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/pom.xml b/pom.xml
@@ -6,15 +6,24 @@
 
   <groupId>life.qbic</groupId>
   <artifactId>data-download-server</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>0.1.0</version>
   <packaging>pom</packaging>
+
+
   <modules>
     <module>zip</module>
     <module>measurement-provider</module>
     <module>openbis-connector</module>
     <module>rest-api</module>
   </modules>
 
+  <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <spring.boot.version>3.2.4</spring.boot.version>
+  </properties>
+
   <repositories>
     <!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
     <!-- Main Maven repository -->
@@ -53,7 +62,6 @@
     </repository>
   </repositories>
 
-
   <distributionManagement>
     <repository>
       <uniqueVersion>true</uniqueVersion>
@@ -69,10 +77,4 @@
     </snapshotRepository>
   </distributionManagement>
 
-  <properties>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
 </project>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
@@ -3,24 +3,29 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>life.qbic.data-download</groupId>
-  <artifactId>rest-api</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
 
   <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.2.4</version>
-    <relativePath/>
+    <groupId>life.qbic</groupId>
+    <artifactId>data-download-server</artifactId>
+    <version>0.1.0</version>
   </parent>
 
-  <properties>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.boot.version>3.2.4</spring.boot.version>
-  </properties>
+  <groupId>life.qbic.data-download</groupId>
+  <artifactId>rest-server</artifactId>
+  <version>0.1.0</version>
+  <packaging>jar</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring.boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <dependencies>
     <dependency>
@@ -57,17 +62,17 @@
     <dependency>
       <groupId>life.qbic.data-download</groupId>
       <artifactId>measurement-provider</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>0.1.0</version>
     </dependency>
     <dependency>
       <groupId>life.qbic.data-download</groupId>
       <artifactId>openbis-connector</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>0.1.0</version>
     </dependency>
     <dependency>
       <groupId>life.qbic.data-download</groupId>
       <artifactId>zip</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>0.1.0</version>
     </dependency>
   </dependencies>
 
@@ -132,6 +137,16 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
         <version>${spring.boot.version}</version>
+        <configuration>
+          <mainClass>life.qbic.data_download.rest.DataDownloadRestServer</mainClass>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

diff --git a/zip/pom.xml b/zip/pom.xml
@@ -6,19 +6,13 @@
   <parent>
     <groupId>life.qbic</groupId>
     <artifactId>data-download-server</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.1.0</version>
   </parent>
 
   <groupId>life.qbic.data-download</groupId>
   <artifactId>zip</artifactId>
   <packaging>jar</packaging>
 
-  <properties>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <build>
     <plugins>
       <plugin>

diff --git a/...src/main/java/life/qbic/data_download/util/zip/manipulation/BufferedZippingFunctions.java b/...src/main/java/life/qbic/data_download/util/zip/manipulation/BufferedZippingFunctions.java
@@ -21,8 +21,17 @@ private BufferedZippingFunctions() {
 
 
   public static ZipOutputStream zipInto(OutputStream outputStream) {
+    return zipInto(outputStream, ZipOutputStream.STORED);
+  }
+
+  /**
+   * @param outputStream the output stream to zip into
+   * @param method the method to use
+   * @return a zip output stream zipping into the output stream using the zipping method
+   */
+  public static ZipOutputStream zipInto(OutputStream outputStream, int method) {
     ZipOutputStream zipOutputStream = new ZipOutputStream(outputStream);
-    zipOutputStream.setMethod(ZipOutputStream.STORED);
+    zipOutputStream.setMethod(method);
     return zipOutputStream;
   }