From 91918d5599395c14078351e9216443fa387bfa21 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 20 Dec 2013 17:33:36 -0500 Subject: [PATCH] Uses Spring 4.0 dependencies Updated the buid version 1.1.0 --- gradle.properties | 6 +++--- .../splunk/inbound/SplunkPollingChannelAdapter.java | 2 +- .../splunk/outbound/SplunkOutboundChannelAdapter.java | 9 +-------- .../integration/splunk/support/SplunkExecutor.java | 4 ++-- .../outbound/SplunkOutboundChannelAdapterTests.java | 2 +- .../integration/splunk/support/SplunkExecutorTests.java | 2 +- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index d2860ca..44a7dde 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ junitVersion=4.8.2 jodaTimeVersion=2.1 -springVersion=3.1.3.RELEASE +springVersion=4.0.0.RELEASE splunkVersion=1.0.0 log4jVersion=1.2.12 -version=1.0.0.BUILD-SNAPSHOT -springIntegrationVersion=2.2.1.RELEASE +version=1.1.0.BUILD-SNAPSHOT +springIntegrationVersion=4.0.0.M2 cglibVersion=2.2 commonsPoolVersion=1.6 mockitoVersion=1.9.0 diff --git a/src/main/java/org/springframework/integration/splunk/inbound/SplunkPollingChannelAdapter.java b/src/main/java/org/springframework/integration/splunk/inbound/SplunkPollingChannelAdapter.java index 09cdc29..01f4cfd 100644 --- a/src/main/java/org/springframework/integration/splunk/inbound/SplunkPollingChannelAdapter.java +++ b/src/main/java/org/springframework/integration/splunk/inbound/SplunkPollingChannelAdapter.java @@ -17,12 +17,12 @@ package org.springframework.integration.splunk.inbound; import java.util.List; -import org.springframework.integration.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.splunk.event.SplunkEvent; import org.springframework.integration.splunk.support.SplunkExecutor; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapter.java b/src/main/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapter.java index a24e1d9..ca5925c 100644 --- a/src/main/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapter.java +++ b/src/main/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapter.java @@ -16,10 +16,10 @@ package org.springframework.integration.splunk.outbound; -import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.splunk.support.SplunkExecutor; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; import org.springframework.util.Assert; @@ -47,13 +47,6 @@ public class SplunkOutboundChannelAdapter extends AbstractReplyProducingMessageH this.splunkExecutor = splunkExecutor; } - /** - * - */ - @Override - protected void onInit() { - super.onInit(); - } @Override protected Object handleRequestMessage(Message requestMessage) { diff --git a/src/main/java/org/springframework/integration/splunk/support/SplunkExecutor.java b/src/main/java/org/springframework/integration/splunk/support/SplunkExecutor.java index 773e1a7..772929b 100644 --- a/src/main/java/org/springframework/integration/splunk/support/SplunkExecutor.java +++ b/src/main/java/org/springframework/integration/splunk/support/SplunkExecutor.java @@ -19,12 +19,12 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; import org.springframework.integration.splunk.core.DataReader; import org.springframework.integration.splunk.core.DataWriter; import org.springframework.integration.splunk.event.SplunkEvent; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * Bundles common core logic for the Splunk components. diff --git a/src/test/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapterTests.java b/src/test/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapterTests.java index de5c655..573039e 100644 --- a/src/test/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapterTests.java +++ b/src/test/java/org/springframework/integration/splunk/outbound/SplunkOutboundChannelAdapterTests.java @@ -21,8 +21,8 @@ import junit.framework.Assert; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.splunk.support.SplunkExecutor; +import org.springframework.messaging.Message; /** * @author Jarred Li diff --git a/src/test/java/org/springframework/integration/splunk/support/SplunkExecutorTests.java b/src/test/java/org/springframework/integration/splunk/support/SplunkExecutorTests.java index 1317dfe..f0736fa 100644 --- a/src/test/java/org/springframework/integration/splunk/support/SplunkExecutorTests.java +++ b/src/test/java/org/springframework/integration/splunk/support/SplunkExecutorTests.java @@ -26,11 +26,11 @@ import junit.framework.Assert; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.splunk.core.DataReader; import org.springframework.integration.splunk.core.DataWriter; import org.springframework.integration.splunk.event.SplunkEvent; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; /** * @author Jarred Li