You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/08/09 08:55:29 UTC
[2/3] camel git commit: CAMEL-11653 - Fixed CS
CAMEL-11653 - Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b63fc68
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b63fc68
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b63fc68
Branch: refs/heads/master
Commit: 4b63fc68de433f9151accfd322bc37b2e5fb5fbc
Parents: 2586982
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Aug 9 10:48:11 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Aug 9 10:48:11 2017 +0200
----------------------------------------------------------------------
.../camel/component/nagios/NagiosConfiguration.java | 10 +++++-----
.../apache/camel/component/nagios/NagiosEndpoint.java | 8 ++++----
.../camel/component/nagios/NagiosEventNotifier.java | 12 ++++++------
.../apache/camel/component/nagios/NagiosProducer.java | 7 +++----
.../camel/component/nagios/NagiosAsyncSendTest.java | 3 +--
.../camel/component/nagios/NagiosEventNotifierTest.java | 8 ++++----
.../org/apache/camel/component/nagios/NagiosTest.java | 10 +++++-----
.../camel/component/nagios/NagiosXorEncryptionTest.java | 9 ++++-----
8 files changed, 32 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
index 8792a27..69cdcee 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.nagios;
import java.net.URI;
+import com.googlecode.jsendnsca.NagiosSettings;
+import com.googlecode.jsendnsca.encryption.Encryption;
+
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
-import org.apache.camel.util.ObjectHelper;
-
-import com.googlecode.jsendnsca.NagiosSettings;
-import com.googlecode.jsendnsca.encryption.Encryption;
+import org.apache.camel.util.StringHelper;
/**
* @version
@@ -76,7 +76,7 @@ public class NagiosConfiguration implements Cloneable {
if (nagiosSettings == null) {
// validate parameters
- ObjectHelper.notEmpty(host, "host", this);
+ StringHelper.notEmpty(host, "host", this);
if (port <= 0) {
throw new IllegalArgumentException("Port must be a positive number on " + this);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
index 637cd8b..cfd6ba2 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.nagios;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
@@ -25,10 +29,6 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ObjectHelper;
-import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.PassiveCheckSender;
-
/**
* To send passive checks to Nagios using JSendNSCA.
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
index ad411a3..6848e0c 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEventNotifier.java
@@ -18,6 +18,12 @@ package org.apache.camel.component.nagios;
import java.util.EventObject;
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.NagiosSettings;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
import org.apache.camel.management.event.CamelContextStartupFailureEvent;
import org.apache.camel.management.event.CamelContextStopFailureEvent;
import org.apache.camel.management.event.ExchangeFailedEvent;
@@ -27,12 +33,6 @@ import org.apache.camel.management.event.ServiceStartupFailureEvent;
import org.apache.camel.management.event.ServiceStopFailureEvent;
import org.apache.camel.support.EventNotifierSupport;
-import com.googlecode.jsendnsca.Level;
-import com.googlecode.jsendnsca.MessagePayload;
-import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.NagiosSettings;
-import com.googlecode.jsendnsca.PassiveCheckSender;
-
/**
* An {@link org.apache.camel.spi.EventNotifier} which sends alters to Nagios.
*
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
index 5a78e8c..2285a88 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosProducer.java
@@ -18,15 +18,14 @@ package org.apache.camel.component.nagios;
import java.util.concurrent.ExecutorService;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultProducer;
-
import com.googlecode.jsendnsca.Level;
import com.googlecode.jsendnsca.MessagePayload;
-import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
import com.googlecode.jsendnsca.PassiveCheckSender;
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultProducer;
+
import static org.apache.camel.component.nagios.NagiosConstants.HOST_NAME;
import static org.apache.camel.component.nagios.NagiosConstants.LEVEL;
import static org.apache.camel.component.nagios.NagiosConstants.SERVICE_NAME;
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
index 66d5c43..b420022 100644
--- a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
+++ b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosAsyncSendTest.java
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.nagios;
+import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.junit.BeforeClass;
import org.mockito.Mockito;
-import com.googlecode.jsendnsca.NonBlockingNagiosPassiveCheckSender;
-
/**
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
index 9ce34ed..4260a5e 100644
--- a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
+++ b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.nagios;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -24,10 +28,6 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import com.googlecode.jsendnsca.MessagePayload;
-import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.PassiveCheckSender;
-
import static org.mockito.Mockito.*;
/**
* @version
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
index e93189c..b3e903d 100644
--- a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
+++ b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
@@ -19,6 +19,11 @@ package org.apache.camel.component.nagios;
import java.util.HashMap;
import java.util.Map;
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
+
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,11 +34,6 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import com.googlecode.jsendnsca.Level;
-import com.googlecode.jsendnsca.MessagePayload;
-import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.PassiveCheckSender;
-
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/camel/blob/4b63fc68/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
index 5a2021b..d9e5346 100644
--- a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
+++ b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.nagios;
+import com.googlecode.jsendnsca.Level;
+import com.googlecode.jsendnsca.MessagePayload;
+import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
+import com.googlecode.jsendnsca.PassiveCheckSender;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
@@ -26,11 +30,6 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.Mockito;
-import com.googlecode.jsendnsca.Level;
-import com.googlecode.jsendnsca.MessagePayload;
-import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
-import com.googlecode.jsendnsca.PassiveCheckSender;
-
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;