- Renamed base package of metrics-micrometer to org.axonframework.mic…

…rometer - Updated module name
AxonFramework · Jan 8, 2019 · 4554371 · 4554371
1 parent fff26e0
commit 4554371
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/metrics-micrometer/pom.xml b/metrics-micrometer/pom.xml
@@ -66,7 +66,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Automatic-Module-Name>org.axonframework.metrics</Automatic-Module-Name>
+                            <Automatic-Module-Name>org.axonframework.micrometer</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -83,7 +83,7 @@
                         <Bundle-Description>${project.description}</Bundle-Description>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Export-Package>
-                            org.axonframework.metrics.*
+                            org.axonframework.micrometer.*
                         </Export-Package>
                         <Import-Package>
                             org.slf4j.*,

diff --git a/...k/metrics/micrometer/CapacityMonitor.java → ...framework/micrometer/CapacityMonitor.java b/...k/metrics/micrometer/CapacityMonitor.java → ...framework/micrometer/CapacityMonitor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
 import org.axonframework.messaging.Message;
-import org.axonframework.metrics.micrometer.reservoir.SlidingTimeWindowReservoir;
+import org.axonframework.micrometer.reservoir.SlidingTimeWindowReservoir;
 import org.axonframework.monitoring.MessageMonitor;
 
 import java.util.concurrent.TimeUnit;
@@ -36,7 +36,7 @@
  * that messages will have to wait to be processed.
  *
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class CapacityMonitor implements MessageMonitor<Message<?>> {
 

diff --git a/...rometer/EventProcessorLatencyMonitor.java → ...rometer/EventProcessorLatencyMonitor.java b/...rometer/EventProcessorLatencyMonitor.java → ...rometer/EventProcessorLatencyMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -28,7 +28,7 @@
  * Measures the difference in message timestamps between the last ingested and the last processed message.
  *
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class EventProcessorLatencyMonitor implements MessageMonitor<EventMessage<?>> {
 

diff --git a/...rics/micrometer/GlobalMetricRegistry.java → ...work/micrometer/GlobalMetricRegistry.java b/...rics/micrometer/GlobalMetricRegistry.java → ...work/micrometer/GlobalMetricRegistry.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -42,7 +42,7 @@
  *
  * @author Rene de Waele
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class GlobalMetricRegistry {
 

diff --git a/...cs/micrometer/MessageCountingMonitor.java → ...rk/micrometer/MessageCountingMonitor.java b/...cs/micrometer/MessageCountingMonitor.java → ...rk/micrometer/MessageCountingMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -25,7 +25,7 @@
  * Counts the number of ingested, successful, failed and processed messages
  *
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class MessageCountingMonitor implements MessageMonitor<Message<?>> {
 

diff --git a/...trics/micrometer/MessageTimerMonitor.java → ...ework/micrometer/MessageTimerMonitor.java b/...trics/micrometer/MessageTimerMonitor.java → ...ework/micrometer/MessageTimerMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -30,7 +30,7 @@
  * Times allTimer messages, successful and failed messages
  *
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class MessageTimerMonitor implements MessageMonitor<Message<?>> {
 

diff --git a/...s/micrometer/MetricsConfigurerModule.java → ...k/micrometer/MetricsConfigurerModule.java b/...s/micrometer/MetricsConfigurerModule.java → ...k/micrometer/MetricsConfigurerModule.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import org.axonframework.config.Configurer;
 import org.axonframework.config.ConfigurerModule;
@@ -26,7 +26,7 @@
  *
  * @author Steven van Beelen
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class MetricsConfigurerModule implements ConfigurerModule {
 

diff --git a/...ter/PayloadTypeMessageMonitorWrapper.java → ...ter/PayloadTypeMessageMonitorWrapper.java b/...ter/PayloadTypeMessageMonitorWrapper.java → ...ter/PayloadTypeMessageMonitorWrapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import org.axonframework.messaging.Message;
 import org.axonframework.monitoring.MessageMonitor;
@@ -34,7 +34,7 @@
  * @param <T> The type of the MessageMonitor created for every payload type.Must implement both {@link MessageMonitor}
  *
  * @author Marijn van Zelst
- * @since 4.0
+ * @since 4.1
  */
 public class PayloadTypeMessageMonitorWrapper<T extends MessageMonitor<Message<?>>>
         implements MessageMonitor<Message<?>> {

diff --git a/...reservoir/SlidingTimeWindowReservoir.java → ...reservoir/SlidingTimeWindowReservoir.java b/...reservoir/SlidingTimeWindowReservoir.java → ...reservoir/SlidingTimeWindowReservoir.java
@@ -1,4 +1,4 @@
-package org.axonframework.metrics.micrometer.reservoir;
+package org.axonframework.micrometer.reservoir;
 
 import io.micrometer.core.instrument.Clock;
 

diff --git a/...trics/micrometer/CapacityMonitorTest.java → ...ework/micrometer/CapacityMonitorTest.java b/...trics/micrometer/CapacityMonitorTest.java → ...ework/micrometer/CapacityMonitorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MockClock;

diff --git a/...ter/EventProcessorLatencyMonitorTest.java → ...ter/EventProcessorLatencyMonitorTest.java b/...ter/EventProcessorLatencyMonitorTest.java → ...ter/EventProcessorLatencyMonitorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/.../micrometer/GlobalMetricRegistryTest.java → .../micrometer/GlobalMetricRegistryTest.java b/.../micrometer/GlobalMetricRegistryTest.java → .../micrometer/GlobalMetricRegistryTest.java
@@ -1,4 +1,4 @@
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import com.codahale.metrics.ConsoleReporter;
 import com.codahale.metrics.MetricRegistry;

diff --git a/...icrometer/MessageCountingMonitorTest.java → ...icrometer/MessageCountingMonitorTest.java b/...icrometer/MessageCountingMonitorTest.java → ...icrometer/MessageCountingMonitorTest.java
@@ -1,4 +1,4 @@
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;

diff --git a/...s/micrometer/MessageTimerMonitorTest.java → ...k/micrometer/MessageTimerMonitorTest.java b/...s/micrometer/MessageTimerMonitorTest.java → ...k/micrometer/MessageTimerMonitorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.MockClock;
 import io.micrometer.core.instrument.Timer;

diff --git a/...crometer/MetricsConfigurerModuleTest.java → ...crometer/MetricsConfigurerModuleTest.java b/...crometer/MetricsConfigurerModuleTest.java → ...crometer/MetricsConfigurerModuleTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import org.axonframework.config.Configurer;
 import org.junit.*;

diff --git a/...PayloadTypeMessageMonitorWrapperTest.java → ...PayloadTypeMessageMonitorWrapperTest.java b/...PayloadTypeMessageMonitorWrapperTest.java → ...PayloadTypeMessageMonitorWrapperTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.axonframework.metrics.micrometer;
+package org.axonframework.micrometer;
 
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.apache.log4j.Appender;

diff --git a/...main/java/org/axonframework/springboot/autoconfig/MicrometerMetricsAutoConfiguration.java b/...main/java/org/axonframework/springboot/autoconfig/MicrometerMetricsAutoConfiguration.java
@@ -18,8 +18,8 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import org.axonframework.metrics.micrometer.GlobalMetricRegistry;
-import org.axonframework.metrics.micrometer.MetricsConfigurerModule;
+import org.axonframework.micrometer.GlobalMetricRegistry;
+import org.axonframework.micrometer.MetricsConfigurerModule;
 import org.axonframework.springboot.MetricsProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -46,7 +46,7 @@
 @AutoConfigureBefore(AxonAutoConfiguration.class)
 @ConditionalOnClass(name = {
         "io.micrometer.core.instrument.MeterRegistry",
-        "org.axonframework.metrics.micrometer.GlobalMetricRegistry"
+        "org.axonframework.micrometer.GlobalMetricRegistry"
 })
 @EnableConfigurationProperties(MetricsProperties.class)
 public class MicrometerMetricsAutoConfiguration {

diff --git a/...est/java/org/axonframework/springboot/AxonAutoConfigurationWithMicrometerMetricsTest.java b/...est/java/org/axonframework/springboot/AxonAutoConfigurationWithMicrometerMetricsTest.java
@@ -17,8 +17,8 @@
 package org.axonframework.springboot;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import org.axonframework.metrics.micrometer.GlobalMetricRegistry;
-import org.axonframework.metrics.micrometer.MetricsConfigurerModule;
+import org.axonframework.micrometer.GlobalMetricRegistry;
+import org.axonframework.micrometer.MetricsConfigurerModule;
 import org.axonframework.springboot.autoconfig.MetricsAutoConfiguration;
 import org.junit.*;
 import org.junit.runner.*;

diff --git a/...framework/springboot/AxonAutoConfigurationWithMicrometerMetricsWithoutConfigurerTest.java b/...framework/springboot/AxonAutoConfigurationWithMicrometerMetricsWithoutConfigurerTest.java
@@ -17,7 +17,7 @@
 package org.axonframework.springboot;
 
 import io.micrometer.core.instrument.MeterRegistry;
-import org.axonframework.metrics.micrometer.GlobalMetricRegistry;
+import org.axonframework.micrometer.GlobalMetricRegistry;
 import org.axonframework.springboot.autoconfig.MetricsAutoConfiguration;
 import org.junit.*;
 import org.junit.runner.*;