You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2015/05/07 13:21:30 UTC
[3/4] cayenne git commit: fix and clean up code
fix and clean up code
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ba8167e8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ba8167e8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ba8167e8
Branch: refs/heads/master
Commit: ba8167e88be3686aba2e8f801b9557637c90b00b
Parents: d37f217
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Dec 1 16:07:28 2014 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Wed May 6 16:45:41 2015 +0300
----------------------------------------------------------------------
cayenne-java8/pom.xml | 48 +++++++-------------
.../cayenne/java8/CayenneJava8Module.java | 3 ++
.../org/apache/cayenne/java8/RuntimeBase.java | 2 +-
.../java/org/apache/cayenne/java8/db/Java8.java | 18 --------
.../org/apache/cayenne/java8/db/Java8Times.java | 18 ++++++++
.../apache/cayenne/java8/db/auto/_Java8.java | 12 -----
.../cayenne/java8/db/auto/_Java8Times.java | 12 +++++
.../src/test/resources/cayenne-java8-times.xml | 17 +++++++
.../src/test/resources/cayenne-java8.xml | 21 ---------
.../src/test/resources/java8-times.map.xml | 28 ++++++++++++
cayenne-java8/src/test/resources/java8.map.xml | 28 ------------
.../cayenne/modeler/util/ModelerUtil.java | 32 +++++++------
pom.xml | 9 ++++
13 files changed, 121 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/pom.xml b/cayenne-java8/pom.xml
index 46af7f0..1f473dd 100644
--- a/cayenne-java8/pom.xml
+++ b/cayenne-java8/pom.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE file distributed with this work for additional
+information regarding copyright ownership. The ASF licenses this file to
+you under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of
+the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+by applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -19,12 +29,7 @@
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-di</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -38,35 +43,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -85,7 +65,7 @@
<artifactId>maven-cayenne-plugin</artifactId>
<version>${project.version}</version>
<configuration>
- <map>${project.basedir}/src/test/resources/java8.map.xml</map>
+ <map>${project.basedir}/src/test/resources/java8-times.map.xml</map>
<destDir>${project.basedir}/src/test/java</destDir>
<defaultPackage>org.apache.cayenne.java8.db</defaultPackage>
<superPkg>org.apache.cayenne.java8.db.auto</superPkg>
@@ -108,6 +88,10 @@
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java b/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
index 1c321ba..563c3c0 100644
--- a/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
+++ b/cayenne-java8/src/main/java/org/apache/cayenne/java8/CayenneJava8Module.java
@@ -28,6 +28,9 @@ import org.apache.cayenne.java8.access.types.LocalTimeType;
public class CayenneJava8Module implements Module {
+ public CayenneJava8Module() {
+ }
+
@Override
public void configure(Binder binder) {
binder
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/java/org/apache/cayenne/java8/RuntimeBase.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/java/org/apache/cayenne/java8/RuntimeBase.java b/cayenne-java8/src/test/java/org/apache/cayenne/java8/RuntimeBase.java
index bcff242..5379b37 100644
--- a/cayenne-java8/src/test/java/org/apache/cayenne/java8/RuntimeBase.java
+++ b/cayenne-java8/src/test/java/org/apache/cayenne/java8/RuntimeBase.java
@@ -32,7 +32,7 @@ public class RuntimeBase {
Module java8Module = new CayenneJava8Module();
- this.runtime = new ServerRuntime("cayenne-java8.xml", java8Module);
+ this.runtime = new ServerRuntime("cayenne-java8-times.xml", java8Module);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8.java b/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8.java
deleted file mode 100644
index 0e0f242..0000000
--- a/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.apache.cayenne.java8.db;
-
-import org.apache.cayenne.java8.db.auto._Java8;
-
-public class Java8 extends _Java8 {
-
- private static Java8 instance;
-
- private Java8() {}
-
- public static Java8 getInstance() {
- if(instance == null) {
- instance = new Java8();
- }
-
- return instance;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8Times.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8Times.java b/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8Times.java
new file mode 100644
index 0000000..c01f4cc
--- /dev/null
+++ b/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/Java8Times.java
@@ -0,0 +1,18 @@
+package org.apache.cayenne.java8.db;
+
+import org.apache.cayenne.java8.db.auto._Java8Times;
+
+public class Java8Times extends _Java8Times {
+
+ private static Java8Times instance;
+
+ private Java8Times() {}
+
+ public static Java8Times getInstance() {
+ if(instance == null) {
+ instance = new Java8Times();
+ }
+
+ return instance;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8.java b/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8.java
deleted file mode 100644
index 793c3c8..0000000
--- a/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.apache.cayenne.java8.db.auto;
-
-
-
-/**
- * This class was generated by Cayenne.
- * It is probably a good idea to avoid changing this class manually,
- * since it may be overwritten next time code is regenerated.
- * If you need to make any customizations, please use subclass.
- */
-public class _Java8 {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8Times.java
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8Times.java b/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8Times.java
new file mode 100644
index 0000000..1d44ef6
--- /dev/null
+++ b/cayenne-java8/src/test/java/org/apache/cayenne/java8/db/auto/_Java8Times.java
@@ -0,0 +1,12 @@
+package org.apache.cayenne.java8.db.auto;
+
+
+
+/**
+ * This class was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public class _Java8Times {
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/resources/cayenne-java8-times.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/resources/cayenne-java8-times.xml b/cayenne-java8/src/test/resources/cayenne-java8-times.xml
new file mode 100644
index 0000000..bb7a77d
--- /dev/null
+++ b/cayenne-java8/src/test/resources/cayenne-java8-times.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain project-version="7">
+ <map name="java8-times"/>
+
+ <node name="datanode"
+ factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
+ >
+ <map-ref name="java8-times"/>
+ <data-source>
+ <driver value="org.hsqldb.jdbcDriver"/>
+ <url value="jdbc:hsqldb:mem:java8"/>
+ <connectionPool min="1" max="1"/>
+ <login userName="sa"/>
+ </data-source>
+ </node>
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/resources/cayenne-java8.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/resources/cayenne-java8.xml b/cayenne-java8/src/test/resources/cayenne-java8.xml
deleted file mode 100644
index 0f0e8d1..0000000
--- a/cayenne-java8/src/test/resources/cayenne-java8.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
- <map name="java8"/>
-
- <node name="datanode"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
- <map-ref name="java8"/>
- <data-source>
- <!--<driver value="org.apache.derby.jdbc.EmbeddedDriver"/>-->
- <!--<url value="jdbc:derby:memory:java8;create=true"/>-->
- <!--<connectionPool min="1" max="1"/>-->
- <!--<login/>-->
- <driver value="org.hsqldb.jdbcDriver"/>
- <url value="jdbc:hsqldb:mem:java8"/>
- <connectionPool min="1" max="1"/>
- <login userName="sa"/>
- </data-source>
- </node>
-</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/resources/java8-times.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/resources/java8-times.map.xml b/cayenne-java8/src/test/resources/java8-times.map.xml
new file mode 100644
index 0000000..ac170f9
--- /dev/null
+++ b/cayenne-java8/src/test/resources/java8-times.map.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
+ project-version="7">
+ <property name="defaultPackage" value="org.apache.cayenne.java8.db"/>
+ <db-entity name="LOCAL_DATE_TEST">
+ <db-attribute name="Date" type="DATE"/>
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ </db-entity>
+ <db-entity name="LOCAL_DATETIME_TEST">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="Timestamp" type="TIMESTAMP"/>
+ </db-entity>
+ <db-entity name="LOCAL_TIME_TEST">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="Time" type="TIME"/>
+ </db-entity>
+ <obj-entity name="LocalDateTest" className="org.apache.cayenne.java8.db.LocalDateTestEntity" dbEntityName="LOCAL_DATE_TEST">
+ <obj-attribute name="date" type="java.time.LocalDate" db-attribute-path="Date"/>
+ </obj-entity>
+ <obj-entity name="LocalDateTimeTest" className="org.apache.cayenne.java8.db.LocalDateTimeTestEntity" dbEntityName="LOCAL_DATETIME_TEST">
+ <obj-attribute name="timestamp" type="java.time.LocalDateTime" db-attribute-path="Timestamp"/>
+ </obj-entity>
+ <obj-entity name="LocalTimeTest" className="org.apache.cayenne.java8.db.LocalTimeTestEntity" dbEntityName="LOCAL_TIME_TEST">
+ <obj-attribute name="time" type="java.time.LocalTime" db-attribute-path="Time"/>
+ </obj-entity>
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/cayenne-java8/src/test/resources/java8.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/resources/java8.map.xml b/cayenne-java8/src/test/resources/java8.map.xml
deleted file mode 100644
index 15d0e8c..0000000
--- a/cayenne-java8/src/test/resources/java8.map.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"
- project-version="7">
- <property name="defaultPackage" value="org.apache.cayenne.java8.db"/>
- <db-entity name="LocalDateTest">
- <db-attribute name="Date" type="DATE"/>
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- </db-entity>
- <db-entity name="LocalDateTimeTest">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="Timestamp" type="TIMESTAMP"/>
- </db-entity>
- <db-entity name="LocalTimeTest">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="Time" type="TIME"/>
- </db-entity>
- <obj-entity name="LocalDateTest" className="org.apache.cayenne.java8.db.LocalDateTestEntity" dbEntityName="LocalDateTest">
- <obj-attribute name="date" type="java.time.LocalDate" db-attribute-path="Date"/>
- </obj-entity>
- <obj-entity name="LocalDateTimeTest" className="org.apache.cayenne.java8.db.LocalDateTimeTestEntity" dbEntityName="LocalDateTimeTest">
- <obj-attribute name="timestamp" type="java.time.LocalDateTime" db-attribute-path="Timestamp"/>
- </obj-entity>
- <obj-entity name="LocalTimeTest" className="org.apache.cayenne.java8.db.LocalTimeTestEntity" dbEntityName="LocalTimeTest">
- <obj-attribute name="time" type="java.time.LocalTime" db-attribute-path="Time"/>
- </obj-entity>
-</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/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 13f81d1..844eab3 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
@@ -19,6 +19,20 @@
package org.apache.cayenne.modeler.util;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.ModelerConstants;
+import org.apache.cayenne.modeler.ProjectController;
+import org.apache.cayenne.modeler.action.ActionManager;
+import org.apache.cayenne.modeler.action.MultipleObjectsAction;
+import org.apache.cayenne.reflect.PropertyUtils;
+import org.apache.cayenne.util.CayenneMapEntry;
+
+import javax.swing.Action;
+import javax.swing.ImageIcon;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.Window;
@@ -40,21 +54,6 @@ import java.util.ResourceBundle;
import java.util.Set;
import java.util.UUID;
-import javax.swing.Action;
-import javax.swing.ImageIcon;
-
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ModelerConstants;
-import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.action.ActionManager;
-import org.apache.cayenne.modeler.action.MultipleObjectsAction;
-import org.apache.cayenne.reflect.PropertyUtils;
-import org.apache.cayenne.util.CayenneMapEntry;
-
/**
* Various unorganized utility methods used by CayenneModeler.
*
@@ -136,6 +135,9 @@ public final class ModelerUtil {
nonPrimitives.add(Serializable.class.getName());
nonPrimitives.add("java.lang.Character[]");
nonPrimitives.add("java.lang.Byte[]");
+ nonPrimitives.add("java.time.LocalDate");
+ nonPrimitives.add("java.time.LocalTime");
+ nonPrimitives.add("java.time.LocalDateTime");
String[] nonPrimitivesNames = new String[nonPrimitives.size()];
nonPrimitives.toArray(nonPrimitivesNames);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ba8167e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f38a05..f8ebab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1460,6 +1460,15 @@
<javadoc.doclint.none>-Xdoclint:none</javadoc.doclint.none>
</properties>
</profile>
+ <profile>
+ <id>cayenne-java8-module-to-build</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <modules>
+ <module>cayenne-java8</module>
+ </modules>
+ </profile>
</profiles>
<reporting>