Refactor package name

haoch · Nov 18, 2017 · a1d8c1d · a1d8c1d
1 parent cec22bc
commit a1d8c1d
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 59 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@ under the License.
     <properties>
         <siddhi.version>4.0.0-M120</siddhi.version>
         <flink.version>1.3.2</flink.version>
-        <scala.binary.version>2.10</scala.binary.version>
+        <scala.binary.version>2.11</scala.binary.version>
     </properties>
 
     <dependencies>

diff --git a/...pache/flink/contrib/siddhi/SiddhiCEP.java → ...che/flink/streaming/siddhi/SiddhiCEP.java b/...pache/flink/contrib/siddhi/SiddhiCEP.java → ...che/flink/streaming/siddhi/SiddhiCEP.java
@@ -15,14 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi;
+package org.apache.flink.streaming.siddhi;
 
 import org.apache.flink.annotation.PublicEvolving;
-import org.apache.flink.contrib.siddhi.exception.DuplicatedStreamException;
-import org.apache.flink.contrib.siddhi.exception.UndefinedStreamException;
-import org.apache.flink.contrib.siddhi.schema.SiddhiStreamSchema;
+import org.apache.flink.streaming.siddhi.exception.DuplicatedStreamException;
+import org.apache.flink.streaming.siddhi.exception.UndefinedStreamException;
+import org.apache.flink.streaming.siddhi.schema.SiddhiStreamSchema;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.streaming.siddhi.operator.SiddhiStreamOperator;
+import org.apache.flink.streaming.siddhi.schema.StreamSchema;
 import org.apache.flink.util.Preconditions;
 
 import java.util.HashMap;
@@ -42,8 +44,8 @@
  * </p>
  *
  * @see SiddhiStream
- * @see org.apache.flink.contrib.siddhi.schema.StreamSchema
- * @see org.apache.flink.contrib.siddhi.operator.SiddhiStreamOperator
+ * @see StreamSchema
+ * @see SiddhiStreamOperator
  */
 @PublicEvolving
 public class SiddhiCEP {

diff --git a/...he/flink/contrib/siddhi/SiddhiStream.java → .../flink/streaming/siddhi/SiddhiStream.java b/...he/flink/contrib/siddhi/SiddhiStream.java → .../flink/streaming/siddhi/SiddhiStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi;
+package org.apache.flink.streaming.siddhi;
 
 import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.api.common.functions.MapFunction;
@@ -24,9 +24,9 @@
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.typeutils.TypeExtractor;
-import org.apache.flink.contrib.siddhi.operator.SiddhiOperatorContext;
-import org.apache.flink.contrib.siddhi.utils.SiddhiStreamFactory;
-import org.apache.flink.contrib.siddhi.utils.SiddhiTypeFactory;
+import org.apache.flink.streaming.siddhi.operator.SiddhiOperatorContext;
+import org.apache.flink.streaming.siddhi.utils.SiddhiStreamFactory;
+import org.apache.flink.streaming.siddhi.utils.SiddhiTypeFactory;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.datastream.KeyedStream;
 import org.apache.flink.util.Preconditions;

diff --git a/.../exception/DuplicatedStreamException.java → .../exception/DuplicatedStreamException.java b/.../exception/DuplicatedStreamException.java → .../exception/DuplicatedStreamException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.exception;
+package org.apache.flink.streaming.siddhi.exception;
 
 public class DuplicatedStreamException extends RuntimeException {
 	public DuplicatedStreamException(String message) {

diff --git a/...i/exception/UndefinedStreamException.java → ...i/exception/UndefinedStreamException.java b/...i/exception/UndefinedStreamException.java → ...i/exception/UndefinedStreamException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.exception;
+package org.apache.flink.streaming.siddhi.exception;
 
 public class UndefinedStreamException extends RuntimeException {
 	public UndefinedStreamException(String message) {

diff --git a/...ddhi/operator/AbstractSiddhiOperator.java → ...ddhi/operator/AbstractSiddhiOperator.java b/...ddhi/operator/AbstractSiddhiOperator.java → ...ddhi/operator/AbstractSiddhiOperator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,8 +29,8 @@
 import org.apache.flink.api.common.state.ListState;
 import org.apache.flink.api.common.state.ListStateDescriptor;
 import org.apache.flink.api.common.typeutils.base.array.BytePrimitiveArraySerializer;
-import org.apache.flink.contrib.siddhi.exception.UndefinedStreamException;
-import org.apache.flink.contrib.siddhi.schema.StreamSchema;
+import org.apache.flink.streaming.siddhi.exception.UndefinedStreamException;
+import org.apache.flink.streaming.siddhi.schema.StreamSchema;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataInputViewStreamWrapper;
 import org.apache.flink.core.memory.DataOutputView;

diff --git a/...iddhi/operator/SiddhiOperatorContext.java → ...iddhi/operator/SiddhiOperatorContext.java b/...iddhi/operator/SiddhiOperatorContext.java → ...iddhi/operator/SiddhiOperatorContext.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.contrib.siddhi.exception.UndefinedStreamException;
-import org.apache.flink.contrib.siddhi.schema.SiddhiStreamSchema;
-import org.apache.flink.contrib.siddhi.schema.StreamSchema;
+import org.apache.flink.streaming.siddhi.exception.UndefinedStreamException;
+import org.apache.flink.streaming.siddhi.schema.SiddhiStreamSchema;
+import org.apache.flink.streaming.siddhi.schema.StreamSchema;
 import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.util.Preconditions;
 import org.wso2.siddhi.core.SiddhiManager;

diff --git a/...siddhi/operator/SiddhiStreamOperator.java → ...siddhi/operator/SiddhiStreamOperator.java b/...siddhi/operator/SiddhiStreamOperator.java → ...siddhi/operator/SiddhiStreamOperator.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import java.io.IOException;
 import java.util.PriorityQueue;
 
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.contrib.siddhi.schema.StreamSchema;
-import org.apache.flink.contrib.siddhi.utils.SiddhiTypeFactory;
+import org.apache.flink.streaming.siddhi.schema.StreamSchema;
+import org.apache.flink.streaming.siddhi.utils.SiddhiTypeFactory;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
 import org.apache.flink.streaming.runtime.streamrecord.StreamElement;

diff --git a/...hi/operator/StreamInMemOutputHandler.java → ...hi/operator/StreamInMemOutputHandler.java b/...hi/operator/StreamInMemOutputHandler.java → ...hi/operator/StreamInMemOutputHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -24,7 +24,7 @@
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.typeutils.PojoTypeInfo;
-import org.apache.flink.contrib.siddhi.utils.SiddhiTupleFactory;
+import org.apache.flink.streaming.siddhi.utils.SiddhiTupleFactory;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../siddhi/operator/StreamOutputHandler.java → .../siddhi/operator/StreamOutputHandler.java b/.../siddhi/operator/StreamOutputHandler.java → .../siddhi/operator/StreamOutputHandler.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.typeutils.PojoTypeInfo;
-import org.apache.flink.contrib.siddhi.utils.SiddhiTupleFactory;
+import org.apache.flink.streaming.siddhi.utils.SiddhiTupleFactory;
 import org.apache.flink.streaming.api.operators.Output;
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 import org.slf4j.Logger;

diff --git a/...ddhi/operator/StreamRecordComparator.java → ...ddhi/operator/StreamRecordComparator.java b/...ddhi/operator/StreamRecordComparator.java → ...ddhi/operator/StreamRecordComparator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
 

diff --git a/...he/flink/contrib/siddhi/package-info.java → .../flink/streaming/siddhi/package-info.java b/...he/flink/contrib/siddhi/package-info.java → .../flink/streaming/siddhi/package-info.java
@@ -75,4 +75,4 @@
  *
  * @see <a href="/~https://github.com/wso2/siddhi">/~https://github.com/wso2/siddhi</a>
  */
-package org.apache.flink.contrib.siddhi;
+package org.apache.flink.streaming.siddhi;
diff --git a/...rib/siddhi/schema/SiddhiStreamSchema.java → ...ing/siddhi/schema/SiddhiStreamSchema.java b/...rib/siddhi/schema/SiddhiStreamSchema.java → ...ing/siddhi/schema/SiddhiStreamSchema.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.schema;
+package org.apache.flink.streaming.siddhi.schema;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.contrib.siddhi.utils.SiddhiTypeFactory;
+import org.apache.flink.streaming.siddhi.utils.SiddhiTypeFactory;
 import org.apache.flink.util.Preconditions;
 import org.wso2.siddhi.query.api.definition.Attribute;
 import org.wso2.siddhi.query.api.definition.StreamDefinition;

diff --git a/...k/contrib/siddhi/schema/StreamSchema.java → ...streaming/siddhi/schema/StreamSchema.java b/...k/contrib/siddhi/schema/StreamSchema.java → ...streaming/siddhi/schema/StreamSchema.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.schema;
+package org.apache.flink.streaming.siddhi.schema;
 
 import org.apache.flink.api.common.typeinfo.AtomicType;
 import org.apache.flink.api.common.typeinfo.TypeInformation;

diff --git a/...ntrib/siddhi/schema/StreamSerializer.java → ...aming/siddhi/schema/StreamSerializer.java b/...ntrib/siddhi/schema/StreamSerializer.java → ...aming/siddhi/schema/StreamSerializer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.schema;
+package org.apache.flink.streaming.siddhi.schema;
 
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.typeutils.TypeExtractor;

diff --git a/...rib/siddhi/utils/SiddhiStreamFactory.java → ...ing/siddhi/utils/SiddhiStreamFactory.java b/...rib/siddhi/utils/SiddhiStreamFactory.java → ...ing/siddhi/utils/SiddhiStreamFactory.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.utils;
+package org.apache.flink.streaming.siddhi.utils;
 
 import org.apache.flink.api.java.tuple.Tuple2;
-import org.apache.flink.contrib.siddhi.operator.SiddhiOperatorContext;
-import org.apache.flink.contrib.siddhi.operator.SiddhiStreamOperator;
+import org.apache.flink.streaming.siddhi.operator.SiddhiOperatorContext;
+import org.apache.flink.streaming.siddhi.operator.SiddhiStreamOperator;
 import org.apache.flink.streaming.api.datastream.DataStream;
 
 /**

diff --git a/...trib/siddhi/utils/SiddhiTupleFactory.java → ...ming/siddhi/utils/SiddhiTupleFactory.java b/...trib/siddhi/utils/SiddhiTupleFactory.java → ...ming/siddhi/utils/SiddhiTupleFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.utils;
+package org.apache.flink.streaming.siddhi.utils;
 
 import org.apache.flink.api.java.tuple.Tuple;
 import org.apache.flink.api.java.tuple.Tuple0;

diff --git a/...ntrib/siddhi/utils/SiddhiTypeFactory.java → ...aming/siddhi/utils/SiddhiTypeFactory.java b/...ntrib/siddhi/utils/SiddhiTypeFactory.java → ...aming/siddhi/utils/SiddhiTypeFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.utils;
+package org.apache.flink.streaming.siddhi.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.flink.api.common.typeinfo.TypeInformation;

diff --git a/...flink/contrib/siddhi/SiddhiCEPITCase.java → ...ink/streaming/siddhi/SiddhiCEPITCase.java b/...flink/contrib/siddhi/SiddhiCEPITCase.java → ...ink/streaming/siddhi/SiddhiCEPITCase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi;
+package org.apache.flink.streaming.siddhi;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -28,12 +28,12 @@
 import org.apache.flink.api.java.tuple.Tuple1;
 import org.apache.flink.api.java.tuple.Tuple4;
 import org.apache.flink.api.java.tuple.Tuple5;
-import org.apache.flink.contrib.siddhi.exception.UndefinedStreamException;
-import org.apache.flink.contrib.siddhi.extension.CustomPlusFunctionExtension;
-import org.apache.flink.contrib.siddhi.source.Event;
-import org.apache.flink.contrib.siddhi.source.RandomEventSource;
-import org.apache.flink.contrib.siddhi.source.RandomTupleSource;
-import org.apache.flink.contrib.siddhi.source.RandomWordSource;
+import org.apache.flink.streaming.siddhi.exception.UndefinedStreamException;
+import org.apache.flink.streaming.siddhi.extension.CustomPlusFunctionExtension;
+import org.apache.flink.streaming.siddhi.source.Event;
+import org.apache.flink.streaming.siddhi.source.RandomEventSource;
+import org.apache.flink.streaming.siddhi.source.RandomTupleSource;
+import org.apache.flink.streaming.siddhi.source.RandomWordSource;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.streaming.api.TimeCharacteristic;
 import org.apache.flink.streaming.api.datastream.DataStream;

diff --git a/...xtension/CustomPlusFunctionExtension.java → ...xtension/CustomPlusFunctionExtension.java b/...xtension/CustomPlusFunctionExtension.java → ...xtension/CustomPlusFunctionExtension.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.extension;
+package org.apache.flink.streaming.siddhi.extension;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...rib/siddhi/operator/SiddhiSyntaxTest.java → ...ing/siddhi/operator/SiddhiSyntaxTest.java b/...rib/siddhi/operator/SiddhiSyntaxTest.java → ...ing/siddhi/operator/SiddhiSyntaxTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.operator;
+package org.apache.flink.streaming.siddhi.operator;
 
 import org.junit.After;
 import org.junit.Assert;

diff --git a/...schema/SiddhiExecutionPlanSchemaTest.java → ...schema/SiddhiExecutionPlanSchemaTest.java b/...schema/SiddhiExecutionPlanSchemaTest.java → ...schema/SiddhiExecutionPlanSchemaTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.schema;
+package org.apache.flink.streaming.siddhi.schema;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.typeutils.PojoTypeInfo;
 import org.apache.flink.api.java.typeutils.TypeExtractor;
-import org.apache.flink.contrib.siddhi.source.Event;
+import org.apache.flink.streaming.siddhi.source.Event;
 import org.junit.Test;
 import org.wso2.siddhi.query.api.definition.Attribute;
 import org.wso2.siddhi.query.api.definition.StreamDefinition;

diff --git a/...ntrib/siddhi/schema/StreamSchemaTest.java → ...aming/siddhi/schema/StreamSchemaTest.java b/...ntrib/siddhi/schema/StreamSchemaTest.java → ...aming/siddhi/schema/StreamSchemaTest.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.schema;
+package org.apache.flink.streaming.siddhi.schema;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.tuple.Tuple4;
 import org.apache.flink.api.java.typeutils.PojoTypeInfo;
 import org.apache.flink.api.java.typeutils.TypeExtractor;
 import org.apache.flink.api.java.typeutils.TypeInfoParser;
-import org.apache.flink.contrib.siddhi.source.Event;
+import org.apache.flink.streaming.siddhi.source.Event;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

diff --git a/...b/siddhi/schema/StreamSerializerTest.java → ...g/siddhi/schema/StreamSerializerTest.java b/...b/siddhi/schema/StreamSerializerTest.java → ...g/siddhi/schema/StreamSerializerTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.schema;
+package org.apache.flink.streaming.siddhi.schema;
 
 import org.apache.flink.api.java.typeutils.TypeExtractor;
-import org.apache.flink.contrib.siddhi.source.Event;
+import org.apache.flink.streaming.siddhi.source.Event;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...he/flink/contrib/siddhi/source/Event.java → .../flink/streaming/siddhi/source/Event.java b/...he/flink/contrib/siddhi/source/Event.java → .../flink/streaming/siddhi/source/Event.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.source;
+package org.apache.flink.streaming.siddhi.source;
 
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.typeinfo.TypeInformation;

diff --git a/...trib/siddhi/source/RandomEventSource.java → ...ming/siddhi/source/RandomEventSource.java b/...trib/siddhi/source/RandomEventSource.java → ...ming/siddhi/source/RandomEventSource.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.source;
+package org.apache.flink.streaming.siddhi.source;
 
 import org.apache.flink.streaming.api.functions.source.SourceFunction;
 

diff --git a/...trib/siddhi/source/RandomTupleSource.java → ...ming/siddhi/source/RandomTupleSource.java b/...trib/siddhi/source/RandomTupleSource.java → ...ming/siddhi/source/RandomTupleSource.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.source;
+package org.apache.flink.streaming.siddhi.source;
 
 import org.apache.flink.api.java.tuple.Tuple4;
 import org.apache.flink.streaming.api.functions.source.SourceFunction;

diff --git a/...ntrib/siddhi/source/RandomWordSource.java → ...aming/siddhi/source/RandomWordSource.java b/...ntrib/siddhi/source/RandomWordSource.java → ...aming/siddhi/source/RandomWordSource.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.source;
+package org.apache.flink.streaming.siddhi.source;
 
 import org.apache.flink.streaming.api.functions.source.SourceFunction;
 

diff --git a/.../siddhi/utils/SiddhiTupleFactoryTest.java → .../siddhi/utils/SiddhiTupleFactoryTest.java b/.../siddhi/utils/SiddhiTupleFactoryTest.java → .../siddhi/utils/SiddhiTupleFactoryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.utils;
+package org.apache.flink.streaming.siddhi.utils;
 
 import org.apache.flink.api.java.tuple.Tuple5;
 import org.junit.Test;

diff --git a/...b/siddhi/utils/SiddhiTypeFactoryTest.java → ...g/siddhi/utils/SiddhiTypeFactoryTest.java b/...b/siddhi/utils/SiddhiTypeFactoryTest.java → ...g/siddhi/utils/SiddhiTypeFactoryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.contrib.siddhi.utils;
+package org.apache.flink.streaming.siddhi.utils;
 
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple2;