Further Java updates

engine/pom.xml

@@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.1.8.RELEASE</version>
+    <version>2.2.0.RELEASE</version>
   </parent>
   <groupId>io.seldon.engine</groupId>
   <artifactId>seldon-engine</artifactId>
@@ -18,14 +18,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <project.build.sourceEncoding>
     UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
-    <grpc.version>1.23.0</grpc.version>
+    <grpc.version>1.24.0</grpc.version>
     <pb.version>3.9.2</pb.version>
-    <micrometer.version>1.1.7</micrometer.version>
+    <micrometer.version>1.3.0</micrometer.version>
     <start-class>io.seldon.engine.App</start-class>
     <jaeger.version>1.0.0</jaeger.version>
     <opentracing.version>0.33.0</opentracing.version>
     <curator.version>4.2.0</curator.version>
-    <jackson.version>2.9.10</jackson.version>
+    <jackson.version>2.10.0</jackson.version>
     <kubernetes.version>6.0.1</kubernetes.version>
   </properties>
   <build>
@@ -267,11 +267,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <artifactId>opentracing-api</artifactId>
       <version>${opentracing.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-properties-migrator</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>

engine/src/main/java/io/seldon/engine/grpc/GrpcChannelHandler.java

@@ -19,11 +19,12 @@ public class GrpcChannelHandler {
   @Autowired TracingProvider tracingProvider;
 
   public Channel get(Endpoint endpoint) {
-    if (store.containsKey(endpoint)) return store.get(endpoint);
-    else {
+    if (store.containsKey(endpoint)) {
+      return store.get(endpoint);
+    } else {
       ManagedChannel channel =
           ManagedChannelBuilder.forAddress(endpoint.getServiceHost(), endpoint.getServicePort())
-              .usePlaintext(true)
+              .usePlaintext()
               .build();
 
       if (tracingProvider != null && tracingProvider.isActive()) {
@@ -32,7 +33,9 @@ public Channel get(Endpoint endpoint) {
                 .withTracer(this.tracingProvider.getTracer())
                 .build();
         store.putIfAbsent(endpoint, tracingInterceptor.intercept(channel));
-      } else store.putIfAbsent(endpoint, channel);
+      } else {
+        store.putIfAbsent(endpoint, channel);
+      }
       return store.get(endpoint);
     }
   }

engine/src/main/java/io/seldon/engine/grpc/SeldonGrpcServer.java

@@ -79,7 +79,7 @@ public SeldonGrpcServer(
       try {
         maxMessageSize = Integer.parseInt(annotations.get(ANNOTATION_MAX_MESSAGE_SIZE));
         logger.info("Setting max message to {}", maxMessageSize);
-        builder.maxMessageSize(maxMessageSize);
+        builder.maxInboundMessageSize(maxMessageSize);
       } catch (NumberFormatException e) {
         logger.warn(
             "Failed to parse {} with value {}",

engine/src/main/java/io/seldon/engine/predictors/AverageCombinerUnit.java

@@ -15,7 +15,8 @@
  */
 package io.seldon.engine.predictors;
 
-import static org.ojalgo.function.PrimitiveFunction.*;
+// import static org.ojalgo.function.PrimitiveFunction.*;
+import static org.ojalgo.function.constant.PrimitiveMath.DIVIDE;
 
 import io.seldon.engine.exception.APIException;
 import io.seldon.protos.PredictionProtos.DefaultData;

engine/src/main/java/io/seldon/engine/service/InternalPredictionService.java

@@ -47,6 +47,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -138,8 +139,8 @@ public InternalPredictionService(
     logger.info("REST read timeout set to {}", readTimeout);
     this.restTemplate =
         restTemplateBuilder
-            .setConnectTimeout(connectionTimeout)
-            .setReadTimeout(readTimeout)
+            .setConnectTimeout(Duration.ofMillis(connectionTimeout))
+            .setReadTimeout(Duration.ofMillis(readTimeout))
             .build();
     if (tracingProvider.isActive()) {
       restTemplate.setInterceptors(
@@ -370,7 +371,9 @@ public SeldonMessage aggregate(List<SeldonMessage> outputs, PredictiveUnitState
   }
 
   private boolean isDefaultData(SeldonMessage message) {
-    if (message.getDataOneofCase() == DataOneofCase.DATA) return true;
+    if (message.getDataOneofCase() == DataOneofCase.DATA) {
+      return true;
+    }
     return false;
   }
 
@@ -393,8 +396,9 @@ private SeldonMessage queryREST(
     URI uri;
     try {
       final String uriKey = getUriKey(endpoint, path);
-      if (uriCache.containsKey(uriKey)) uri = uriCache.get(uriKey);
-      else {
+      if (uriCache.containsKey(uriKey)) {
+        uri = uriCache.get(uriKey);
+      } else {
         URIBuilder builder =
             new URIBuilder()
                 .setScheme("http")
@@ -413,8 +417,9 @@ private SeldonMessage queryREST(
     for (int i = 0; i < restRetries; i++) {
       try {
         HttpHeaders headers;
-        if (headersCache.containsKey(state.name)) headers = headersCache.get(state.name);
-        else {
+        if (headersCache.containsKey(state.name)) {
+          headers = headersCache.get(state.name);
+        } else {
           headers = new HttpHeaders();
           headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
           headers.add(MODEL_NAME_HEADER, state.name);
@@ -430,7 +435,9 @@ private SeldonMessage queryREST(
         HttpEntity<MultiValueMap<String, String>> request =
             new HttpEntity<MultiValueMap<String, String>>(map, headers);
 
-        if (logger.isDebugEnabled()) logger.debug("Requesting {}", uri.toString());
+        if (logger.isDebugEnabled()) {
+          logger.debug("Requesting {}", uri.toString());
+        }
         ResponseEntity<String> httpResponse =
             restTemplate.postForEntity(uri, request, String.class);
         try {
@@ -449,9 +456,10 @@ private SeldonMessage queryREST(
                 String.format("Bad return code %d", httpResponse.getStatusCode()));
           }
         } finally {
-          if (logger.isDebugEnabled())
+          if (logger.isDebugEnabled()) {
             logger.debug(
                 "External prediction server took " + (System.currentTimeMillis() - timeNow) + "ms");
+          }
         }
       } catch (ResourceAccessException e) {
         logger.warn("Caught resource access exception ", e);

engine/src/test/java/io/seldon/engine/api/rest/TestRandomABTest.java

@@ -27,7 +27,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
@@ -41,10 +40,6 @@
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
-@TestPropertySource(
-    properties = {
-      "management.security.enabled=false",
-    })
 public class TestRandomABTest {
 
   @Autowired private WebApplicationContext context;

engine/src/test/java/io/seldon/engine/api/rest/TestRestClientControllerExternalGraphs.java

@@ -29,7 +29,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
@@ -43,10 +42,6 @@
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
-@TestPropertySource(
-    properties = {
-      "management.security.enabled=false",
-    })
 public class TestRestClientControllerExternalGraphs {
 
   @Autowired private WebApplicationContext context;

engine/src/test/java/io/seldon/engine/config/TestConfig.java

@@ -1,13 +1,14 @@
 package io.seldon.engine.config;
 
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import io.seldon.engine.grpc.GrpcChannelHandler;
 import io.seldon.engine.service.InternalPredictionService;
 import io.seldon.engine.tracing.TracingProvider;
 import java.io.IOException;
+import java.time.Duration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
@@ -33,8 +34,8 @@ public RestTemplateBuilder restTemplateBuilder() {
     RestTemplateBuilder rtb = mock(RestTemplateBuilder.class);
     RestTemplate restTemplate = mock(RestTemplate.class);
     ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
-    when(rtb.setConnectTimeout(anyInt())).thenReturn(rtb);
-    when(rtb.setReadTimeout(anyInt())).thenReturn(rtb);
+    when(rtb.setConnectTimeout(any(Duration.class))).thenReturn(rtb);
+    when(rtb.setReadTimeout(any(Duration.class))).thenReturn(rtb);
     when(rtb.build()).thenReturn(restTemplate);
     when(restTemplate.getRequestFactory()).thenReturn(requestFactory);