diff --git a/samples/splunk/build.gradle b/samples/splunk/build.gradle index b4a426b..1e793ae 100644 --- a/samples/splunk/build.gradle +++ b/samples/splunk/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'eclipse' apply plugin: 'application' repositories { - maven { url "http://repo.springsource.org/libs-snapshot" } mavenLocal() + maven { url "http://repo.springsource.org/libs-snapshot" } } dependencies { diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/SplunkCommon-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/SplunkCommon-context.xml index c3cef43..8b54628 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/SplunkCommon-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/SplunkCommon-context.xml @@ -11,7 +11,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> - + diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterBlockingSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterBlockingSample-context.xml index abd548d..13b500e 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterBlockingSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterBlockingSample-context.xml @@ -16,7 +16,7 @@ + channel="inputFromSplunk" mode="BLOCKING" initEarliestTime="-1d"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterExportSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterExportSample-context.xml index 931953e..c854a3b 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterExportSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterExportSample-context.xml @@ -15,7 +15,7 @@ + mode="EXPORT" earliestTime="-5d" latestTime="now" initEarliestTime="-1d"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterNonBlockingSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterNonBlockingSample-context.xml index aa0de8f..1ba36dd 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterNonBlockingSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterNonBlockingSample-context.xml @@ -15,7 +15,7 @@ + mode="NORMAL" earliestTime="-5d" latestTime="now" initEarliestTime="-1d"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterRealtimeSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterRealtimeSample-context.xml index 45e3fc7..96e1bfe 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterRealtimeSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterRealtimeSample-context.xml @@ -15,7 +15,7 @@ + mode="REALTIME" earliestTime="-5s" latestTime="rt" initEarliestTime="-1d"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterSavedSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterSavedSample-context.xml index 80b0826..6505a58 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterSavedSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/inbound/SplunkInboundChannelAdapterSavedSample-context.xml @@ -15,7 +15,7 @@ + mode="SAVEDSEARCH" earliestTime="-5d" latestTime="now" initEarliestTime="-1d"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterStreamSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterStreamSample-context.xml index 15aae83..757120e 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterStreamSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterStreamSample-context.xml @@ -14,7 +14,7 @@ + ingest="STREAM" host="localhost"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterSubmitSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterSubmitSample-context.xml index 337ca0c..45543a8 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterSubmitSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterSubmitSample-context.xml @@ -15,7 +15,7 @@ id="splunkOutboundChannelAdapter" auto-startup="true" order="1" channel="outputToSplunkWithMessageStore" splunk-server-ref="splunkServer" pool-server-connection="true" sourceType="spring-integration" source="example5" - ingest="submit" host="test.host"> + ingest="SUBMIT" host="test.host"> diff --git a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterTcpSample-context.xml b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterTcpSample-context.xml index bead7d5..85b934c 100644 --- a/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterTcpSample-context.xml +++ b/samples/splunk/src/main/resources/org/springframework/integration/samples/splunk/outbound/SplunkOutboundChannelAdapterTcpSample-context.xml @@ -14,7 +14,7 @@ + ingest="TCP" tcpPort="9999"> diff --git a/spring-integration-splunk/README.md b/spring-integration-splunk/README.md index 511b4c0..3e34235 100644 --- a/spring-integration-splunk/README.md +++ b/spring-integration-splunk/README.md @@ -19,7 +19,7 @@ Spring Integration's channel. There are 5 ways to get data out of Splunk: + channel="inputFromSplunk" mode="BLOCKING" earliestTime="-1d" latestTime="now" initEarliestTime="-1d"> ~~~~~ @@ -29,7 +29,7 @@ Spring Integration's channel. There are 5 ways to get data out of Splunk: + channel="inputFromSplunk" mode="NORMAL" earliestTime="-1d" latestTime="now" initEarliestTime="-1d"> ~~~~~ @@ -38,7 +38,7 @@ Spring Integration's channel. There are 5 ways to get data out of Splunk: ~~~~~xml + channel="inputFromSplunk" mode="SAVEDSEARCH" earliestTime="-1d" latestTime="now" initEarliestTime="-1d"> ~~~~~ @@ -47,7 +47,7 @@ Spring Integration's channel. There are 5 ways to get data out of Splunk: ~~~~~xml + mode="REALTIME" earliestTime="-5s" latestTime="rt" initEarliestTime="-1d"> ~~~~~ @@ -56,7 +56,7 @@ Spring Integration's channel. There are 5 ways to get data out of Splunk: ~~~~~xml + mode="EXPORT" earliestTime="-5d" latestTime="now" initEarliestTime="-1d"> ~~~~~ @@ -75,7 +75,7 @@ channels in Spring Integration. There are 3 kinds of method to put data id="splunkOutboundChannelAdapter" auto-startup="true" order="1" channel="outputToSplunk" splunk-server-ref="splunkServer" pool-server-connection="true" - sourceType="spring-integration" source="example2" ingest="submit"> + sourceType="spring-integration" source="example2" ingest="SUBMIT"> ~~~~~ @@ -85,7 +85,7 @@ channels in Spring Integration. There are 3 kinds of method to put data + ingest="STREAM"> ~~~~~ @@ -95,7 +95,7 @@ channels in Spring Integration. There are 3 kinds of method to put data + ingest="TCP" tcpPort="9999"> ~~~~~ diff --git a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/IngestType.java b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/IngestType.java index a03f505..a559a7b 100644 --- a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/IngestType.java +++ b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/IngestType.java @@ -27,15 +27,5 @@ package org.springframework.integration.splunk.support; * */ public enum IngestType { - stream("stream"), tcp("tcp"), submit("submit"); - - private String type; - - IngestType(String ingestType) { - this.type = ingestType; - } - - public String getIngestType() { - return type; - } + STREAM, TCP, SUBMIT; } \ No newline at end of file diff --git a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SearchMode.java b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SearchMode.java index 3d4c62a..641c77d 100644 --- a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SearchMode.java +++ b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SearchMode.java @@ -29,5 +29,5 @@ package org.springframework.integration.splunk.support; * */ public enum SearchMode { - blocking, normal, realtime, export, saved; + BLOCKING, NORMAL, REALTIME, EXPORT, SAVEDSEARCH; } \ No newline at end of file diff --git a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataReader.java b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataReader.java index b0fce88..a03fe66 100644 --- a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataReader.java +++ b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataReader.java @@ -179,19 +179,19 @@ public class SplunkDataReader implements DataReader, InitializingBean { public List search() throws Exception { logger.debug("mode:" + mode); switch (mode) { - case saved: { + case SAVEDSEARCH: { return savedSearch(); } - case blocking: { + case BLOCKING: { return blockingSearch(); } - case normal: { + case NORMAL: { return nonBlockingSearch(); } - case export: { + case EXPORT: { return exportSearch(); } - case realtime: { + case REALTIME: { return realtimeSearch(); } } diff --git a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataWriter.java b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataWriter.java index 15a53fe..135644d 100644 --- a/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataWriter.java +++ b/spring-integration-splunk/src/main/java/org/springframework/integration/splunk/support/SplunkDataWriter.java @@ -54,7 +54,7 @@ public class SplunkDataWriter implements DataWriter, InitializingBean { private String index; - private IngestType ingest = IngestType.stream; //tcp, stream, submit + private IngestType ingest = IngestType.STREAM; //tcp, stream, submit private int tcpPort; @@ -101,8 +101,8 @@ public class SplunkDataWriter implements DataWriter, InitializingBean { receiver = service.getReceiver(); } - if ((ingest.equals(IngestType.stream) || ingest.equals(IngestType.tcp))) { - if (ingest.equals("stream")) { + if ((ingest.equals(IngestType.STREAM) || ingest.equals(IngestType.TCP))) { + if (ingest.equals(IngestType.STREAM)) { if (indexObject != null) socket = indexObject.attach(args); else @@ -115,7 +115,7 @@ public class SplunkDataWriter implements DataWriter, InitializingBean { writer = new OutputStreamWriter(ostream, "UTF8"); } - if ((ingest.equals(IngestType.stream) || ingest.equals(IngestType.tcp))) { + if ((ingest.equals(IngestType.STREAM) || ingest.equals(IngestType.TCP))) { writer.write(data.toString()); writer.flush(); writer.close(); diff --git a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests.java b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests.java index ba6756a..9634741 100644 --- a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests.java +++ b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests.java @@ -53,7 +53,7 @@ public class SplunkInboundChannelAdapterParserSavedSearchTests { SplunkDataReader.class); Assert.assertNotNull(reader); - SearchMode mode = SearchMode.saved; + SearchMode mode = SearchMode.SAVEDSEARCH; Assert.assertEquals(mode, reader.getMode()); String savedSearch = "savedSearch"; diff --git a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests.java b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests.java index e3a8f8b..6191822 100644 --- a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests.java +++ b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests.java @@ -58,7 +58,7 @@ public class SplunkInboundChannelAdapterParserTests { String searchString = "search spring:example"; Assert.assertEquals(searchString, reader.getSearch()); - SearchMode mode = SearchMode.blocking; + SearchMode mode = SearchMode.BLOCKING; Assert.assertEquals(mode, reader.getMode()); String earliestTime = "-1d"; diff --git a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests.java b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests.java index 5b70423..7baaf2b 100644 --- a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests.java +++ b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests.java @@ -50,7 +50,7 @@ public class SplunkOutboundChannelAdapterParserStreamTests { SplunkDataWriter.class); Assert.assertNotNull(writer); - IngestType ingest = IngestType.stream; + IngestType ingest = IngestType.STREAM; Assert.assertEquals(ingest, writer.getIngest()); String host = "test.host"; diff --git a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests.java b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests.java index 99dd49b..2442330 100644 --- a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests.java +++ b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests.java @@ -56,7 +56,7 @@ public class SplunkOutboundChannelAdapterParserTests { String source = "example5"; Assert.assertEquals(source, writer.getSource()); - IngestType ingest = IngestType.submit; + IngestType ingest = IngestType.SUBMIT; Assert.assertEquals(ingest, writer.getIngest()); diff --git a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataReaderTests.java b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataReaderTests.java index 7fcde9e..7400b79 100644 --- a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataReaderTests.java +++ b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataReaderTests.java @@ -58,7 +58,7 @@ public class SplunkDataReaderTests { */ @Test public void testBlockingSearch() throws Exception { - reader.setMode(SearchMode.blocking); + reader.setMode(SearchMode.BLOCKING); reader.setSearch("search spring:example"); List data = reader.search(); Assert.assertNotNull(data); @@ -67,7 +67,7 @@ public class SplunkDataReaderTests { @Test public void testNonBlockingSearch() throws Exception { - reader.setMode(SearchMode.normal); + reader.setMode(SearchMode.NORMAL); reader.setSearch("search spring:example"); List data = reader.search(); Assert.assertNotNull(data); @@ -77,7 +77,7 @@ public class SplunkDataReaderTests { @Test public void testRealtimeSearch() throws Exception { - reader.setMode(SearchMode.realtime); + reader.setMode(SearchMode.REALTIME); reader.setSearch("search spring:example"); List data = reader.search(); Assert.assertNotNull(data); diff --git a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataWriterTests.java b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataWriterTests.java index 7fea6b8..ab811da 100644 --- a/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataWriterTests.java +++ b/spring-integration-splunk/src/test/java/org/springframework/integration/splunk/support/SplunkDataWriterTests.java @@ -50,7 +50,7 @@ public class SplunkDataWriterTests { */ @Test public void testWrite() throws Exception { - writer.setIngest(IngestType.submit); + writer.setIngest(IngestType.SUBMIT); SplunkData sd = new SplunkData("spring", "spring:example"); sd.setCommonDesc("description"); diff --git a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/SplunkCommon-context.xml b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/SplunkCommon-context.xml index 4cdbdf3..997a716 100644 --- a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/SplunkCommon-context.xml +++ b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/SplunkCommon-context.xml @@ -11,7 +11,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests-context.xml b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests-context.xml index 8a0ab3f..07a05d4 100644 --- a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests-context.xml +++ b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserSavedSearchTests-context.xml @@ -16,7 +16,7 @@ diff --git a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests-context.xml b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests-context.xml index 0bd2da1..bb3c7d1 100644 --- a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkInboundChannelAdapterParserTests-context.xml @@ -16,7 +16,7 @@ diff --git a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests-context.xml b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests-context.xml index 3462ff6..b999717 100644 --- a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests-context.xml +++ b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserStreamTests-context.xml @@ -18,7 +18,7 @@ id="splunkOutboundChannelAdapter" auto-startup="true" order="1" channel="outputToSplunk" splunk-server-ref="splunkServer" pool-server-connection="true" sourceType="spring-integration" source="example5" - ingest="stream" host="test.host" hostRegex="test.host.*"> + ingest="STREAM" host="test.host" hostRegex="test.host.*"> diff --git a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests-context.xml b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests-context.xml index 57ec361..15ef044 100644 --- a/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests-context.xml +++ b/spring-integration-splunk/src/test/resources/org/springframework/integration/splunk/config/xml/SplunkOutboundChannelAdapterParserTests-context.xml @@ -18,7 +18,7 @@ id="splunkOutboundChannelAdapter" auto-startup="true" order="1" channel="outputToSplunk" splunk-server-ref="splunkServer" pool-server-connection="true" sourceType="spring-integration" source="example5" - ingest="submit"> + ingest="SUBMIT">