Upgrade to Dropwizard 5.x series

pom.xml

@@ -23,7 +23,7 @@
     <groupId>io.appform.ranger</groupId>
     <artifactId>ranger</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.0</version>
+    <version>1.2.0-RC1</version>
     <name>Ranger</name>
     <url>https://github.com/appform-io/ranger</url>
     <description>Service Discovery for Java</description>
@@ -103,22 +103,23 @@
         <curator.version>5.5.0</curator.version>
         <slf4j.version>1.7.32</slf4j.version>
 
-        <maven.compiler.version>3.8.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
         <java.version>17</java.version>
         <java.release.version>17</java.release.version>
-        <lombok.version>1.18.30</lombok.version>
+        <lombok.version>1.18.36</lombok.version>
         <annotations.version>3.0.1u2</annotations.version>
 
-        <junit.version>5.8.2</junit.version>
-        <awaitility.version>4.1.1</awaitility.version>
+        <junit.version>5.10.2</junit.version>
+        <awaitility.version>4.2.1</awaitility.version>
         <guava-retrying.version>2.0.0</guava-retrying.version>
 
         <http.client.version>4.9.3</http.client.version>
-        <wiremock.version>3.3.1</wiremock.version>
-        <mockito.version>4.2.0</mockito.version>
+        <wiremock.version>3.5.4</wiremock.version>
+        <mockito.version>5.11.0</mockito.version>
 
-        <dropwizard.version>2.1.12</dropwizard.version>
+        <dropwizard.version>5.0.0-rc.3</dropwizard.version>
         <logback.version>1.2.12</logback.version>
+        <jacoco.version>0.8.13</jacoco.version>
     </properties>
 
     <dependencyManagement>
@@ -232,7 +233,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>${jacoco.version}</version>
                 <executions>
                     <execution>
                         <goals>

ranger-bom/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.appform.ranger</groupId>
     <artifactId>ranger</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-RC1</version>
   </parent>
 
   <artifactId>ranger-bom</artifactId>
@@ -172,7 +172,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.8</version>
+        <version>${jacoco.version}</version>
         <executions>
           <execution>
             <phase>verify</phase>

ranger-client/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.1.0</version>
+        <version>1.2.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <goals>

ranger-core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.1.0</version>
+        <version>1.2.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,7 +44,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <goals>

ranger-core/src/main/java/io/appform/ranger/core/finder/serviceregistry/ServiceRegistryUpdater.java

@@ -16,7 +16,6 @@
 package io.appform.ranger.core.finder.serviceregistry;
 
 import com.github.rholder.retry.RetryerBuilder;
-import com.github.rholder.retry.WaitStrategies;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
 import io.appform.ranger.core.healthcheck.HealthcheckStatus;

ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/ListShardSelector.java

@@ -21,7 +21,6 @@
 
 import java.util.List;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 public class ListShardSelector<T> implements ShardSelector<T, ListBasedServiceRegistry<T>> {
 

ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/MatchingShardSelector.java

@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 public class MatchingShardSelector<T> implements ShardSelector<T, MapBasedServiceRegistry<T>> {
 

ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json

@@ -1,8 +1,8 @@
 {
   "name" : "io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate",
   "mode" : "Throughput",
-  "iterations" : 4,
+  "iterations" : 2,
   "threads" : 1,
-  "forks" : 3,
-  "mean_ops" : 823635.7718335792
+  "forks" : 1,
+  "mean_ops" : 972120.7148037818
 }

ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json

@@ -1,8 +1,8 @@
 {
   "name" : "io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36",
   "mode" : "Throughput",
-  "iterations" : 4,
+  "iterations" : 2,
   "threads" : 1,
-  "forks" : 3,
-  "mean_ops" : 655010.8023043653
+  "forks" : 1,
+  "mean_ops" : 915895.4912517057
 }

ranger-discovery-bundle/pom.xml

@@ -21,15 +21,15 @@
     <parent>
         <artifactId>ranger</artifactId>
         <groupId>io.appform.ranger</groupId>
-        <version>1.1.0</version>
+        <version>1.2.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ranger-discovery-bundle</artifactId>
 
     <properties>
         <dns.cache.manipulator.version>1.8.1</dns.cache.manipulator.version>
-        <failsafe.version>3.2.4</failsafe.version>
+        <failsafe.version>3.3.2</failsafe.version>
     </properties>
 
     <dependencies>

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/InfoResource.java

@@ -20,11 +20,11 @@
 import io.appform.ranger.common.server.ShardInfo;
 import io.appform.ranger.core.finder.serviceregistry.MapBasedServiceRegistry;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Given information about the cluster.

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java

@@ -52,11 +52,11 @@
 import io.appform.ranger.discovery.bundle.util.ConfigurationUtils;
 import io.appform.ranger.zookeeper.ServiceProviderBuilders;
 import io.appform.ranger.zookeeper.serde.ZkNodeDataSerializer;
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.ConfiguredBundle;
 import io.dropwizard.lifecycle.Managed;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryConfiguration.java

@@ -19,10 +19,10 @@
 import com.google.common.base.Strings;
 import lombok.*;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import java.util.Set;
 
 /**

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/Id.java

@@ -16,9 +16,14 @@
 
 package io.appform.ranger.discovery.bundle.id;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
 
-import java.util.Date;
 
 /**
  * A representation of an ID
@@ -30,7 +35,7 @@
 @ToString
 public class Id {
     private String id;
-    private Date generatedDate;
+    private LocalDateTime generatedDate;
     private int node;
     private int exponent;
 }

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/Base36IdFormatter.java

@@ -16,9 +16,9 @@
 package io.appform.ranger.discovery.bundle.id.formatter;
 
 import io.appform.ranger.discovery.bundle.id.Id;
-import org.joda.time.DateTime;
 
 import java.math.BigInteger;
+import java.time.LocalDateTime;
 import java.util.Optional;
 
 public class Base36IdFormatter implements IdFormatter {
@@ -35,7 +35,7 @@ public IdParserType getType() {
     }
 
     @Override
-    public String format(final DateTime dateTime,
+    public String format(final LocalDateTime dateTime,
                          final int nodeId,
                          final int randomNonce) {
         return toBase36(idFormatter.format(dateTime, nodeId, randomNonce));

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/DefaultIdFormatter.java

@@ -17,27 +17,26 @@
 
 import io.appform.ranger.discovery.bundle.id.Id;
 import lombok.val;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
 public class DefaultIdFormatter implements IdFormatter {
     private static final Pattern PATTERN = Pattern.compile("(.*)([0-9]{15})([0-9]{4})([0-9]{3})");
-    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyMMddHHmmssSSS");
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyMMddHHmmssSSS");
 
     @Override
     public IdParserType getType() {
         return IdParserType.DEFAULT;
     }
 
     @Override
-    public String format(final DateTime dateTime,
+    public String format(final LocalDateTime dateTime,
                          final int nodeId,
                          final int randomNonce) {
-        return String.format("%s%04d%03d", DATE_TIME_FORMATTER.print(dateTime), nodeId, randomNonce);
+        return String.format("%s%04d%03d", DATE_TIME_FORMATTER.format(dateTime), nodeId, randomNonce);
     }
 
     @Override
@@ -46,11 +45,13 @@ public Optional<Id> parse(final String idString) {
         if (!matcher.find()) {
             return Optional.empty();
         }
+        var dateTimeString = matcher.group(2);
+        val localDateTime = LocalDateTime.from(DATE_TIME_FORMATTER.parse(dateTimeString));
         return Optional.of(Id.builder()
                 .id(idString)
                 .node(Integer.parseInt(matcher.group(3)))
                 .exponent(Integer.parseInt(matcher.group(4)))
-                .generatedDate(DATE_TIME_FORMATTER.parseDateTime(matcher.group(2)).toDate())
+                .generatedDate(localDateTime)
                 .build());
     }
 }

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/IdFormatter.java

@@ -16,15 +16,15 @@
 package io.appform.ranger.discovery.bundle.id.formatter;
 
 import io.appform.ranger.discovery.bundle.id.Id;
-import org.joda.time.DateTime;
 
+import java.time.LocalDateTime;
 import java.util.Optional;
 
 public interface IdFormatter {
 
     IdParserType getType();
 
-    String format(final DateTime dateTime,
+    String format(final LocalDateTime localDateTime,
                   final int nodeId,
                   final int randomNonce);
 

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/generator/IdGeneratorBase.java

@@ -17,8 +17,9 @@
 import io.appform.ranger.discovery.bundle.id.request.IdGenerationRequest;
 import lombok.Getter;
 import lombok.val;
-import org.joda.time.DateTime;
 
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -84,12 +85,13 @@ public final synchronized void registerDomainSpecificConstraints(
     }
 
     public final Id getIdFromIdInfo(final NonceInfo nonceInfo, final String namespace, final IdFormatter idFormatter) {
-        val dateTime = new DateTime(nonceInfo.getTime());
+        val instant = Instant.ofEpochMilli(nonceInfo.getTime());
+        val dateTime = instant.atZone(ZoneId.systemDefault()).toLocalDateTime();
         val id = String.format("%s%s", namespace, idFormatter.format(dateTime, getNodeId(), nonceInfo.getExponent()));
         return Id.builder()
                 .id(id)
                 .exponent(nonceInfo.getExponent())
-                .generatedDate(dateTime.toDate())
+                .generatedDate(dateTime)
                 .node(getNodeId())
                 .build();
     }

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardHealthMonitor.java

@@ -20,7 +20,7 @@
 import io.appform.ranger.core.healthcheck.HealthcheckStatus;
 import io.appform.ranger.core.healthservice.TimeEntity;
 import io.appform.ranger.core.healthservice.monitor.IsolatedHealthMonitor;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Environment;
 
 /**
  * This monitor calls dropwizard healthchecks every few secs.

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardServerStartupCheck.java

@@ -19,7 +19,7 @@
 import io.appform.ranger.core.healthcheck.Healthcheck;
 import io.appform.ranger.core.healthcheck.HealthcheckStatus;
 import io.appform.ranger.discovery.bundle.rotationstatus.DropwizardServerStatus;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Environment;
 import lombok.extern.slf4j.Slf4j;
 
 /**

ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolver.java

@@ -16,12 +16,12 @@
 package io.appform.ranger.discovery.bundle.resolvers;
 
 import io.appform.ranger.core.model.PortSchemes;
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.server.DefaultServerFactory;
+import io.dropwizard.core.server.ServerFactory;
+import io.dropwizard.core.server.SimpleServerFactory;
 import io.dropwizard.jetty.ConnectorFactory;
 import io.dropwizard.jetty.HttpsConnectorFactory;
-import io.dropwizard.server.DefaultServerFactory;
-import io.dropwizard.server.ServerFactory;
-import io.dropwizard.server.SimpleServerFactory;
 import lombok.val;
 
 import java.util.Optional;