You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/03/29 13:55:25 UTC
[5/5] cayenne git commit: Cleanup
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3e3ad4ff
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3e3ad4ff
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3e3ad4ff
Branch: refs/heads/master
Commit: 3e3ad4ff20653bd0d1b03526f9a20dde52e5c53a
Parents: 4aee557
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Mar 29 16:54:08 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Mar 29 16:54:08 2018 +0300
----------------------------------------------------------------------
.../cayenne/lifecycle/id/EntityIdCoder.java | 71 ++++++--------------
.../cayenne/map/ProxiedMappingNamespace.java | 2 -
.../dialog/datamap/PackageUpdateController.java | 26 ++-----
.../objentity/ObjAttributeInfoDialog.java | 1 -
.../cayenne/modeler/util/ModelerUtil.java | 1 -
5 files changed, 29 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e3ad4ff/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java
index edc4676..76ee168 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/EntityIdCoder.java
@@ -24,6 +24,7 @@ import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.SortedMap;
import java.util.StringTokenizer;
import java.util.TreeMap;
@@ -48,7 +49,7 @@ public class EntityIdCoder {
private static final int TEMP_PREFIX_LENGTH = TEMP_ID_PREFIX.length();
private String entityName;
- private Map<String, Converter> converters;
+ private SortedMap<String, Converter<?>> converters;
private int idSize;
public static String getEntityName(String id) {
@@ -69,32 +70,27 @@ public class EntityIdCoder {
public EntityIdCoder(ObjEntity entity) {
this.entityName = entity.getName();
- this.converters = new HashMap<>();
+ this.converters = new TreeMap<>();
for (ObjAttribute attribute : entity.getAttributes()) {
if (attribute.isPrimaryKey()) {
- converters.put(attribute.getDbAttributeName(),
- create(attribute.getJavaClass()));
+ converters.put(attribute.getDbAttributeName(), create(attribute.getJavaClass()));
}
}
for (DbAttribute attribute : entity.getDbEntity().getPrimaryKeys()) {
if (!converters.containsKey(attribute.getName())) {
- String type = TypesMapping
- .getJavaBySqlType(attribute.getType());
+ String type = TypesMapping.getJavaBySqlType(attribute.getType());
try {
- converters.put(attribute.getName(),
- create(Util.getJavaClass(type)));
+ converters.put(attribute.getName(), create(Util.getJavaClass(type)));
} catch (ClassNotFoundException e) {
- throw new CayenneRuntimeException(
- "Can't instantiate class " + type, e);
+ throw new CayenneRuntimeException("Can't instantiate class " + type, e);
}
}
}
if (converters.isEmpty()) {
- throw new IllegalArgumentException("Entity has no PK definied: "
- + entity.getName());
+ throw new IllegalArgumentException("Entity has no PK defined: " + entity.getName());
}
this.idSize = (int) Math.ceil(converters.size() / 0.75d);
@@ -137,7 +133,7 @@ public class EntityIdCoder {
buffer.append(id.getEntityName());
Map<String, Object> idValues = id.getIdSnapshot();
- for (Entry<String, Converter> entry : converters.entrySet()) {
+ for (Entry<String, Converter<?>> entry : converters.entrySet()) {
Object value = idValues.get(entry.getKey());
buffer.append(ID_SEPARATOR).append(entry.getValue().toUuid(value));
}
@@ -148,16 +144,14 @@ public class EntityIdCoder {
public ObjectId toObjectId(String stringId) {
if (stringId.startsWith(TEMP_ID_PREFIX)) {
- String idValues = stringId.substring(entityName.length() + 1
- + TEMP_PREFIX_LENGTH);
+ String idValues = stringId.substring(entityName.length() + 1 + TEMP_PREFIX_LENGTH);
return new ObjectId(entityName, decodeTemp(idValues));
}
String idValues = stringId.substring(entityName.length() + 1);
if (converters.size() == 1) {
- Entry<String, Converter> entry = converters.entrySet().iterator()
- .next();
+ Entry<String, Converter<?>> entry = converters.entrySet().iterator().next();
String decoded;
try {
@@ -166,8 +160,7 @@ public class EntityIdCoder {
// unexpected
throw new CayenneRuntimeException("Unsupported encoding", e);
}
- return new ObjectId(entityName, entry.getKey(), entry.getValue()
- .fromStringId(decoded));
+ return new ObjectId(entityName, entry.getKey(), entry.getValue().fromStringId(decoded));
}
Map<String, Object> idMap = new HashMap<>(idSize);
@@ -178,7 +171,7 @@ public class EntityIdCoder {
+ entityName + ": " + idValues);
}
- for (Entry<String, Converter> entry : converters.entrySet()) {
+ for (Entry<String, Converter<?>> entry : converters.entrySet()) {
String value = toks.nextToken();
String decoded;
@@ -205,52 +198,32 @@ public class EntityIdCoder {
// 128 as negative bytes
int c1 = byteString.charAt(index);
int c2 = byteString.charAt(index + 1);
- bytes[i] = (byte) ((Character.digit(c1, 16) << 4) + Character
- .digit(c2, 16));
+ bytes[i] = (byte) ((Character.digit(c1, 16) << 4) + Character.digit(c2, 16));
}
return bytes;
}
- private Converter create(Class<?> type) {
+ private Converter<?> create(Class<?> type) {
if (type == null) {
throw new NullPointerException("Null type");
}
if (Long.class.isAssignableFrom(type)) {
- return new Converter() {
-
- @Override
- Object fromStringId(String stringId) {
- return Long.valueOf(stringId);
- }
- };
+ return Long::valueOf;
} else if (Integer.class.isAssignableFrom(type)) {
- return new Converter() {
-
- @Override
- Object fromStringId(String stringId) {
- return Integer.valueOf(stringId);
- }
- };
+ return Integer::valueOf;
} else if (String.class.isAssignableFrom(type)) {
- return new Converter() {
-
- @Override
- Object fromStringId(String stringId) {
- return stringId;
- }
- };
+ return stringId -> stringId;
}
- throw new IllegalArgumentException("Unsupported ID type: "
- + type.getName());
+ throw new IllegalArgumentException("Unsupported ID type: " + type.getName());
}
- abstract class Converter {
+ interface Converter<T> {
- String toUuid(Object value) {
+ default String toUuid(Object value) {
try {
return URLEncoder.encode(String.valueOf(value), "UTF-8");
} catch (UnsupportedEncodingException e) {
@@ -259,6 +232,6 @@ public class EntityIdCoder {
}
}
- abstract Object fromStringId(String stringId);
+ T fromStringId(String stringId);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e3ad4ff/cayenne-server/src/main/java/org/apache/cayenne/map/ProxiedMappingNamespace.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ProxiedMappingNamespace.java b/cayenne-server/src/main/java/org/apache/cayenne/map/ProxiedMappingNamespace.java
index f1b0c46..3d5a879 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/ProxiedMappingNamespace.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/ProxiedMappingNamespace.java
@@ -18,9 +18,7 @@
****************************************************************/
package org.apache.cayenne.map;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import org.apache.cayenne.Persistent;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e3ad4ff/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
index 23c2249..255e358 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
@@ -80,18 +80,8 @@ public class PackageUpdateController extends DefaultsPreferencesController {
}
private void initController() {
- view.getCancelButton().addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent arg0) {
- view.dispose();
- }
- });
- view.getUpdateButton().addActionListener(new ActionListener() {
-
- public void actionPerformed(ActionEvent arg0) {
- updatePackage();
- }
- });
+ view.getCancelButton().addActionListener(e -> view.dispose());
+ view.getUpdateButton().addActionListener(e -> updatePackage());
}
protected void updatePackage() {
@@ -104,8 +94,7 @@ public class PackageUpdateController extends DefaultsPreferencesController {
for (Embeddable embeddable : embeddables) {
String oldName = embeddable.getClassName();
- Pattern p = Pattern.compile("[.]");
- String[] tokens = p.split(oldName);
+ String[] tokens = oldName.split("\\.");
String className = tokens[tokens.length-1];
if (doAll || Util.isEmptyString(oldName) || oldName.indexOf('.') < 0) {
@@ -121,8 +110,7 @@ public class PackageUpdateController extends DefaultsPreferencesController {
String oldName = getClassName(entity);
if (doAll || Util.isEmptyString(oldName) || oldName.indexOf('.') < 0) {
- String className = extractClassName(Util.isEmptyString(oldName) ? entity
- .getName() : oldName);
+ String className = extractClassName(Util.isEmptyString(oldName) ? entity.getName() : oldName);
setClassName(entity, getNameWithDefaultPackage(className));
}
@@ -146,9 +134,9 @@ public class PackageUpdateController extends DefaultsPreferencesController {
}
int dot = name.lastIndexOf('.');
- return (dot < 0) ? name : (dot + 1 < name.length())
- ? name.substring(dot + 1)
- : "";
+ return (dot < 0)
+ ? name
+ : (dot + 1 < name.length()) ? name.substring(dot + 1) : "";
}
protected String getNameWithDefaultPackage(String name) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e3ad4ff/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
index 2a9ecbc..2bf61cf 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
@@ -61,7 +61,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.TreeMap;
public class ObjAttributeInfoDialog extends CayenneController implements TreeSelectionListener {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e3ad4ff/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
index c437d2d..f750752 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerUtil.java
@@ -51,7 +51,6 @@ import java.util.GregorianCalendar;
import java.util.List;
import java.util.ResourceBundle;
import java.util.Set;
-import java.util.TreeMap;
import java.util.UUID;
/**