fix 修改全量同步只有一条数据不同步的问题，格式化代码

linchao.wc · linchao.wc · commit 04be63260a8e · 2019-07-04T11:23:08.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.star.sync</groupId>
     <artifactId>canal-mysql-elasticsearch-sync</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
     <packaging>jar</packaging>
 
     <name>canal-mysql-elasticsearch-sync</name>
diff --git a/src/main/java/com/star/sync/elasticsearch/event/AbstractCanalEvent.java b/src/main/java/com/star/sync/elasticsearch/event/AbstractCanalEvent.java
@@ -8,14 +8,14 @@
  * @version 1.0
  * @since 2017-08-26 22:22:00
  */
-public abstract class CanalEvent extends ApplicationEvent {
+public abstract class AbstractCanalEvent extends ApplicationEvent {
 
     /**
      * Create a new ApplicationEvent.
      *
      * @param source the object on which the event initially occurred (never {@code null})
      */
-    public CanalEvent(Entry source) {
+    public AbstractCanalEvent(Entry source) {
         super(source);
     }
 
diff --git a/src/main/java/com/star/sync/elasticsearch/event/DeleteAbstractCanalEvent.java b/src/main/java/com/star/sync/elasticsearch/event/DeleteAbstractCanalEvent.java
@@ -7,13 +7,13 @@
  * @version 1.0
  * @since 2017-08-26 22:31:00
  */
-public class DeleteCanalEvent extends CanalEvent {
+public class DeleteAbstractCanalEvent extends AbstractCanalEvent {
     /**
      * Create a new ApplicationEvent.
      *
      * @param source the object on which the event initially occurred (never {@code null})
      */
-    public DeleteCanalEvent(Entry source) {
+    public DeleteAbstractCanalEvent(Entry source) {
         super(source);
     }
 }
diff --git a/src/main/java/com/star/sync/elasticsearch/event/InsertAbstractCanalEvent.java b/src/main/java/com/star/sync/elasticsearch/event/InsertAbstractCanalEvent.java
@@ -7,13 +7,13 @@
  * @version 1.0
  * @since 2017-08-26 22:30:00
  */
-public class InsertCanalEvent extends CanalEvent {
+public class InsertAbstractCanalEvent extends AbstractCanalEvent {
     /**
      * Create a new ApplicationEvent.
      *
      * @param source the object on which the event initially occurred (never {@code null})
      */
-    public InsertCanalEvent(Entry source) {
+    public InsertAbstractCanalEvent(Entry source) {
         super(source);
     }
 }
diff --git a/src/main/java/com/star/sync/elasticsearch/event/UpdateAbstractCanalEvent.java b/src/main/java/com/star/sync/elasticsearch/event/UpdateAbstractCanalEvent.java
@@ -7,13 +7,13 @@
  * @version 1.0
  * @since 2017-08-26 22:30:00
  */
-public class UpdateCanalEvent extends CanalEvent {
+public class UpdateAbstractCanalEvent extends AbstractCanalEvent {
     /**
      * Create a new ApplicationEvent.
      *
      * @param source the object on which the event initially occurred (never {@code null})
      */
-    public UpdateCanalEvent(Entry source) {
+    public UpdateAbstractCanalEvent(Entry source) {
         super(source);
     }
 }
diff --git a/src/main/java/com/star/sync/elasticsearch/listener/AbstractCanalListener.java b/src/main/java/com/star/sync/elasticsearch/listener/AbstractCanalListener.java
@@ -5,7 +5,7 @@
 import com.alibaba.otter.canal.protocol.CanalEntry.RowChange;
 import com.alibaba.otter.canal.protocol.CanalEntry.RowData;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.star.sync.elasticsearch.event.CanalEvent;
+import com.star.sync.elasticsearch.event.AbstractCanalEvent;
 import com.star.sync.elasticsearch.model.DatabaseTableModel;
 import com.star.sync.elasticsearch.model.IndexTypeModel;
 import com.star.sync.elasticsearch.service.MappingService;
@@ -23,7 +23,7 @@
  * @version 1.0
  * @since 2017-08-28 14:40:00
  */
-public abstract class AbstractCanalListener<EVENT extends CanalEvent> implements ApplicationListener<EVENT> {
+public abstract class AbstractCanalListener<EVENT extends AbstractCanalEvent> implements ApplicationListener<EVENT> {
     private static final Logger logger = LoggerFactory.getLogger(AbstractCanalListener.class);
 
     @Resource
diff --git a/src/main/java/com/star/sync/elasticsearch/listener/DeleteCanalListener.java b/src/main/java/com/star/sync/elasticsearch/listener/DeleteCanalListener.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.otter.canal.protocol.CanalEntry.Column;
 import com.alibaba.otter.canal.protocol.CanalEntry.RowData;
-import com.star.sync.elasticsearch.event.DeleteCanalEvent;
+import com.star.sync.elasticsearch.event.DeleteAbstractCanalEvent;
 import com.star.sync.elasticsearch.service.ElasticsearchService;
 import com.star.sync.elasticsearch.service.MappingService;
 import org.apache.commons.lang.StringUtils;
@@ -20,7 +20,7 @@
  * @since 2017-08-26 22:33:00
  */
 @Component
-public class DeleteCanalListener extends AbstractCanalListener<DeleteCanalEvent> {
+public class DeleteCanalListener extends AbstractCanalListener<DeleteAbstractCanalEvent> {
     private static final Logger logger = LoggerFactory.getLogger(DeleteCanalListener.class);
 
     @Resource
diff --git a/src/main/java/com/star/sync/elasticsearch/listener/InsertCanalListener.java b/src/main/java/com/star/sync/elasticsearch/listener/InsertCanalListener.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.otter.canal.protocol.CanalEntry.Column;
 import com.alibaba.otter.canal.protocol.CanalEntry.RowData;
-import com.star.sync.elasticsearch.event.InsertCanalEvent;
+import com.star.sync.elasticsearch.event.InsertAbstractCanalEvent;
 import com.star.sync.elasticsearch.service.ElasticsearchService;
 import com.star.sync.elasticsearch.service.MappingService;
 import com.star.sync.elasticsearch.util.JsonUtil;
@@ -22,7 +22,7 @@
  * @since 2017-08-26 22:32:00
  */
 @Component
-public class InsertCanalListener extends AbstractCanalListener<InsertCanalEvent> {
+public class InsertCanalListener extends AbstractCanalListener<InsertAbstractCanalEvent> {
     private static final Logger logger = LoggerFactory.getLogger(InsertCanalListener.class);
 
     @Resource
diff --git a/src/main/java/com/star/sync/elasticsearch/listener/UpdateCanalListener.java b/src/main/java/com/star/sync/elasticsearch/listener/UpdateCanalListener.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.otter.canal.protocol.CanalEntry.Column;
 import com.alibaba.otter.canal.protocol.CanalEntry.RowData;
-import com.star.sync.elasticsearch.event.UpdateCanalEvent;
+import com.star.sync.elasticsearch.event.UpdateAbstractCanalEvent;
 import com.star.sync.elasticsearch.service.ElasticsearchService;
 import com.star.sync.elasticsearch.service.MappingService;
 import org.apache.commons.lang.StringUtils;
@@ -21,7 +21,7 @@
  * @since 2017-08-26 22:32:00
  */
 @Component
-public class UpdateCanalListener extends AbstractCanalListener<UpdateCanalEvent> {
+public class UpdateCanalListener extends AbstractCanalListener<UpdateAbstractCanalEvent> {
     private static final Logger logger = LoggerFactory.getLogger(UpdateCanalListener.class);
 
     @Resource
diff --git a/src/main/java/com/star/sync/elasticsearch/model/DatabaseTableModel.java b/src/main/java/com/star/sync/elasticsearch/model/DatabaseTableModel.java
@@ -37,8 +37,12 @@ public void setTable(String table) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         DatabaseTableModel that = (DatabaseTableModel) o;
         return Objects.equal(database, that.database) &&
                 Objects.equal(table, that.table);
diff --git a/src/main/java/com/star/sync/elasticsearch/model/IndexTypeModel.java b/src/main/java/com/star/sync/elasticsearch/model/IndexTypeModel.java
@@ -37,8 +37,12 @@ public void setType(String type) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         IndexTypeModel that = (IndexTypeModel) o;
         return Objects.equal(index, that.index) &&
                 Objects.equal(type, that.type);
diff --git a/src/main/java/com/star/sync/elasticsearch/scheduling/CanalScheduling.java b/src/main/java/com/star/sync/elasticsearch/scheduling/CanalScheduling.java
@@ -5,9 +5,9 @@
 import com.alibaba.otter.canal.protocol.CanalEntry.EntryType;
 import com.alibaba.otter.canal.protocol.CanalEntry.EventType;
 import com.alibaba.otter.canal.protocol.Message;
-import com.star.sync.elasticsearch.event.DeleteCanalEvent;
-import com.star.sync.elasticsearch.event.InsertCanalEvent;
-import com.star.sync.elasticsearch.event.UpdateCanalEvent;
+import com.star.sync.elasticsearch.event.DeleteAbstractCanalEvent;
+import com.star.sync.elasticsearch.event.InsertAbstractCanalEvent;
+import com.star.sync.elasticsearch.event.UpdateAbstractCanalEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -64,13 +64,13 @@ private void publishCanalEvent(Entry entry) {
         EventType eventType = entry.getHeader().getEventType();
         switch (eventType) {
             case INSERT:
-                applicationContext.publishEvent(new InsertCanalEvent(entry));
+                applicationContext.publishEvent(new InsertAbstractCanalEvent(entry));
                 break;
             case UPDATE:
-                applicationContext.publishEvent(new UpdateCanalEvent(entry));
+                applicationContext.publishEvent(new UpdateAbstractCanalEvent(entry));
                 break;
             case DELETE:
-                applicationContext.publishEvent(new DeleteCanalEvent(entry));
+                applicationContext.publishEvent(new DeleteAbstractCanalEvent(entry));
                 break;
             default:
                 break;
diff --git a/src/main/java/com/star/sync/elasticsearch/service/impl/MappingServiceImpl.java b/src/main/java/com/star/sync/elasticsearch/service/impl/MappingServiceImpl.java
@@ -27,7 +27,7 @@
 @PropertySource("classpath:mapping.properties")
 @ConfigurationProperties
 public class MappingServiceImpl implements MappingService, InitializingBean {
-    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     private Map<String, String> dbEsMapping;
     private BiMap<DatabaseTableModel, IndexTypeModel> dbEsBiMapping;
@@ -74,8 +74,8 @@ public void afterPropertiesSet() throws Exception {
         mysqlTypeElasticsearchTypeMapping.put("text", data -> data);
         mysqlTypeElasticsearchTypeMapping.put("blob", data -> data);
         mysqlTypeElasticsearchTypeMapping.put("int", Long::valueOf);
-        mysqlTypeElasticsearchTypeMapping.put("date", data -> LocalDateTime.parse(data, formatter));
-        mysqlTypeElasticsearchTypeMapping.put("time", data -> LocalDateTime.parse(data, formatter));
+        mysqlTypeElasticsearchTypeMapping.put("date", data -> LocalDateTime.parse(data, FORMATTER));
+        mysqlTypeElasticsearchTypeMapping.put("time", data -> LocalDateTime.parse(data, FORMATTER));
         mysqlTypeElasticsearchTypeMapping.put("float", Double::valueOf);
         mysqlTypeElasticsearchTypeMapping.put("double", Double::valueOf);
         mysqlTypeElasticsearchTypeMapping.put("decimal", Double::valueOf);
diff --git a/src/main/java/com/star/sync/elasticsearch/service/impl/SyncServiceImpl.java b/src/main/java/com/star/sync/elasticsearch/service/impl/SyncServiceImpl.java
@@ -56,7 +56,7 @@ public boolean syncByTable(SyncByTableRequest request) {
         long maxPK = Optional.ofNullable(request.getTo()).orElse(baseDao.selectMaxPK(primaryKey, request.getDatabase(), request.getTable()));
         cachedThreadPool.submit(() -> {
             try {
-                for (long i = minPK; i < maxPK; i += request.getStepSize()) {
+                for (long i = minPK; i <= maxPK; i += request.getStepSize()) {
                     transactionalService.batchInsertElasticsearch(request, primaryKey, i, i + request.getStepSize(), indexTypeModel);
                     logger.info(String.format("当前同步pk=%s，总共total=%s，进度=%s%%", i, maxPK, new BigDecimal(i * 100).divide(new BigDecimal(maxPK), 3, BigDecimal.ROUND_HALF_UP)));
                 }
diff --git a/src/main/java/com/star/sync/elasticsearch/util/JsonUtil.java b/src/main/java/com/star/sync/elasticsearch/util/JsonUtil.java
@@ -20,19 +20,19 @@
  * @version 1.0
  * @since 2017-08-26 22:54:00
  */
-public abstract class JsonUtil {
+public class JsonUtil {
     private static final Logger logger = LoggerFactory.getLogger(JsonUtil.class);
     private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
     /**
      * 对象映射
      */
-    private static final ObjectMapper objMapper = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     static {
-        objMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        objMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
-        objMapper.setDateFormat(new SimpleDateFormat(DATE_FORMAT));
-        objMapper.setSerializationInclusion(Include.NON_NULL);
+        OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        OBJECT_MAPPER.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        OBJECT_MAPPER.setDateFormat(new SimpleDateFormat(DATE_FORMAT));
+        OBJECT_MAPPER.setSerializationInclusion(Include.NON_NULL);
     }
 
 
@@ -48,7 +48,7 @@ public static String toJson(Object obj) {
             return (String) obj;
         }
         try {
-            rst = objMapper.writeValueAsString(obj);
+            rst = OBJECT_MAPPER.writeValueAsString(obj);
         } catch (Exception e) {
             logger.error("将Java对象转换成Json串出错！");
             throw new RuntimeException("将Java对象转换成Json串出错！", e);
@@ -66,7 +66,7 @@ public static String toJson(Object obj) {
     public static <T> T fromJson(String json, Class<T> type) {
         T rst;
         try {
-            rst = objMapper.readValue(json, type);
+            rst = OBJECT_MAPPER.readValue(json, type);
         } catch (Exception e) {
             logger.error("Json串转换成对象出错：{}", json);
             throw new RuntimeException("Json串转换成对象出错!", e);
@@ -87,7 +87,7 @@ public static <T> T fromJson(String json, Class<T> type) {
     public static <T> T fromJson(String json, TypeReference<T> typeRef) {
         T rst;
         try {
-            rst = objMapper.readValue(json, typeRef);
+            rst = OBJECT_MAPPER.readValue(json, typeRef);
         } catch (Exception e) {
             logger.error("Json串转换成对象出错：{}", json);
             throw new RuntimeException("Json串转换成对象出错!", e);
@@ -99,7 +99,7 @@ public static <T> T fromJson(String json, TypeReference<T> typeRef) {
     public static HashMap<String, Object> fromJsonToMap(String json) {
         HashMap<String, Object> map = new HashMap<String, Object>();
         try {
-            map = objMapper.readValue(json, map.getClass());
+            map = OBJECT_MAPPER.readValue(json, map.getClass());
         } catch (IOException e) {
             logger.error("Json串转换成对象出错：{}", json);
         }
@@ -110,7 +110,7 @@ public static HashMap<String, Object> fromJsonToMap(String json) {
     public static HashMap<String, Object> toMap(String json) {
         HashMap<String, Object> map;
         try {
-            map = objMapper.readValue(json, HashMap.class);
+            map = OBJECT_MAPPER.readValue(json, HashMap.class);
         } catch (Exception e) {
             map = null;
             logger.error("Json串转换成对象出错：{}", json);
@@ -122,7 +122,7 @@ public static HashMap<String, Object> toMap(String json) {
     public static List<HashMap<String, Object>> fromJsonToList(String json) {
         List<HashMap<String, Object>> list;
         try {
-            list = objMapper.readValue(json, List.class);
+            list = OBJECT_MAPPER.readValue(json, List.class);
         } catch (IOException e) {
             logger.error("Json串转换成对象出错：{}", json);
             throw new RuntimeException("Json串转换成List出错!", e);

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`* @version 1.0`
`8`	`8`	`* @since 2017-08-26 22:31:00`
`9`	`9`	`*/`
`10`		`-public class DeleteCanalEvent extends CanalEvent {`
	`10`	`+public class DeleteAbstractCanalEvent extends AbstractCanalEvent {`
`11`	`11`	`/**`
`12`	`12`	`* Create a new ApplicationEvent.`
`13`	`13`	`*`
`14`	`14`	`* @param source the object on which the event initially occurred (never {@code null})`
`15`	`15`	`*/`
`16`		`- public DeleteCanalEvent(Entry source) {`
	`16`	`+ public DeleteAbstractCanalEvent(Entry source) {`
`17`	`17`	`super(source);`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`* @version 1.0`
`8`	`8`	`* @since 2017-08-26 22:30:00`
`9`	`9`	`*/`
`10`		`-public class InsertCanalEvent extends CanalEvent {`
	`10`	`+public class InsertAbstractCanalEvent extends AbstractCanalEvent {`
`11`	`11`	`/**`
`12`	`12`	`* Create a new ApplicationEvent.`
`13`	`13`	`*`
`14`	`14`	`* @param source the object on which the event initially occurred (never {@code null})`
`15`	`15`	`*/`
`16`		`- public InsertCanalEvent(Entry source) {`
	`16`	`+ public InsertAbstractCanalEvent(Entry source) {`
`17`	`17`	`super(source);`
`18`	`18`	`}`
`19`	`19`	`}`