diff --git a/pom.xml b/pom.xml index ba800403..78ba2dc2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.appform.ranger ranger pom - 1.1.0 + 1.2.0-RC1 Ranger https://github.com/appform-io/ranger Service Discovery for Java @@ -103,22 +103,23 @@ 5.5.0 1.7.32 - 3.8.0 + 3.14.0 17 17 - 1.18.30 + 1.18.36 3.0.1u2 - 5.8.2 - 4.1.1 + 5.10.2 + 4.2.1 2.0.0 4.9.3 - 3.3.1 - 4.2.0 + 3.5.4 + 5.11.0 - 2.1.12 + 5.0.0-rc.3 1.2.12 + 0.8.13 @@ -232,7 +233,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + ${jacoco.version} diff --git a/ranger-bom/pom.xml b/ranger-bom/pom.xml index 107c1c53..134cab77 100644 --- a/ranger-bom/pom.xml +++ b/ranger-bom/pom.xml @@ -6,7 +6,7 @@ io.appform.ranger ranger - 1.1.0 + 1.2.0-RC1 ranger-bom @@ -172,7 +172,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + ${jacoco.version} verify diff --git a/ranger-client/pom.xml b/ranger-client/pom.xml index cc79a4ed..e626455c 100644 --- a/ranger-client/pom.xml +++ b/ranger-client/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 @@ -46,7 +46,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.4.1 diff --git a/ranger-core/pom.xml b/ranger-core/pom.xml index 19240b1b..1a9b0af8 100644 --- a/ranger-core/pom.xml +++ b/ranger-core/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 @@ -44,7 +44,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.4.1 diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finder/serviceregistry/ServiceRegistryUpdater.java b/ranger-core/src/main/java/io/appform/ranger/core/finder/serviceregistry/ServiceRegistryUpdater.java index 70d43b7c..4e26c558 100644 --- a/ranger-core/src/main/java/io/appform/ranger/core/finder/serviceregistry/ServiceRegistryUpdater.java +++ b/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; diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/ListShardSelector.java b/ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/ListShardSelector.java index 6b7acf03..ca712c13 100644 --- a/ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/ListShardSelector.java +++ b/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 implements ShardSelector> { diff --git a/ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/MatchingShardSelector.java b/ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/MatchingShardSelector.java index 86317c75..49b41ace 100644 --- a/ranger-core/src/main/java/io/appform/ranger/core/finder/shardselector/MatchingShardSelector.java +++ b/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 implements ShardSelector> { diff --git a/ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json b/ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json index 5b64c35a..7a680ae2 100644 --- a/ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json +++ b/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 } \ No newline at end of file diff --git a/ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json b/ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json index fe461876..479b99a7 100644 --- a/ranger-discovery-bundle/perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json +++ b/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 } \ No newline at end of file diff --git a/ranger-discovery-bundle/pom.xml b/ranger-discovery-bundle/pom.xml index e84d8ac6..fca25e08 100644 --- a/ranger-discovery-bundle/pom.xml +++ b/ranger-discovery-bundle/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 @@ -29,7 +29,7 @@ 1.8.1 - 3.2.4 + 3.3.2 diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/InfoResource.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/InfoResource.java index d074f3a5..373e497e 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/InfoResource.java +++ b/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. diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java index 1c7a54f0..44ffd4bc 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java +++ b/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; diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryConfiguration.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryConfiguration.java index 2a42ae97..34740106 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryConfiguration.java +++ b/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; /** diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/Id.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/Id.java index 575b43bb..bdfac331 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/Id.java +++ b/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; } diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/Base36IdFormatter.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/Base36IdFormatter.java index e53aac78..474c0f98 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/Base36IdFormatter.java +++ b/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)); diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/DefaultIdFormatter.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/DefaultIdFormatter.java index 3cb6ac51..29bd04e0 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/DefaultIdFormatter.java +++ b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/DefaultIdFormatter.java @@ -17,16 +17,15 @@ 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() { @@ -34,10 +33,10 @@ public IdParserType getType() { } @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 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()); } } diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/IdFormatter.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/IdFormatter.java index 0fa33809..ef4f9e60 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/formatter/IdFormatter.java +++ b/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); diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/generator/IdGeneratorBase.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/generator/IdGeneratorBase.java index a91d91ca..9f388894 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/id/generator/IdGeneratorBase.java +++ b/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(); } diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardHealthMonitor.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardHealthMonitor.java index 29fd6ae2..1a46f57a 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardHealthMonitor.java +++ b/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. diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardServerStartupCheck.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardServerStartupCheck.java index f5d57f9f..ec838183 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/monitors/DropwizardServerStartupCheck.java +++ b/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; /** diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolver.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolver.java index e81ed139..2ad9f7b0 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolver.java +++ b/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; diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/PortSchemeResolver.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/PortSchemeResolver.java index 863a6957..58272351 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/PortSchemeResolver.java +++ b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/resolvers/PortSchemeResolver.java @@ -15,7 +15,7 @@ */ package io.appform.ranger.discovery.bundle.resolvers; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; /** * NodeInfoResolver.java diff --git a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelector.java b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelector.java index 7f8834da..743518aa 100644 --- a/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelector.java +++ b/ranger-discovery-bundle/src/main/java/io/appform/ranger/discovery/bundle/selectors/HierarchicalEnvironmentAwareShardSelector.java @@ -24,9 +24,12 @@ import lombok.extern.slf4j.Slf4j; import lombok.val; -import java.util.*; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; import java.util.function.Predicate; -import java.util.stream.Collectors; /** * diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleCustomHostPortTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleCustomHostPortTest.java index 83440be4..d35cd5cb 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleCustomHostPortTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleCustomHostPortTest.java @@ -16,23 +16,21 @@ package io.appform.ranger.discovery.bundle; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.health.HealthCheckRegistry; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import io.appform.ranger.core.healthcheck.HealthcheckStatus; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.curator.test.TestingCluster; @@ -41,22 +39,15 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodeAbsence; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodePresence; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @Slf4j class ServiceDiscoveryBundleCustomHostPortTest { - static { - val root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - root.setLevel(Level.INFO); - } - private final HealthCheckRegistry healthChecks = mock(HealthCheckRegistry.class); private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); private final MetricRegistry metricRegistry = mock(MetricRegistry.class); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwMonitorTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwMonitorTest.java index adf73745..a999f8a7 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwMonitorTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwMonitorTest.java @@ -16,24 +16,22 @@ package io.appform.ranger.discovery.bundle; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.health.HealthCheck; import com.codahale.metrics.health.HealthCheckRegistry; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import io.appform.ranger.core.healthcheck.HealthcheckStatus; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.curator.test.TestingCluster; @@ -42,24 +40,17 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; import java.util.concurrent.atomic.AtomicInteger; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodeAbsence; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodePresence; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @Slf4j class ServiceDiscoveryBundleDwMonitorTest { - static { - val root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - root.setLevel(Level.INFO); - } - private final HealthCheckRegistry healthChecks = new HealthCheckRegistry(); private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); private final MetricRegistry metricRegistry = mock(MetricRegistry.class); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwStalenessMonitorTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwStalenessMonitorTest.java index ef485c31..47ad8f47 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwStalenessMonitorTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleDwStalenessMonitorTest.java @@ -16,24 +16,22 @@ package io.appform.ranger.discovery.bundle; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.health.HealthCheck; import com.codahale.metrics.health.HealthCheckRegistry; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import io.appform.ranger.core.healthcheck.HealthcheckStatus; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.curator.test.TestingCluster; @@ -42,24 +40,17 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; import java.util.concurrent.atomic.AtomicBoolean; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodeAbsence; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodePresence; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @Slf4j class ServiceDiscoveryBundleDwStalenessMonitorTest { - static { - val root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - root.setLevel(Level.INFO); - } - private final HealthCheckRegistry healthChecks = new HealthCheckRegistry(); private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); private final MetricRegistry metricRegistry = mock(MetricRegistry.class); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleHierarchicalSelectorTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleHierarchicalSelectorTest.java index 7f7d7cfc..481750de 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleHierarchicalSelectorTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleHierarchicalSelectorTest.java @@ -16,8 +16,6 @@ package io.appform.ranger.discovery.bundle; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import com.alibaba.dcm.DnsCacheManipulator; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.health.HealthCheckRegistry; @@ -25,16 +23,16 @@ import com.google.common.collect.Lists; import io.appform.ranger.core.healthcheck.HealthcheckStatus; import io.appform.ranger.discovery.bundle.util.ConfigurationUtils; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import lombok.val; @@ -44,22 +42,15 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodeAbsence; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodePresence; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @Slf4j class ServiceDiscoveryBundleHierarchicalSelectorTest { - static { - val root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - root.setLevel(Level.INFO); - } - private final HealthCheckRegistry healthChecks = mock(HealthCheckRegistry.class); private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); private final MetricRegistry metricRegistry = mock(MetricRegistry.class); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleLocalHostPortTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleLocalHostPortTest.java index 0cc51373..3fd767c4 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleLocalHostPortTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleLocalHostPortTest.java @@ -21,13 +21,13 @@ import com.codahale.metrics.health.HealthCheckRegistry; import com.fasterxml.jackson.databind.ObjectMapper; import io.appform.ranger.discovery.bundle.util.ConfigurationUtils; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.jupiter.api.AfterEach; @@ -41,7 +41,6 @@ import static io.appform.ranger.discovery.bundle.Constants.LOCAL_ADDRESSES; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleRotationTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleRotationTest.java index 509795b2..ffa8354c 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleRotationTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleRotationTest.java @@ -16,8 +16,6 @@ package io.appform.ranger.discovery.bundle; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import com.alibaba.dcm.DnsCacheManipulator; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.health.HealthCheckRegistry; @@ -27,16 +25,16 @@ import io.appform.ranger.discovery.bundle.rotationstatus.OORTask; import io.appform.ranger.discovery.bundle.rotationstatus.RotationStatus; import io.appform.ranger.discovery.bundle.util.ConfigurationUtils; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.curator.test.TestingCluster; @@ -45,24 +43,17 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; import java.util.Collections; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodeAbsence; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodePresence; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @Slf4j class ServiceDiscoveryBundleRotationTest { - static { - val root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - root.setLevel(Level.INFO); - } - private final HealthCheckRegistry healthChecks = mock(HealthCheckRegistry.class); private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); private final MetricRegistry metricRegistry = mock(MetricRegistry.class); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleTest.java index 7f0bdde8..f04c623d 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundleTest.java @@ -16,8 +16,6 @@ package io.appform.ranger.discovery.bundle; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.Logger; import com.alibaba.dcm.DnsCacheManipulator; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.health.HealthCheckRegistry; @@ -27,16 +25,16 @@ import io.appform.ranger.discovery.bundle.resolvers.DefaultNodeInfoResolver; import io.appform.ranger.discovery.bundle.resolvers.NodeInfoResolver; import io.appform.ranger.discovery.bundle.util.ConfigurationUtils; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jetty.ConnectorFactory; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.curator.test.TestingCluster; @@ -45,22 +43,15 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodeAbsence; import static io.appform.ranger.discovery.bundle.TestUtils.assertNodePresence; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @Slf4j class ServiceDiscoveryBundleTest { - static { - val root = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); - root.setLevel(Level.INFO); - } - private final HealthCheckRegistry healthChecks = mock(HealthCheckRegistry.class); private final JerseyEnvironment jerseyEnvironment = mock(JerseyEnvironment.class); private final MetricRegistry metricRegistry = mock(MetricRegistry.class); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/TestUtils.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/TestUtils.java index 6bcc0505..7a88c9da 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/TestUtils.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/TestUtils.java @@ -16,7 +16,7 @@ package io.appform.ranger.discovery.bundle; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import lombok.experimental.UtilityClass; import org.awaitility.Awaitility; diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/BenchmarkTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/BenchmarkTest.java index 0335e24e..f57af8d9 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/BenchmarkTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/BenchmarkTest.java @@ -43,10 +43,10 @@ void testBenchmark() throws RunnerException { .timeUnit(TimeUnit.SECONDS) .warmupTime(TimeValue.seconds(5)) .warmupIterations(1) - .measurementTime(TimeValue.seconds(5)) - .measurementIterations(4) + .measurementTime(TimeValue.seconds(2)) + .measurementIterations(2) .threads(1) - .forks(3) + .forks(1) .shouldFailOnError(true) .shouldDoGC(true) .build(); diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdGeneratorTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdGeneratorTest.java index 98020083..abda903f 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdGeneratorTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdGeneratorTest.java @@ -32,7 +32,6 @@ import java.time.*; import java.util.Collections; -import java.util.Date; import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.Executors; @@ -99,8 +98,8 @@ void testGenerate() { val executorService = Executors.newFixedThreadPool(numRunners); runners.forEach(executorService::submit); Awaitility.await() - .pollInterval(Duration.ofSeconds(10)) - .timeout(Duration.ofSeconds(11)) + .pollInterval(Duration.ofSeconds(2)) + .timeout(Duration.ofSeconds(3)) .until(() -> true); executorService.shutdownNow(); val totalCount = runners.stream().mapToLong(Runner::getCount).sum(); @@ -221,7 +220,7 @@ void testParseSuccess() { Assertions.assertEquals(247, id.getExponent()); Assertions.assertEquals(3972, id.getNode()); Assertions.assertEquals(generateDate(2020, 11, 25, 9, 59, 3, 64, ZoneId.systemDefault()), - id.getGeneratedDate()); + id.getGeneratedDate()); } @Test @@ -244,17 +243,10 @@ void testParseSuccessAfterGeneration() { @SuppressWarnings("SameParameterValue") - private Date generateDate(int year, int month, int day, int hour, int min, int sec, int ms, ZoneId zoneId) { - return Date.from( - Instant.from( - ZonedDateTime.of( - LocalDateTime.of( - year, month, day, hour, min, sec, Math.multiplyExact(ms, 1000000) - ), - zoneId - ) - ) - ); + private LocalDateTime generateDate(int year, int month, int day, int hour, int min, int sec, int ms, ZoneId zoneId) { + return LocalDateTime.of( + year, month, day, hour, min, sec, Math.multiplyExact(ms, 1000000) + ); } diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdParsersTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdParsersTest.java index 0d1d0e06..bf951574 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdParsersTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/id/IdParsersTest.java @@ -5,24 +5,28 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.temporal.ChronoField; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class IdParsersTest { @Test - void testDefaultId() throws ParseException { + void testDefaultId() { val id = "T2407101232336168748798"; val parsedId = IdParsers.parse(id).orElse(null); Assertions.assertNotNull(parsedId); - Assertions.assertEquals(id, parsedId.getId()); - Assertions.assertEquals(798, parsedId.getExponent()); - Assertions.assertEquals(8748, parsedId.getNode()); - assertDate("240710123233616", parsedId.getGeneratedDate()); - } + assertEquals(id, parsedId.getId()); + assertEquals(798, parsedId.getExponent()); + assertEquals(8748, parsedId.getNode()); - private void assertDate(final String dateString, final Date date) throws ParseException { - Assertions.assertEquals(new SimpleDateFormat("yyMMddHHmmssSSS").parse(dateString), date); + var dateTime = parsedId.getGeneratedDate(); + assertEquals(2024, dateTime.get(ChronoField.YEAR_OF_ERA)); + assertEquals(7, dateTime.getMonth().getValue()); + assertEquals(10, dateTime.getDayOfMonth()); + assertEquals(12, dateTime.getHour()); + assertEquals(32, dateTime.getMinute()); + assertEquals(33, dateTime.getSecond()); + assertEquals(616, dateTime.get(ChronoField.MILLI_OF_SECOND)); } } diff --git a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolverTest.java b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolverTest.java index 8e79e40c..45fcdf58 100644 --- a/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolverTest.java +++ b/ranger-discovery-bundle/src/test/java/io/appform/ranger/discovery/bundle/resolvers/DefaultPortSchemeResolverTest.java @@ -16,11 +16,11 @@ package io.appform.ranger.discovery.bundle.resolvers; import com.google.common.collect.Lists; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jetty.HttpConnectorFactory; import io.dropwizard.jetty.HttpsConnectorFactory; -import io.dropwizard.server.DefaultServerFactory; -import io.dropwizard.server.SimpleServerFactory; +import io.dropwizard.core.server.DefaultServerFactory; +import io.dropwizard.core.server.SimpleServerFactory; import lombok.val; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ranger-drove-client/pom.xml b/ranger-drove-client/pom.xml index c33e3312..ac49f11c 100644 --- a/ranger-drove-client/pom.xml +++ b/ranger-drove-client/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-drove/pom.xml b/ranger-drove/pom.xml index 8f7a829e..109f389c 100644 --- a/ranger-drove/pom.xml +++ b/ranger-drove/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 1.30 diff --git a/ranger-drove/src/main/java/io/appform/ranger/drove/common/DroveCachingCommunicator.java b/ranger-drove/src/main/java/io/appform/ranger/drove/common/DroveCachingCommunicator.java index 892a39ec..97d1d046 100644 --- a/ranger-drove/src/main/java/io/appform/ranger/drove/common/DroveCachingCommunicator.java +++ b/ranger-drove/src/main/java/io/appform/ranger/drove/common/DroveCachingCommunicator.java @@ -82,9 +82,8 @@ public DroveCachingCommunicator( } @Override - public @NonNull Map> loadAll( - @NonNull Iterable services) { - return root.listNodes(services); //This will throw in the case of comm failure, which is correct + public Map> loadAll(Set keys) throws Exception { + return root.listNodes(keys); } }); val relevantEvents = EnumSet.of(DroveEventType.APP_STATE_CHANGE, DroveEventType.INSTANCE_STATE_CHANGE); diff --git a/ranger-drove/src/main/java/io/appform/ranger/drove/config/DroveUpstreamConfig.java b/ranger-drove/src/main/java/io/appform/ranger/drove/config/DroveUpstreamConfig.java index 60882748..625d3dd7 100644 --- a/ranger-drove/src/main/java/io/appform/ranger/drove/config/DroveUpstreamConfig.java +++ b/ranger-drove/src/main/java/io/appform/ranger/drove/config/DroveUpstreamConfig.java @@ -20,8 +20,8 @@ import lombok.Value; import lombok.extern.jackson.Jacksonized; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/ranger-http-client/pom.xml b/ranger-http-client/pom.xml index 42d86038..a83cc915 100644 --- a/ranger-http-client/pom.xml +++ b/ranger-http-client/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-http-model/pom.xml b/ranger-http-model/pom.xml index 8d742248..f52ff70b 100644 --- a/ranger-http-model/pom.xml +++ b/ranger-http-model/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-http/pom.xml b/ranger-http/pom.xml index 44da1b2a..3386e881 100644 --- a/ranger-http/pom.xml +++ b/ranger-http/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-hub-server-bundle/pom.xml b/ranger-hub-server-bundle/pom.xml index 8f5ab10d..7b58f080 100644 --- a/ranger-hub-server-bundle/pom.xml +++ b/ranger-hub-server-bundle/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 diff --git a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundle.java b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundle.java index 8a3eb670..6ade3781 100644 --- a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundle.java +++ b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundle.java @@ -37,7 +37,7 @@ import io.appform.ranger.hub.server.bundle.healthcheck.RangerHealthCheck; import io.appform.ranger.hub.server.bundle.lifecycle.CuratorLifecycle; import io.appform.ranger.server.bundle.RangerServerBundle; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerDroveUpstreamConfiguration.java b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerDroveUpstreamConfiguration.java index 9d5322a2..37f12956 100644 --- a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerDroveUpstreamConfiguration.java +++ b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerDroveUpstreamConfiguration.java @@ -23,8 +23,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerHttpUpstreamConfiguration.java b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerHttpUpstreamConfiguration.java index 96b9c423..928f2e3b 100644 --- a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerHttpUpstreamConfiguration.java +++ b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerHttpUpstreamConfiguration.java @@ -23,8 +23,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import java.util.List; @Data diff --git a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerServerConfiguration.java b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerServerConfiguration.java index e2232a33..c5040cfa 100644 --- a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerServerConfiguration.java +++ b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerServerConfiguration.java @@ -21,9 +21,9 @@ import lombok.Value; import lombok.extern.jackson.Jacksonized; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.List; /** diff --git a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerUpstreamConfiguration.java b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerUpstreamConfiguration.java index 06ec4b43..f8ec7abc 100644 --- a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerUpstreamConfiguration.java +++ b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerUpstreamConfiguration.java @@ -22,8 +22,8 @@ import lombok.AllArgsConstructor; import lombok.Getter; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; @AllArgsConstructor @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", visible = true) diff --git a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerZkUpstreamConfiguration.java b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerZkUpstreamConfiguration.java index 8927e835..debc0d2b 100644 --- a/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerZkUpstreamConfiguration.java +++ b/ranger-hub-server-bundle/src/main/java/io/appform/ranger/hub/server/bundle/configuration/RangerZkUpstreamConfiguration.java @@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; import java.util.List; @Data diff --git a/ranger-hub-server-bundle/src/test/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundleTest.java b/ranger-hub-server-bundle/src/test/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundleTest.java index 3b41b263..09bc8657 100644 --- a/ranger-hub-server-bundle/src/test/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundleTest.java +++ b/ranger-hub-server-bundle/src/test/java/io/appform/ranger/hub/server/bundle/RangerHubServerBundleTest.java @@ -32,13 +32,13 @@ import io.appform.ranger.hub.server.bundle.configuration.RangerHttpUpstreamConfiguration; import io.appform.ranger.hub.server.bundle.configuration.RangerServerConfiguration; import io.appform.ranger.hub.server.bundle.configuration.RangerUpstreamConfiguration; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.Getter; import lombok.SneakyThrows; import lombok.val; diff --git a/ranger-server-bundle/pom.xml b/ranger-server-bundle/pom.xml index 6e0121d7..66aa0154 100644 --- a/ranger-server-bundle/pom.xml +++ b/ranger-server-bundle/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/RangerServerBundle.java b/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/RangerServerBundle.java index 59b2e451..35f672e6 100644 --- a/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/RangerServerBundle.java +++ b/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/RangerServerBundle.java @@ -25,11 +25,11 @@ import io.appform.ranger.server.bundle.rotation.OorTask; import io.appform.ranger.server.bundle.rotation.RotationCheck; import io.appform.ranger.server.bundle.rotation.RotationStatus; -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.Getter; import lombok.extern.slf4j.Slf4j; import lombok.val; diff --git a/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/resources/RangerResource.java b/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/resources/RangerResource.java index d30e72da..45a28c6a 100644 --- a/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/resources/RangerResource.java +++ b/ranger-server-bundle/src/main/java/io/appform/ranger/server/bundle/resources/RangerResource.java @@ -21,14 +21,20 @@ import io.appform.ranger.core.model.ServiceNode; import io.appform.ranger.core.model.ServiceRegistry; import io.appform.ranger.http.response.model.GenericResponse; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import lombok.extern.slf4j.Slf4j; import lombok.val; -import javax.inject.Inject; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.MediaType; import java.util.Collection; import java.util.List; import java.util.Set; diff --git a/ranger-server-bundle/src/test/java/io/appform/ranger/server/bundle/RangerServerBundleTest.java b/ranger-server-bundle/src/test/java/io/appform/ranger/server/bundle/RangerServerBundleTest.java index afae5220..c81a25f7 100644 --- a/ranger-server-bundle/src/test/java/io/appform/ranger/server/bundle/RangerServerBundleTest.java +++ b/ranger-server-bundle/src/test/java/io/appform/ranger/server/bundle/RangerServerBundleTest.java @@ -25,13 +25,13 @@ import io.appform.ranger.core.finder.serviceregistry.ListBasedServiceRegistry; import io.appform.ranger.core.units.TestNodeData; import io.appform.ranger.core.utils.RangerTestUtils; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.jersey.DropwizardResourceConfig; import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.setup.AdminEnvironment; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.AdminEnvironment; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.val; import org.eclipse.jetty.util.component.LifeCycle; import org.junit.jupiter.api.*; @@ -40,7 +40,6 @@ import java.util.List; import static io.appform.ranger.client.utils.RangerHubTestUtils.service; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; public class RangerServerBundleTest { diff --git a/ranger-server-common/pom.xml b/ranger-server-common/pom.xml index bb989c00..11337eb6 100644 --- a/ranger-server-common/pom.xml +++ b/ranger-server-common/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-server/pom.xml b/ranger-server/pom.xml index 87022734..00867a2e 100644 --- a/ranger-server/pom.xml +++ b/ranger-server/pom.xml @@ -22,7 +22,7 @@ io.appform.ranger ranger - 1.1.0 + 1.2.0-RC1 ranger-server diff --git a/ranger-server/src/main/java/io/appform/ranger/server/App.java b/ranger-server/src/main/java/io/appform/ranger/server/App.java index 31e074ff..7fdaf119 100644 --- a/ranger-server/src/main/java/io/appform/ranger/server/App.java +++ b/ranger-server/src/main/java/io/appform/ranger/server/App.java @@ -23,9 +23,9 @@ import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import io.appform.ranger.hub.server.bundle.RangerHubServerBundle; import io.appform.ranger.hub.server.bundle.configuration.RangerServerConfiguration; -import io.dropwizard.Application; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.Application; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import lombok.SneakyThrows; import lombok.val; diff --git a/ranger-server/src/main/java/io/appform/ranger/server/AppConfig.java b/ranger-server/src/main/java/io/appform/ranger/server/AppConfig.java index 624bb316..c9232595 100644 --- a/ranger-server/src/main/java/io/appform/ranger/server/AppConfig.java +++ b/ranger-server/src/main/java/io/appform/ranger/server/AppConfig.java @@ -17,13 +17,13 @@ package io.appform.ranger.server; import io.appform.ranger.hub.server.bundle.configuration.RangerServerConfiguration; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * diff --git a/ranger-zk-client/pom.xml b/ranger-zk-client/pom.xml index b8a6c0d0..2983e3a9 100644 --- a/ranger-zk-client/pom.xml +++ b/ranger-zk-client/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0 diff --git a/ranger-zookeeper/pom.xml b/ranger-zookeeper/pom.xml index 707147cf..056c20ee 100644 --- a/ranger-zookeeper/pom.xml +++ b/ranger-zookeeper/pom.xml @@ -21,7 +21,7 @@ ranger io.appform.ranger - 1.1.0 + 1.2.0-RC1 4.0.0