[jacoco] Uses jacoco aggregation report plugin

.github/workflows/continuous.yml

@@ -38,7 +38,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build with Gradle
-        run: ./gradlew --refresh-dependencies build jRR jRV
+        run: ./gradlew --refresh-dependencies build :jacoco:testCodeCoverageReport
       - name: Upload test results
         uses: actions/upload-artifact@v3
         if: always()

benchmark/src/main/java/ai/djl/benchmark/AbstractBenchmark.java

@@ -123,7 +123,7 @@ public final boolean runBenchmark(String[] args) {
                 Metrics metrics = new Metrics(); // Reset Metrics for each test loop.
                 progressBar = new ProgressBar("Iteration", iteration);
                 float[] lastResult = predict(arguments, metrics, iteration);
-                if (lastResult == null) {
+                if (lastResult.length == 0) {
                     return false;
                 }
 

benchmark/src/main/java/ai/djl/benchmark/Arguments.java

@@ -290,7 +290,7 @@ String getModelName() {
 
     Map<String, String> getModelOptions() {
         if (modelOptions == null) {
-            return null;
+            return null; // NOPMD
         }
         Map<String, String> map = new ConcurrentHashMap<>();
         for (String option : modelOptions.split(",")) {
@@ -306,7 +306,7 @@ Map<String, String> getModelOptions() {
 
     Map<String, Object> getModelArguments() {
         if (modelArguments == null) {
-            return null;
+            return null; // NOPMD
         }
 
         Map<String, Object> map = new ConcurrentHashMap<>();

benchmark/src/main/java/ai/djl/benchmark/MultithreadedBenchmark.java

@@ -126,7 +126,7 @@ public float[] predict(Arguments arguments, Metrics metrics, int iteration)
         models.forEach(ZooModel::close);
         if (successThreads != numOfThreads) {
             logger.error("Only {}/{} threads finished.", successThreads, numOfThreads);
-            return null;
+            return new float[0];
         }
 
         return result;

benchmark/src/main/java/ai/djl/benchmark/WlmBenchmark.java

@@ -105,7 +105,7 @@ public float[] predict(Arguments arguments, Metrics metrics, int iteration) {
 
         if (successfulResults != iteration) {
             logger.error("Only {}/{} results successfully finished.", successfulResults, iteration);
-            return null;
+            return new float[0];
         }
 
         return results[0].join();

build.gradle

@@ -123,4 +123,3 @@ configure(javaProjects()) {
 }
 
 apply from: file("${rootProject.projectDir}/tools/gradle/publish.gradle")
-apply from: file("${rootProject.projectDir}/tools/gradle/jacoco.gradle")

engines/python/src/main/java/ai/djl/python/engine/CodecUtils.java

@@ -34,7 +34,7 @@ private CodecUtils() {}
     public static byte[] readBytes(ByteBuf in, int maxLength) {
         int len = in.readInt();
         if (len < 0) {
-            return null;
+            return null; // NOPMD
         }
         if (len > maxLength) {
             throw new CorruptedFrameException("Message size exceed limit: " + len);

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip

jacoco/build.gradle

@@ -0,0 +1,34 @@
+plugins {
+    id "base"
+    id "jacoco-report-aggregation"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    jacocoAggregation project(":benchmark")
+    // TODO: Add unit test for central and console
+    // jacocoAggregation project(":central")
+    jacocoAggregation project(":engines:python")
+    jacocoAggregation project(":engines:java")
+    jacocoAggregation project(":plugins:kserve")
+    // jacocoAggregation project(":plugins:management-console")
+    jacocoAggregation project(":plugins:plugin-management-plugin")
+    jacocoAggregation project(":plugins:static-file-plugin")
+    jacocoAggregation project(":serving")
+    jacocoAggregation project(":wlm")
+}
+
+reporting {
+    reports {
+        testCodeCoverageReport(JacocoCoverageReport) {
+            testType = TestSuiteType.UNIT_TEST
+        }
+    }
+}
+
+tasks.named("check") {
+    dependsOn tasks.named("testCodeCoverageReport", JacocoReport)
+}

jacoco/gradlew

@@ -0,0 +1 @@
+../gradlew

plugins/kserve/src/main/java/ai/djl/serving/kserve/KServeRequestHandler.java

@@ -79,11 +79,7 @@ public boolean acceptInboundMessage(Object msg) {
         return PATTERN.matcher(req.uri()).matches();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @return
-     */
+    /** {@inheritDoc} */
     @Override
     public Void handleRequest(
             ChannelHandlerContext ctx,

plugins/kserve/src/test/java/ai/djl/serving/kserve/KServeTensorTest.java

@@ -38,7 +38,9 @@ public void testKServeTensor() {
         Shape shape = new Shape(1);
         try (NDManager manager = NDManager.newBaseManager()) {
             for (DataType type : DataType.values()) {
-                if (type != DataType.STRING && type != DataType.UNKNOWN) {
+                if (type != DataType.STRING
+                        && type != DataType.UNKNOWN
+                        && type != DataType.COMPLEX64) {
                     KServeTensor tensor = getKServeTensor(shape, type);
                     tensor.toTensor(manager);
                 }

serving/src/main/java/ai/djl/serving/util/OpenSslKey.java

@@ -28,7 +28,7 @@ private OpenSslKey() {}
      */
     public static byte[] convertPrivateKey(byte[] keySpec) {
         if (keySpec == null) {
-            return null;
+            return null; // NOPMD
         }
 
         byte[] bytes = new byte[keySpec.length];
@@ -55,7 +55,7 @@ public static byte[] convertPrivateKey(byte[] keySpec) {
 
     private static byte[] encodeOID(int[] oid) {
         if (oid == null) {
-            return null;
+            return null; // NOPMD
         }
 
         int oLen = 1;
@@ -82,7 +82,7 @@ private static byte[] encodeOID(int[] oid) {
 
     private static byte[] encodeOctetString(byte[] bytes) {
         if (bytes == null) {
-            return null;
+            return null; // NOPMD
         }
 
         int oLen = bytes.length; // one byte for unused bits field
@@ -94,7 +94,7 @@ private static byte[] encodeOctetString(byte[] bytes) {
         int offset = writeLengthField(newBytes, oLen);
 
         if (len - oLen != offset) {
-            return null;
+            return null; // NOPMD
         }
 
         System.arraycopy(bytes, 0, newBytes, offset, oLen);
@@ -103,7 +103,7 @@ private static byte[] encodeOctetString(byte[] bytes) {
 
     private static byte[] encodeSequence(byte[][] byteArrays) {
         if (byteArrays == null) {
-            return null;
+            return null; // NOPMD
         }
 
         int oLen = 0;
@@ -122,7 +122,7 @@ private static byte[] encodeSequence(byte[][] byteArrays) {
         int offset = writeLengthField(bytes, oLen);
 
         if (len - oLen != offset) {
-            return null;
+            return null; // NOPMD
         }
 
         for (byte[] b : byteArrays) {

settings.gradle

@@ -9,3 +9,4 @@ include ':plugins:plugin-management-plugin'
 include ':plugins:static-file-plugin'
 include ':serving'
 include ':wlm'
+include ':jacoco'