TcpDataWriter should use TcpInput class to attach to socket

apache · Jul 25, 2015 · bcaddc1 · bcaddc1
1 parent b170152
commit bcaddc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...s/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/TcpDataWriter.java b/...s/camel-splunk/src/main/java/org/apache/camel/component/splunk/support/TcpDataWriter.java
@@ -20,8 +20,9 @@
 import java.net.Socket;
 
 import com.splunk.Args;
-import com.splunk.Input;
 import com.splunk.Service;
+import com.splunk.TcpInput;
+
 import org.apache.camel.component.splunk.SplunkEndpoint;
 
 public class TcpDataWriter extends SplunkDataWriter {
@@ -37,14 +38,13 @@ public void setPort(int port) {
 
     @Override
     protected Socket createSocket(Service service) throws IOException {
-        Input input = service.getInputs().get(String.valueOf(port));
+        TcpInput input = (TcpInput)service.getInputs().get(String.valueOf(port));
         if (input == null) {
             throw new RuntimeException("no input defined for port " + port);
         }
         if (input.isDisabled()) {
             throw new RuntimeException(String.format("input on port %d is disabled", port));
         }
-        Socket socket = service.open(port);
+        return input.attach();
-        return socket;
     }
 }
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/Helper.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/Helper.java
@@ -23,13 +23,12 @@
 import com.splunk.Args;
 import com.splunk.Index;
 import com.splunk.IndexCollection;
-import com.splunk.Input;
 import com.splunk.InputCollection;
 import com.splunk.Service;
+import com.splunk.TcpInput;
 
 import org.apache.camel.CamelContext;
 
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
@@ -69,8 +68,8 @@ private void mockSplunkWriterApi() {
             when(service.getIndexes()).thenReturn(indexColl);
             InputCollection inputCollection = mock(InputCollection.class);
             when(service.getInputs()).thenReturn(inputCollection);
-            Input input = mock(Input.class);
+            TcpInput input = mock(TcpInput.class);
-            when(service.open(anyInt())).thenReturn(socket);
+            when(input.attach()).thenReturn(socket);
             when(inputCollection.get(anyString())).thenReturn(input);
             when(indexColl.get(anyString())).thenReturn(index);
             when(index.attach(isA(Args.class))).thenReturn(socket);