优化包

edp963 · Aug 22, 2018 · 5c67467 · 5c67467
1 parent e4b5c32
commit 5c67467
Show file tree

Hide file tree

Showing 68 changed files with 46 additions and 33 deletions.
diff --git a/...wormhole.common/json/JsonParseUtils.scala → ...wormhole/common/json/JsonParseUtils.scala b/...wormhole.common/json/JsonParseUtils.scala → ...wormhole/common/json/JsonParseUtils.scala
diff --git a/...wormhole.common/json/JsonSourceConf.scala → ...wormhole/common/json/JsonSourceConf.scala b/...wormhole.common/json/JsonSourceConf.scala → ...wormhole/common/json/JsonSourceConf.scala
diff --git a/dev/build b/dev/build
@@ -63,6 +63,9 @@ cd ../../
 cd sinks
 mvn clean deploy -Dassembly.skipAssembly=true -U -Dmaven.test.skip=true
 cd ../
+cd swifts
+mvn clean deploy -Dassembly.skipAssembly=true -U -Dmaven.test.skip=true
+cd ../
 cd sparkx
 mvn clean package -U -Dmaven.test.skip=true
 cd ../
@@ -124,6 +127,9 @@ cd ../../
 cd sinks
 mvn clean install
 cd ../
+cd swifts
+mvn clean install
+cd ../
 cd sparkx
 mvn clean package -Dmaven.test.skip=true
 cd ../

diff --git a/flinkx/src/main/scala/edp/wormhole/flinkx/eventflow/WormholeFlinkxFlowDirective.scala b/flinkx/src/main/scala/edp/wormhole/flinkx/eventflow/WormholeFlinkxFlowDirective.scala
@@ -1,12 +1,12 @@
 package edp.wormhole.flinkx.eventflow
 
 import com.alibaba.fastjson.JSON
-import edp.wormhole.common.InputDataRequirement
 import edp.wormhole.common.json.{JsonSourceConf, RegularJsonSchema}
 import edp.wormhole.flinkx.common.ConfMemoryStorage
 import edp.wormhole.flinkx.util.FlinkSchemaUtils.findJsonSchema
 import edp.wormhole.flinkx.util.UmsFlowStartUtils.extractVersion
 import edp.wormhole.flinkx.util.{FlinkSchemaUtils, UmsFlowStartUtils}
+import edp.wormhole.sinks.common.InputDataRequirement
 import edp.wormhole.ums.{Ums, UmsFieldType, UmsProtocolType, UmsSchema}
 
 

diff --git a/flinkx/src/main/scala/edp/wormhole/flinkx/swifts/common/LookupHbaseHelper.scala b/flinkx/src/main/scala/edp/wormhole/flinkx/swifts/common/LookupHbaseHelper.scala
@@ -8,13 +8,12 @@ import org.apache.log4j.Logger
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 import edp.wormhole.ums._
-import edp.wormhole.common.{RowkeyPatternContent, RowkeyTool}
 import edp.wormhole.sinks.hbasesink.HbaseConnection
 import edp.wormhole.util.config.ConnectionConfig
 import edp.wormhole.util.swifts.SwiftsSql
-import edp.wormhole.swifts.ConnectionMemoryStorage
 import edp.wormhole.flinkx.util.FlinkSchemaUtils
 import edp.wormhole.flinkx.util.FlinkSchemaUtils._
+import edp.wormhole.sinks.common.{RowkeyPatternContent, RowkeyTool}
 import edp.wormhole.swifts.ConnectionMemoryStorage
 
 object LookupHbaseHelper extends java.io.Serializable{

diff --git a/...scala/edp.wormhole.sinks/SinkHelper.scala → ...scala/edp/wormhole/sinks/SinkHelper.scala b/...scala/edp.wormhole.sinks/SinkHelper.scala → ...scala/edp/wormhole/sinks/SinkHelper.scala
@@ -23,7 +23,6 @@ package edp.wormhole.sinks
 
 import java.util.UUID
 
-import edp.wormhole.sinks.elasticsearchsink.EsConfig
 import edp.wormhole.ums.UmsFieldType.UmsFieldType
 import org.apache.log4j.Logger
 

diff --git a/...sinks/cassandrasink/CassandraConfig.scala → ...sinks/cassandrasink/CassandraConfig.scala b/...sinks/cassandrasink/CassandraConfig.scala → ...sinks/cassandrasink/CassandraConfig.scala
diff --git a/...s/cassandrasink/CassandraConnection.scala → ...s/cassandrasink/CassandraConnection.scala b/...s/cassandrasink/CassandraConnection.scala → ...s/cassandrasink/CassandraConnection.scala
diff --git a/...ks/cassandrasink/Data2CassandraSink.scala → ...ks/cassandrasink/Data2CassandraSink.scala b/...ks/cassandrasink/Data2CassandraSink.scala → ...ks/cassandrasink/Data2CassandraSink.scala
diff --git a/...dp/wormhole/common/FeedbackPriority.scala → ...mhole/sinks/common/FeedbackPriority.scala b/...dp/wormhole/common/FeedbackPriority.scala → ...mhole/sinks/common/FeedbackPriority.scala
@@ -1,4 +1,4 @@
-package edp.wormhole.common;
+package edp.wormhole.sinks.common
 
 object FeedbackPriority {
 

diff --git a/...edp/wormhole/common/JsonParseHelper.scala → ...rmhole/sinks/common/JsonParseHelper.scala b/...edp/wormhole/common/JsonParseHelper.scala → ...rmhole/sinks/common/JsonParseHelper.scala
@@ -1,4 +1,4 @@
-package edp.wormhole.common;
+package edp.wormhole.sinks.common
 
 import com.alibaba.fastjson.{JSON, JSONArray, JSONObject}
 import edp.wormhole.util.config.WormholeDefault._

diff --git a/...a/edp/wormhole/common/RowkeyPattern.scala → ...wormhole/sinks/common/RowkeyPattern.scala b/...a/edp/wormhole/common/RowkeyPattern.scala → ...wormhole/sinks/common/RowkeyPattern.scala
@@ -18,8 +18,7 @@
  * >>
  */
 
-package edp.wormhole.common
-
+package edp.wormhole.sinks.common
 
 import edp.wormhole.ums.UmsFieldType.UmsFieldType
 import edp.wormhole.util.MD5Utils

diff --git a/.../wormhole/common/WhHdfsLogPathUtils.scala → ...ole/sinks/common/WhHdfsLogPathUtils.scala b/.../wormhole/common/WhHdfsLogPathUtils.scala → ...ole/sinks/common/WhHdfsLogPathUtils.scala
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
  */
 
 
-package edp.wormhole.common
+package edp.wormhole.sinks.common
 
 import edp.wormhole.util.{CommonUtils, DateUtils, DtFormat, FileUtils}
 import edp.wormhole.externalclient.hadoop.HdfsUtils

diff --git a/.../edp/wormhole/common/WormholeConfig.scala → ...ormhole/sinks/common/WormholeConfig.scala b/.../edp/wormhole/common/WormholeConfig.scala → ...ormhole/sinks/common/WormholeConfig.scala
@@ -19,7 +19,7 @@
  */
 
 
-package edp.wormhole.common
+package edp.wormhole.sinks.common
 
 import edp.wormhole.util.config.KVConfig
 

diff --git a/...p/wormhole/common/WormholeConstants.scala → ...hole/sinks/common/WormholeConstants.scala b/...p/wormhole/common/WormholeConstants.scala → ...hole/sinks/common/WormholeConstants.scala
@@ -1,4 +1,4 @@
-package edp.wormhole.common;
+package edp.wormhole.sinks.common
 
 object WormholeConstants {
 

diff --git a/...p.wormhole.sinks/dbsink/Data2DbSink.scala → ...p/wormhole/sinks/dbsink/Data2DbSink.scala b/...p.wormhole.sinks/dbsink/Data2DbSink.scala → ...p/wormhole/sinks/dbsink/Data2DbSink.scala
diff --git a/.../edp.wormhole.sinks/dbsink/DbConfig.scala → .../edp/wormhole/sinks/dbsink/DbConfig.scala b/.../edp.wormhole.sinks/dbsink/DbConfig.scala → .../edp/wormhole/sinks/dbsink/DbConfig.scala
diff --git a/...sinks/dbsink/SplitTableSqlProcessor.scala → ...sinks/dbsink/SplitTableSqlProcessor.scala b/...sinks/dbsink/SplitTableSqlProcessor.scala → ...sinks/dbsink/SplitTableSqlProcessor.scala
diff --git a/....wormhole.sinks/dbsink/SqlProcessor.scala → .../wormhole/sinks/dbsink/SqlProcessor.scala b/....wormhole.sinks/dbsink/SqlProcessor.scala → .../wormhole/sinks/dbsink/SqlProcessor.scala
diff --git a/...sinks/elasticsearchsink/Data2EsSink.scala → ...sinks/elasticsearchsink/Data2EsSink.scala b/...sinks/elasticsearchsink/Data2EsSink.scala → ...sinks/elasticsearchsink/Data2EsSink.scala
@@ -21,15 +21,14 @@
 package edp.wormhole.sinks.elasticsearchsink
 
 import com.alibaba.fastjson.JSONObject
-import edp.wormhole.common.JsonParseHelper
+import edp.wormhole.sinks.common.JsonParseHelper
 import edp.wormhole.publicinterface.sinks.{SinkProcessConfig, SinkProcessor}
 import edp.wormhole.sinks.{SourceMutationType, _IDHelper}
 import edp.wormhole.ums.{UmsNamespace, UmsSysField}
 import edp.wormhole.ums.UmsFieldType._
 import edp.wormhole.ums.UmsProtocolType._
 import edp.wormhole.util.config.ConnectionConfig
 import org.apache.log4j.Logger
-import edp.wormhole.util.DateUtils._
 import edp.wormhole.util.JsonUtils._
 
 import scala.collection.mutable

diff --git a/...s/elasticsearchsink/DataJson2EsSink.scala → ...s/elasticsearchsink/DataJson2EsSink.scala b/...s/elasticsearchsink/DataJson2EsSink.scala → ...s/elasticsearchsink/DataJson2EsSink.scala
@@ -21,7 +21,7 @@
 package edp.wormhole.sinks.elasticsearchsink
 
 import com.alibaba.fastjson.{JSON, JSONArray}
-import edp.wormhole.common.JsonParseHelper
+import edp.wormhole.sinks.common.JsonParseHelper
 import edp.wormhole.publicinterface.sinks.{SinkProcessConfig, SinkProcessor}
 import edp.wormhole.sinks.SourceMutationType.INSERT_ONLY
 import edp.wormhole.sinks.{SourceMutationType, _IDHelper}

diff --git a/...le.sinks/elasticsearchsink/EsConfig.scala → ...le/sinks/elasticsearchsink/EsConfig.scala b/...le.sinks/elasticsearchsink/EsConfig.scala → ...le/sinks/elasticsearchsink/EsConfig.scala
diff --git a/...hole.sinks/hbasesink/Data2HbaseSink.scala → ...hole/sinks/hbasesink/Data2HbaseSink.scala b/...hole.sinks/hbasesink/Data2HbaseSink.scala → ...hole/sinks/hbasesink/Data2HbaseSink.scala
@@ -20,9 +20,10 @@
 
 package edp.wormhole.sinks.hbasesink
 
-import edp.wormhole.common.{RowkeyPatternContent, RowkeyPatternType, RowkeyTool}
+import edp.wormhole.sinks.common.{RowkeyPatternType, RowkeyTool}
 import edp.wormhole.publicinterface.sinks.{SinkProcessConfig, SinkProcessor}
 import edp.wormhole.sinks.SourceMutationType
+import edp.wormhole.sinks.common.{RowkeyPatternContent, RowkeyPatternType, RowkeyTool}
 import edp.wormhole.sinks.hbasesink.HbaseConstants._
 import org.apache.hadoop.hbase.client._
 import org.apache.hadoop.hbase.util.Bytes

diff --git a/...ormhole.sinks/hbasesink/HbaseConfig.scala → ...ormhole/sinks/hbasesink/HbaseConfig.scala b/...ormhole.sinks/hbasesink/HbaseConfig.scala → ...ormhole/sinks/hbasesink/HbaseConfig.scala
diff --git a/...ole.sinks/hbasesink/HbaseConnection.scala → ...ole/sinks/hbasesink/HbaseConnection.scala b/...ole.sinks/hbasesink/HbaseConnection.scala → ...ole/sinks/hbasesink/HbaseConnection.scala
diff --git a/...ormhole.sinks/hbasesink/HbaseHelper.scala → ...ormhole/sinks/hbasesink/HbaseHelper.scala b/...ormhole.sinks/hbasesink/HbaseHelper.scala → ...ormhole/sinks/hbasesink/HbaseHelper.scala
diff --git a/...hole.sinks/kafkasink/Data2KafkaSink.scala → ...hole/sinks/kafkasink/Data2KafkaSink.scala b/...hole.sinks/kafkasink/Data2KafkaSink.scala → ...hole/sinks/kafkasink/Data2KafkaSink.scala
diff --git a/....sinks/kafkasink/DataJson2KafkaSink.scala → .../sinks/kafkasink/DataJson2KafkaSink.scala b/....sinks/kafkasink/DataJson2KafkaSink.scala → .../sinks/kafkasink/DataJson2KafkaSink.scala
@@ -3,11 +3,10 @@ package edp.wormhole.sinks.kafkasink
 import java.util.UUID
 
 import com.alibaba.fastjson.JSON
-import edp.wormhole.common.JsonParseHelper
+import edp.wormhole.sinks.common.JsonParseHelper
 import edp.wormhole.kafka.WormholeKafkaProducer
 import edp.wormhole.publicinterface.sinks.{SinkProcessConfig, SinkProcessor}
 import edp.wormhole.ums.UmsFieldType.UmsFieldType
-import edp.wormhole.ums.UmsProtocol
 import edp.wormhole.ums.UmsProtocolType.UmsProtocolType
 import edp.wormhole.util.config.ConnectionConfig
 import org.apache.log4j.Logger

diff --git a/...ormhole.sinks/kafkasink/KafkaConfig.scala → ...ormhole/sinks/kafkasink/KafkaConfig.scala b/...ormhole.sinks/kafkasink/KafkaConfig.scala → ...ormhole/sinks/kafkasink/KafkaConfig.scala
diff --git a/...p.wormhole.sinks/kudu/Data2KuduSink.scala → ...p/wormhole/sinks/kudu/Data2KuduSink.scala b/...p.wormhole.sinks/kudu/Data2KuduSink.scala → ...p/wormhole/sinks/kudu/Data2KuduSink.scala
diff --git a/.../edp.wormhole.sinks/kudu/KuduConfig.scala → .../edp/wormhole/sinks/kudu/KuduConfig.scala b/.../edp.wormhole.sinks/kudu/KuduConfig.scala → .../edp/wormhole/sinks/kudu/KuduConfig.scala
diff --git a/....wormhole.sinks/kudu/KuduConnection.scala → .../wormhole/sinks/kudu/KuduConnection.scala b/....wormhole.sinks/kudu/KuduConnection.scala → .../wormhole/sinks/kudu/KuduConnection.scala
diff --git a/...hole.sinks/mongosink/Data2MongoSink.scala → ...hole/sinks/mongosink/Data2MongoSink.scala b/...hole.sinks/mongosink/Data2MongoSink.scala → ...hole/sinks/mongosink/Data2MongoSink.scala
diff --git a/....sinks/mongosink/DataJson2MongoSink.scala → .../sinks/mongosink/DataJson2MongoSink.scala b/....sinks/mongosink/DataJson2MongoSink.scala → .../sinks/mongosink/DataJson2MongoSink.scala
@@ -26,7 +26,7 @@ import com.alibaba.fastjson.{JSON, JSONArray, JSONObject}
 import com.mongodb.casbah._
 import com.mongodb.casbah.commons.{Imports, MongoDBList, MongoDBObject}
 import com.mongodb.{ReadPreference, WriteConcern, casbah}
-import edp.wormhole.common.JsonParseHelper
+import edp.wormhole.sinks.common.JsonParseHelper
 import edp.wormhole.publicinterface.sinks.{SinkProcessConfig, SinkProcessor}
 import edp.wormhole.sinks.SourceMutationType.INSERT_ONLY
 import edp.wormhole.sinks.{SourceMutationType, _IDHelper}

diff --git a/...ormhole.sinks/mongosink/MongoConfig.scala → ...ormhole/sinks/mongosink/MongoConfig.scala b/...ormhole.sinks/mongosink/MongoConfig.scala → ...ormhole/sinks/mongosink/MongoConfig.scala
diff --git a/...ormhole.sinks/mongosink/MongoHelper.scala → ...ormhole/sinks/mongosink/MongoHelper.scala b/...ormhole.sinks/mongosink/MongoHelper.scala → ...ormhole/sinks/mongosink/MongoHelper.scala
diff --git a/....sinks/phoenixsink/Data2PhoenixSink.scala → .../sinks/phoenixsink/Data2PhoenixSink.scala b/....sinks/phoenixsink/Data2PhoenixSink.scala → .../sinks/phoenixsink/Data2PhoenixSink.scala
diff --git a/...ole.sinks/phoenixsink/PhoenixConfig.scala → ...ole/sinks/phoenixsink/PhoenixConfig.scala b/...ole.sinks/phoenixsink/PhoenixConfig.scala → ...ole/sinks/phoenixsink/PhoenixConfig.scala
diff --git a/...le.sinks/phoenixsink/PhoenixProcess.scala → ...le/sinks/phoenixsink/PhoenixProcess.scala b/...le.sinks/phoenixsink/PhoenixProcess.scala → ...le/sinks/phoenixsink/PhoenixProcess.scala
diff --git a/.../scala/edp.wormhole.sinks/utils/README.md → .../scala/edp/wormhole/sinks/utils/README.md b/.../scala/edp.wormhole.sinks/utils/README.md → .../scala/edp/wormhole/sinks/utils/README.md
diff --git a/...inks/utils/SinkCassandraSchemaUtils.scala → ...inks/utils/SinkCassandraSchemaUtils.scala b/...inks/utils/SinkCassandraSchemaUtils.scala → ...inks/utils/SinkCassandraSchemaUtils.scala
diff --git a/...ormhole.sinks/utils/SinkCommonUtils.scala → ...ormhole/sinks/utils/SinkCommonUtils.scala b/...ormhole.sinks/utils/SinkCommonUtils.scala → ...ormhole/sinks/utils/SinkCommonUtils.scala
diff --git a/...mhole.sinks/utils/SinkDbSchemaUtils.scala → ...mhole/sinks/utils/SinkDbSchemaUtils.scala b/...mhole.sinks/utils/SinkDbSchemaUtils.scala → ...mhole/sinks/utils/SinkDbSchemaUtils.scala
diff --git a/...dp.wormhole.sinks/utils/SinkDefault.scala → ...dp/wormhole/sinks/utils/SinkDefault.scala b/...dp.wormhole.sinks/utils/SinkDefault.scala → ...dp/wormhole/sinks/utils/SinkDefault.scala
diff --git a/...mhole.sinks/utils/SinkEsSchemaUtils.scala → ...mhole/sinks/utils/SinkEsSchemaUtils.scala b/...mhole.sinks/utils/SinkEsSchemaUtils.scala → ...mhole/sinks/utils/SinkEsSchemaUtils.scala
diff --git a/...le.sinks/utils/SinkHbaseSchemaUtils.scala → ...le/sinks/utils/SinkHbaseSchemaUtils.scala b/...le.sinks/utils/SinkHbaseSchemaUtils.scala → ...le/sinks/utils/SinkHbaseSchemaUtils.scala
diff --git a/...le.sinks/utils/SinkHdfsLogPathUtils.scala → ...le/sinks/utils/SinkHdfsLogPathUtils.scala b/...le.sinks/utils/SinkHdfsLogPathUtils.scala → ...le/sinks/utils/SinkHdfsLogPathUtils.scala
diff --git a/...hole.sinks/utils/SinkUmsSchemaUtils.scala → ...hole/sinks/utils/SinkUmsSchemaUtils.scala b/...hole.sinks/utils/SinkUmsSchemaUtils.scala → ...hole/sinks/utils/SinkUmsSchemaUtils.scala
diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/batchflow/BatchflowDirective.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/batchflow/BatchflowDirective.scala
@@ -28,6 +28,7 @@ import edp.wormhole.common.json.{JsonSourceConf, RegularJsonSchema}
 import edp.wormhole.sparkx.directive._
 import edp.wormhole.kafka.WormholeKafkaProducer
 import edp.wormhole.publicinterface.sinks.SinkProcessConfig
+import edp.wormhole.sinks.common.{FeedbackPriority, InputDataRequirement}
 import edp.wormhole.sparkx.memorystorage.ConfMemoryStorage
 import edp.wormhole.sparkx.swifts.parse.ParseSwiftsSql
 import edp.wormhole.sparkxinterface.swifts.{SwiftsProcessConfig, ValidityConfig}

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/batchflow/BatchflowMainProcess.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/batchflow/BatchflowMainProcess.scala
@@ -30,6 +30,7 @@ import edp.wormhole.externalclient.hadoop.HdfsUtils
 import edp.wormhole.kafka.WormholeKafkaProducer
 import edp.wormhole.publicinterface.sinks.SinkProcessConfig
 import edp.wormhole.sinks.SourceMutationType
+import edp.wormhole.sinks.common.{FeedbackPriority, InputDataRequirement, WormholeConfig}
 import edp.wormhole.sinks.elasticsearchsink.EsConfig
 import edp.wormhole.sinks.mongosink.MongoConfig
 import edp.wormhole.sinks.utils.SinkCommonUtils

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/batchflow/BatchflowStarter.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/batchflow/BatchflowStarter.scala
@@ -24,6 +24,7 @@ package edp.wormhole.sparkx.batchflow
 import edp.wormhole.common._
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.{KafkaInputConfig, WormholeConfig, WormholeConstants}
 import edp.wormhole.sparkx.common.SparkContextUtils.createKafkaStream
 import edp.wormhole.sparkx.common.{SparkContextUtils, SparkUtils}
 import edp.wormhole.sparkx.directive.DirectiveFlowWatch

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/batchjob/source/SourceHdfs.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/batchjob/source/SourceHdfs.scala
@@ -22,8 +22,8 @@
 package edp.wormhole.sparkx.batchjob.source
 
 import com.alibaba.fastjson.JSON
-import edp.wormhole.common.InputDataRequirement
 import edp.wormhole.externalclient.hadoop.HdfsUtils
+import edp.wormhole.sinks.common.InputDataRequirement
 import edp.wormhole.sparkx.common.{SparkSchemaUtils, SparkUtils}
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.sparkxinterface.batchjob.source.ObtainSourceDataInterface

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/common/SparkContextUtils.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/common/SparkContextUtils.scala
@@ -23,6 +23,7 @@ package edp.wormhole.sparkx.common
 
 import edp.wormhole.common._
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
+import edp.wormhole.sinks.common.{KafkaInputConfig, WormholeConstants}
 import edp.wormhole.sparkx.spark.kafka010.{WormholeKafkaUtils, WormholePerPartitionConfig}
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import org.apache.kafka.common.TopicPartition

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/common/WormholeUtils.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/common/WormholeUtils.scala
@@ -24,6 +24,7 @@ import java.sql.Timestamp
 import edp.wormhole.common._
 import edp.wormhole.common.json.{FieldInfo, JsonParseUtils}
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.{FeedbackPriority, PartitionOffsetConfig, WormholeConfig}
 import edp.wormhole.ums.UmsProtocolType.UmsProtocolType
 import edp.wormhole.ums._
 import edp.wormhole.util.DateUtils

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/directive/Directive.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/directive/Directive.scala
@@ -21,7 +21,8 @@
 
 package edp.wormhole.sparkx.directive
 
-import edp.wormhole.common.{KafkaTopicConfig, PartitionOffsetConfig, WormholeConfig}
+import edp.wormhole.sinks.common
+import edp.wormhole.sinks.common.{KafkaTopicConfig, PartitionOffsetConfig, WormholeConfig}
 import edp.wormhole.sparkx.memorystorage.OffsetPersistenceManager
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.ums.{Ums, UmsFieldType}
@@ -88,7 +89,7 @@ trait Directive extends EdpLogging{
         val partitionOffsetArray = partitionOffset.split(":")
         PartitionOffsetConfig(partitionOffsetArray(0).toInt, partitionOffsetArray(1).toLong)
       })
-      topicConfigList += ((KafkaTopicConfig(topicName, topicRate, partitionsOffsetSeq), directiveId))
+      topicConfigList += ((common.KafkaTopicConfig(topicName, topicRate, partitionsOffsetSeq), directiveId))
     })
 
     topicConfigList

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/directive/DirectiveFlowWatch.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/directive/DirectiveFlowWatch.scala
@@ -21,8 +21,8 @@
 
 package edp.wormhole.sparkx.directive
 
-import edp.wormhole.common.{StreamType, WormholeConfig, WormholeConstants}
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
+import edp.wormhole.sinks.common.{StreamType, WormholeConfig, WormholeConstants}
 import edp.wormhole.sparkx.batchflow.BatchflowDirective
 import edp.wormhole.sparkx.hdfslog.{HdfsDirective, HdfsMainProcess}
 import edp.wormhole.sparkx.memorystorage.ConfMemoryStorage

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/directive/DirectiveOffsetWatch.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/directive/DirectiveOffsetWatch.scala
@@ -21,8 +21,8 @@
 
 package edp.wormhole.sparkx.directive
 
-import edp.wormhole.common.{WormholeConfig, WormholeConstants}
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
+import edp.wormhole.sinks.common.{WormholeConfig, WormholeConstants}
 import edp.wormhole.sparkx.memorystorage.OffsetPersistenceManager
 import edp.wormhole.sparkx.spark.log.EdpLogging
 

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/directive/UdfDirective.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/directive/UdfDirective.scala
@@ -22,8 +22,8 @@ package edp.wormhole.sparkx.directive
 
 import java.util.concurrent.ConcurrentLinkedQueue
 
-import edp.wormhole.common.FeedbackPriority
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.FeedbackPriority
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.sparkx.udf.UdfRegister
 import edp.wormhole.ums.UmsProtocolUtils.feedbackDirective

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/hdfslog/HdfsDirective.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/hdfslog/HdfsDirective.scala
@@ -21,9 +21,9 @@
 
 package edp.wormhole.sparkx.hdfslog
 
-import edp.wormhole.common.FeedbackPriority
 import edp.wormhole.common.json.{JsonSourceConf, RegularJsonSchema}
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.FeedbackPriority
 import edp.wormhole.sparkx.directive.Directive
 import edp.wormhole.ums.UmsProtocolUtils.feedbackDirective
 import edp.wormhole.ums.{Ums, UmsFeedbackStatus, UmsFieldType}

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/hdfslog/HdfsLogStarter.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/hdfslog/HdfsLogStarter.scala
@@ -25,6 +25,7 @@ import edp.wormhole.sparkx.common.SparkContextUtils.createKafkaStream
 import edp.wormhole.common._
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.{KafkaInputConfig, WormholeConfig, WormholeConstants}
 import edp.wormhole.sparkx.common.{SparkContextUtils, SparkUtils}
 import edp.wormhole.sparkx.directive.DirectiveFlowWatch
 import edp.wormhole.sparkx.memorystorage.OffsetPersistenceManager

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/hdfslog/HdfsMainProcess.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/hdfslog/HdfsMainProcess.scala
@@ -29,6 +29,7 @@ import edp.wormhole.common._
 import edp.wormhole.common.json.{FieldInfo, JsonParseUtils}
 import edp.wormhole.externalclient.hadoop.HdfsUtils
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.{FeedbackPriority, WormholeConfig}
 import edp.wormhole.sinks.utils.SinkCommonUtils._
 import edp.wormhole.sparkx.common.{SparkUtils, WormholeUtils}
 import edp.wormhole.sparkx.spark.log.EdpLogging

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/memorystorage/OffsetPersistenceManager.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/memorystorage/OffsetPersistenceManager.scala
@@ -26,6 +26,8 @@ import java.util.concurrent.ConcurrentLinkedQueue
 import edp.wormhole.common._
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common
+import edp.wormhole.sinks.common._
 import edp.wormhole.sparkx.directive.DirectiveOffsetWatch
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.ums.UmsSchemaUtils.toUms
@@ -90,7 +92,7 @@ object OffsetPersistenceManager extends EdpLogging {
     if (topicConfigMap == null) throw new Exception("do not config kafka any topic,include heardbeat topic")
 
     DirectiveOffsetWatch.offsetWatch(config, appId)
-    KafkaInputConfig(kafkaBaseConfig, topicConfigMap.values.toList,inWatch)
+    common.KafkaInputConfig(kafkaBaseConfig, topicConfigMap.values.toList,inWatch)
   }
 
   private def deleteTopics(zookeeperAddress: String, offsetPath: String, topicList: Seq[String]): Unit = {

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/router/RouterDirective.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/router/RouterDirective.scala
@@ -21,8 +21,8 @@
 
 package edp.wormhole.sparkx.router
 
-import edp.wormhole.common.FeedbackPriority
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.FeedbackPriority
 import edp.wormhole.sparkx.directive.Directive
 import edp.wormhole.sparkx.memorystorage.ConfMemoryStorage.routerMap
 import edp.wormhole.ums.UmsProtocolUtils.feedbackDirective

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/router/RouterMainProcess.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/router/RouterMainProcess.scala
@@ -23,8 +23,8 @@ package edp.wormhole.sparkx.router
 
 import java.util.UUID
 
-import edp.wormhole.common.{FeedbackPriority, WormholeConfig}
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.{FeedbackPriority, WormholeConfig}
 import edp.wormhole.sparkx.common.{SparkUtils, WormholeUtils}
 import edp.wormhole.sparkx.memorystorage.ConfMemoryStorage
 import edp.wormhole.sparkx.spark.log.EdpLogging

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/router/RouterStarter.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/router/RouterStarter.scala
@@ -25,6 +25,7 @@ import edp.wormhole.common._
 import edp.wormhole.sparkx.common.SparkContextUtils.createKafkaStream
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
 import edp.wormhole.kafka.WormholeKafkaProducer
+import edp.wormhole.sinks.common.{KafkaInputConfig, WormholeConfig, WormholeConstants}
 import edp.wormhole.sparkx.common.{SparkContextUtils, SparkUtils}
 import edp.wormhole.sparkx.directive.DirectiveFlowWatch
 import edp.wormhole.sparkx.memorystorage.OffsetPersistenceManager

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/swifts/custom/LookupHbase.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/swifts/custom/LookupHbase.scala
@@ -21,7 +21,7 @@
 package edp.wormhole.sparkx.swifts.custom
 
 import edp.wormhole.sinks.hbasesink.HbaseConnection
-import edp.wormhole.common.{RowkeyPatternContent, RowkeyTool}
+import edp.wormhole.sinks.common.{RowkeyPatternContent, RowkeyTool}
 import edp.wormhole.sparkx.common.SparkSchemaUtils
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.ums.UmsFieldType.umsFieldType

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/swifts/transform/SwiftsTransform.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/swifts/transform/SwiftsTransform.scala
@@ -23,7 +23,7 @@ package edp.wormhole.sparkx.swifts.transform
 
 import java.util.UUID
 
-import edp.wormhole.common.WormholeConfig
+import edp.wormhole.sinks.common.WormholeConfig
 import edp.wormhole.sparkx.memorystorage.ConfMemoryStorage
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.sparkx.swifts.custom.{LookupHbase, LookupKudu, LookupRedis}

diff --git a/sparkx/src/main/scala/edp/wormhole/sparkx/udf/UdfWatch.scala b/sparkx/src/main/scala/edp/wormhole/sparkx/udf/UdfWatch.scala
@@ -20,8 +20,8 @@
 
 package edp.wormhole.sparkx.udf
 
-import edp.wormhole.common.{WormholeConfig, WormholeConstants}
 import edp.wormhole.externalclient.zookeeper.WormholeZkClient
+import edp.wormhole.sinks.common.{WormholeConfig, WormholeConstants}
 import edp.wormhole.sparkx.directive.UdfDirective
 import edp.wormhole.sparkx.spark.log.EdpLogging
 import edp.wormhole.ums.{UmsProtocolType, UmsSchemaUtils}
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
      */
-    package edp.wormhole.common
+    package edp.wormhole.sinks.common
     import edp.wormhole.util.config.KVConfig
@@ Expand Down @@