Repository: cayenne Updated Branches: refs/heads/master 45da5a0d1 -> 34ad5252c
Code cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/18ff80cc Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/18ff80cc Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/18ff80cc Branch: refs/heads/master Commit: 18ff80ccb063fb023ea5746dba44c36c5190565b Parents: 45da5a0 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Nov 30 17:43:56 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Nov 30 17:43:56 2018 +0300 ---------------------------------------------------------------------- .../configuration/rop/client/ClientModule.java | 2 +- .../merge/factory/IngresMergerTokenFactory.java | 6 +----- .../dbsync/reverse/dbimport/IncludeTable.java | 2 +- .../cayenne/remote/RemoteIncrementalFaultList.java | 2 +- .../apache/cayenne/access/IncrementalFaultList.java | 2 +- .../java/org/apache/cayenne/access/ObjectDiff.java | 9 +++++---- .../cayenne/access/jdbc/RowDescriptorBuilder.java | 2 -- .../cayenne/configuration/server/ServerModule.java | 2 +- .../apache/cayenne/datasource/DriverDataSource.java | 4 +--- .../java/org/apache/cayenne/dba/TypesMapping.java | 1 - .../main/java/org/apache/cayenne/map/DataMap.java | 2 +- .../apache/cayenne/map/QueryDescriptorLoader.java | 2 +- .../reflect/LifecycleCallbackEventHandler.java | 2 +- .../cayenne/reflect/LifecycleCallbackRegistry.java | 2 +- .../cayenne/access/DataContextProcedureQueryIT.java | 4 ++-- .../reflect/LifecycleCallbackEventHandlerTest.java | 15 +++++---------- 16 files changed, 23 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java b/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java index 8e51fe7..4a95df6 100644 --- a/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java +++ b/cayenne-client/src/main/java/org/apache/cayenne/configuration/rop/client/ClientModule.java @@ -55,7 +55,7 @@ public class ClientModule implements Module { public void configure(Binder binder) { // Contribute always to create binding - MapBuilder<String> propertiesBuilder = ServerModule.contributeProperties(binder); + ServerModule.contributeProperties(binder); binder.bind(ObjectContextFactory.class).to(CayenneContextFactory.class); binder.bind(ROPSerializationService.class).toProvider(ClientHessianSerializationServiceProvider.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/IngresMergerTokenFactory.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/IngresMergerTokenFactory.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/IngresMergerTokenFactory.java index e9f1d6c..3dee679 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/IngresMergerTokenFactory.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/IngresMergerTokenFactory.java @@ -120,11 +120,7 @@ public class IngresMergerTokenFactory extends DefaultMergerTokenFactory { // also make sure we delete dependent FKs buf.append(" ON DELETE CASCADE"); - String fksql = buf.toString(); - - if (fksql != null) { - return Collections.singletonList(fksql); - } + return Collections.singletonList(buf.toString()); } return Collections.emptyList(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/IncludeTable.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/IncludeTable.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/IncludeTable.java index ff2ed59..0dd46f2 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/IncludeTable.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/IncludeTable.java @@ -125,7 +125,7 @@ public class IncludeTable extends PatternParam implements XMLSerializable { } } - if(excludeRelationship != null && !excludeColumns.isEmpty()) { + if(excludeRelationship != null && !excludeRelationship.isEmpty()) { for(ExcludeRelationship excludeRelationship : excludeRelationship) { excludeRelationship.toString(res, prefix); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-rop-server/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java ---------------------------------------------------------------------- diff --git a/cayenne-rop-server/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java b/cayenne-rop-server/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java index 1952db5..47a6ec3 100644 --- a/cayenne-rop-server/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java +++ b/cayenne-rop-server/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java @@ -279,7 +279,7 @@ public class RemoteIncrementalFaultList implements List { throw new IndexOutOfBoundsException("Index: " + elementIndex); } - if (pageSize <= 0 || elementIndex < 0) { + if (pageSize <= 0) { return -1; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java b/cayenne-server/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java index d78b3d9..1c83d3c 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/IncrementalFaultList.java @@ -339,7 +339,7 @@ public class IncrementalFaultList<E> implements List<E>, Serializable { throw new IndexOutOfBoundsException("Index: " + elementIndex); } - if (pageSize <= 0 || elementIndex < 0) { + if (pageSize <= 0) { return -1; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java index 0928b32..d711bcf 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectDiff.java @@ -112,7 +112,9 @@ class ObjectDiff extends NodeDiff { boolean isUsedForLocking = entity.getRelationship(property.getName()).isUsedForLocking(); // eagerly resolve optimistically locked relationships - Object target = isUsedForLocking ? property.readProperty(object) : property.readPropertyDirectly(object); + Object target = (lock && isUsedForLocking) + ? property.readProperty(object) + : property.readPropertyDirectly(object); if (target instanceof Persistent) { target = ((Persistent) target).getObjectId(); @@ -159,7 +161,7 @@ class ObjectDiff extends NodeDiff { } boolean containsArcSnapshot(String propertyName) { - return arcSnapshot != null ? arcSnapshot.containsKey(propertyName) : false; + return arcSnapshot != null && arcSnapshot.containsKey(propertyName); } /** @@ -263,8 +265,7 @@ class ObjectDiff extends NodeDiff { String arcId = arcDiff.getArcId().toString(); DbEntity dbEntity = classDescriptor.getEntity().getDbEntity(); - DbRelationship dbRelationship = (DbRelationship) dbEntity.getRelationship(arcId.substring(ASTDbPath.DB_PREFIX - .length())); + DbRelationship dbRelationship = dbEntity.getRelationship(arcId.substring(ASTDbPath.DB_PREFIX.length())); if (dbRelationship.isToMany()) { return; http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java index 7ab51b7..5a2356c 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java @@ -199,8 +199,6 @@ public class RowDescriptorBuilder { } private void performTransformAndTypeOverride(ColumnDescriptor[] columnArray) { - int len = columnArray.length; - if (caseTransformer != null) { for (ColumnDescriptor aColumnArray : columnArray) { aColumnArray.setDataRowKey(caseTransformer.apply(aColumnArray.getDataRowKey())); http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java index 3a1987d..0fa82b8 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java @@ -426,7 +426,7 @@ public class ServerModule implements Module { binder.bind(ValueObjectTypeRegistry.class).to(DefaultValueObjectTypeRegistry.class); // configure explicit configurations - ListBuilder<String> locationsListBuilder = contributeProjectLocations(binder); + contributeProjectLocations(binder); binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java index b5ccc5a..851ba03 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java @@ -121,9 +121,7 @@ public class DriverDataSource implements DataSource { private void logConnect(String url, String userName, String password) { if (LOGGER.isInfoEnabled()) { - StringBuilder buf = new StringBuilder("Connecting to '").append(url).append("' as '").append(userName) - .append("'"); - LOGGER.info(buf.toString()); + LOGGER.info("Connecting to '" + url + "' as '" + userName + "'"); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java index 8e7c05d..b6fbecf 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/TypesMapping.java @@ -258,7 +258,6 @@ public class TypesMapping { JAVA_SQL_ENUM.put(JAVA_SHORT, SMALLINT); JAVA_SQL_ENUM.put(JAVA_BYTE, SMALLINT); JAVA_SQL_ENUM.put(JAVA_TIME, TIME); - JAVA_SQL_ENUM.put(JAVA_TIMESTAMP, TIMESTAMP); // add primitives JAVA_SQL_ENUM.put("byte", TINYINT); http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java index 73e68f7..5f78888 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java @@ -870,7 +870,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable for (ObjEntity ent : getObjEntities()) { // take a copy since we're going to modify the entity for (Relationship relationship : new ArrayList<>(ent.getRelationships())) { - if (objEntityName.equals(relationship.getTargetEntityName()) + if (objEntityName.equals(relationship.getSourceEntity().getName()) || objEntityName.equals(relationship.getTargetEntityName())) { ent.removeRelationship(relationship.getName()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptorLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptorLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptorLoader.java index 785493e..92b1cec 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptorLoader.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptorLoader.java @@ -235,7 +235,7 @@ public class QueryDescriptorLoader { } public void addPrefetch(String path, int semantics) { - if (path == null || (path != null && isBlank(path))) { + if (path == null || isBlank(path)) { // throw?? return; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java index fd044a6..2779e12 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandler.java @@ -37,7 +37,7 @@ class LifecycleCallbackEventHandler { private Map<String, Collection<AbstractCallback>> listeners; private Collection<AbstractCallback> defaultListeners; - LifecycleCallbackEventHandler(EntityResolver resolver) { + LifecycleCallbackEventHandler() { this.listeners = new HashMap<>(); this.defaultListeners = new ArrayList<>(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java b/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java index 3b01d5e..669a91d 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java @@ -69,7 +69,7 @@ public class LifecycleCallbackRegistry { // downstream. this.eventCallbacks = new LifecycleCallbackEventHandler[LifecycleEvent.values().length]; for (int i = 0; i < eventCallbacks.length; i++) { - eventCallbacks[i] = new LifecycleCallbackEventHandler(resolver); + eventCallbacks[i] = new LifecycleCallbackEventHandler(); } // other "static" lookup maps are initialized on-demand http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java index d8e6b0b..2009911 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java @@ -149,7 +149,7 @@ public class DataContextProcedureQueryIT extends ServerCase { ProcedureQuery q = new ProcedureQuery(SELECT_STORED_PROCEDURE); q.addParameter("aName", "An Artist"); - q.addParameter("paintingPrice", new Integer(3000)); + q.addParameter("paintingPrice", 3000); List<?> artists = runProcedureSelect(q); // check the results @@ -175,7 +175,7 @@ public class DataContextProcedureQueryIT extends ServerCase { ProcedureQuery q = new ProcedureQuery(SELECT_STORED_PROCEDURE); q.addParameter("aName", "An Artist"); - q.addParameter("paintingPrice", new Integer(3000)); + q.addParameter("paintingPrice", 3000); List<?> artists = runProcedureSelect(q); http://git-wip-us.apache.org/repos/asf/cayenne/blob/18ff80cc/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java index 9c1c1da..72c8360 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackEventHandlerTest.java @@ -34,8 +34,7 @@ public class LifecycleCallbackEventHandlerTest { @Test public void testDefaultListeners() { - LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler( - new EntityResolver()); + LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(); L1 l1 = new L1(); map.addDefaultListener(l1, "callback"); @@ -51,8 +50,7 @@ public class LifecycleCallbackEventHandlerTest { @Test public void testDefaultListenersCallbackOrder() { - LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler( - new EntityResolver()); + LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(); L2 l1 = new L2(); map.addListener(C1.class, l1, "callback"); @@ -74,8 +72,7 @@ public class LifecycleCallbackEventHandlerTest { @Test public void testCallbackOnSuperclass() { - LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler( - new EntityResolver()); + LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(); map.addListener(C1.class, "c1Callback"); C3 subclass = new C3(); @@ -89,8 +86,7 @@ public class LifecycleCallbackEventHandlerTest { @Test public void testCallbackOnSuperclassWithSublcassOverrides() { - LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler( - new EntityResolver()); + LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(); map.addListener(C1.class, "c1Callback"); C4 subclass = new C4(); @@ -105,8 +101,7 @@ public class LifecycleCallbackEventHandlerTest { @Test public void testCallbackOrderInInheritanceHierarchy() { - LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler( - new EntityResolver()); + LifecycleCallbackEventHandler map = new LifecycleCallbackEventHandler(); map.addListener(C2.class, "c2Callback"); map.addListener(C1.class, "c1Callback");
