cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abulat...@apache.org
Subject [cayenne] branch master updated: cleanup
Date Fri, 26 Apr 2019 13:55:35 GMT
This is an automated email from the ASF dual-hosted git repository.

abulatski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new bd5dd02  cleanup
bd5dd02 is described below

commit bd5dd0247627e3789e1e620f9caa19b971514926
Author: Arseni Bulatski <ancarseni@gmail.com>
AuthorDate: Fri Apr 26 16:52:14 2019 +0300

    cleanup
---
 .../src/test/java/org/apache/cayenne/access/Cay2032IT.java   |  1 -
 .../apache/cayenne/testdo/cay_2032/{User.java => Users.java} |  4 ++--
 .../java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java  | 12 ++++++------
 .../cayenne/testdo/cay_2032/auto/{_User.java => _Users.java} |  4 ++--
 cayenne-server/src/test/resources/cay-2032.map.xml           |  8 ++++----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/Cay2032IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/Cay2032IT.java
index 2e7f208..c473cf3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/Cay2032IT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/Cay2032IT.java
@@ -23,7 +23,6 @@ import java.util.List;
 
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.query.SortOrder;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.cay_2032.Team;
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java
similarity index 92%
rename from cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java
rename to cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java
index ce6238d..cbdd192 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/User.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/Users.java
@@ -19,9 +19,9 @@
 
 package org.apache.cayenne.testdo.cay_2032;
 
-import org.apache.cayenne.testdo.cay_2032.auto._User;
+import org.apache.cayenne.testdo.cay_2032.auto._Users;
 
-public class User extends _User {
+public class Users extends _Users {
 
     private static final long serialVersionUID = 1L; 
 
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
index a448636..666d96c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Team.java
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.ExpressionFactory;
 import org.apache.cayenne.exp.property.ListProperty;
 import org.apache.cayenne.exp.property.NumericProperty;
 import org.apache.cayenne.exp.property.PropertyFactory;
-import org.apache.cayenne.testdo.cay_2032.User;
+import org.apache.cayenne.testdo.cay_2032.Users;
 
 /**
  * Class _Team was generated by Cayenne.
@@ -25,22 +25,22 @@ public abstract class _Team extends BaseDataObject {
     public static final NumericProperty<Integer> TEAM_ID_PK_PROPERTY = PropertyFactory.createNumeric(ExpressionFactory.dbPathExp("team_id"),
Integer.class);
     public static final String TEAM_ID_PK_COLUMN = "team_id";
 
-    public static final ListProperty<User> TEAM_USERS = PropertyFactory.createList("teamUsers",
User.class);
+    public static final ListProperty<Users> TEAM_USERS = PropertyFactory.createList("teamUsers",
Users.class);
 
 
     protected Object teamUsers;
 
-    public void addToTeamUsers(User obj) {
+    public void addToTeamUsers(Users obj) {
         addToManyTarget("teamUsers", obj, true);
     }
 
-    public void removeFromTeamUsers(User obj) {
+    public void removeFromTeamUsers(Users obj) {
         removeToManyTarget("teamUsers", obj, true);
     }
 
     @SuppressWarnings("unchecked")
-    public List<User> getTeamUsers() {
-        return (List<User>)readProperty("teamUsers");
+    public List<Users> getTeamUsers() {
+        return (List<Users>)readProperty("teamUsers");
     }
 
     @Override
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java
similarity index 97%
rename from cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
rename to cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java
index bc702ff..9e78767 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_User.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/cay_2032/auto/_Users.java
@@ -14,12 +14,12 @@ import org.apache.cayenne.exp.property.PropertyFactory;
 import org.apache.cayenne.testdo.cay_2032.Team;
 
 /**
- * Class _User was generated by Cayenne.
+ * Class _Users 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 abstract class _User extends BaseDataObject {
+public abstract class _Users extends BaseDataObject {
 
     private static final long serialVersionUID = 1L; 
 
diff --git a/cayenne-server/src/test/resources/cay-2032.map.xml b/cayenne-server/src/test/resources/cay-2032.map.xml
index 00b3875..33a1627 100644
--- a/cayenne-server/src/test/resources/cay-2032.map.xml
+++ b/cayenne-server/src/test/resources/cay-2032.map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+	 xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap https://cayenne.apache.org/schema/10/modelMap.xsd"
 	 project-version="10">
 	<property name="defaultPackage" value="org.apache.cayenne.testdo.cay_2032"/>
 	<db-entity name="TEAM">
@@ -16,7 +16,7 @@
 		<db-attribute name="user_id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 	</db-entity>
 	<obj-entity name="Team" className="org.apache.cayenne.testdo.cay_2032.Team" dbEntityName="TEAM"/>
-	<obj-entity name="User" className="org.apache.cayenne.testdo.cay_2032.User" dbEntityName="USERS">
+	<obj-entity name="Users" className="org.apache.cayenne.testdo.cay_2032.Users" dbEntityName="USERS">
 		<obj-attribute name="name" type="byte[]" db-attribute-path="name"/>
 	</obj-entity>
 	<db-relationship name="userHasTeam" source="TEAM" target="USER_HAS_TEAM" toMany="true">
@@ -31,6 +31,6 @@
 	<db-relationship name="user" source="USER_HAS_TEAM" target="USERS">
 		<db-attribute-pair source="user_id" target="user_id"/>
 	</db-relationship>
-	<obj-relationship name="teamUsers" source="Team" target="User" deleteRule="Deny" db-relationship-path="userHasTeam.user"/>
-	<obj-relationship name="userTeams" source="User" target="Team" deleteRule="Deny" db-relationship-path="userHasTeam.team"/>
+	<obj-relationship name="teamUsers" source="Team" target="Users" deleteRule="Deny" db-relationship-path="userHasTeam.user"/>
+	<obj-relationship name="userTeams" source="Users" target="Team" deleteRule="Deny" db-relationship-path="userHasTeam.team"/>
 </data-map>


Mime
View raw message