Merge pull request #298 from tishan89/master

Cleaning up TCP transport pom and moving org.wso2.siddhi.core.test.util.SiddhiTestHelper to org.wso2.siddhi.core.util.SiddhiTestHelper
siddhi-io · Mar 29, 2017 · 6e3c1b2 · 6e3c1b2
2 parents dd44e08 + 525ed88
commit 6e3c1b2
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 113 deletions.
diff --git a/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/managment/QuerySyncTestCase.java b/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/managment/QuerySyncTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...-core/src/test/java/org/wso2/siddhi/core/query/function/CastFunctionExecutorTestCase.java b/...-core/src/test/java/org/wso2/siddhi/core/query/function/CastFunctionExecutorTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/query/join/JoinTestCase.java b/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/query/join/JoinTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 import org.wso2.siddhi.query.api.exception.ExecutionPlanValidationException;
 

diff --git a/...siddhi-core/src/test/java/org/wso2/siddhi/core/query/partition/JoinPartitionTestCase.java b/...siddhi-core/src/test/java/org/wso2/siddhi/core/query/partition/JoinPartitionTestCase.java
@@ -26,7 +26,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...les/siddhi-core/src/test/java/org/wso2/siddhi/core/query/partition/PartitionTestCase.java b/...les/siddhi-core/src/test/java/org/wso2/siddhi/core/query/partition/PartitionTestCase.java
@@ -26,7 +26,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 import org.wso2.siddhi.query.api.ExecutionPlan;
 import org.wso2.siddhi.query.api.annotation.Annotation;

diff --git a/...dhi-core/src/test/java/org/wso2/siddhi/core/query/partition/PatternPartitionTestCase.java b/...dhi-core/src/test/java/org/wso2/siddhi/core/query/partition/PatternPartitionTestCase.java
@@ -26,7 +26,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...iddhi-core/src/test/java/org/wso2/siddhi/core/query/partition/TablePartitionTestCase.java b/...iddhi-core/src/test/java/org/wso2/siddhi/core/query/partition/TablePartitionTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/.../siddhi-core/src/test/java/org/wso2/siddhi/core/query/pattern/ComplexPatternTestCase.java b/.../siddhi-core/src/test/java/org/wso2/siddhi/core/query/pattern/ComplexPatternTestCase.java
@@ -27,8 +27,6 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...e/src/test/java/org/wso2/siddhi/core/query/ratelimit/SnapshotOutputRateLimitTestCase.java b/...e/src/test/java/org/wso2/siddhi/core/query/ratelimit/SnapshotOutputRateLimitTestCase.java
@@ -28,7 +28,7 @@
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/IndexTableTestCase.java b/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/IndexTableTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.ArrayList;

diff --git a/...es/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/IndexedByTableTestCase.java b/...es/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/IndexedByTableTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.ArrayList;

diff --git a/...les/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/LocgicalTableTestCase.java b/...les/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/LocgicalTableTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.ArrayList;

diff --git a/...s/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/PrimaryKeyTableTestCase.java b/...s/siddhi-core/src/test/java/org/wso2/siddhi/core/query/table/PrimaryKeyTableTestCase.java
@@ -27,7 +27,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.ArrayList;

diff --git a/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/stream/ExceptionHandlerTestCase.java b/modules/siddhi-core/src/test/java/org/wso2/siddhi/core/stream/ExceptionHandlerTestCase.java
@@ -44,7 +44,7 @@
 import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 import org.wso2.siddhi.core.stream.output.StreamCallback;
-import org.wso2.siddhi.core.test.util.SiddhiTestHelper;
+import org.wso2.siddhi.core.util.SiddhiTestHelper;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...ddhi/core/test/util/SiddhiTestHelper.java → ...o2/siddhi/core/util/SiddhiTestHelper.java b/...ddhi/core/test/util/SiddhiTestHelper.java → ...o2/siddhi/core/util/SiddhiTestHelper.java
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.siddhi.core.test.util;
+package org.wso2.siddhi.core.util;
 
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/modules/siddhi-extensions/transport/tcp-transport/pom.xml b/modules/siddhi-extensions/transport/tcp-transport/pom.xml
@@ -60,131 +60,35 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.0</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-query-api</artifactId>
-            <version>${siddhi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-query-compiler</artifactId>
-            <version>${siddhi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-core</artifactId>
-            <version>${siddhi.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
-            <version>${orbit.version.json}</version>
         </dependency>
     </dependencies>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!--<siddhi.version>3.1.3-SNAPSHOT</siddhi.version>-->
-        <gson.version>2.5</gson.version>
-        <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>wso2-nexus</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-
-        <repository>
-            <id>wso2.releases</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-
-        <repository>
-            <id>wso2.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-        <!--todo is this necessary ?-->
-        <repository>
-            <id>sonatype.releases</id>
-            <url>https://oss.sonatype.org/content/repositories/releases/</url>
-        </repository>
-
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>wso2.releases</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>wso2.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-
-        <pluginRepository>
-            <id>wso2-nexus</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -315,7 +315,16 @@
                 <artifactId>jackson-datatype-joda</artifactId>
                 <version>${jackson-datatype-joda-version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>${netty-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+                <version>${commons-collection-version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -521,6 +530,8 @@
         <maven.shadeplugin.version>2.4.1</maven.shadeplugin.version>
         <servlet-api-version>2.5</servlet-api-version>
         <jackson-datatype-joda-version>2.4.1</jackson-datatype-joda-version>
+        <netty-version>4.1.0.Final</netty-version>
+        <commons-collection-version>4.0</commons-collection-version>
     </properties>
 
     <scm>