瀏覽代碼

fixed testcase

agapple 5 年之前
父節點
當前提交
d86b0e6e67
共有 19 個文件被更改,包括 32 次插入38 次删除
  1. 1 1
      client-adapter/es6x/pom.xml
  2. 0 0
      client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml
  3. 1 1
      client-adapter/es7x/pom.xml
  4. 2 2
      client-adapter/escore/pom.xml
  5. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java
  6. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java
  7. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java
  8. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java
  9. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java
  10. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java
  11. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java
  12. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java
  13. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java
  14. 0 0
      client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java
  15. 4 4
      client-adapter/pom.xml
  16. 0 10
      dbsync/pom.xml
  17. 0 10
      driver/pom.xml
  18. 0 10
      parse/pom.xml
  19. 24 0
      pom.xml

+ 1 - 1
client-adapter/es6x/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.otter</groupId>
-            <artifactId>client-adapter.es-core</artifactId>
+            <artifactId>client-adapter.escore</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

+ 0 - 0
client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml_ → client-adapter/es6x/src/test/resources/es6/mytest_user_single.yml


+ 1 - 1
client-adapter/es7x/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>com.alibaba.otter</groupId>
-            <artifactId>client-adapter.es-core</artifactId>
+            <artifactId>client-adapter.escore</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

+ 2 - 2
client-adapter/es-core/pom.xml → client-adapter/escore/pom.xml

@@ -9,9 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba.otter</groupId>
-    <artifactId>client-adapter.es-core</artifactId>
+    <artifactId>client-adapter.escore</artifactId>
     <packaging>jar</packaging>
-    <name>canal client adapter es-core module for otter ${project.version}</name>
+    <name>canal client adapter escore module for otter ${project.version}</name>
 
     <dependencies>
         <dependency>

+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfig.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/ESSyncConfigLoader.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SchemaItem.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/config/SqlParser.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/monitor/ESConfigMonitor.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/service/ESSyncService.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESBulkRequest.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESSyncUtil.java


+ 0 - 0
client-adapter/es-core/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java → client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/support/ESTemplate.java


+ 4 - 4
client-adapter/pom.xml

@@ -23,9 +23,9 @@
         <module>elasticsearch</module>
         <module>launcher</module>
         <module>rdb</module>
-        <module>es_6.x</module>
-        <module>es_7.x</module>
-        <module>es-core</module>
+        <module>es6x</module>
+        <module>es7x</module>
+        <module>escore</module>
     </modules>
 
     <licenses>
@@ -123,4 +123,4 @@
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-</project>
+</project>

+ 0 - 10
dbsync/pom.xml

@@ -47,31 +47,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.diffblue</groupId>
             <artifactId>deeptestutils</artifactId>
-            <version>1.9.0</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

+ 0 - 10
driver/pom.xml

@@ -42,31 +42,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.diffblue</groupId>
             <artifactId>deeptestutils</artifactId>
-            <version>1.9.0</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

+ 0 - 10
parse/pom.xml

@@ -95,31 +95,21 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.diffblue</groupId>
             <artifactId>deeptestutils</artifactId>
-            <version>1.9.0</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>

+ 24 - 0
pom.xml

@@ -301,6 +301,30 @@
                 <version>4.12</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.10.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.diffblue</groupId>
+                <artifactId>deeptestutils</artifactId>
+                <version>1.9.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>