Java 17, bumping dependencies (#298)

Former-commit-id: 9884837

Author: silvanheller

.github/workflows/codeql-analysis.yml

@@ -40,6 +40,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.github/workflows/gradle.yml

@@ -17,7 +17,7 @@ jobs:
     # Setup Cottontail DB service container
     services:
       cottontail:
-        image: vitrivr/cottontaildb:0.15.0
+        image: vitrivr/cottontaildb:0.15.1
         ports:
           - 1865:1865
         options: -it
@@ -35,10 +35,10 @@ jobs:
       run: nc -zv 127.0.0.1 1865
     - name: polypheny connection test
       run: nc -zv 127.0.0.1 13137
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
     - name: Cleanup Gradle Cache
       # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.

.github/workflows/release-maven.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.6
+          java-version: 17
           server-id: maven
       - id: get_version
         name: Extract publication version from tag.

.github/workflows/snapshot-maven.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.6
+          java-version: 17
           server-id: maven
       - id: publish-gradle
         name: Publish package to the OSS Snapshot Repository & GitHub Packages

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '6.1.0'
-    id 'de.undercouch.download' version "4.1.1"
-    id 'com.google.osdetector' version '1.6.2'
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'de.undercouch.download' version "5.0.5"
+    id 'com.google.osdetector' version '1.7.0'
     id 'java-library'
     id 'idea'
 }
@@ -11,7 +11,7 @@ allprojects {
     group = 'org.vitrivr'
 
     /* Our current version, on dev branch this should always be release+1-SNAPSHOT */
-    version = '3.11.1'
+    version = '3.11.2'
 
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
@@ -28,9 +28,7 @@ subprojects {
         }
 
         dependencies {
-            classpath "gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.6.2"
-            classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.14"
-            classpath "de.undercouch:gradle-download-task:4.1.1"
+            classpath "gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18"
         }
     }
 
@@ -40,8 +38,8 @@ subprojects {
         zip64 true // Required to allow more than 65535 entries in final archive
     }
 
-    sourceCompatibility = 1.11
-    targetCompatibility = 1.11
+    sourceCompatibility = 17
+    targetCompatibility = 17
 
     repositories {
         mavenCentral()
@@ -69,8 +67,8 @@ subprojects {
         implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: version_jackson
 
         /** Protobuf */
-        implementation group: 'io.grpc', name: 'grpc-stub', version: '1.45.0'
-        implementation group: 'io.grpc', name: 'grpc-netty', version: '1.45.0'
+        implementation group: 'io.grpc', name: 'grpc-stub', version: '1.45.1'
+        implementation group: 'io.grpc', name: 'grpc-netty', version: '1.45.1'
 
         /** Test dependencies (JUnit 5) */
         testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: version_junit
@@ -97,7 +95,7 @@ task getExternalFiles {
         fileList.eachLine { String line ->
             def split = line.split(",")
             def destination = split[1]
-            download {
+            download.run {
                 src split[0]
                 dest destination
             }

cineast-api/build.gradle

@@ -111,7 +111,6 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: version_jackson
     implementation group: 'de.svenkubiak', name: 'jBCrypt', version: version_jbcrypt
     implementation group: 'org.vitrivr', name: 'cineast-proto', version: version_cineast_proto
-    implementation group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.8'
 
 }
 

cineast-api/src/main/java/org/vitrivr/cineast/api/APIEndpoint.java

@@ -18,6 +18,7 @@
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.vitrivr.cineast.api.rest.OpenApiCompatHelper;
 import org.vitrivr.cineast.api.rest.handlers.actions.StatusInvocationHandler;
+import org.vitrivr.cineast.api.rest.handlers.actions.bool.CountRowsGetHandler;
 import org.vitrivr.cineast.api.rest.handlers.actions.bool.FindDistinctElementsByColumnPostHandler;
 import org.vitrivr.cineast.api.rest.handlers.actions.bool.SelectFromTablePostHandler;
 import org.vitrivr.cineast.api.rest.handlers.actions.feature.FindFeaturesByCategoryPostHandler;
@@ -281,16 +282,17 @@ public Javalin dispatchService(boolean secure) {
       }
       /* Serve the UI if requested statically*/
       if (config.getServeUI()) {
+        LOGGER.info("UI serving is enabled");
         /* Add css, js and other static files */
         serviceConfig.addStaticFiles(config.getUiLocation(), Location.EXTERNAL);
-        /* Add index.html - the ui's front page as default route. Anything reroutes to thre */
-        serviceConfig
-            .addSinglePageRoot("/", config.getUiLocation() + "/index.html", Location.EXTERNAL);
+        /* Add index.html - the ui's front page as default route. Anything reroutes to there */
+        serviceConfig.addSinglePageRoot("/", config.getUiLocation() + "/index.html", Location.EXTERNAL);
       }
     });
 
     /* Enable WebSocket (if configured). */
     if (config.getEnableWebsocket()) {
+      LOGGER.info("Starting WS API");
       this.webSocketApi = new WebsocketAPI();
 
       service.ws(String.format("%s/websocket", namespace()), handler -> {
@@ -308,6 +310,7 @@ public Javalin dispatchService(boolean secure) {
 
     /* Setup HTTP/RESTful connection (if configured). */
     if (config.getEnableRest() || config.getEnableRestSecure()) {
+      LOGGER.info("Starting REST API");
       this.restHandlers.forEach(handler -> registerRestHandler(service, handler));
       this.registerServingRoutes(service, config);
     }
@@ -326,8 +329,7 @@ public Javalin dispatchService(boolean secure) {
         service.start();
       }
     } catch (Exception ex) {
-      LOGGER.log(Level.FATAL,
-          "Failed to start HTTP endpoint due to an exception. Cineast will shut down now!", ex);
+      LOGGER.log(Level.FATAL, "Failed to start HTTP endpoint due to an exception. Cineast will shut down now!", ex);
       System.exit(100);
     }
 
@@ -441,6 +443,7 @@ private void registerRestOperations() {
    */
   private void registerServingRoutes(final Javalin service, final APIConfig config) {
     if (config.getServeContent()) {
+      LOGGER.info("Serving content is enabled");
       service.get("/thumbnails/{id}", new ResolvedContentRoute(
           new FileSystemThumbnailResolver(
               new File(Config.sharedConfig().getApi().getThumbnailLocation()))));

cineast-api/src/main/java/org/vitrivr/cineast/api/GRPCEndpoint.java

@@ -14,9 +14,8 @@
 
 public class GRPCEndpoint {
 
-  private static Server server;
-
   private static final Logger LOGGER = LogManager.getLogger();
+  private static Server server;
 
   public static void start() throws IOException {
 

cineast-api/src/main/java/org/vitrivr/cineast/api/Main.java

@@ -31,20 +31,23 @@ public static void main(String[] args) {
     try {
       APIEndpoint.getInstance().start();
     } catch (Throwable e) {
+      e.printStackTrace();
       System.err.println("Failed to initialize API endpoint due to an exception: " + e.getMessage());
     }
 
     /* Start gRPC endpoint. */
     try {
       GRPCEndpoint.start();
     } catch (Throwable e) {
+      e.printStackTrace();
       System.err.println("Failed to initialize gRPC endpoint due to an exception: " + e.getMessage());
     }
 
     /* Initialize Monitoring */
     try {
       PrometheusServer.initialize();
     } catch (Throwable e) {
+      e.printStackTrace();
       System.err.println("Failed to initialize Monitoring due to an exception: " + e.getMessage());
     }
 

cineast-api/src/main/java/org/vitrivr/cineast/api/SessionExtractionContainer.java

@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.vitrivr.cineast.core.util.json.JacksonJsonProvider;
@@ -19,8 +20,8 @@
  */
 public class SessionExtractionContainer {
 
-  private static SessionContainerProvider provider;
   private static final Logger LOGGER = LogManager.getLogger();
+  private static SessionContainerProvider provider;
   private static boolean open = false;
   private static Counter submittedPaths;
   private static File configFile;
@@ -85,10 +86,10 @@ public static void endSession() {
     getProviderOrExit().endSession();
   }
 
-  public static void addPaths(ExtractionItemContainer[] items) {
-    getOpenProviderOrExit().addPaths(Arrays.asList(items));
+  public static void addPaths(List<ExtractionItemContainer> items) {
+    getOpenProviderOrExit().addPaths(items);
     if (submittedPaths != null) {
-      submittedPaths.inc(items.length);
+      submittedPaths.inc(items.size());
     }
   }
 

cineast-api/src/main/java/org/vitrivr/cineast/api/grpc/CineastQueryService.java

@@ -37,10 +37,8 @@
 public class CineastQueryService extends CineastQueryGrpc.CineastQueryImplBase {
 
   private static final int DEFAULT_NEIGHBORING_SEGMENTS = 10;
-
-  private final ContinuousRetrievalLogic continuousRetrievalLogic;
-
   private static final Logger LOGGER = LogManager.getLogger();
+  private final ContinuousRetrievalLogic continuousRetrievalLogic;
 
   public CineastQueryService(ContinuousRetrievalLogic continuousRetrievalLogic) {
     this.continuousRetrievalLogic = continuousRetrievalLogic;
@@ -114,7 +112,7 @@ public void getMediaSegmentScores(CineastGrpc.Query query, StreamObserver<Cineas
               break stages;
             }
 
-            results.stream().forEach(x -> relevantSegments.add(x.key));
+            results.forEach(x -> relevantSegments.add(x.key()));
           }
         }
       }
@@ -203,7 +201,7 @@ public void getSimilar(CineastGrpc.TemporalQuery query, StreamObserver<CineastGr
               /* Transform raw results into list of StringDoublePairs (segmentId -> score) */
               final List<StringDoublePair> results = scores.stream()
                   .map(elem -> new StringDoublePair(elem.getSegmentId(), elem.getScore()))
-                  .filter(p -> p.value > 0d)
+                  .filter(p -> p.value() > 0d)
                   .sorted(StringDoublePair.COMPARATOR)
                   .limit(max)
                   .collect(Collectors.toList());
@@ -215,7 +213,7 @@ public void getSimilar(CineastGrpc.TemporalQuery query, StreamObserver<CineastGr
                 LOGGER.error("Category {} was used twice in stage {}. This erases the results of the previous category... ", category, finalStageIndex);
               }
               cache.get(finalStageIndex).put(category, results);
-              results.forEach(res -> relevantSegments.add(res.key));
+              results.forEach(res -> relevantSegments.add(res.key()));
               LOGGER.trace("Category {} at stage {} executed @ {} ms", category, finalStageIndex, watch.getTime(TimeUnit.MILLISECONDS));
 
               /* If this is the last stage, we can send relevant results per category back to the UI.
@@ -231,7 +229,7 @@ public void getSimilar(CineastGrpc.TemporalQuery query, StreamObserver<CineastGr
                             results
                         )));
 
-                List<String> segmentIds = results.stream().map(x -> x.key).filter(x -> !sentSegmentIds.contains(x)).collect(Collectors.toList());
+                List<String> segmentIds = results.stream().map(StringDoublePair::key).filter(x -> !sentSegmentIds.contains(x)).collect(Collectors.toList());
                 if (segmentIds.isEmpty()) {
                   continue;
                 }
@@ -313,7 +311,7 @@ public void getSimilar(CineastGrpc.TemporalQuery query, StreamObserver<CineastGr
       /* At this point, we have iterated over all stages. Now, we need to go back for all stages and send the results for the relevant ids. */
       for (int stageIndex = 0; stageIndex < stages.size() - 1; stageIndex++) {
         cache.get(stageIndex).forEach((category, results) -> {
-          results.removeIf(pair -> !stageQConf.getRelevantSegmentIds().contains(pair.key));
+          results.removeIf(pair -> !stageQConf.getRelevantSegmentIds().contains(pair.key()));
 
           responseObserver.onNext(
               QueryContainerUtil.queryResult(

cineast-api/src/main/java/org/vitrivr/cineast/api/grpc/util/QueryContainerUtil.java

@@ -266,7 +266,7 @@ public static CineastGrpc.MediaSegmentId mediaSegmentId(String id) {
   }
 
   public static CineastGrpc.MediaSegmentIdScore mediaSegmentIdScore(StringDoublePair pair) {
-    return CineastGrpc.MediaSegmentIdScore.newBuilder().setId(mediaSegmentId(pair.key)).setScore(pair.value).build();
+    return CineastGrpc.MediaSegmentIdScore.newBuilder().setId(mediaSegmentId(pair.key())).setScore(pair.value()).build();
   }
 
   public static CineastGrpc.QueryId queryId(String id) {