You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2018/12/24 20:19:34 UTC
[camel] branch master updated: Fix CS - camel-management-api &
camel-management-impl
This is an automated email from the ASF dual-hosted git repository.
onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0d7d7ee Fix CS - camel-management-api & camel-management-impl
0d7d7ee is described below
commit 0d7d7eed3b60034c0d6af20aa42cb4e034974060
Author: onders <on...@apache.org>
AuthorDate: Mon Dec 24 23:18:51 2018 +0300
Fix CS - camel-management-api & camel-management-impl
---
.../api/management/mbean/ManagedRouteMBean.java | 2 +-
.../DefaultManagementLifecycleStrategy.java | 6 ++---
.../management/mbean/ManagedClusterService.java | 2 +-
.../camel/management/mbean/ManagedComponent.java | 11 +--------
.../mbean/ManagedStreamCachingStrategy.java | 28 +++++++++++-----------
.../management/mbean/RouteCoverageXmlParser.java | 2 +-
.../DualManagedThreadPoolProfileTest.java | 2 +-
.../management/ManagedAggregateControllerTest.java | 5 +---
.../camel/management/ManagedComponentTest.java | 2 +-
.../management/ManagedThreadPoolProfileTest.java | 2 +-
10 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java b/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
index ede4f95..f34b6fb 100644
--- a/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
+++ b/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedRouteMBean.java
@@ -18,9 +18,9 @@ package org.apache.camel.api.management.mbean;
import javax.management.openmbean.TabularData;
-import org.apache.camel.meta.Experimental;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedOperation;
+import org.apache.camel.meta.Experimental;
public interface ManagedRouteMBean extends ManagedPerformanceCounterMBean {
diff --git a/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java b/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
index 60522cc..bc63b12 100644
--- a/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
+++ b/camel-management-impl/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
@@ -49,9 +49,6 @@ import org.apache.camel.StartupListener;
import org.apache.camel.TimerListener;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.spi.ManagementInterceptStrategy.InstrumentationProcessor;
-import org.apache.camel.throttling.ThrottlingExceptionRoutePolicy;
-import org.apache.camel.throttling.ThrottlingInflightRoutePolicy;
import org.apache.camel.management.mbean.ManagedAsyncProcessorAwaitManager;
import org.apache.camel.management.mbean.ManagedBacklogDebugger;
import org.apache.camel.management.mbean.ManagedBacklogTracer;
@@ -91,6 +88,7 @@ import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.InflightRepository;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.ManagementAgent;
+import org.apache.camel.spi.ManagementInterceptStrategy.InstrumentationProcessor;
import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.spi.ManagementObjectStrategy;
import org.apache.camel.spi.ManagementStrategy;
@@ -105,6 +103,8 @@ import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.spi.ValidatorRegistry;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.support.TimerListenerManager;
+import org.apache.camel.throttling.ThrottlingExceptionRoutePolicy;
+import org.apache.camel.throttling.ThrottlingInflightRoutePolicy;
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.ObjectHelper;
diff --git a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
index 9839de5..93b52d6 100644
--- a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
+++ b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedClusterService.java
@@ -25,8 +25,8 @@ import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
import org.apache.camel.api.management.mbean.ManagedClusterServiceMBean;
import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.support.cluster.ClusterServiceHelper;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.support.cluster.ClusterServiceHelper;
public class ManagedClusterService implements ManagedClusterServiceMBean {
private final CamelContext context;
diff --git a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
index 770f9b7..7e67958 100644
--- a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
+++ b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
@@ -17,18 +17,12 @@
package org.apache.camel.management.mbean;
import java.io.IOException;
-import java.util.AbstractList;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
-import java.util.function.Function;
import java.util.stream.Collectors;
import javax.management.openmbean.CompositeData;
@@ -44,6 +38,7 @@ import org.apache.camel.StatefulService;
import org.apache.camel.api.management.ManagedInstance;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.CamelOpenMBeanTypes;
+import org.apache.camel.api.management.mbean.ComponentVerifierExtension;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.Result;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.Result.Status;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.Scope;
@@ -53,10 +48,6 @@ import org.apache.camel.api.management.mbean.ComponentVerifierExtension.Verifica
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.VerificationError.HttpAttribute;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.VerificationError.StandardCode;
import org.apache.camel.api.management.mbean.ManagedComponentMBean;
-import org.apache.camel.api.management.mbean.ComponentVerifierExtension;
-import org.apache.camel.component.extension.ComponentVerifierExtension.VerificationError.Attribute;
-import org.apache.camel.component.extension.verifier.ResultBuilder;
-import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.JsonSchemaHelper;
diff --git a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
index 4cb5efc..8a13bb0 100644
--- a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
+++ b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
@@ -75,14 +75,14 @@ public class ManagedStreamCachingStrategy extends ManagedService implements Mana
l = null;
} else {
switch (limit) {
- case Committed:
- l = StreamCachingStrategy.SpoolUsedHeapMemoryLimit.Committed;
- break;
- case Max:
- l = StreamCachingStrategy.SpoolUsedHeapMemoryLimit.Max;
- break;
- default:
- throw new IllegalStateException();
+ case Committed:
+ l = StreamCachingStrategy.SpoolUsedHeapMemoryLimit.Committed;
+ break;
+ case Max:
+ l = StreamCachingStrategy.SpoolUsedHeapMemoryLimit.Max;
+ break;
+ default:
+ throw new IllegalStateException();
}
}
streamCachingStrategy.setSpoolUsedHeapMemoryLimit(l);
@@ -94,12 +94,12 @@ public class ManagedStreamCachingStrategy extends ManagedService implements Mana
return null;
} else {
switch (l) {
- case Committed:
- return SpoolUsedHeapMemoryLimit.Committed;
- case Max:
- return SpoolUsedHeapMemoryLimit.Max;
- default:
- throw new IllegalStateException();
+ case Committed:
+ return SpoolUsedHeapMemoryLimit.Committed;
+ case Max:
+ return SpoolUsedHeapMemoryLimit.Max;
+ default:
+ throw new IllegalStateException();
}
}
}
diff --git a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
index 25b9b87..17481a4 100644
--- a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
+++ b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
@@ -35,9 +35,9 @@ import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.camel.CamelContext;
+import org.apache.camel.api.management.ManagedCamelContext;
import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
-import org.apache.camel.api.management.ManagedCamelContext;
/**
* An XML parser that uses SAX to enrich route stats in the route dump.
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
index 72ab231..ec9adb2 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.ThreadPoolProfile;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.junit.Test;
public class DualManagedThreadPoolProfileTest extends ManagementTestSupport {
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
index e7c4b42..6b9575b 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedAggregateControllerTest.java
@@ -19,18 +19,15 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.api.management.ManagedCamelContext;
import org.apache.camel.api.management.mbean.ManagedAggregateProcessorMBean;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.aggregate.AggregateController;
-import org.apache.camel.AggregationStrategy;
import org.apache.camel.processor.aggregate.DefaultAggregateController;
import org.junit.Test;
-/**
- *
- */
public class ManagedAggregateControllerTest extends ManagementTestSupport {
private AggregateController controller = new DefaultAggregateController();
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
index e602b95..3b80779 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedComponentTest.java
@@ -28,10 +28,10 @@ import javax.management.remote.JMXServiceURL;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.Result;
import org.apache.camel.api.management.mbean.ComponentVerifierExtension.Scope;
+import org.apache.camel.component.direct.DirectComponent;
import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
import org.apache.camel.component.extension.verifier.ResultBuilder;
import org.apache.camel.support.DefaultComponent;
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
index c51a3f2..8fb6857 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.ThreadPoolProfile;
+import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
import org.junit.Test;
public class ManagedThreadPoolProfileTest extends ManagementTestSupport {