From 9db434398c86d86c0bc3b58e3ce0fda1a4005580 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:31:36 +0100 Subject: [PATCH] Update dependency io.dropwizard:dropwizard-dependencies to v4 (release/4.0.x) (#242) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jochen Schalanda --- pom.xml | 2 +- .../discovery/AbstractDiscoveryBundle.java | 26 ++++++------ .../dropwizard/discovery/DiscoveryBundle.java | 6 +-- .../discovery/DiscoveryConfiguration.java | 2 +- .../discovery/DiscoveryFactory.java | 24 +++++------ .../discovery/client/DiscoveryClient.java | 30 +++++++------- .../client/DiscoveryClientManager.java | 4 +- .../core/CuratorAdvertisementListener.java | 4 +- .../discovery/core/CuratorAdvertiser.java | 40 +++++++++---------- .../discovery/core/CuratorFactory.java | 12 +++--- .../discovery/core/InstanceMetadata.java | 6 +-- .../core/JacksonInstanceSerializer.java | 6 +-- .../discovery/health/CuratorHealthCheck.java | 4 +- .../manage/CuratorAdvertiserManager.java | 4 +- .../discovery/manage/CuratorManager.java | 4 +- .../manage/ServiceDiscoveryManager.java | 4 +- .../DiscoveryBundleIntegrationTest.java | 16 ++++---- .../discovery/DiscoveryFactoryTest.java | 32 +++++++-------- .../client/DiscoveryClientManagerTest.java | 10 ++--- .../discovery/client/DiscoveryClientTest.java | 31 +++++++------- .../discovery/core/CuratorAdvertiserTest.java | 16 ++++---- .../discovery/core/CuratorFactoryTest.java | 23 +++++------ .../discovery/core/InstanceMetadataTest.java | 21 +++++----- .../health/CuratorHealthCheckTest.java | 12 +++--- .../manage/CuratorAdvertiserManagerTest.java | 4 +- .../discovery/manage/CuratorManagerTest.java | 16 ++++---- .../manage/ServiceDiscoveryManagerTest.java | 6 +-- .../discovery/testutil/TestApplication.java | 8 ++-- .../discovery/testutil/TestConfiguration.java | 4 +- 29 files changed, 185 insertions(+), 192 deletions(-) diff --git a/pom.xml b/pom.xml index 966ba41..14741a1 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ https://sonarcloud.io -Xdoclint:none - 2.0.29 + 4.0.4 5.5.0 9+181-r4173-1 diff --git a/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java b/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java index b784e5f..bf35f12 100644 --- a/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java +++ b/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java @@ -1,7 +1,9 @@ package io.dropwizard.discovery; -import io.dropwizard.Configuration; -import io.dropwizard.ConfiguredBundle; +import io.dropwizard.core.Configuration; +import io.dropwizard.core.ConfiguredBundle; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import io.dropwizard.discovery.client.DiscoveryClient; import io.dropwizard.discovery.core.CuratorAdvertisementListener; import io.dropwizard.discovery.core.CuratorAdvertiser; @@ -9,9 +11,7 @@ import io.dropwizard.discovery.core.JacksonInstanceSerializer; import io.dropwizard.discovery.manage.CuratorAdvertiserManager; import io.dropwizard.discovery.manage.ServiceDiscoveryManager; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.x.discovery.DownInstancePolicy; import org.apache.curator.x.discovery.ProviderStrategy; @@ -31,13 +31,13 @@ public abstract class AbstractDiscoveryBundle public abstract Class getPayloadClass(); @Override - public void initialize(@Nonnull final Bootstrap bootstrap) { + public void initialize(@NonNull final Bootstrap bootstrap) { mapper = bootstrap.getObjectMapper(); } @Override - public void run(@Nonnull final T configuration, - @Nonnull final Environment environment) throws Exception { + public void run(@NonNull final T configuration, + @NonNull final Environment environment) throws Exception { final DiscoveryFactory discoveryConfig = getDiscoveryFactory(configuration); // Allow disabling all discovery functionality @@ -77,13 +77,13 @@ public void run(@Nonnull final T configuration, * Return a new {@link DiscoveryClient} instance that uses a * {@link RoundRobinStrategy} when selecting a instance to return and the * default {@link DownInstancePolicy}. - * + * * @param serviceName * name of the service to monitor * @return {@link DiscoveryClient} */ public DiscoveryClient newDiscoveryClient( - @Nonnull final String serviceName) { + @NonNull final String serviceName) { return newDiscoveryClient(serviceName, new RoundRobinStrategy()); } @@ -91,7 +91,7 @@ public DiscoveryClient newDiscoveryClient( * Return a new {@link DiscoveryClient} instance uses a default * {@link DownInstancePolicy} and the provided {@link ProviderStrategy} for * selecting an instance. - * + * * @param serviceName * name of the service to monitor * @param providerStrategy @@ -100,8 +100,8 @@ public DiscoveryClient newDiscoveryClient( * @return {@link DiscoveryClient} */ public DiscoveryClient newDiscoveryClient( - @Nonnull final String serviceName, - @Nonnull final ProviderStrategy providerStrategy) { + @NonNull final String serviceName, + @NonNull final ProviderStrategy providerStrategy) { return new DiscoveryClient(serviceName, discovery, new DownInstancePolicy(), providerStrategy); } diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java b/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java index 605e4c2..dc08ea5 100644 --- a/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java +++ b/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java @@ -1,6 +1,6 @@ package io.dropwizard.discovery; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.discovery.core.CuratorAdvertiser; import io.dropwizard.discovery.core.DefaultServiceInstanceFactory; import io.dropwizard.discovery.core.InstanceMetadata; @@ -11,12 +11,12 @@ * DiscoveryBundle provides a more completed implementation of * AbstractDiscoveryBundle, using InstanceMetadata as * payload for ServiceInstance - * + * *

* Users should extend AbstractDiscoveryBundle if more fine-grain * control is necessary of the ServiceInstance payload. *

- * + * * @see io.dropwizard.discovery.core.InstanceMetadata * @see io.dropwizard.discovery.DiscoveryBundle */ diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java b/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java index 9cbf569..671f0c5 100644 --- a/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java +++ b/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java @@ -1,6 +1,6 @@ package io.dropwizard.discovery; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; import io.dropwizard.discovery.core.CuratorAdvertiser; import org.apache.curator.x.discovery.ServiceDiscovery; diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java b/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java index fc62e7a..ab8b4c7 100644 --- a/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java +++ b/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java @@ -2,10 +2,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import org.checkerframework.checker.nullness.qual.NonNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.api.CompressionProvider; import org.apache.curator.framework.imps.GzipCompressionProvider; @@ -38,7 +38,7 @@ enum CompressionCodec { final private CompressionProvider provider; - CompressionCodec(@Nonnull final CompressionProvider provider) { + CompressionCodec(@NonNull final CompressionProvider provider) { this.provider = provider; } @@ -125,7 +125,7 @@ public String getServiceName() { } @JsonProperty - public void setServiceName(@Nonnull final String serviceName) { + public void setServiceName(@NonNull final String serviceName) { this.serviceName = checkNotNull(serviceName); } @@ -135,7 +135,7 @@ public String getNamespace() { } @JsonProperty - public void setNamespace(@Nonnull final String namespace) { + public void setNamespace(@NonNull final String namespace) { this.namespace = checkNotNull(namespace); } @@ -145,7 +145,7 @@ public String getBasePath() { } @JsonProperty - public void setBasePath(@Nonnull final String basePath) { + public void setBasePath(@NonNull final String basePath) { this.basePath = checkNotNull(basePath); } @@ -155,7 +155,7 @@ public String getListenAddress() { } @JsonProperty - public void setListenAddress(@Nonnull final String listenAddress) { + public void setListenAddress(@NonNull final String listenAddress) { this.listenAddress = checkNotNull(listenAddress); } @@ -166,7 +166,7 @@ public Duration getConnectionTimeout() { @JsonProperty public void setConnectionTimeout( - @Nonnull final Duration connectionTimeout) { + @NonNull final Duration connectionTimeout) { this.connectionTimeout = checkNotNull(connectionTimeout); } @@ -176,7 +176,7 @@ public Duration getSessionTimeout() { } @JsonProperty - public void setSessionTimeout(@Nonnull final Duration sessionTimeout) { + public void setSessionTimeout(@NonNull final Duration sessionTimeout) { this.sessionTimeout = checkNotNull(sessionTimeout); } @@ -216,7 +216,7 @@ public Duration getBaseSleepTime() { } @JsonProperty - public void setBaseSleepTime(@Nonnull final Duration baseSleepTime) { + public void setBaseSleepTime(@NonNull final Duration baseSleepTime) { this.baseSleepTime = checkNotNull(baseSleepTime); } diff --git a/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java b/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java index b59903a..07b270c 100644 --- a/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java +++ b/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java @@ -5,8 +5,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.Collection; -import javax.annotation.Nonnull; -import javax.annotation.concurrent.ThreadSafe; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.x.discovery.DownInstancePolicy; import org.apache.curator.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.ServiceCache; @@ -16,7 +15,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@ThreadSafe public class DiscoveryClient implements Closeable { private static final Logger LOGGER = LoggerFactory @@ -27,7 +25,7 @@ public class DiscoveryClient implements Closeable { /** * Constructor - * + * * @param serviceName * name of the service to monitor * @param discovery @@ -38,10 +36,10 @@ public class DiscoveryClient implements Closeable { * @param providerStrategy * {@link ProviderStrategy} to use when selecting an instance */ - public DiscoveryClient(@Nonnull final String serviceName, - @Nonnull final ServiceDiscovery discovery, - @Nonnull final DownInstancePolicy downInstancePolicy, - @Nonnull final ProviderStrategy providerStrategy) { + public DiscoveryClient(@NonNull final String serviceName, + @NonNull final ServiceDiscovery discovery, + @NonNull final DownInstancePolicy downInstancePolicy, + @NonNull final ProviderStrategy providerStrategy) { checkNotNull(serviceName); checkArgument(!serviceName.isEmpty(), "serviceName cannot be empty"); checkNotNull(providerStrategy); @@ -58,7 +56,7 @@ public DiscoveryClient(@Nonnull final String serviceName, /** * Return a list of discoverable services - * + * * @return Collection of service names */ public Collection getServices() throws Exception { @@ -67,17 +65,17 @@ public Collection getServices() throws Exception { /** * Return the running instances for the service. - * + * * @return Collection of service instances */ public Collection> getInstances( - @Nonnull final String serviceName) throws Exception { + @NonNull final String serviceName) throws Exception { return discovery.queryForInstances(serviceName); } /** * Return a cached list of the running instances for the service. - * + * * @return Collection of service instances */ public Collection> getInstances() { @@ -86,7 +84,7 @@ public Collection> getInstances() { /** * Return an instance of this service. - * + * * @return ServiceInstance * @throws Exception */ @@ -96,17 +94,17 @@ public ServiceInstance getInstance() throws Exception { /** * Note an error when connecting to a service instance. - * + * * @param instance * {@link ServiceInstance} that is causing the error. */ - public void noteError(@Nonnull final ServiceInstance instance) { + public void noteError(@NonNull final ServiceInstance instance) { provider.noteError(instance); } /** * Start the internal {@link ServiceProvider} and {@link ServiceCache} - * + * * @throws Exception */ public void start() throws Exception { diff --git a/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java b/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java index 639049f..6db6b97 100644 --- a/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java +++ b/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java @@ -2,7 +2,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.dropwizard.lifecycle.Managed; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; public class DiscoveryClientManager implements Managed { @@ -14,7 +14,7 @@ public class DiscoveryClientManager implements Managed { * @param client * {@link DiscoveryClient} */ - public DiscoveryClientManager(@Nonnull final DiscoveryClient client) { + public DiscoveryClientManager(@NonNull final DiscoveryClient client) { this.client = checkNotNull(client); } diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java index 9b661aa..0df0205 100644 --- a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java +++ b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java @@ -1,7 +1,7 @@ package io.dropwizard.discovery.core; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; import org.eclipse.jetty.server.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +21,7 @@ public class CuratorAdvertisementListener * {@link CuratorAdvertiser} */ public CuratorAdvertisementListener( - @Nonnull final CuratorAdvertiser advertiser) { + @NonNull final CuratorAdvertiser advertiser) { this.advertiser = checkNotNull(advertiser); } diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java index afa0ad6..bc54f4e 100644 --- a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java +++ b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java @@ -6,10 +6,9 @@ import java.util.Collection; import java.util.Optional; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.checker.nullness.qual.Nullable; +import com.google.errorprone.annotations.concurrent.GuardedBy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.framework.state.ConnectionStateListener; @@ -21,7 +20,6 @@ import com.google.common.base.Strings; import io.dropwizard.discovery.DiscoveryFactory; -@ThreadSafe public class CuratorAdvertiser implements ConnectionStateListener { private static final Logger LOGGER = LoggerFactory .getLogger(CuratorAdvertiser.class); @@ -48,15 +46,15 @@ public class CuratorAdvertiser implements ConnectionStateListener { /** * Constructor - * + * * @param configuration * {@link DiscoveryFactory} * @param discovery * {@link ServiceDiscovery} */ - public CuratorAdvertiser(@Nonnull final DiscoveryFactory configuration, - @Nonnull final ServiceDiscovery discovery, - @Nonnull final ServiceInstanceFactory serviceInstanceFactory) { + public CuratorAdvertiser(@NonNull final DiscoveryFactory configuration, + @NonNull final ServiceDiscovery discovery, + @NonNull final ServiceInstanceFactory serviceInstanceFactory) { this.configuration = checkNotNull(configuration); this.discovery = checkNotNull(discovery); this.serviceInstanceFactory = checkNotNull(serviceInstanceFactory); @@ -65,7 +63,7 @@ public CuratorAdvertiser(@Nonnull final DiscoveryFactory configuration, /** * Set the listen port and set the listen address from the configuration * file or attempt to auto-detect the first IPv4 address that is found. - * + * * @param port * port this instance is listening on * @param adminPort @@ -111,7 +109,7 @@ public synchronized void initListenInfo(final int port, /** * Register the instance in Zookeeper - * + * * @throws Exception */ public synchronized void registerAvailability() throws Exception { @@ -120,13 +118,13 @@ public synchronized void registerAvailability() throws Exception { /** * Register a specific instance in Zookeeper - * + * * @param instance * Service Instance * @throws Exception */ public synchronized void registerAvailability( - @Nonnull final ServiceInstance instance) throws Exception { + @NonNull final ServiceInstance instance) throws Exception { checkInitialized(); LOGGER.info("Registering service ({}) at <{}:{}>", configuration.getServiceName(), listenAddress, listenPort); @@ -138,7 +136,7 @@ public synchronized void registerAvailability( /** * Remove the instance from Zookeeper - * + * * @throws Exception */ public synchronized void unregisterAvailability() throws Exception { @@ -147,13 +145,13 @@ public synchronized void unregisterAvailability() throws Exception { /** * Remove the specific instance from Zookeeper - * + * * @param instance * Service Instance * @throws Exception */ public synchronized void unregisterAvailability( - @Nonnull final ServiceInstance instance) throws Exception { + @NonNull final ServiceInstance instance) throws Exception { checkInitialized(); LOGGER.info("Unregistering service ({}) at <{}:{}>", configuration.getServiceName(), listenAddress, listenPort); @@ -165,7 +163,7 @@ public synchronized void unregisterAvailability( /** * Return the instance ID - * + * * @return {@link UUID} */ public UUID getInstanceId() { @@ -174,7 +172,7 @@ public UUID getInstanceId() { /** * Return the listening port - * + * * @return port number */ public synchronized int getListenPort() { @@ -192,7 +190,7 @@ public synchronized Optional getAdminPort() { /** * Return the listening IP address - * + * * @return IP address */ @Nullable @@ -203,7 +201,7 @@ public synchronized String getListenAddress() { /** * Return the {@link ServiceInstance} that will be registered with the * {@link ServiceDiscovery} instance. - * + * * @return {@link ServiceInstance} * @throws Exception */ @@ -219,7 +217,7 @@ public synchronized ServiceInstance getInstance() throws Exception { /** * Check that the {@link #initListenInfo} method has been called by * validating that the listenPort is greater than 1. - * + * * @throws IllegalStateException */ public synchronized void checkInitialized() { diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java b/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java index 8d9ba79..1e3fabb 100644 --- a/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java +++ b/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java @@ -4,8 +4,8 @@ import io.dropwizard.discovery.DiscoveryFactory; import io.dropwizard.discovery.health.CuratorHealthCheck; import io.dropwizard.discovery.manage.CuratorManager; -import io.dropwizard.setup.Environment; -import javax.annotation.Nonnull; +import io.dropwizard.core.setup.Environment; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -15,23 +15,23 @@ public class CuratorFactory { /** * Constructor - * + * * @param environment * {@link Environment} */ - public CuratorFactory(@Nonnull final Environment environment) { + public CuratorFactory(@NonNull final Environment environment) { this.environment = checkNotNull(environment); } /** * Build a new instance of a {@link CuratorFramework} and register a health * check and make sure it's properly managed. - * + * * @param config * {@link DiscoveryFactory} * @return {@link CuratorFramework} */ - public CuratorFramework build(@Nonnull final DiscoveryFactory config) { + public CuratorFramework build(@NonNull final DiscoveryFactory config) { final CuratorFramework framework = CuratorFrameworkFactory .builder() .connectionTimeoutMs( diff --git a/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java b/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java index b40f409..5b1aabc 100644 --- a/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java +++ b/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java @@ -3,9 +3,9 @@ import java.util.Objects; import java.util.Optional; import java.util.UUID; -import javax.annotation.Nullable; -import javax.annotation.concurrent.Immutable; -import javax.validation.constraints.NotNull; +import org.checkerframework.checker.nullness.qual.Nullable; +import com.google.errorprone.annotations.Immutable; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java b/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java index e7f1a4f..5c13b49 100644 --- a/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java +++ b/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java @@ -1,7 +1,7 @@ package io.dropwizard.discovery.core; import java.io.ByteArrayOutputStream; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.details.InstanceSerializer; import com.fasterxml.jackson.core.type.TypeReference; @@ -23,8 +23,8 @@ public class JacksonInstanceSerializer implements InstanceSerializer { * @param typeRef * {@link TypeReference} */ - public JacksonInstanceSerializer(@Nonnull final ObjectMapper mapper, - @Nonnull final TypeReference> typeRef) { + public JacksonInstanceSerializer(@NonNull final ObjectMapper mapper, + @NonNull final TypeReference> typeRef) { this.reader = mapper.reader(); this.writer = mapper.writer(); this.typeRef = typeRef; diff --git a/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java b/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java index b81165a..0ae524d 100644 --- a/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java +++ b/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java @@ -1,7 +1,7 @@ package io.dropwizard.discovery.health; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.imps.CuratorFrameworkState; import com.codahale.metrics.health.HealthCheck; @@ -16,7 +16,7 @@ public class CuratorHealthCheck extends HealthCheck { * @param framework * {@link CuratorFramework} */ - public CuratorHealthCheck(@Nonnull final CuratorFramework framework) { + public CuratorHealthCheck(@NonNull final CuratorFramework framework) { this.framework = checkNotNull(framework); } diff --git a/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java b/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java index f8666c5..7ce0d21 100644 --- a/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java +++ b/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java @@ -3,7 +3,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.dropwizard.discovery.core.CuratorAdvertiser; import io.dropwizard.lifecycle.Managed; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; public class CuratorAdvertiserManager implements Managed { @@ -16,7 +16,7 @@ public class CuratorAdvertiserManager implements Managed { * {@link CuratorAdvertiser} */ public CuratorAdvertiserManager( - @Nonnull final CuratorAdvertiser advertiser) { + @NonNull final CuratorAdvertiser advertiser) { this.advertiser = checkNotNull(advertiser); } diff --git a/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java b/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java index 2617b47..5bb7bd2 100644 --- a/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java +++ b/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java @@ -1,7 +1,7 @@ package io.dropwizard.discovery.manage; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.imps.CuratorFrameworkState; import org.apache.zookeeper.data.Stat; @@ -17,7 +17,7 @@ public class CuratorManager implements Managed { * @param framework * {@link CuratorFramework} */ - public CuratorManager(@Nonnull final CuratorFramework framework) { + public CuratorManager(@NonNull final CuratorFramework framework) { this.framework = checkNotNull(framework); // start framework directly to allow other bundles to interact with // zookeeper during their run() method. diff --git a/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java b/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java index a201f54..e0dca90 100644 --- a/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java +++ b/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java @@ -2,7 +2,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.dropwizard.lifecycle.Managed; -import javax.annotation.Nonnull; +import org.checkerframework.checker.nullness.qual.NonNull; import org.apache.curator.x.discovery.ServiceDiscovery; public class ServiceDiscoveryManager implements Managed { @@ -15,7 +15,7 @@ public class ServiceDiscoveryManager implements Managed { * @param discovery * {@link ServiceDiscovery} */ - public ServiceDiscoveryManager(@Nonnull final ServiceDiscovery discovery) { + public ServiceDiscoveryManager(@NonNull final ServiceDiscovery discovery) { this.discovery = checkNotNull(discovery); } diff --git a/src/test/java/io/dropwizard/discovery/DiscoveryBundleIntegrationTest.java b/src/test/java/io/dropwizard/discovery/DiscoveryBundleIntegrationTest.java index e21b2e6..3dd7a44 100644 --- a/src/test/java/io/dropwizard/discovery/DiscoveryBundleIntegrationTest.java +++ b/src/test/java/io/dropwizard/discovery/DiscoveryBundleIntegrationTest.java @@ -10,9 +10,8 @@ import org.apache.curator.test.TestingServer; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.details.InstanceSerializer; -import org.junit.ClassRule; -import org.junit.Test; - +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.Test; import com.fasterxml.jackson.core.type.TypeReference; import io.dropwizard.discovery.core.InstanceMetadata; @@ -20,15 +19,16 @@ import io.dropwizard.discovery.testutil.TestApplication; import io.dropwizard.discovery.testutil.TestConfiguration; import io.dropwizard.testing.ResourceHelpers; -import io.dropwizard.testing.junit.DropwizardAppRule; +import io.dropwizard.testing.junit5.DropwizardAppExtension; +import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; +@ExtendWith(DropwizardExtensionsSupport.class) public class DiscoveryBundleIntegrationTest { private static final String NAMESPACE = "dropwizard"; private static final String SERVICE_NAME = "test-service"; private static final String SERVICE_PATH = "/service/" + SERVICE_NAME; - @ClassRule - public static final DropwizardAppRule RULE = new DropwizardAppRule( + public static final DropwizardAppExtension RULE = new DropwizardAppExtension( TestApplication.class, ResourceHelpers.resourceFilePath("test-config.yaml")); InstanceSerializer serializer = new JacksonInstanceSerializer( @@ -40,7 +40,7 @@ private String instancePath(String instanceNode) { } @Test - public void testRegistration() throws Exception { + void testRegistration() throws Exception { // use a separate instance of curator to pull out the app's data TestingServer testingServer = RULE.getConfiguration().getTestingServer(); try (final CuratorFramework curatorFramework = CuratorFrameworkFactory @@ -60,4 +60,4 @@ public void testRegistration() throws Exception { assertThat(serviceInstanceMetadata.getName()).isEqualTo(SERVICE_NAME); } } -} \ No newline at end of file +} diff --git a/src/test/java/io/dropwizard/discovery/DiscoveryFactoryTest.java b/src/test/java/io/dropwizard/discovery/DiscoveryFactoryTest.java index 123e42c..409c03b 100644 --- a/src/test/java/io/dropwizard/discovery/DiscoveryFactoryTest.java +++ b/src/test/java/io/dropwizard/discovery/DiscoveryFactoryTest.java @@ -3,7 +3,7 @@ import io.dropwizard.util.Duration; import org.apache.curator.RetryPolicy; import org.apache.curator.retry.ExponentialBackoffRetry; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; @@ -12,22 +12,22 @@ public class DiscoveryFactoryTest { private final DiscoveryFactory factory = new DiscoveryFactory(); @Test - public void testGetHosts() { + void testGetHosts() { assertThat(factory.getHosts()).containsOnly("localhost"); } @Test - public void testGetPort() { + void testGetPort() { assertThat(factory.getPort()).isEqualTo(2181); } @Test - public void testGetQuorumSpec() { + void testGetQuorumSpec() { assertThat(factory.getQuorumSpec()).isEqualTo("localhost:2181"); } @Test - public void testServiceNameAccessors() { + void testServiceNameAccessors() { assertThat(factory.getServiceName()).isEqualTo(""); factory.setServiceName("test-service-name"); try { @@ -39,7 +39,7 @@ public void testServiceNameAccessors() { } @Test - public void testNamespaceAccessors() { + void testNamespaceAccessors() { assertThat(factory.getNamespace()).isEqualTo("dropwizard"); factory.setNamespace("test-namespace"); try { @@ -51,7 +51,7 @@ public void testNamespaceAccessors() { } @Test - public void testBasePathAccessors() { + void testBasePathAccessors() { assertThat(factory.getBasePath()).isEqualTo("service"); factory.setBasePath("test-base-path"); try { @@ -63,7 +63,7 @@ public void testBasePathAccessors() { } @Test - public void testListenAddressAccessors() { + void testListenAddressAccessors() { assertThat(factory.getListenAddress()).isEqualTo(""); factory.setListenAddress("0.0.0.0"); try { @@ -75,7 +75,7 @@ public void testListenAddressAccessors() { } @Test - public void testConnectionTimeoutAccessors() { + void testConnectionTimeoutAccessors() { assertThat(factory.getConnectionTimeout()).isEqualTo(Duration.seconds(6)); factory.setConnectionTimeout(Duration.minutes(30)); try { @@ -87,7 +87,7 @@ public void testConnectionTimeoutAccessors() { } @Test - public void testSessionTimeoutAccessors() { + void testSessionTimeoutAccessors() { assertThat(factory.getSessionTimeout()).isEqualTo(Duration.seconds(6)); factory.setSessionTimeout(Duration.minutes(30)); try { @@ -99,28 +99,28 @@ public void testSessionTimeoutAccessors() { } @Test - public void testIsDisabledAccessors() { + void testIsDisabledAccessors() { assertThat(factory.isDisabled()).isFalse(); factory.setIsDisabled(true); assertThat(factory.isDisabled()).isTrue(); } @Test - public void testIsReadOnlyAccessors() { + void testIsReadOnlyAccessors() { assertThat(factory.isReadOnly()).isFalse(); factory.setIsReadOnly(true); assertThat(factory.isReadOnly()).isTrue(); } @Test - public void testMaxRetriesAccessors() { + void testMaxRetriesAccessors() { assertThat(factory.getMaxRetries()).isEqualTo(5); factory.setMaxRetries(20); assertThat(factory.getMaxRetries()).isEqualTo(20); } @Test - public void testBaseSleepTimeAccessors() { + void testBaseSleepTimeAccessors() { assertThat(factory.getBaseSleepTime()).isEqualTo(Duration.seconds(1)); factory.setBaseSleepTime(Duration.minutes(30)); try { @@ -132,7 +132,7 @@ public void testBaseSleepTimeAccessors() { } @Test - public void testGetRetryPolicy() { + void testGetRetryPolicy() { DiscoveryFactory factory = new DiscoveryFactory(); RetryPolicy retryPolicy = factory.getRetryPolicy(); assertThat(retryPolicy).isInstanceOf(ExponentialBackoffRetry.class); @@ -142,7 +142,7 @@ public void testGetRetryPolicy() { } @Test - public void testGetCompressionProvider() { + void testGetCompressionProvider() { assertThat(factory.getCompressionProvider()).isEqualTo(DiscoveryFactory.CompressionCodec.GZIP.getProvider()); } } diff --git a/src/test/java/io/dropwizard/discovery/client/DiscoveryClientManagerTest.java b/src/test/java/io/dropwizard/discovery/client/DiscoveryClientManagerTest.java index cc3f22f..ac9b025 100644 --- a/src/test/java/io/dropwizard/discovery/client/DiscoveryClientManagerTest.java +++ b/src/test/java/io/dropwizard/discovery/client/DiscoveryClientManagerTest.java @@ -1,11 +1,11 @@ package io.dropwizard.discovery.client; -import org.junit.Test; - import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import org.junit.jupiter.api.Test; + public class DiscoveryClientManagerTest { @SuppressWarnings("unchecked") @@ -14,7 +14,7 @@ public class DiscoveryClientManagerTest { DiscoveryClientManager manager = new DiscoveryClientManager(client); @Test - public void testConstructorInvalidClient() { + void testConstructorInvalidClient() { try { new DiscoveryClientManager(null); failBecauseExceptionWasNotThrown(NullPointerException.class); @@ -23,13 +23,13 @@ public void testConstructorInvalidClient() { } @Test - public void testStart() throws Exception { + void testStart() throws Exception { manager.start(); verify(client).start(); } @Test - public void testStop() throws Exception { + void testStop() throws Exception { manager.stop(); verify(client).close(); } diff --git a/src/test/java/io/dropwizard/discovery/client/DiscoveryClientTest.java b/src/test/java/io/dropwizard/discovery/client/DiscoveryClientTest.java index 63cb30d..7f741e1 100644 --- a/src/test/java/io/dropwizard/discovery/client/DiscoveryClientTest.java +++ b/src/test/java/io/dropwizard/discovery/client/DiscoveryClientTest.java @@ -1,9 +1,8 @@ package io.dropwizard.discovery.client; import org.apache.curator.x.discovery.*; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; @@ -34,7 +33,7 @@ public class DiscoveryClientTest { @SuppressWarnings("unchecked") ServiceCache serviceCache = mock(ServiceCache.class); - @Before + @BeforeEach public void setup() throws Exception { @SuppressWarnings("unchecked") ServiceProviderBuilder serviceProviderBuilder = mock(ServiceProviderBuilder.class); @@ -61,7 +60,7 @@ public void setup() throws Exception { @SuppressWarnings("resource") @Test - public void testConstructorInvalidServiceName() { + void testConstructorInvalidServiceName() { try { new DiscoveryClient(null, discovery, downInstancePolicy, providerStrategy); failBecauseExceptionWasNotThrown(NullPointerException.class); @@ -77,7 +76,7 @@ public void testConstructorInvalidServiceName() { @SuppressWarnings("resource") @Test - public void testConstructorInvalidProviderStrategy() { + void testConstructorInvalidProviderStrategy() { try { new DiscoveryClient(SERVICE_NAME, discovery, downInstancePolicy, null); failBecauseExceptionWasNotThrown(NullPointerException.class); @@ -87,7 +86,7 @@ public void testConstructorInvalidProviderStrategy() { @SuppressWarnings("resource") @Test - public void testConstructorInvalidServiceDiscovery() { + void testConstructorInvalidServiceDiscovery() { try { new DiscoveryClient(SERVICE_NAME, null, downInstancePolicy, providerStrategy); failBecauseExceptionWasNotThrown(NullPointerException.class); @@ -96,47 +95,47 @@ public void testConstructorInvalidServiceDiscovery() { } @Test - public void testGetServices() throws Exception { + void testGetServices() throws Exception { assertThat(client.getServices()).containsOnly("service-one", "service-two", "service-three"); } @Test - public void testGetInstancesByName() throws Exception { + void testGetInstancesByName() throws Exception { assertThat(client.getInstances("service-one")).containsOnly(instanceOne, instanceTwo, instanceThree); } @Test - public void testGetInstances() { + void testGetInstances() { assertThat(client.getInstances()).containsOnly(instanceOne, instanceTwo, instanceThree); } @Test - public void testGetInstance() throws Exception { + void testGetInstance() throws Exception { assertThat(client.getInstance()).isEqualTo(instanceOne); } @Test - public void testNoteError() { + void testNoteError() { client.noteError(instanceOne); verify(serviceProvider).noteError(instanceOne); } @Test - public void testStart() throws Exception { + void testStart() throws Exception { client.start(); verify(serviceProvider).start(); verify(serviceCache).start(); } @Test - public void testClose() throws Exception { + void testClose() throws Exception { client.close(); verify(serviceCache).close(); verify(serviceProvider).close(); } @Test - public void testCloseWithExceptionInCacheClose() throws Exception { + void testCloseWithExceptionInCacheClose() throws Exception { doThrow(IOException.class).when(serviceCache).close(); client.close(); verify(serviceCache).close(); @@ -144,7 +143,7 @@ public void testCloseWithExceptionInCacheClose() throws Exception { } @Test - public void testCloseWithExceptionInProviderClose() throws Exception { + void testCloseWithExceptionInProviderClose() throws Exception { doThrow(IOException.class).when(serviceProvider).close(); client.close(); verify(serviceCache).close(); diff --git a/src/test/java/io/dropwizard/discovery/core/CuratorAdvertiserTest.java b/src/test/java/io/dropwizard/discovery/core/CuratorAdvertiserTest.java index 44d22c7..41c5cbf 100644 --- a/src/test/java/io/dropwizard/discovery/core/CuratorAdvertiserTest.java +++ b/src/test/java/io/dropwizard/discovery/core/CuratorAdvertiserTest.java @@ -7,8 +7,8 @@ import java.util.Optional; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.ServiceInstance; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import io.dropwizard.discovery.DiscoveryFactory; public class CuratorAdvertiserTest { @@ -20,13 +20,13 @@ public class CuratorAdvertiserTest { private final CuratorAdvertiser advertiser = new CuratorAdvertiser( factory, discovery, new DefaultServiceInstanceFactory()); - @Before + @BeforeEach public void setUp() { factory.setServiceName("test-service"); } @Test - public void testInitListenInfo() throws Exception { + void testInitListenInfo() throws Exception { factory.setListenAddress("127.0.0.1"); advertiser.initListenInfo(8080, 8180); assertThat(advertiser.getListenPort()).isEqualTo(8080); @@ -35,7 +35,7 @@ public void testInitListenInfo() throws Exception { } @Test - public void testInitListenInfoNoAdmin() throws Exception { + void testInitListenInfoNoAdmin() throws Exception { factory.setListenAddress("127.0.0.1"); advertiser.initListenInfo(8080, null); assertThat(advertiser.getListenPort()).isEqualTo(8080); @@ -45,7 +45,7 @@ public void testInitListenInfoNoAdmin() throws Exception { } @Test - public void testCheckInitialized() throws Exception { + void testCheckInitialized() throws Exception { try { advertiser.checkInitialized(); failBecauseExceptionWasNotThrown(IllegalStateException.class); @@ -57,7 +57,7 @@ public void testCheckInitialized() throws Exception { } @Test - public void testRegisterAvailability() throws Exception { + void testRegisterAvailability() throws Exception { try { advertiser.registerAvailability(); failBecauseExceptionWasNotThrown(IllegalStateException.class); @@ -72,7 +72,7 @@ public void testRegisterAvailability() throws Exception { } @Test - public void testUnregisterAvailability() throws Exception { + void testUnregisterAvailability() throws Exception { try { advertiser.unregisterAvailability(); failBecauseExceptionWasNotThrown(IllegalStateException.class); diff --git a/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java b/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java index 2e9f6cc..8af5647 100644 --- a/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java +++ b/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java @@ -13,16 +13,15 @@ import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.api.CompressionProvider; import org.apache.curator.test.TestingServer; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.codahale.metrics.health.HealthCheckRegistry; import io.dropwizard.discovery.DiscoveryFactory; import io.dropwizard.discovery.health.CuratorHealthCheck; import io.dropwizard.discovery.manage.CuratorManager; import io.dropwizard.lifecycle.setup.LifecycleEnvironment; -import io.dropwizard.setup.Environment; +import io.dropwizard.core.setup.Environment; import io.dropwizard.util.Duration; public class CuratorFactoryTest { @@ -43,7 +42,7 @@ public class CuratorFactoryTest { private CuratorFactory factory; - @Before + @BeforeEach public void setup() throws Exception { testingServer = new TestingServer(); @@ -64,7 +63,7 @@ public void setup() throws Exception { } @Test - public void testConstructorInvalidEnvironment() { + void testConstructorInvalidEnvironment() { try { new CuratorFactory(null); failBecauseExceptionWasNotThrown(NullPointerException.class); @@ -73,7 +72,7 @@ public void testConstructorInvalidEnvironment() { } @Test - public void testBuild() { + void testBuild() { factory.build(discoveryFactory); verify(lifecycle).manage(any(CuratorManager.class)); verify(healthchecks).register(eq("curator"), any(CuratorHealthCheck.class)); @@ -90,7 +89,7 @@ public void testBuild() { } @Test - public void testConnectionTimeout() { + void testConnectionTimeout() { CuratorFramework curatorFramework = factory.build(discoveryFactory); assertThat(curatorFramework.getZookeeperClient().getConnectionTimeoutMs()) .isEqualTo(connectionTimeout.toMilliseconds()); @@ -99,7 +98,7 @@ public void testConnectionTimeout() { // TODO: session timeout @Test - public void testRetryPolicy() { + void testRetryPolicy() { CuratorFramework curatorFramework = factory.build(discoveryFactory); assertThat(curatorFramework.getZookeeperClient().getRetryPolicy()).isEqualTo(retryPolicy); } @@ -107,7 +106,7 @@ public void testRetryPolicy() { // TODO: compression provider @Test - public void testQuorumSpec() { + void testQuorumSpec() { CuratorFramework curatorFramework = factory.build(discoveryFactory); assertThat(curatorFramework.getZookeeperClient().getCurrentConnectionString()) .isEqualTo(testingServer.getConnectString()); @@ -116,8 +115,8 @@ public void testQuorumSpec() { // TODO: read-only @Test - public void testNamespace() { + void testNamespace() { CuratorFramework curatorFramework = factory.build(discoveryFactory); assertThat(curatorFramework.getNamespace()).isEqualTo(namespace); } -} \ No newline at end of file +} diff --git a/src/test/java/io/dropwizard/discovery/core/InstanceMetadataTest.java b/src/test/java/io/dropwizard/discovery/core/InstanceMetadataTest.java index a019501..91a2eac 100644 --- a/src/test/java/io/dropwizard/discovery/core/InstanceMetadataTest.java +++ b/src/test/java/io/dropwizard/discovery/core/InstanceMetadataTest.java @@ -4,8 +4,7 @@ import java.util.Optional; import java.util.UUID; - -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InstanceMetadataTest { @@ -18,41 +17,41 @@ public class InstanceMetadataTest { Optional.of(ADMIN_PORT)); @Test - public void testGetInstance() { + void testGetInstance() { assertThat(metadata.getInstanceId()).isEqualTo(INSTANCE_ID); } @Test - public void testGetListenAddress() { + void testGetListenAddress() { assertThat(metadata.getListenAddress()).isEqualTo(LISTEN_ADDRESS); } @Test - public void testGetListenPort() { + void testGetListenPort() { assertThat(metadata.getListenPort()).isEqualTo(LISTEN_PORT); } @Test - public void testGetAdminPort() { + void testGetAdminPort() { assertThat(metadata.getAdminPort().isPresent()).isTrue(); assertThat(metadata.getAdminPort().get()).isEqualTo(ADMIN_PORT); } @Test - public void testGetAdminPortNull() { + void testGetAdminPortNull() { InstanceMetadata metadataAdminPortNull = new InstanceMetadata(INSTANCE_ID, LISTEN_ADDRESS, LISTEN_PORT, null); assertThat(metadataAdminPortNull.getAdminPort().isPresent()).isFalse(); } @Test - public void testGetAdminPortNotPresent() { + void testGetAdminPortNotPresent() { InstanceMetadata metadataAdminPortNotPresent = new InstanceMetadata(INSTANCE_ID, LISTEN_ADDRESS, LISTEN_PORT, Optional.empty()); assertThat(metadataAdminPortNotPresent.getAdminPort().isPresent()).isFalse(); } @Test - public void testEquals() { + void testEquals() { assertThat(metadata).isEqualTo(metadata); assertThat(metadata).isNotEqualTo(null); @@ -85,7 +84,7 @@ public void testEquals() { } @Test - public void testHashCode() { + void testHashCode() { assertThat(metadata.hashCode()).isEqualTo(metadata.hashCode()); InstanceMetadata equal = new InstanceMetadata(INSTANCE_ID, LISTEN_ADDRESS, LISTEN_PORT, Optional.of(ADMIN_PORT)); @@ -93,7 +92,7 @@ public void testHashCode() { } @Test - public void testToString() { + void testToString() { StringBuilder expectedString = new StringBuilder("InstanceMetadata{") .append("instanceId=").append(INSTANCE_ID.toString()).append(", ") .append("listenAddress=").append(LISTEN_ADDRESS).append(", ") diff --git a/src/test/java/io/dropwizard/discovery/health/CuratorHealthCheckTest.java b/src/test/java/io/dropwizard/discovery/health/CuratorHealthCheckTest.java index 3ecf380..7de5737 100644 --- a/src/test/java/io/dropwizard/discovery/health/CuratorHealthCheckTest.java +++ b/src/test/java/io/dropwizard/discovery/health/CuratorHealthCheckTest.java @@ -8,8 +8,8 @@ import org.apache.curator.framework.api.ExistsBuilder; import org.apache.curator.framework.imps.CuratorFrameworkState; import org.apache.zookeeper.data.Stat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class CuratorHealthCheckTest { @@ -17,25 +17,25 @@ public class CuratorHealthCheckTest { private final ExistsBuilder exists = mock(ExistsBuilder.class); private final CuratorHealthCheck health = new CuratorHealthCheck(framework); - @Before + @BeforeEach public void setUp() { when(framework.checkExists()).thenReturn(exists); } @Test - public void testCheckHealthy() throws Exception { + void testCheckHealthy() throws Exception { when(framework.getState()).thenReturn(CuratorFrameworkState.STARTED); when(exists.forPath(anyString())).thenReturn(new Stat()); assertThat(health.check().isHealthy()).isTrue(); } @Test - public void testCheckNotStarted() throws Exception { + void testCheckNotStarted() throws Exception { assertThat(health.check().isHealthy()).isFalse(); } @Test - public void testCheckMissingRoot() throws Exception { + void testCheckMissingRoot() throws Exception { when(framework.getState()).thenReturn(CuratorFrameworkState.STARTED); when(exists.forPath(anyString())).thenReturn(null); assertThat(health.check().isHealthy()).isFalse(); diff --git a/src/test/java/io/dropwizard/discovery/manage/CuratorAdvertiserManagerTest.java b/src/test/java/io/dropwizard/discovery/manage/CuratorAdvertiserManagerTest.java index 4d30a55..07a20bc 100644 --- a/src/test/java/io/dropwizard/discovery/manage/CuratorAdvertiserManagerTest.java +++ b/src/test/java/io/dropwizard/discovery/manage/CuratorAdvertiserManagerTest.java @@ -4,7 +4,7 @@ import static org.mockito.Mockito.verify; import io.dropwizard.discovery.core.CuratorAdvertiser; import io.dropwizard.discovery.core.InstanceMetadata; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CuratorAdvertiserManagerTest { @@ -13,7 +13,7 @@ public class CuratorAdvertiserManagerTest { advertiser); @Test - public void testStop() throws Exception { + void testStop() throws Exception { manager.stop(); verify(advertiser).unregisterAvailability(); } diff --git a/src/test/java/io/dropwizard/discovery/manage/CuratorManagerTest.java b/src/test/java/io/dropwizard/discovery/manage/CuratorManagerTest.java index f188485..c7d831b 100644 --- a/src/test/java/io/dropwizard/discovery/manage/CuratorManagerTest.java +++ b/src/test/java/io/dropwizard/discovery/manage/CuratorManagerTest.java @@ -10,9 +10,9 @@ import org.apache.curator.framework.api.ExistsBuilder; import org.apache.curator.framework.api.ProtectACLCreateModeStatPathAndBytesable; import org.apache.zookeeper.data.Stat; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class CuratorManagerTest { @@ -24,34 +24,34 @@ public class CuratorManagerTest { ProtectACLCreateModeStatPathAndBytesable.class); private final CuratorManager manager = new CuratorManager(framework); - @Before + @BeforeEach public void setUp() { when(framework.create()).thenReturn(create); when(framework.checkExists()).thenReturn(exists); when(create.creatingParentsIfNeeded()).thenReturn(acl); } - @After + @AfterEach public void tearDown() { reset(framework); } @Test - public void testStartRootExists() throws Exception { + void testStartRootExists() throws Exception { when(exists.forPath("/")).thenReturn(new Stat()); manager.start(); verify(framework, never()).create(); } @Test - public void testStartRootMissing() throws Exception { + void testStartRootMissing() throws Exception { when(exists.forPath("/")).thenReturn(null); manager.start(); verify(framework).create(); } @Test - public void testStop() throws Exception { + void testStop() throws Exception { manager.stop(); verify(framework).close(); } diff --git a/src/test/java/io/dropwizard/discovery/manage/ServiceDiscoveryManagerTest.java b/src/test/java/io/dropwizard/discovery/manage/ServiceDiscoveryManagerTest.java index 783d613..0b392a8 100644 --- a/src/test/java/io/dropwizard/discovery/manage/ServiceDiscoveryManagerTest.java +++ b/src/test/java/io/dropwizard/discovery/manage/ServiceDiscoveryManagerTest.java @@ -3,7 +3,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import org.apache.curator.x.discovery.ServiceDiscovery; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ServiceDiscoveryManagerTest { @@ -13,13 +13,13 @@ public class ServiceDiscoveryManagerTest { discovery); @Test - public void testStart() throws Exception { + void testStart() throws Exception { manager.start(); verify(discovery).start(); } @Test - public void testStop() throws Exception { + void testStop() throws Exception { manager.stop(); verify(discovery).close(); } diff --git a/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java b/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java index 0c0c750..33e5de7 100644 --- a/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java +++ b/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java @@ -2,11 +2,11 @@ import org.apache.curator.test.TestingServer; -import io.dropwizard.Application; +import io.dropwizard.core.Application; +import io.dropwizard.core.setup.Bootstrap; +import io.dropwizard.core.setup.Environment; import io.dropwizard.discovery.DiscoveryBundle; import io.dropwizard.discovery.DiscoveryFactory; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; public class TestApplication extends Application { private TestingServer testingServer; @@ -44,4 +44,4 @@ public void run(TestConfiguration configuration, Environment environment) throws // use the configuration to pass this application's testing server to the test configuration.setTestingServer(testingServer); } -} \ No newline at end of file +} diff --git a/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java b/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java index cb721d2..f9b86e6 100644 --- a/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java +++ b/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import io.dropwizard.Configuration; +import io.dropwizard.core.Configuration; public class TestConfiguration extends Configuration { @NotBlank @@ -36,4 +36,4 @@ public TestingServer getTestingServer() { public void setTestingServer(TestingServer testingServer) { this.testingServer = testingServer; } -} \ No newline at end of file +}