cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [15/16] cayenne git commit: missing @Override
Date Wed, 14 Dec 2016 19:12:51 GMT
missing @Override


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/badabfda
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/badabfda
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/badabfda

Branch: refs/heads/master
Commit: badabfdafae254574e4f39d1bef979da22738b83
Parents: ebc71c8
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Wed Dec 14 22:03:48 2016 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Wed Dec 14 22:04:40 2016 +0300

----------------------------------------------------------------------
 .../apache/cayenne/dbsync/merge/AbstractMerger.java  |  9 +++++----
 .../apache/cayenne/dbsync/merge/DataMapMerger.java   | 15 ++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/badabfda/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AbstractMerger.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AbstractMerger.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AbstractMerger.java
index ba3c35f..4a6b2b7 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AbstractMerger.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/AbstractMerger.java
@@ -19,14 +19,14 @@
 
 package org.apache.cayenne.dbsync.merge;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
 import org.apache.cayenne.dbsync.merge.token.MergerToken;
 import org.apache.cayenne.map.DataMap;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 abstract class AbstractMerger<T, M> implements Merger<T> {
 
     private MergerDictionaryDiff<M> diff;
@@ -40,6 +40,7 @@ abstract class AbstractMerger<T, M> implements Merger<T> {
         this.importedDataMap = imported;
     }
 
+    @Override
     public List<MergerToken> createMergeTokens(T original, T imported) {
         diff = createDiff(original, imported);
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/badabfda/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DataMapMerger.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DataMapMerger.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DataMapMerger.java
index a4dac01..b5bfd40 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DataMapMerger.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/DataMapMerger.java
@@ -19,16 +19,11 @@
 
 package org.apache.cayenne.dbsync.merge;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import org.apache.cayenne.dbsync.merge.token.EmptyValueForNullProvider;
-import org.apache.cayenne.dbsync.merge.token.ValueForNullProvider;
 import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
+import org.apache.cayenne.dbsync.merge.token.EmptyValueForNullProvider;
 import org.apache.cayenne.dbsync.merge.token.MergerToken;
 import org.apache.cayenne.dbsync.merge.token.TokenComparator;
+import org.apache.cayenne.dbsync.merge.token.ValueForNullProvider;
 import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
 import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
 import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
@@ -37,6 +32,11 @@ import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Synchronization of data base store and Cayenne model.
  */
@@ -56,6 +56,7 @@ public class DataMapMerger implements Merger<DataMap> {
     /**
      * Create List of MergerToken that represent the difference between two {@link DataMap}
objects.
      */
+    @Override
     public List<MergerToken> createMergeTokens(DataMap original, DataMap importedFromDb)
{
         prepare(original, importedFromDb);
 


Mime
View raw message