Relocate classes and rename artifact groupId (#14)

ExpediaGroup · Jan 6, 2020 · 00864d5 · 00864d5
1 parent 12f3f18
commit 00864d5
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## [Unreleased]
-### Added
+## [2.0.0] - TBD
+### Changed
+- Renamed artifact groupId from `com.expediagroup.dropwizard.bundle` to `com.expediagroup`
+- Relocated classes from `com.homeaway.dropwizard.bundle.resilience4j` to `com.expediagroup.dropwizard.resilience4j`
 
+## [1.0.1] - 2019-10-31
 ### Changed
 - Fixed crash at startup when no `retryConfigurations` are specified in the config
 
-
 ## [1.0.0] - 2019-10-27
 ### Added
 - Added support for R4j `Retry`

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ User Guide
 In your POM...
 ```xml
 <dependency>
-    <groupId>com.expediagroup.dropwizard.bundle</groupId>
+    <groupId>com.expediagroup</groupId>
     <artifactId>dropwizard-resilience4j-bundle</artifactId>
     <version>0.1.0</version> <!-- use latest -->
 </dependency>
@@ -51,7 +51,7 @@ Add to your application's Config class:
 private Resilience4jConfiguration resilience4j;
 ```
 
-Configured R4J objects are automatically wired into Dropwizard Metrics, and also [into HK2 using the name from the YAML](src/main/java/com/homeaway/dropwizard/bundle/resilience4j/Resilience4jBundle.java#L93).
+Configured R4J objects are automatically wired into Dropwizard Metrics, and also [into HK2 using the name from the YAML](src/main/java/com/expediagroup/dropwizard/resilience4j/Resilience4jBundle.java#L93).
 You can also retrieve them from the configuration class...
 
 ```java

diff --git a/pom.xml b/pom.xml
@@ -3,9 +3,9 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.expediagroup.dropwizard.bundle</groupId>
+    <groupId>com.expediagroup</groupId>
     <artifactId>dropwizard-resilience4j-bundle</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>dropwizard-resilience4j-bundle</name>

diff --git a/...ndle/resilience4j/Resilience4jBundle.java → ...zard/resilience4j/Resilience4jBundle.java b/...ndle/resilience4j/Resilience4jBundle.java → ...zard/resilience4j/Resilience4jBundle.java
@@ -14,17 +14,17 @@
 limitations under the License.
  */
 
-package com.homeaway.dropwizard.bundle.resilience4j;
+package com.expediagroup.dropwizard.resilience4j;
 
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.CircuitBreakerConfiguration;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.Resilience4jConfiguration;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.RetryConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.CircuitBreakerConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.Resilience4jConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.RetryConfiguration;
 
 import io.dropwizard.ConfiguredBundle;
 import io.dropwizard.setup.Bootstrap;

diff --git a/...guration/CircuitBreakerConfiguration.java → ...guration/CircuitBreakerConfiguration.java b/...guration/CircuitBreakerConfiguration.java → ...guration/CircuitBreakerConfiguration.java
@@ -14,7 +14,7 @@
 limitations under the License.
  */
 
-package com.homeaway.dropwizard.bundle.resilience4j.configuration;
+package com.expediagroup.dropwizard.resilience4j.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...figuration/Resilience4jConfiguration.java → ...figuration/Resilience4jConfiguration.java b/...figuration/Resilience4jConfiguration.java → ...figuration/Resilience4jConfiguration.java
@@ -14,14 +14,14 @@
 limitations under the License.
  */
 
-package com.homeaway.dropwizard.bundle.resilience4j.configuration;
+package com.expediagroup.dropwizard.resilience4j.configuration;
 
 import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.validation.Valid;
 
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.RetryConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.RetryConfiguration;
 
 import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
 import io.github.resilience4j.retry.RetryRegistry;

diff --git a/...etry/ConstantIntervalFunctionFactory.java → ...etry/ConstantIntervalFunctionFactory.java b/...etry/ConstantIntervalFunctionFactory.java → ...etry/ConstantIntervalFunctionFactory.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j.configuration.retry;
+package com.expediagroup.dropwizard.resilience4j.configuration.retry;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;

diff --git a/...ry/ExponentialBackoffFunctionFactory.java → ...ry/ExponentialBackoffFunctionFactory.java b/...ry/ExponentialBackoffFunctionFactory.java → ...ry/ExponentialBackoffFunctionFactory.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j.configuration.retry;
+package com.expediagroup.dropwizard.resilience4j.configuration.retry;
 
 import javax.validation.constraints.NotNull;
 

diff --git a/...onentialRandomBackoffFunctionFactory.java → ...onentialRandomBackoffFunctionFactory.java b/...onentialRandomBackoffFunctionFactory.java → ...onentialRandomBackoffFunctionFactory.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j.configuration.retry;
+package com.expediagroup.dropwizard.resilience4j.configuration.retry;
 
 import javax.validation.constraints.NotNull;
 

diff --git a/...ration/retry/IntervalFunctionFactory.java → ...ration/retry/IntervalFunctionFactory.java b/...ration/retry/IntervalFunctionFactory.java → ...ration/retry/IntervalFunctionFactory.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j.configuration.retry;
+package com.expediagroup.dropwizard.resilience4j.configuration.retry;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;

diff --git a/...ry/RandomizedIntervalFunctionFactory.java → ...ry/RandomizedIntervalFunctionFactory.java b/...ry/RandomizedIntervalFunctionFactory.java → ...ry/RandomizedIntervalFunctionFactory.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j.configuration.retry;
+package com.expediagroup.dropwizard.resilience4j.configuration.retry;
 
 import javax.validation.constraints.NotNull;
 

diff --git a/...nfiguration/retry/RetryConfiguration.java → ...nfiguration/retry/RetryConfiguration.java b/...nfiguration/retry/RetryConfiguration.java → ...nfiguration/retry/RetryConfiguration.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j.configuration.retry;
+package com.expediagroup.dropwizard.resilience4j.configuration.retry;
 
 import javax.validation.constraints.NotNull;
 

diff --git a/...bundle/resilience4j/ResourceTestUtil.java → ...wizard/resilience4j/ResourceTestUtil.java b/...bundle/resilience4j/ResourceTestUtil.java → ...wizard/resilience4j/ResourceTestUtil.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j;
+package com.expediagroup.dropwizard.resilience4j;
 
 import java.io.File;
 import java.net.URI;
@@ -27,4 +27,4 @@ private static File resource(String resourcePath) {
     public static String resourceAbsolutePath(String resourcePath) {
         return resource(resourcePath).getAbsolutePath();
     }
-}
+}
diff --git a/.../bundle/resilience4j/TestApplication.java → ...pwizard/resilience4j/TestApplication.java b/.../bundle/resilience4j/TestApplication.java → ...pwizard/resilience4j/TestApplication.java
@@ -1,4 +1,4 @@
-package com.homeaway.dropwizard.bundle.resilience4j;
+package com.expediagroup.dropwizard.resilience4j;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,4 +46,4 @@ public List<Pair<String, CircuitBreakerConfig.Builder>> getBreakersSeenInConfigu
     public List<Pair<String, RetryConfig.Builder>> getRetryersSeenInConfiguration() {
         return retryersSeenInConfiguration;
     }
-}
+}
diff --git a/...undle/resilience4j/TestConfiguration.java → ...izard/resilience4j/TestConfiguration.java b/...undle/resilience4j/TestConfiguration.java → ...izard/resilience4j/TestConfiguration.java
@@ -1,6 +1,6 @@
-package com.homeaway.dropwizard.bundle.resilience4j;
+package com.expediagroup.dropwizard.resilience4j;
 
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.Resilience4jConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.Resilience4jConfiguration;
 
 import io.dropwizard.Configuration;
 
@@ -11,4 +11,4 @@ public class TestConfiguration extends Configuration {
     public Resilience4jConfiguration getResilience4j() {
         return resilience4j;
     }
-}
+}
diff --git a/...cuitbreaker/CircuitBreakerConfigTest.java → ...cuitbreaker/CircuitBreakerConfigTest.java b/...cuitbreaker/CircuitBreakerConfigTest.java → ...cuitbreaker/CircuitBreakerConfigTest.java
@@ -1,16 +1,16 @@
-package com.homeaway.dropwizard.bundle.resilience4j.circuitbreaker;
+package com.expediagroup.dropwizard.resilience4j.circuitbreaker;
 
 import java.util.List;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.homeaway.dropwizard.bundle.resilience4j.ResourceTestUtil;
-import com.homeaway.dropwizard.bundle.resilience4j.TestApplication;
-import com.homeaway.dropwizard.bundle.resilience4j.TestConfiguration;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.CircuitBreakerConfiguration;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.Resilience4jConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.CircuitBreakerConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.Resilience4jConfiguration;
+import com.expediagroup.dropwizard.resilience4j.ResourceTestUtil;
+import com.expediagroup.dropwizard.resilience4j.TestApplication;
+import com.expediagroup.dropwizard.resilience4j.TestConfiguration;
 
 import io.dropwizard.testing.junit.DropwizardAppRule;
 import io.dropwizard.util.Duration;

diff --git a/...e/resilience4j/retry/RetryConfigTest.java → ...d/resilience4j/retry/RetryConfigTest.java b/...e/resilience4j/retry/RetryConfigTest.java → ...d/resilience4j/retry/RetryConfigTest.java
@@ -1,17 +1,18 @@
-package com.homeaway.dropwizard.bundle.resilience4j.retry;
+package com.expediagroup.dropwizard.resilience4j.retry;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 
-import com.homeaway.dropwizard.bundle.resilience4j.ResourceTestUtil;
-import com.homeaway.dropwizard.bundle.resilience4j.TestApplication;
-import com.homeaway.dropwizard.bundle.resilience4j.TestConfiguration;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.Resilience4jConfiguration;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.ConstantIntervalFunctionFactory;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.ExponentialBackoffFunctionFactory;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.ExponentialRandomBackoffFunctionFactory;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.RandomizedIntervalFunctionFactory;
-import com.homeaway.dropwizard.bundle.resilience4j.configuration.retry.RetryConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.Resilience4jConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.ConstantIntervalFunctionFactory;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.RetryConfiguration;
+import com.expediagroup.dropwizard.resilience4j.ResourceTestUtil;
+import com.expediagroup.dropwizard.resilience4j.TestApplication;
+import com.expediagroup.dropwizard.resilience4j.TestConfiguration;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.ExponentialBackoffFunctionFactory;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.ExponentialRandomBackoffFunctionFactory;
+import com.expediagroup.dropwizard.resilience4j.configuration.retry.RandomizedIntervalFunctionFactory;
 
 import io.dropwizard.testing.junit.DropwizardAppRule;
 
@@ -28,7 +29,7 @@ public void configWithJustRetry_runs() throws Exception {
         Resilience4jConfiguration r4jConfig = app.getConfiguration().getResilience4j();
 
         //Check that retry was configured correctly
-        assertThat(r4jConfig.getRetryConfigurations()).isNotNull();
+        Assertions.assertThat(r4jConfig.getRetryConfigurations()).isNotNull();
         assertThat(r4jConfig.getRetryConfigurations().size()).isEqualTo(4);
 
         RetryConfiguration retry1 = r4jConfig.getRetryConfigurations().get(0);