You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by dk...@apache.org on 2016/02/19 15:07:25 UTC
[01/16] cayenne git commit: CAY-2060 Ongoing work on replacing actual
query objects stored in the DataMap with query descriptors.
Repository: cayenne
Updated Branches:
refs/heads/master faa35546a -> a6c438354
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml b/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
index 67e6cb8..1011c91 100644
--- a/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
+++ b/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml
@@ -45,12 +45,12 @@
<obj-relationship name="preferences" source="Domain" target="DomainPreference" deleteRule="Cascade" db-relationship-path="preferences"/>
<obj-relationship name="subdomains" source="Domain" target="Domain" deleteRule="Cascade" db-relationship-path="subdomains"/>
<obj-relationship name="domain" source="DomainPreference" target="Domain" deleteRule="Nullify" db-relationship-path="domain"/>
- <query name="DomainPreferenceForKey" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="DomainPreference">
+ <query name="DomainPreferenceForKey" type="SelectQuery" root="obj-entity" root-name="DomainPreference">
<property name="cayenne.GenericSelectQuery.fetchLimit" value="1"/>
<qualifier><![CDATA[(key = $key) and (domain = $domain)]]></qualifier>
<ordering descending="true"><![CDATA[domain.level]]></ordering>
</query>
- <query name="TopLevelDomain" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Domain">
+ <query name="TopLevelDomain" type="SelectQuery" root="obj-entity" root-name="Domain">
<qualifier><![CDATA[(name = $name) and (level = 0)]]></qualifier>
</query>
</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
index 4797b43..179dae2 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
@@ -41,12 +41,12 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.naming.DefaultUniqueNameGenerator;
import org.apache.cayenne.map.naming.NameCheckers;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.wocompat.parser.Parser;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -238,7 +238,7 @@ public class EOModelProcessor {
*
* @since 1.1
*/
- protected Query makeQuery(EOModelHelper helper, EOObjEntity entity, String queryName) {
+ protected QueryDescriptor makeQuery(EOModelHelper helper, EOObjEntity entity, String queryName) {
DataMap dataMap = helper.getDataMap();
Map queryPlist = helper.queryPListMap(entity.getName(), queryName);
@@ -246,18 +246,106 @@ public class EOModelProcessor {
return null;
}
- AbstractQuery query;
+ QueryDescriptor query;
if (queryPlist.containsKey("hints")) { // just a predefined SQL query
- query = new EOSQLQuery(entity, queryPlist);
+ query = makeEOSQLQueryDescriptor(entity, queryPlist);
} else {
- query = new EOQuery(entity, queryPlist);
+ query = makeEOQueryDescriptor(entity, queryPlist);
}
query.setName(entity.qualifiedQueryName(queryName));
- dataMap.addQuery(query);
+ dataMap.addQueryDescriptor(query);
return query;
}
+ protected QueryDescriptor makeEOQueryDescriptor(ObjEntity root, Map plistMap) {
+ SelectQueryDescriptor descriptor = QueryDescriptor.selectQueryDescriptor();
+ descriptor.setRoot(root);
+
+ descriptor.setDistinct("YES".equalsIgnoreCase((String) plistMap.get("usesDistinct")));
+
+ Object fetchLimit = plistMap.get("fetchLimit");
+ if (fetchLimit != null) {
+ try {
+ if (fetchLimit instanceof Number) {
+ descriptor.setProperty(QueryMetadata.FETCH_LIMIT_PROPERTY,
+ String.valueOf(((Number) fetchLimit).intValue()));
+ } else if (StringUtils.isNumeric(fetchLimit.toString())) {
+ descriptor.setProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, fetchLimit.toString());
+ }
+ } catch (NumberFormatException nfex) {
+ // ignoring...
+ }
+ }
+
+ // sort orderings
+ List<Map<String, String>> orderings = (List<Map<String, String>>) plistMap.get("sortOrderings");
+ if (orderings != null && !orderings.isEmpty()) {
+ for (Map<String, String> ordering : orderings) {
+ boolean asc = !"compareDescending:".equals(ordering.get("selectorName"));
+ String key = ordering.get("key");
+ if (key != null) {
+ descriptor.addOrdering(new Ordering(key, asc ? SortOrder.ASCENDING : SortOrder.DESCENDING));
+ }
+ }
+ }
+
+ // qualifiers
+ Map<String, ?> qualifierMap = (Map<String, ?>) plistMap.get("qualifier");
+ if (qualifierMap != null && !qualifierMap.isEmpty()) {
+ descriptor.setQualifier(EOQuery.EOFetchSpecificationParser.makeQualifier((EOObjEntity) root, qualifierMap));
+ }
+
+ // prefetches
+ List prefetches = (List) plistMap.get("prefetchingRelationshipKeyPaths");
+ if (prefetches != null && !prefetches.isEmpty()) {
+ Iterator it = prefetches.iterator();
+ while (it.hasNext()) {
+ descriptor.addPrefetch((String) it.next());
+ }
+ }
+
+ // data rows - note that we do not support fetching individual columns
+ // in the
+ // modeler...
+ if (plistMap.containsKey("rawRowKeyPaths")) {
+ descriptor.setProperty(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY, String.valueOf(true));
+ }
+
+ return descriptor;
+ }
+
+ protected QueryDescriptor makeEOSQLQueryDescriptor(ObjEntity root, Map plistMap) {
+ SQLTemplateDescriptor descriptor = QueryDescriptor.sqlTemplateDescriptor();
+ descriptor.setRoot(root);
+
+ Object fetchLimit = plistMap.get("fetchLimit");
+ if (fetchLimit != null) {
+ try {
+ if (fetchLimit instanceof Number) {
+ descriptor.setProperty(QueryMetadata.FETCH_LIMIT_PROPERTY,
+ String.valueOf(((Number) fetchLimit).intValue()));
+ } else if (StringUtils.isNumeric(fetchLimit.toString())) {
+ descriptor.setProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, fetchLimit.toString());
+ }
+ } catch (NumberFormatException nfex) {
+ // ignoring...
+ }
+ }
+
+ //query
+ // TODO: doesn't work with Stored Procedures.
+ Map hints = (Map) plistMap.get("hints");
+ if (hints != null && !hints.isEmpty()) {
+ String sqlExpression = (String) hints.get("EOCustomQueryExpressionHintKey");
+ if (sqlExpression != null) {
+ descriptor.setSql(sqlExpression);
+ }
+ }
+
+ return descriptor;
+ }
+
/**
* Creates and returns a new ObjEntity linked to a corresponding DbEntity.
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
index 7689074..240682d 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
@@ -34,7 +34,6 @@ import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.query.Query;
import org.apache.commons.collections.Transformer;
/**
@@ -56,20 +55,6 @@ public class EOObjEntity extends ObjEntity {
}
/**
- * Returns stored EOQuery.
- *
- * @since 1.1
- */
- public EOQuery getEOQuery(String queryName) {
- Query query = getDataMap().getQuery(qualifiedQueryName(queryName));
- if (query instanceof EOQuery) {
- return (EOQuery) query;
- }
-
- return null;
- }
-
- /**
* Overrides super to support translation of EO attributes that have no ObjAttributes.
*
* @since 1.2
@@ -118,7 +103,7 @@ public class EOObjEntity extends ObjEntity {
*/
public Collection getEOQueries() {
if (filteredQueries == null) {
- Collection queries = getDataMap().getQueries();
+ Collection queries = getDataMap().getQueryDescriptors();
if (queries.isEmpty()) {
filteredQueries = Collections.EMPTY_LIST;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
index 55555c8..f511d18 100644
--- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
+++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
@@ -26,8 +26,8 @@ import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.query.SelectQueryDescriptor;
import org.apache.cayenne.util.XMLEncoder;
import org.junit.Before;
import org.junit.Test;
@@ -130,21 +130,13 @@ public class EOModelProcessorTest {
protected void assertLoadedQueries(DataMap map) throws Exception {
// queries
- Query query = map.getQuery("ExhibitType_TestQuery");
+ QueryDescriptor query = map.getQueryDescriptor("ExhibitType_TestQuery");
assertNotNull(query);
- assertTrue(query instanceof SelectQuery);
- assertTrue(query instanceof EOQuery);
- EOQuery eoQuery = (EOQuery) query;
-
- assertSame(map.getObjEntity("ExhibitType"), eoQuery.getRoot());
-
- Collection<?> bindings = eoQuery.getBindingNames();
- assertNotNull(bindings);
- assertEquals(3, bindings.size());
- assertEquals("java.lang.String", eoQuery.bindingClass("x"));
- assertEquals("java.lang.String", eoQuery.bindingClass("y"));
- assertEquals("java.lang.Object", eoQuery.bindingClass("z"));
+ assertEquals(QueryDescriptor.SELECT_QUERY, query.getType());
+ assertTrue(query instanceof SelectQueryDescriptor);
+
+ assertSame(map.getObjEntity("ExhibitType"), query.getRoot());
}
protected void assertLoadedCustomTypes(DataMap map) throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index 8e683c1..87a3156 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -230,7 +230,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
// attributes
generator.addEmbeddables(dataMap.getEmbeddables());
// TODO add the "includeQueries" and "excludeQueries" attributes
- generator.addQueries(dataMap.getQueries());
+ generator.addQueries(dataMap.getQueryDescriptors());
generator.execute();
} catch (Exception e) {
throw new MojoExecutionException("Error generating classes: ", e);
[12/16] cayenne git commit: CAY-2060 Deprecate Query.getName()
property,
since it is only relevant for QueryDescriptor and not the Query itself.
Posted by dk...@apache.org.
CAY-2060 Deprecate Query.getName() property, since it is only relevant for QueryDescriptor and not the Query itself.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/aeabc69e
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/aeabc69e
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/aeabc69e
Branch: refs/heads/master
Commit: aeabc69e5bb735367300ca9bece60d506efed37d
Parents: 74f65f9
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Fri Feb 19 15:11:15 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:47 2016 +0300
----------------------------------------------------------------------
cayenne-server/src/main/java/org/apache/cayenne/query/Query.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aeabc69e/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
index ebd5ce0..62341d8 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
@@ -22,7 +22,6 @@ package org.apache.cayenne.query;
import java.io.Serializable;
import org.apache.cayenne.access.QueryEngine;
-import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
@@ -68,6 +67,7 @@ public interface Query extends Serializable {
* queries stored in the DataMap.
*
* @since 1.1
+ * @deprecated {@link QueryDescriptor#getName()} should be used instead
*/
String getName();
[07/16] cayenne git commit: CAY-2060 Update schema version from 7 to
8 in all XML config files throughout the project.
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/misc-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/misc-types.map.xml b/cayenne-server/src/test/resources/misc-types.map.xml
index 56371e3..be79dd6 100644
--- a/cayenne-server/src/test/resources/misc-types.map.xml
+++ b/cayenne-server/src/test/resources/misc-types.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.misc_types"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -35,4 +35,4 @@
<obj-entity name="SerializableEntity" className="org.apache.cayenne.testdo.misc_types.SerializableEntity" dbEntityName="SERIALIZABLE_ENTITY">
<obj-attribute name="serializableField" type="org.apache.cayenne.MockSerializable" db-attribute-path="SERIALIZABLE_FIELD"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml b/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
index 494546d..ca9045e 100644
--- a/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
+++ b/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.mixed_persistence_strategy"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -33,4 +33,4 @@
</db-relationship>
<obj-relationship name="details" source="MixedPersistenceStrategy" target="MixedPersistenceStrategy2" db-relationship-path="details"/>
<obj-relationship name="master" source="MixedPersistenceStrategy2" target="MixedPersistenceStrategy" db-relationship-path="master"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/multi-tier.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/multi-tier.map.xml b/cayenne-server/src/test/resources/multi-tier.map.xml
index c643813..7511ab8 100644
--- a/cayenne-server/src/test/resources/multi-tier.map.xml
+++ b/cayenne-server/src/test/resources/multi-tier.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.mt"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.mt"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/no-pk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/no-pk.map.xml b/cayenne-server/src/test/resources/no-pk.map.xml
index 114d247..618cbfc 100644
--- a/cayenne-server/src/test/resources/no-pk.map.xml
+++ b/cayenne-server/src/test/resources/no-pk.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.no_pk"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -14,4 +14,4 @@
<obj-entity name="NoPkTestEntity" className="org.apache.cayenne.testdo.no_pk.NoPkTestEntity" dbEntityName="NO_PK_TEST">
<obj-attribute name="attribute1" type="java.lang.Integer" db-attribute-path="ATTRIBUTE1"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/numeric-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/numeric-types.map.xml b/cayenne-server/src/test/resources/numeric-types.map.xml
index c5a8e2e..4e44409 100644
--- a/cayenne-server/src/test/resources/numeric-types.map.xml
+++ b/cayenne-server/src/test/resources/numeric-types.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.numeric_types"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -76,4 +76,4 @@
<obj-entity name="TinyintTestEntity" className="org.apache.cayenne.testdo.numeric_types.TinyintTestEntity" dbEntityName="TINYINT_TEST">
<obj-attribute name="tinyintCol" type="java.lang.Byte" db-attribute-path="TINYINT_COL"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/oneway-rels.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/oneway-rels.map.xml b/cayenne-server/src/test/resources/oneway-rels.map.xml
index a2c5849..626fa8b 100644
--- a/cayenne-server/src/test/resources/oneway-rels.map.xml
+++ b/cayenne-server/src/test/resources/oneway-rels.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.oneway"/>
<db-entity name="oneway_table1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/people.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/people.map.xml b/cayenne-server/src/test/resources/people.map.xml
index 861eb9f..68fcb7b 100644
--- a/cayenne-server/src/test/resources/people.map.xml
+++ b/cayenne-server/src/test/resources/people.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_people"/>
<db-entity name="ADDRESS">
<db-attribute name="ADDRESS_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/persistent.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/persistent.map.xml b/cayenne-server/src/test/resources/persistent.map.xml
index 7e50534..18d9574 100644
--- a/cayenne-server/src/test/resources/persistent.map.xml
+++ b/cayenne-server/src/test/resources/persistent.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.persistent"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.persistent"/>
@@ -29,4 +29,4 @@
</db-relationship>
<obj-relationship name="countries" source="Continent" target="Country" deleteRule="Cascade" db-relationship-path="countries"/>
<obj-relationship name="continent" source="Country" target="Continent" deleteRule="Nullify" db-relationship-path="continent"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/primitive.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/primitive.map.xml b/cayenne-server/src/test/resources/primitive.map.xml
index db129dd..7cc6992 100644
--- a/cayenne-server/src/test/resources/primitive.map.xml
+++ b/cayenne-server/src/test/resources/primitive.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.primitive"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -17,4 +17,4 @@
<obj-attribute name="booleanColumn" type="boolean" db-attribute-path="BOOLEAN_COLUMN"/>
<obj-attribute name="intColumn" type="int" db-attribute-path="INT_COLUMN"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/qualified.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/qualified.map.xml b/cayenne-server/src/test/resources/qualified.map.xml
index 956df27..3375fab 100644
--- a/cayenne-server/src/test/resources/qualified.map.xml
+++ b/cayenne-server/src/test/resources/qualified.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.qualified"/>
<property name="quoteSqlIdentifiers" value="true"/>
<db-entity name="TEST_QUALIFIED1">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/quoted-identifiers.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/quoted-identifiers.map.xml b/cayenne-server/src/test/resources/quoted-identifiers.map.xml
index fbad2e8..739b16f 100644
--- a/cayenne-server/src/test/resources/quoted-identifiers.map.xml
+++ b/cayenne-server/src/test/resources/quoted-identifiers.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.quotemap"/>
<property name="quoteSqlIdentifiers" value="true"/>
<db-entity name="QUOTED_ADDRESS">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/reflexive.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/reflexive.map.xml b/cayenne-server/src/test/resources/reflexive.map.xml
index 28fbf77..cee4586 100644
--- a/cayenne-server/src/test/resources/reflexive.map.xml
+++ b/cayenne-server/src/test/resources/reflexive.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.reflexive"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.reflexive"/>
@@ -22,4 +22,4 @@
</db-relationship>
<obj-relationship name="children" source="Reflexive" target="Reflexive" db-relationship-path="children"/>
<obj-relationship name="toParent" source="Reflexive" target="Reflexive" db-relationship-path="toParent"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-activity.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-activity.map.xml b/cayenne-server/src/test/resources/relationships-activity.map.xml
index 96e2e53..6463e34 100644
--- a/cayenne-server/src/test/resources/relationships-activity.map.xml
+++ b/cayenne-server/src/test/resources/relationships-activity.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_activity"/>
<db-entity name="X_ACTIVITY">
<db-attribute name="ACTIVITY_ID" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="50"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-child-master.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-child-master.map.xml b/cayenne-server/src/test/resources/relationships-child-master.map.xml
index bf5b391..abcbb15 100644
--- a/cayenne-server/src/test/resources/relationships-child-master.map.xml
+++ b/cayenne-server/src/test/resources/relationships-child-master.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_child_master"/>
<db-entity name="CHILD">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -26,4 +26,4 @@
<obj-relationship name="master" source="Child" target="Master" deleteRule="Nullify" db-relationship-path="master"/>
<obj-relationship name="children" source="Master" target="Child" deleteRule="Deny" db-relationship-path="children"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-clob.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-clob.map.xml b/cayenne-server/src/test/resources/relationships-clob.map.xml
index 9912e4b..afae0b3 100644
--- a/cayenne-server/src/test/resources/relationships-clob.map.xml
+++ b/cayenne-server/src/test/resources/relationships-clob.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationship_clob"/>
<db-entity name="CLOB_DETAIL">
<db-attribute name="CLOB_DETAIL_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -29,4 +29,4 @@
</db-relationship>
<obj-relationship name="master" source="ClobDetail" target="ClobMaster" db-relationship-path="master"/>
<obj-relationship name="details" source="ClobMaster" target="ClobDetail" db-relationship-path="details"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-collection-to-many.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-collection-to-many.map.xml b/cayenne-server/src/test/resources/relationships-collection-to-many.map.xml
index de7ce49..d9a5c68 100644
--- a/cayenne-server/src/test/resources/relationships-collection-to-many.map.xml
+++ b/cayenne-server/src/test/resources/relationships-collection-to-many.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_collection_to_many"/>
<db-entity name="COLLECTION_TO_MANY">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -23,4 +23,4 @@
</db-relationship>
<obj-relationship name="targets" source="CollectionToMany" target="CollectionToManyTarget" collection-type="java.util.Collection" db-relationship-path="targets"/>
<obj-relationship name="collectionToMany" source="CollectionToManyTarget" target="CollectionToMany" db-relationship-path="collectionToMany"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-delete-rules.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-delete-rules.map.xml b/cayenne-server/src/test/resources/relationships-delete-rules.map.xml
index 4110921..fe470c3 100644
--- a/cayenne-server/src/test/resources/relationships-delete-rules.map.xml
+++ b/cayenne-server/src/test/resources/relationships-delete-rules.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_delete_rules"/>
<db-entity name="DELETE_RULE_FLATA">
<db-attribute name="FLATA_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -68,4 +68,4 @@
<obj-relationship name="deleteRuleTest3Array" source="DeleteRuleTest2" target="DeleteRuleTest3" db-relationship-path="deleteRuleTest3Array"/>
<obj-relationship name="test1Array" source="DeleteRuleTest2" target="DeleteRuleTest1" deleteRule="Nullify" db-relationship-path="test1Array"/>
<obj-relationship name="toDeleteRuleTest2" source="DeleteRuleTest3" target="DeleteRuleTest2" db-relationship-path="toDeleteRuleTest2"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-flattened.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-flattened.map.xml b/cayenne-server/src/test/resources/relationships-flattened.map.xml
index c032f55..6a83bd2 100644
--- a/cayenne-server/src/test/resources/relationships-flattened.map.xml
+++ b/cayenne-server/src/test/resources/relationships-flattened.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationship_flattened"/>
<db-entity name="COMPLEX_JOIN">
<db-attribute name="EXTRA_COLUMN" type="VARCHAR" length="50"/>
@@ -104,4 +104,4 @@
<obj-relationship name="toFT1" source="FlattenedTest3" target="FlattenedTest1" db-relationship-path="toFT2.toFT1"/>
<obj-relationship name="toFT2" source="FlattenedTest3" target="FlattenedTest2" db-relationship-path="toFT2"/>
<obj-relationship name="toFT3" source="FlattenedTest4" target="FlattenedTest3" db-relationship-path="toFT3"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-set-to-many.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-set-to-many.map.xml b/cayenne-server/src/test/resources/relationships-set-to-many.map.xml
index 6e1de37..bed10b0 100644
--- a/cayenne-server/src/test/resources/relationships-set-to-many.map.xml
+++ b/cayenne-server/src/test/resources/relationships-set-to-many.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_set_to_many"/>
<db-entity name="SET_TO_MANY">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -23,4 +23,4 @@
</db-relationship>
<obj-relationship name="targets" source="SetToMany" target="SetToManyTarget" collection-type="java.util.Set" db-relationship-path="targets"/>
<obj-relationship name="setToMany" source="SetToManyTarget" target="SetToMany" db-relationship-path="setToMany"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-to-many-fk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-to-many-fk.map.xml b/cayenne-server/src/test/resources/relationships-to-many-fk.map.xml
index 0a6d575..159e962 100644
--- a/cayenne-server/src/test/resources/relationships-to-many-fk.map.xml
+++ b/cayenne-server/src/test/resources/relationships-to-many-fk.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_to_many_fk"/>
<db-entity name="TO_MANY_FKDEP">
<db-attribute name="DEP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -45,4 +45,4 @@
<obj-relationship name="root2" source="ToManyFkDep" target="ToManyRoot2" db-relationship-path="root2"/>
<obj-relationship name="deps" source="ToManyFkRoot" target="ToManyFkDep" db-relationship-path="deps"/>
<obj-relationship name="deps" source="ToManyRoot2" target="ToManyFkDep" db-relationship-path="deps"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml b/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml
index 70393ea..a27f06a 100644
--- a/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml
+++ b/cayenne-server/src/test/resources/relationships-to-one-fk.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships_to_one_fk"/>
<db-entity name="TO_ONE_FK1">
<db-attribute name="TO_ONE_FK1_FK" type="INTEGER" isMandatory="true"/>
@@ -23,4 +23,4 @@
</db-relationship>
<obj-relationship name="toPK" source="ToOneFK1" target="ToOneFK2" db-relationship-path="toPK"/>
<obj-relationship name="toOneToFK" source="ToOneFK2" target="ToOneFK1" db-relationship-path="toOneToFK"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/relationships.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/relationships.map.xml b/cayenne-server/src/test/resources/relationships.map.xml
index ec20cc7..58769e9 100644
--- a/cayenne-server/src/test/resources/relationships.map.xml
+++ b/cayenne-server/src/test/resources/relationships.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.relationships"/>
<db-entity name="FK_OF_DIFFERENT_TYPE">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/return-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/return-types.map.xml b/cayenne-server/src/test/resources/return-types.map.xml
index 67266bd..915f76c 100644
--- a/cayenne-server/src/test/resources/return-types.map.xml
+++ b/cayenne-server/src/test/resources/return-types.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.return_types"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -89,4 +89,4 @@
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
</query>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/soft-delete.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/soft-delete.map.xml b/cayenne-server/src/test/resources/soft-delete.map.xml
index 52efe07..bfa3351 100644
--- a/cayenne-server/src/test/resources/soft-delete.map.xml
+++ b/cayenne-server/src/test/resources/soft-delete.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.soft_delete"/>
<db-entity name="SOFT_DELETE">
<db-attribute name="DELETED" type="BOOLEAN"/>
@@ -15,4 +15,4 @@
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
<post-add method-name="onPrePersist"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/sus-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/sus-map.map.xml b/cayenne-server/src/test/resources/sus-map.map.xml
index 867e8c6..f911763 100644
--- a/cayenne-server/src/test/resources/sus-map.map.xml
+++ b/cayenne-server/src/test/resources/sus-map.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="SUS1">
<db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="strNoMandatory" type="VARCHAR" length="200"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/table-primitives.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/table-primitives.map.xml b/cayenne-server/src/test/resources/table-primitives.map.xml
index a2c3c23..13d8193 100644
--- a/cayenne-server/src/test/resources/table-primitives.map.xml
+++ b/cayenne-server/src/test/resources/table-primitives.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.table_primitives"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.table_primitives"/>
@@ -15,4 +15,4 @@
<obj-attribute name="booleanColumn" type="boolean" db-attribute-path="BOOLEAN_COLUMN"/>
<obj-attribute name="intColumn" type="int" db-attribute-path="INT_COLUMN"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/testmap.map.xml b/cayenne-server/src/test/resources/testmap.map.xml
index 4cdda33..4604801 100644
--- a/cayenne-server/src/test/resources/testmap.map.xml
+++ b/cayenne-server/src/test/resources/testmap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/things.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/things.map.xml b/cayenne-server/src/test/resources/things.map.xml
index 384f98f..03c705b 100644
--- a/cayenne-server/src/test/resources/things.map.xml
+++ b/cayenne-server/src/test/resources/things.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.things"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -107,4 +107,4 @@
<obj-relationship name="box" source="BoxInfo" target="Box" deleteRule="Nullify" db-relationship-path="BOX"/>
<obj-relationship name="ball" source="Thing" target="Ball" deleteRule="Nullify" db-relationship-path="BALL"/>
<obj-relationship name="box" source="Thing" target="Box" deleteRule="Deny" db-relationship-path="BOX_THING.BOX"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/toone.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/toone.map.xml b/cayenne-server/src/test/resources/toone.map.xml
index 5a30192..0f5aae5 100644
--- a/cayenne-server/src/test/resources/toone.map.xml
+++ b/cayenne-server/src/test/resources/toone.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.toone"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.toone"/>
@@ -24,4 +24,4 @@
</db-relationship>
<obj-relationship name="toMaster" source="TooneDep" target="TooneMaster" deleteRule="Nullify" db-relationship-path="toMaster"/>
<obj-relationship name="toDependent" source="TooneMaster" target="TooneDep" deleteRule="Cascade" db-relationship-path="toDependent"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml b/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml
index abf6fab..ebfbf99 100644
--- a/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml
+++ b/cayenne-server/src/test/resources/unsupported-distinct-types.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.unsupported_distinct_types"/>
<db-entity name="COMPOSITION">
<db-attribute name="BASE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/uuid.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/uuid.map.xml b/cayenne-server/src/test/resources/uuid.map.xml
index c5ed630..af86ec2 100644
--- a/cayenne-server/src/test/resources/uuid.map.xml
+++ b/cayenne-server/src/test/resources/uuid.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.uuid"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -21,4 +21,4 @@
<obj-entity name="UuidTestEntity" className="org.apache.cayenne.testdo.uuid.UuidTestEntity" dbEntityName="UUID_TEST">
<obj-attribute name="uuid" type="java.util.UUID" db-attribute-path="UUID"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-tools/src/test/resources/org/apache/cayenne/tools/dbimport/build-include-table.map.xml-result
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/resources/org/apache/cayenne/tools/dbimport/build-include-table.map.xml-result b/cayenne-tools/src/test/resources/org/apache/cayenne/tools/dbimport/build-include-table.map.xml-result
index 8854a8b..760ce23 100644
--- a/cayenne-tools/src/test/resources/org/apache/cayenne/tools/dbimport/build-include-table.map.xml-result
+++ b/cayenne-tools/src/test/resources/org/apache/cayenne/tools/dbimport/build-include-table.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="PARENT" schema="APP">
<db-attribute name="COL2" type="CHAR" length="25"/>
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
index 3624e3c..88cec3a 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.example.test"/>
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="CHILD" schema="SCHEMA_01">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
index 093f6cc..31491cd 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="CHILD" schema="SCHEMA_01">
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
index cf592e4..ed6746b 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.not.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
index 4a45ce9..a689c1c 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="testImportAddTableAndColumn" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
index 1a8f6bb..edd8b54 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="CHILD" schema="APP">
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
<db-attribute name="COL4" type="VARCHAR" length="25"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
index bd487c2..f1c2c9c 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="TEST_TABLE" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
index ef77081..d354661 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="testImportWithoutChanges" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
index a11524b..ba5abbc 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="testImportWithoutChanges" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOldParamsSchemasAndTableExclude.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOldParamsSchemasAndTableExclude.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOldParamsSchemasAndTableExclude.map.xml-result
index 5853842..b07dfb6 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOldParamsSchemasAndTableExclude.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOldParamsSchemasAndTableExclude.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="PARENT" schema="SCHEMA_01">
<db-attribute name="COL2" type="CHAR" length="25"/>
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
index 557423d..8c61540 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="PICK_SCHEDULE" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="OWNER_ID" type="INTEGER" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
index 4ca0886..9febe2f 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="CHILD" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
<db-attribute name="PARENT_ID" type="INTEGER" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
index aad5d5b..71d4d9b 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="CHILD" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
</db-entity>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
index 83f9934..b0706f9 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="PARENT" schema="SCHEMA_01">
<db-attribute name="COL2" type="CHAR" length="25"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSimpleFiltering.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSimpleFiltering.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSimpleFiltering.map.xml-result
index f8eb58e..e5ba734 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSimpleFiltering.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSimpleFiltering.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="PARENT" schema="APP">
<db-attribute name="COL2" type="CHAR" length="25"/>
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
index ec4bb60..ae0318a 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
index 323aaee..cbf0e21 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
index a18b3f3..32a1d58 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
index a18b3f3..32a1d58 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSupportsCatalogsOnReverseEngineering.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSupportsCatalogsOnReverseEngineering.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSupportsCatalogsOnReverseEngineering.map.xml
index 4e28e1c..c9e0334 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSupportsCatalogsOnReverseEngineering.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSupportsCatalogsOnReverseEngineering.map.xml
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.my.home"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
index 805898d..48834d3 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="PERSON" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
</db-entity>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
index d3a85be..afb7e5f 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="com.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
index f7d6f81..5fa049f 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.not.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
index 25bf598..e6cd3dd 100644
--- a/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
+++ b/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="GIRL" schema="APP">
<db-attribute name="ID" type="INTEGER" isMandatory="true" length="10"/>
</db-entity>
[04/16] cayenne git commit: CAY-2060 Ongoing work on replacing actual
query objects stored in the DataMap with query descriptors.
Posted by dk...@apache.org.
CAY-2060 Ongoing work on replacing actual query objects stored in the DataMap with query descriptors.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a265b3ab
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a265b3ab
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a265b3ab
Branch: refs/heads/master
Commit: a265b3aba5f8c2d0b4a8ef08d7d00b80a82724ab
Parents: faa3554
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Tue Feb 16 19:40:52 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:56:38 2016 +0300
----------------------------------------------------------------------
.../cayenne/lifecycle/id/StringIdQuery.java | 5 -
.../DefaultConfigurationNodeParentGetter.java | 4 +-
.../validation/DefaultProjectValidator.java | 38 ++-
.../project/validation/EJBQLQueryValidator.java | 4 +-
.../validation/EJBQLStatementValidator.java | 7 +-
.../validation/ProcedureQueryValidator.java | 12 +-
.../validation/SQLTemplateValidator.java | 22 +-
.../validation/SelectQueryValidator.java | 26 +-
.../apache/cayenne/access/DataDomainQuery.java | 7 -
.../access/ObjectsFromDataRowsQuery.java | 5 -
.../BaseConfigurationNodeVisitor.java | 3 +-
.../configuration/ConfigurationNodeVisitor.java | 3 +-
.../java/org/apache/cayenne/map/DataMap.java | 85 +++----
.../org/apache/cayenne/map/EntityResolver.java | 19 +-
.../java/org/apache/cayenne/map/MapLoader.java | 26 +-
.../org/apache/cayenne/map/MappingCache.java | 31 +--
.../apache/cayenne/map/MappingNamespace.java | 5 +-
.../cayenne/map/ProxiedMappingNamespace.java | 10 +-
.../cayenne/map/QueryDescriptorLoader.java | 214 +++++++++++++++++
.../apache/cayenne/map/naming/NameCheckers.java | 2 +-
.../org/apache/cayenne/query/AbstractQuery.java | 8 -
.../org/apache/cayenne/query/BatchQuery.java | 5 -
.../org/apache/cayenne/query/EJBQLQuery.java | 4 -
.../cayenne/query/EJBQLQueryDescriptor.java | 82 +++++++
.../org/apache/cayenne/query/IndirectQuery.java | 9 -
.../org/apache/cayenne/query/NamedQuery.java | 16 +-
.../apache/cayenne/query/ProcedureQuery.java | 2 +-
.../cayenne/query/ProcedureQueryDescriptor.java | 105 ++++++++
.../java/org/apache/cayenne/query/Query.java | 2 +-
.../org/apache/cayenne/query/QueryChain.java | 8 -
.../apache/cayenne/query/QueryDescriptor.java | 238 +++++++++++++++++++
.../org/apache/cayenne/query/RefreshQuery.java | 11 -
.../org/apache/cayenne/query/SQLTemplate.java | 2 +-
.../cayenne/query/SQLTemplateDescriptor.java | 173 ++++++++++++++
.../cayenne/query/SelectQueryDescriptor.java | 221 +++++++++++++++++
.../apache/cayenne/remote/IncrementalQuery.java | 7 -
.../org/apache/cayenne/remote/RangeQuery.java | 7 -
.../cayenne/map/DataMapNamespaceTest.java | 24 +-
.../org/apache/cayenne/map/DataMapTest.java | 33 +--
.../apache/cayenne/map/EntityResolverIT.java | 19 +-
.../apache/cayenne/map/MapLoaderLoadTest.java | 29 +--
.../cayenne/map/MockMappingNamespace.java | 15 +-
.../cayenne/map/naming/NameCheckersTest.java | 6 +-
.../org/apache/cayenne/query/MockQuery.java | 4 -
.../src/test/resources/date-time.map.xml | 2 +-
.../src/test/resources/multi-tier.map.xml | 8 +-
.../src/test/resources/return-types.map.xml | 6 +-
.../src/test/resources/testmap.map.xml | 28 +--
.../cayenne/gen/ClassGenerationAction.java | 4 +-
.../gen/ClientClassGenerationAction.java | 3 +-
.../cayenne/gen/ClientDataMapArtifact.java | 4 +-
.../org/apache/cayenne/gen/DataMapArtifact.java | 57 ++---
.../cayenne/tools/CayenneGeneratorTask.java | 2 +-
.../cayenne/gen/ClassGenerationActionTest.java | 11 +-
.../src/test/resources/testmap.map.xml | 34 +--
.../src/test/resources/testmap-client.map.xml | 34 +--
.../src/test/resources/testmap.map.xml | 34 +--
.../cayenne/configuration/event/QueryEvent.java | 20 +-
.../cayenne/modeler/ProjectController.java | 5 +-
.../cayenne/modeler/ProjectTreeFactory.java | 3 +-
.../apache/cayenne/modeler/ProjectTreeView.java | 8 +-
.../modeler/action/CreateQueryAction.java | 8 +-
.../cayenne/modeler/action/FindAction.java | 6 +-
.../modeler/action/ImportEOModelAction.java | 10 +-
.../cayenne/modeler/action/PasteAction.java | 21 +-
.../cayenne/modeler/action/RemoveAction.java | 21 +-
.../cayenne/modeler/dialog/FindDialog.java | 19 +-
.../dialog/codegen/GeneratorController.java | 2 +-
.../cayenne/modeler/dialog/query/QueryType.java | 74 ++----
.../modeler/dialog/validator/QueryErrorMsg.java | 4 +-
.../validator/ValidationDisplayHandler.java | 3 +-
.../cayenne/modeler/editor/EditorView.java | 39 ++-
.../modeler/editor/EjbqlQueryMainTab.java | 22 +-
.../editor/EjbqlQueryPropertiesPanel.java | 33 ---
.../modeler/editor/EjbqlQueryScriptsTab.java | 33 +--
.../cayenne/modeler/editor/EjbqlTabbedView.java | 4 +-
.../editor/ObjectQueryPropertiesPanel.java | 10 +-
.../modeler/editor/ProcedureQueryView.java | 55 ++---
.../modeler/editor/RawQueryPropertiesPanel.java | 17 +-
.../modeler/editor/SQLTemplateMainTab.java | 48 ++--
.../modeler/editor/SQLTemplateScriptsTab.java | 37 +--
.../modeler/editor/SQLTemplateTabbedView.java | 6 +-
.../modeler/editor/SelectPropertiesPanel.java | 86 +++----
.../modeler/editor/SelectQueryMainTab.java | 42 ++--
.../modeler/editor/SelectQueryOrderingTab.java | 15 +-
.../modeler/editor/SelectQueryPrefetchTab.java | 26 +-
.../modeler/editor/SelectQueryTabbedView.java | 6 +-
.../modeler/event/QueryDisplayEvent.java | 9 +-
.../modeler/undo/CreateQueryUndoableEdit.java | 5 +-
.../cayenne/modeler/undo/PasteUndoableEdit.java | 6 +-
.../modeler/undo/RemoveUndoableEdit.java | 5 +-
.../cayenne/modeler/util/CellRenderers.java | 4 +-
.../cayenne/modeler/util/ProjectUtil.java | 21 +-
.../state/MultipleObjectsDisplayEventType.java | 4 +-
.../util/state/QueryDisplayEventType.java | 3 +-
.../src/main/resources/pref/Preferences.map.xml | 4 +-
.../cayenne/wocompat/EOModelProcessor.java | 102 +++++++-
.../apache/cayenne/wocompat/EOObjEntity.java | 17 +-
.../cayenne/wocompat/EOModelProcessorTest.java | 22 +-
.../cayenne/tools/CayenneGeneratorMojo.java | 2 +-
100 files changed, 1770 insertions(+), 902 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
index d448c03..aa98f02 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.map.DataMap;
@@ -141,10 +140,6 @@ public class StringIdQuery implements Query {
return this.idQueriesByEntity;
}
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
public QueryMetadata getMetaData(EntityResolver resolver) {
// Cayenne doesn't know how to handle multiple root entities, so this
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java b/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
index 9af9b38..6dbe6ef 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
public class DefaultConfigurationNodeParentGetter implements ConfigurationNodeParentGetter {
@@ -110,7 +110,7 @@ public class DefaultConfigurationNodeParentGetter implements ConfigurationNodePa
}
@Override
- public ConfigurationNode visitQuery(Query query) {
+ public ConfigurationNode visitQuery(QueryDescriptor query) {
return query.getDataMap();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
index ceb5645..5835a5d 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
@@ -35,11 +35,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.validation.ValidationResult;
/**
@@ -139,9 +135,9 @@ public class DefaultProjectValidator implements ProjectValidator {
visitProcedure(proc);
}
- Iterator<Query> itQuer = dataMap.getQueries().iterator();
+ Iterator<QueryDescriptor> itQuer = dataMap.getQueryDescriptors().iterator();
while (itQuer.hasNext()) {
- Query q = itQuer.next();
+ QueryDescriptor q = itQuer.next();
visitQuery(q);
}
@@ -251,19 +247,21 @@ public class DefaultProjectValidator implements ProjectValidator {
return validationResult;
}
- public ValidationResult visitQuery(Query query) {
- if (query instanceof SelectQuery) {
- selectQueryValidator.validate((SelectQuery) query, validationResult);
- }
- else if (query instanceof SQLTemplate) {
- sqlTemplateValidator.validate((SQLTemplate) query, validationResult);
- }
- else if (query instanceof ProcedureQuery) {
- procedureQueryValidator
- .validate((ProcedureQuery) query, validationResult);
- }
- else if (query instanceof EJBQLQuery) {
- ejbqlQueryValidator.validate((EJBQLQuery) query, validationResult);
+ public ValidationResult visitQuery(QueryDescriptor query) {
+
+ switch (query.getType()) {
+ case QueryDescriptor.SELECT_QUERY:
+ selectQueryValidator.validate((SelectQueryDescriptor) query, validationResult);
+ break;
+ case QueryDescriptor.SQL_TEMPLATE:
+ sqlTemplateValidator.validate((SQLTemplateDescriptor) query, validationResult);
+ break;
+ case QueryDescriptor.PROCEDURE_QUERY:
+ procedureQueryValidator.validate((ProcedureQueryDescriptor) query, validationResult);
+ break;
+ case QueryDescriptor.EJBQL_QUERY:
+ ejbqlQueryValidator.validate((EJBQLQueryDescriptor) query, validationResult);
+ break;
}
return validationResult;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
index 90fe9e4..20a7b61 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
@@ -21,11 +21,13 @@ package org.apache.cayenne.project.validation;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.project.validation.EJBQLStatementValidator.PositionException;
import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.query.EJBQLQueryDescriptor;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.validation.ValidationResult;
class EJBQLQueryValidator extends ConfigurationNodeValidator {
- void validate(EJBQLQuery query, ValidationResult validationResult) {
+ void validate(EJBQLQueryDescriptor query, ValidationResult validationResult) {
PositionException message = new EJBQLStatementValidator().validateEJBQL(
query,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
index 3ef7352..40a98c9 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
@@ -24,15 +24,16 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ejbql.EJBQLException;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.query.EJBQLQueryDescriptor;
public class EJBQLStatementValidator {
- public PositionException validateEJBQL(EJBQLQuery query, EntityResolver er) {
- if (query.getEjbqlStatement() != null) {
+ public PositionException validateEJBQL(EJBQLQueryDescriptor query, EntityResolver er) {
+ if (query.getEjbql() != null) {
PositionException message = null;
EJBQLQuery queryTemp = new EJBQLQuery();
- queryTemp.setEjbqlStatement(query.getEjbqlStatement());
+ queryTemp.setEjbqlStatement(query.getEjbql());
try {
queryTemp.getExpression(er);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
index 785c66f..5a259d1 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
@@ -20,19 +20,19 @@ package org.apache.cayenne.project.validation;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.ProcedureQueryDescriptor;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
class ProcedureQueryValidator extends ConfigurationNodeValidator {
- void validate(ProcedureQuery query, ValidationResult validationResult) {
+ void validate(ProcedureQueryDescriptor query, ValidationResult validationResult) {
validateName(query, validationResult);
validateRoot(query, validationResult);
}
- void validateRoot(ProcedureQuery query, ValidationResult validationResult) {
+ void validateRoot(ProcedureQueryDescriptor query, ValidationResult validationResult) {
DataMap map = query.getDataMap();
Object root = query.getRoot();
@@ -71,7 +71,7 @@ class ProcedureQueryValidator extends ConfigurationNodeValidator {
}
}
- void validateName(ProcedureQuery query, ValidationResult validationResult) {
+ void validateName(QueryDescriptor query, ValidationResult validationResult) {
String name = query.getName();
// Must have name
@@ -86,7 +86,7 @@ class ProcedureQueryValidator extends ConfigurationNodeValidator {
}
// check for duplicate names in the parent context
- for (final Query otherQuery : map.getQueries()) {
+ for (final QueryDescriptor otherQuery : map.getQueryDescriptors()) {
if (otherQuery == query) {
continue;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
index 5959a1d..2899351 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
@@ -19,26 +19,28 @@
package org.apache.cayenne.project.validation;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.query.SQLTemplateDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
+import java.util.Map;
+
class SQLTemplateValidator extends ConfigurationNodeValidator {
- void validate(SQLTemplate query, ValidationResult validationResult) {
+ void validate(SQLTemplateDescriptor query, ValidationResult validationResult) {
validateName(query, validationResult);
validateRoot(query, validationResult);
validateDefaultSQL(query, validationResult);
}
- void validateDefaultSQL(SQLTemplate query, ValidationResult validationResult) {
+ void validateDefaultSQL(SQLTemplateDescriptor query, ValidationResult validationResult) {
- if (Util.isEmptyString(query.getDefaultTemplate())) {
+ if (Util.isEmptyString(query.getSql())) {
// see if there is at least one adapter-specific template...
- for (final String key : query.getTemplateKeys()) {
- if (!Util.isEmptyString(query.getCustomTemplate(key))) {
+ for (Map.Entry<String, String> entry : query.getAdapterSql().entrySet()) {
+ if (!Util.isEmptyString(entry.getValue())) {
return;
}
}
@@ -51,7 +53,7 @@ class SQLTemplateValidator extends ConfigurationNodeValidator {
}
}
- void validateRoot(SQLTemplate query, ValidationResult validationResult) {
+ void validateRoot(QueryDescriptor query, ValidationResult validationResult) {
DataMap map = query.getDataMap();
if (query.getRoot() == null && map != null) {
addFailure(
@@ -62,7 +64,7 @@ class SQLTemplateValidator extends ConfigurationNodeValidator {
}
}
- void validateName(SQLTemplate query, ValidationResult validationResult) {
+ void validateName(QueryDescriptor query, ValidationResult validationResult) {
String name = query.getName();
// Must have name
@@ -77,7 +79,7 @@ class SQLTemplateValidator extends ConfigurationNodeValidator {
}
// check for duplicate names in the parent context
- for (final Query otherQuery : map.getQueries()) {
+ for (final QueryDescriptor otherQuery : map.getQueryDescriptors()) {
if (otherQuery == query) {
continue;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
index 3ea8eb1..7a1425c 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
@@ -24,17 +24,14 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionException;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.PrefetchTreeNode;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
class SelectQueryValidator extends ConfigurationNodeValidator {
- <T> void validate(SelectQuery<T> query, ValidationResult validationResult) {
+ void validate(SelectQueryDescriptor query, ValidationResult validationResult) {
validateName(query, validationResult);
@@ -49,11 +46,10 @@ class SelectQueryValidator extends ConfigurationNodeValidator {
validateOrdering(query, root, ordering, validationResult);
}
- if (query.getPrefetchTree() != null) {
- for (PrefetchTreeNode prefetchTreeNode : query
- .getPrefetchTree()
- .nonPhantomNodes()) {
- validatePrefetch(root, prefetchTreeNode.getPath(), validationResult);
+ if (query.getPrefetches() != null) {
+ for (String prefetchPath : query
+ .getPrefetches()) {
+ validatePrefetch(root, prefetchPath, validationResult);
}
}
@@ -64,8 +60,8 @@ class SelectQueryValidator extends ConfigurationNodeValidator {
// TODO: andrus 03/10/2010 - should this be implemented?
}
- <T> void validateOrdering(
- SelectQuery<T> query,
+ void validateOrdering(
+ QueryDescriptor query,
Entity root,
Ordering ordering,
ValidationResult validationResult) {
@@ -89,7 +85,7 @@ class SelectQueryValidator extends ConfigurationNodeValidator {
// TODO: andrus 03/10/2010 - should this be implemented?
}
- <T> Entity validateRoot(SelectQuery<T> query, ValidationResult validationResult) {
+ Entity validateRoot(QueryDescriptor query, ValidationResult validationResult) {
DataMap map = query.getDataMap();
if (query.getRoot() == null && map != null) {
addFailure(validationResult, query, "Query '%s' has no root", query.getName());
@@ -128,7 +124,7 @@ class SelectQueryValidator extends ConfigurationNodeValidator {
return null;
}
- <T> void validateName(SelectQuery<T> query, ValidationResult validationResult) {
+ void validateName(QueryDescriptor query, ValidationResult validationResult) {
String name = query.getName();
// Must have name
@@ -144,7 +140,7 @@ class SelectQueryValidator extends ConfigurationNodeValidator {
// check for duplicate names in the parent context
- for (final Query otherQuery : map.getQueries()) {
+ for (final QueryDescriptor otherQuery : map.getQueryDescriptors()) {
if (otherQuery == query) {
continue;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
index 4fbfd98..2200f24 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
@@ -47,13 +47,6 @@ class DataDomainQuery implements Query, QueryMetadata {
public SQLAction createSQLAction(SQLActionVisitor visitor) {
throw new UnsupportedOperationException("Not an executable query.");
}
-
- /**
- * @since 3.1
- */
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
public QueryMetadata getMetaData(EntityResolver resolver) {
return this;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
index a6876c1..e564f02 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import org.apache.cayenne.DataRow;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
@@ -58,10 +57,6 @@ class ObjectsFromDataRowsQuery implements Query, QueryMetadata {
return dataRows;
}
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
public QueryMetadata getMetaData(EntityResolver resolver) {
return this;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
index 15699b2..e8badcd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* A {@link ConfigurationNodeVisitor} that does nothing, used as a convenience superclass
@@ -94,7 +95,7 @@ public abstract class BaseConfigurationNodeVisitor<T> implements
throw new UnsupportedOperationException("Not implemented for ProcedureParameter");
}
- public T visitQuery(Query query) {
+ public T visitQuery(QueryDescriptor query) {
throw new UnsupportedOperationException("Not implemented for Query");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
index 998b1e3..201bfa7 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
@@ -30,6 +30,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* A visitor interface for implementing operations on different types of
@@ -65,5 +66,5 @@ public interface ConfigurationNodeVisitor<T> {
T visitProcedureParameter(ProcedureParameter parameter);
- T visitQuery(Query query);
+ T visitQuery(QueryDescriptor query);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/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 3d118a1..10d38a2 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
@@ -28,8 +28,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.event.DbEntityListener;
import org.apache.cayenne.map.event.EntityEvent;
import org.apache.cayenne.map.event.ObjEntityListener;
-import org.apache.cayenne.query.NamedQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.util.ToStringBuilder;
import org.apache.cayenne.util.Util;
@@ -144,7 +143,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
private SortedMap<String, ObjEntity> objEntityMap;
private SortedMap<String, DbEntity> dbEntityMap;
private SortedMap<String, Procedure> procedureMap;
- private SortedMap<String, Query> queryMap;
+ private SortedMap<String, QueryDescriptor> queryDescriptorMap;
private SortedMap<String, SQLResult> results;
/**
@@ -182,7 +181,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
objEntityMap = new TreeMap<String, ObjEntity>();
dbEntityMap = new TreeMap<String, DbEntity>();
procedureMap = new TreeMap<String, Procedure>();
- queryMap = new TreeMap<String, Query>();
+ queryDescriptorMap = new TreeMap<>();
defaultEntityListeners = new ArrayList<EntityListener>(3);
results = new TreeMap<String, SQLResult>();
setName(mapName);
@@ -299,16 +298,8 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
}
// create proxies for named queries
- for (Query q : getQueries()) {
- NamedQuery proxy = new NamedQuery(q.getName());
- proxy.setName(q.getName());
- proxy.setDataMap(clientMap);
-
- // resolve metadata so that client can have access to it without
- // knowing about
- // the server query.
- proxy.initMetadata(q.getMetaData(serverResolver));
- clientMap.addQuery(proxy);
+ for (QueryDescriptor q : getQueryDescriptors()) {
+ clientMap.addQueryDescriptor(q);
}
return clientMap;
@@ -385,7 +376,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
// since Queries are not XMLSerializable by default, check for
// non-serilaizable
// queries and throws if they are not..
- for (Query query : getQueries()) {
+ for (QueryDescriptor query : getQueryDescriptors()) {
if (query instanceof XMLSerializable) {
((XMLSerializable) query).encodeAsXML(encoder);
} else {
@@ -459,9 +450,9 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
this.addObjEntity(ent);
}
- for (Query query : new ArrayList<Query>(map.getQueries())) {
- this.removeQuery(query.getName());
- this.addQuery(query);
+ for (QueryDescriptor query : new ArrayList<>(map.getQueryDescriptors())) {
+ this.removeQueryDescriptor(query.getName());
+ this.addQueryDescriptor(query);
}
}
@@ -500,53 +491,53 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
/**
* Returns a named query associated with this DataMap.
*
- * @since 1.1
+ * @since 4.0
*/
- public Query getQuery(String queryName) {
- Query query = queryMap.get(queryName);
- if (query != null) {
- return query;
+ public QueryDescriptor getQueryDescriptor(String queryName) {
+ QueryDescriptor queryDescriptor = queryDescriptorMap.get(queryName);
+ if (queryDescriptor != null) {
+ return queryDescriptor;
}
- return namespace != null ? namespace.getQuery(queryName) : null;
+ return namespace != null ? namespace.getQueryDescriptor(queryName) : null;
}
/**
- * Stores a query under its name.
- *
+ * Stores a query descriptor under its name.
+ *
* @since 1.1
*/
- public void addQuery(Query query) {
- if (query == null) {
+ public void addQueryDescriptor(QueryDescriptor queryDescriptor) {
+ if (queryDescriptor == null) {
throw new NullPointerException("Can't add null query.");
}
- if (query.getName() == null) {
+ if (queryDescriptor.getName() == null) {
throw new NullPointerException("Query name can't be null.");
}
// TODO: change method signature to return replaced procedure and make
// sure the
// Modeler handles it...
- Object existingQuery = queryMap.get(query.getName());
- if (existingQuery != null) {
- if (existingQuery == query) {
+ QueryDescriptor existingQueryDescriptor = queryDescriptorMap.get(queryDescriptor.getName());
+ if (existingQueryDescriptor != null) {
+ if (existingQueryDescriptor == queryDescriptor) {
return;
} else {
- throw new IllegalArgumentException("An attempt to override entity '" + query.getName());
+ throw new IllegalArgumentException("An attempt to override entity '" + queryDescriptor.getName());
}
}
- queryMap.put(query.getName(), query);
+ queryDescriptorMap.put(queryDescriptor.getName(), queryDescriptor);
}
/**
* Removes a named query from the DataMap.
*
- * @since 1.1
+ * @since 4.0
*/
- public void removeQuery(String queryName) {
- queryMap.remove(queryName);
+ public void removeQueryDescriptor(String queryName) {
+ queryDescriptorMap.remove(queryName);
}
/**
@@ -569,7 +560,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
* @since 1.1
*/
public void clearQueries() {
- queryMap.clear();
+ queryDescriptorMap.clear();
}
/**
@@ -594,19 +585,19 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
}
/**
- * @since 1.1
- */
- public SortedMap<String, Query> getQueryMap() {
- return Collections.unmodifiableSortedMap(queryMap);
+ * @since 4.0
+ */
+ public SortedMap<String, QueryDescriptor> getQueryDescriptorMap() {
+ return Collections.unmodifiableSortedMap(queryDescriptorMap);
}
/**
* Returns an unmodifiable collection of mapped queries.
- *
- * @since 1.1
- */
- public Collection<Query> getQueries() {
- return Collections.unmodifiableCollection(queryMap.values());
+ *
+ * @since 4.0
+ */
+ public Collection<QueryDescriptor> getQueryDescriptors() {
+ return Collections.unmodifiableCollection(queryDescriptorMap.values());
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
index fbd8b55..0f4c837 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.map;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.reflect.ClassDescriptor;
import org.apache.cayenne.reflect.ClassDescriptorMap;
import org.apache.cayenne.reflect.FaultFactory;
@@ -264,9 +265,9 @@ public class EntityResolver implements MappingNamespace, Serializable {
return mappingCache.getProcedures();
}
- public Collection<Query> getQueries() {
+ public Collection<QueryDescriptor> getQueryDescriptors() {
checkMappingCache();
- return mappingCache.getQueries();
+ return mappingCache.getQueryDescriptors();
}
public DbEntity getDbEntity(String name) {
@@ -314,15 +315,15 @@ public class EntityResolver implements MappingNamespace, Serializable {
/**
* Returns a named query or null if no query exists for a given name.
*/
- public Query getQuery(String name) {
+ public QueryDescriptor getQueryDescriptor(String name) {
checkMappingCache();
- Query result = mappingCache.getQuery(name);
+ QueryDescriptor result = mappingCache.getQueryDescriptor(name);
if (result == null) {
// reconstruct cache just in case some of the datamaps
// have changed and now contain the required information
refreshMappingCache();
- result = mappingCache.getQuery(name);
+ result = mappingCache.getQueryDescriptor(name);
}
return result;
}
@@ -552,14 +553,6 @@ public class EntityResolver implements MappingNamespace, Serializable {
return getProcedure(procedureName);
}
- /**
- * @deprecated since 4.0 use {@link #getQuery(String)}.
- */
- @Deprecated
- public Query lookupQuery(String name) {
- return getQuery(name);
- }
-
public synchronized void removeDataMap(DataMap map) {
if (maps.remove(map)) {
refreshMappingCache();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java
index fa12691..101bebd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MapLoader.java
@@ -143,7 +143,7 @@ public class MapLoader extends DefaultHandler {
private ObjRelationship objRelationship;
private DbAttribute attrib;
private Procedure procedure;
- private QueryLoader queryBuilder;
+ private QueryDescriptorLoader queryBuilder;
private String sqlKey;
private String descending;
@@ -1024,27 +1024,11 @@ public class MapLoader extends DefaultHandler {
throw new SAXException("MapLoader::processStartQuery(), no query name.");
}
- String builder = attributes.getValue("", "factory");
+ this.queryBuilder = new QueryDescriptorLoader();
- if (builder == null) {
- builder = SelectQueryBuilder.class.getName();
- } else {
- // TODO: this is a hack to migrate between 1.1M6 and 1.1M7...
- // remove this at some point
- if (builder.equals("org.objectstyle.cayenne.query.SelectQueryBuilder")) {
- builder = SelectQueryBuilder.class.getName();
- }
- // upgrade from v. <= 1.2
- else {
- builder = convertClassNameFromV1_2(builder);
- }
- }
+ String type = attributes.getValue("", "type");
- try {
- queryBuilder = (QueryLoader) Class.forName(builder).newInstance();
- } catch (Exception ex) {
- throw new SAXException("MapLoader::processStartQuery(), invalid query builder: " + builder);
- }
+ queryBuilder.setQueryType(type);
String rootType = attributes.getValue("", "root");
String rootName = attributes.getValue("", "root-name");
@@ -1103,7 +1087,7 @@ public class MapLoader extends DefaultHandler {
}
private void processEndQuery() {
- dataMap.addQuery(queryBuilder.getQuery());
+ dataMap.addQueryDescriptor(queryBuilder.buildQueryDescriptor());
queryBuilder = null;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
index add4e11..4ddbe9c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.commons.collections.collection.CompositeCollection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,7 +42,7 @@ class MappingCache implements MappingNamespace {
protected static final Log logger = LogFactory.getLog(MappingCache.class);
protected Collection<DataMap> maps;
- protected Map<String, Query> queries;
+ protected Map<String, QueryDescriptor> queryDesriptors;
protected Map<String, Embeddable> embeddables;
protected Map<String, SQLResult> results;
protected Map<String, DbEntity> dbEntities;
@@ -55,7 +56,7 @@ class MappingCache implements MappingNamespace {
this.maps = maps;
this.embeddables = new HashMap<>();
- this.queries = new HashMap<>();
+ this.queryDesriptors = new HashMap<>();
this.dbEntities = new HashMap<>();
this.objEntities = new HashMap<>();
this.objEntitiesByClassName = new HashMap<>();
@@ -113,13 +114,13 @@ class MappingCache implements MappingNamespace {
// index embeddables
embeddables.putAll(map.getEmbeddableMap());
- // index queries
- for (Query query : map.getQueries()) {
- String name = query.getName();
- Object existingQuery = queries.put(name, query);
+ // index query descriptors
+ for (QueryDescriptor queryDescriptor : map.getQueryDescriptors()) {
+ String name = queryDescriptor.getName();
+ QueryDescriptor existingQueryDescriptor = queryDesriptors.put(name, queryDescriptor);
- if (existingQuery != null && query != existingQuery) {
- throw new CayenneRuntimeException("More than one Query for name" + name);
+ if (existingQueryDescriptor != null && queryDescriptor != existingQueryDescriptor) {
+ throw new CayenneRuntimeException("More than one QueryDescriptor for name: " + name);
}
}
}
@@ -178,8 +179,8 @@ class MappingCache implements MappingNamespace {
return procedures.get(procedureName);
}
- public Query getQuery(String queryName) {
- return queries.get(queryName);
+ public QueryDescriptor getQueryDescriptor(String queryName) {
+ return queryDesriptors.get(queryName);
}
public DbEntity getDbEntity(String name) {
@@ -255,7 +256,7 @@ class MappingCache implements MappingNamespace {
return c;
}
- public Collection<Query> getQueries() {
+ public Collection<QueryDescriptor> getQueryDescriptors() {
// TODO: LEGACY SUPPORT:
// some downstream code (like Modeler and merge framework) expect
// always fresh list here, so instead of doing the right thing of
@@ -264,14 +265,14 @@ class MappingCache implements MappingNamespace {
if (maps.size() == 0) {
return Collections.emptyList();
}
-
+
if (maps.size() == 1) {
- return maps.iterator().next().getQueries();
+ return maps.iterator().next().getQueryDescriptors();
}
-
+
CompositeCollection c = new CompositeCollection();
for (DataMap map : maps) {
- c.addComposited(map.getQueries());
+ c.addComposited(map.getQueryDescriptors());
}
return c;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
index ab0e414..d4f7697 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* Defines API of a container of DbEntities, ObjEntities, Procedures, Queries
@@ -79,7 +80,7 @@ public interface MappingNamespace {
* Returns Query for a given name, or null if no such Query is found in the
* MappingNamespace.
*/
- Query getQuery(String name);
+ QueryDescriptor getQueryDescriptor(String name);
/**
* Returns all DbEntities in the namespace.
@@ -99,7 +100,7 @@ public interface MappingNamespace {
/**
* Returns all Queries in the namespace.
*/
- Collection<Query> getQueries();
+ Collection<QueryDescriptor> getQueryDescriptors();
/**
* @since 4.0
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/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 46f688a..79b89a1 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
@@ -21,7 +21,7 @@ package org.apache.cayenne.map;
import java.util.Collection;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* A proxy for lazy on-demand initialization of the mapping cache.
@@ -62,8 +62,8 @@ abstract class ProxiedMappingNamespace implements MappingNamespace {
return getDelegate().getProcedure(procedureName);
}
- public Query getQuery(String queryName) {
- return getDelegate().getQuery(queryName);
+ public QueryDescriptor getQueryDescriptor(String queryName) {
+ return getDelegate().getQueryDescriptor(queryName);
}
public DbEntity getDbEntity(String name) {
@@ -94,8 +94,8 @@ abstract class ProxiedMappingNamespace implements MappingNamespace {
return getDelegate().getProcedures();
}
- public Collection<Query> getQueries() {
- return getDelegate().getQueries();
+ public Collection<QueryDescriptor> getQueryDescriptors() {
+ return getDelegate().getQueryDescriptors();
}
public Collection<Embeddable> getEmbeddables() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/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
new file mode 100644
index 0000000..0ea6476
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptorLoader.java
@@ -0,0 +1,214 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.query.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @since 4.0
+ */
+public class QueryDescriptorLoader {
+
+ protected String name;
+ protected String queryType;
+ protected String sql;
+ protected String ejbql;
+ protected Expression qualifier;
+ protected DataMap dataMap;
+ protected String rootType;
+ protected String rootName;
+ protected String resultEntity;
+
+ protected List<Ordering> orderings = new ArrayList<>();
+ protected List<String> prefetches = new ArrayList<>();
+ protected Map<String, String> adapterSql = new HashMap<>();
+ protected Map<String, String> properties = new HashMap<>();
+
+ /**
+ * Builds a Query object based on internal configuration information.
+ */
+ public QueryDescriptor buildQueryDescriptor() {
+ QueryDescriptor descriptor = QueryDescriptor.descriptor(queryType);
+
+ descriptor.setName(name);
+ descriptor.setDataMap(dataMap);
+ descriptor.setRoot(getRoot());
+ descriptor.setProperties(properties);
+
+ switch (queryType) {
+ case QueryDescriptor.SELECT_QUERY:
+ ((SelectQueryDescriptor) descriptor).setQualifier(qualifier);
+ ((SelectQueryDescriptor) descriptor).setOrderings(orderings);
+ ((SelectQueryDescriptor) descriptor).setPrefetches(prefetches);
+ break;
+ case QueryDescriptor.SQL_TEMPLATE:
+ ((SQLTemplateDescriptor) descriptor).setSql(sql);
+ ((SQLTemplateDescriptor) descriptor).setAdapterSql(adapterSql);
+ break;
+ case QueryDescriptor.EJBQL_QUERY:
+ ((EJBQLQueryDescriptor) descriptor).setEjbql(ejbql);
+ break;
+ case QueryDescriptor.PROCEDURE_QUERY:
+ ((ProcedureQueryDescriptor) descriptor).setResultEntityName(resultEntity);
+ break;
+ default:
+ // no additional properties
+ }
+
+ return descriptor;
+ }
+
+ void setName(String name) {
+ this.name = name;
+ }
+
+ void setQueryType(String queryType) {
+ this.queryType = queryType;
+ }
+
+ /**
+ * Determines query root based on configuration info, falls back to a DataMap root if
+ * the data is invalid.
+ *
+ * @throws CayenneRuntimeException if a valid root can't be established.
+ */
+ protected Object getRoot() {
+
+ Object root = null;
+
+ if (rootType == null
+ || MapLoader.DATA_MAP_ROOT.equals(rootType)
+ || rootName == null) {
+ root = dataMap;
+ }
+ else if (MapLoader.OBJ_ENTITY_ROOT.equals(rootType)) {
+ root = dataMap.getObjEntity(rootName);
+ }
+ else if (MapLoader.DB_ENTITY_ROOT.equals(rootType)) {
+ root = dataMap.getDbEntity(rootName);
+ }
+ else if (MapLoader.PROCEDURE_ROOT.equals(rootType)) {
+ root = dataMap.getProcedure(rootName);
+ }
+ else if (MapLoader.JAVA_CLASS_ROOT.equals(rootType)) {
+ // setting root to ObjEntity, since creating a Class requires
+ // the knowledge of the ClassLoader
+ root = dataMap.getObjEntityForJavaClass(rootName);
+ }
+
+ return (root != null) ? root : dataMap;
+ }
+
+ void setResultEntity(String resultEntity) {
+ this.resultEntity = resultEntity;
+ }
+
+ /**
+ * Sets the information pertaining to the root of the query.
+ */
+ void setRoot(DataMap dataMap, String rootType, String rootName) {
+ this.dataMap = dataMap;
+ this.rootType = rootType;
+ this.rootName = rootName;
+ }
+
+ void setEjbql(String ejbql) {
+ this.ejbql = ejbql;
+ }
+
+ /**
+ * Adds raw sql. If adapterClass parameter is not null, sets the SQL string to be
+ * adapter-specific. Otherwise it is used as a default SQL string.
+ */
+ void addSql(String sql, String adapterClass) {
+ if (adapterClass == null) {
+ this.sql = sql;
+ }
+ else {
+ if (adapterSql == null) {
+ adapterSql = new HashMap<>();
+ }
+
+ adapterSql.put(adapterClass, sql);
+ }
+ }
+
+ void setQualifier(String qualifier) {
+ if (qualifier == null || qualifier.trim().length() == 0) {
+ this.qualifier = null;
+ }
+ else {
+ this.qualifier = Expression.fromString(qualifier.trim());
+ }
+ }
+
+ void addProperty(String name, String value) {
+ if (properties == null) {
+ properties = new HashMap<>();
+ }
+
+ properties.put(name, value);
+ }
+
+ void addOrdering(String path, String descending, String ignoreCase) {
+ if (orderings == null) {
+ orderings = new ArrayList<Ordering>();
+ }
+
+ if (path != null && path.trim().length() == 0) {
+ path = null;
+ }
+ boolean isDescending = "true".equalsIgnoreCase(descending);
+ boolean isIgnoringCase = "true".equalsIgnoreCase(ignoreCase);
+
+ SortOrder order;
+
+ if (isDescending) {
+ order = isIgnoringCase
+ ? SortOrder.DESCENDING_INSENSITIVE
+ : SortOrder.DESCENDING;
+ }
+ else {
+ order = isIgnoringCase
+ ? SortOrder.ASCENDING_INSENSITIVE
+ : SortOrder.ASCENDING;
+ }
+
+ orderings.add(new Ordering(path, order));
+ }
+
+ void addPrefetch(String path) {
+ if (path == null || (path != null && path.trim().length() == 0)) {
+ // throw??
+ return;
+ }
+
+ if (prefetches == null) {
+ prefetches = new ArrayList<String>();
+ }
+ prefetches.add(path.trim());
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
index eb7fb37..b6f6070 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
@@ -126,7 +126,7 @@ public enum NameCheckers implements NameChecker {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataMap map = (DataMap) namingContext;
- return map.getQuery(name) != null;
+ return map.getQueryDescriptor(name) != null;
}
},
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
index d520ae4..c3413d0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.query;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
@@ -44,13 +43,6 @@ public abstract class AbstractQuery implements Query {
/**
* @since 3.1
*/
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
- /**
- * @since 3.1
- */
public DataMap getDataMap() {
return dataMap;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
index 1df4b3b..82be088 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
@@ -73,11 +73,6 @@ public abstract class BatchQuery implements Query {
}
@Override
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
- @Override
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
index 5c878ec..9ce3d2f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
@@ -70,10 +70,6 @@ public class EJBQLQuery implements Query, XMLSerializable {
public void setDataMap(DataMap dataMap) {
this.dataMap = dataMap;
}
-
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
public void initWithProperties(Map<String, ?> properties) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java
new file mode 100644
index 0000000..bc0f550
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java
@@ -0,0 +1,82 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.query;
+
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.Map;
+
+public class EJBQLQueryDescriptor extends QueryDescriptor {
+
+ protected String ejbql;
+
+ public EJBQLQueryDescriptor() {
+ this.type = EJBQL_QUERY;
+ }
+
+ /**
+ * Returns EJBQL query string for this query.
+ */
+ public String getEjbql() {
+ return ejbql;
+ }
+
+ /**
+ * Sets EJBQL query string for this query.
+ */
+ public void setEjbql(String ejbql) {
+ this.ejbql = ejbql;
+ }
+
+ @Override
+ public EJBQLQuery buildQuery() {
+ EJBQLQuery ejbqlQuery = new EJBQLQuery(this.getEjbql());
+ ejbqlQuery.setName(this.getName());
+ ejbqlQuery.setDataMap(dataMap);
+ ejbqlQuery.initWithProperties(this.getProperties());
+
+ return ejbqlQuery;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+
+ if (ejbql != null) {
+ encoder.print("<ejbql><![CDATA[");
+ encoder.print(ejbql);
+ encoder.println("]]></ejbql>");
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
index be3cb22..8bcf52b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.query;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
@@ -48,14 +47,6 @@ public abstract class IndirectQuery implements Query {
* @since 3.1
*/
@Override
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
- /**
- * @since 3.1
- */
- @Override
public DataMap getDataMap() {
return dataMap;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
index 034cb59..7218c41 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
@@ -19,11 +19,7 @@
package org.apache.cayenne.query;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.Persistent;
@@ -169,13 +165,11 @@ public class NamedQuery extends IndirectQuery {
* EntityResolver.
*/
protected Query resolveQuery(EntityResolver resolver) {
- Query query = resolver.lookupQuery(getName());
+ QueryDescriptor queryDescriptor = resolver.getQueryDescriptor(getName());
- if (query == null) {
- throw new CayenneRuntimeException("Can't find named query for name '"
- + getName()
- + "'");
- }
+ Query query = queryDescriptor.buildQuery();
+
+ Object root = queryDescriptor.getRoot();
if (query == this) {
throw new CayenneRuntimeException("Named query resolves to self: '"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
index 84adff7..1bd6479 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
@@ -56,7 +56,7 @@ import org.apache.cayenne.util.XMLSerializable;
public class ProcedureQuery extends AbstractQuery implements ParameterizedQuery,
XMLSerializable {
- static final String COLUMN_NAME_CAPITALIZATION_PROPERTY = "cayenne.ProcedureQuery.columnNameCapitalization";
+ public static final String COLUMN_NAME_CAPITALIZATION_PROPERTY = "cayenne.ProcedureQuery.columnNameCapitalization";
/**
* @since 1.2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java
new file mode 100644
index 0000000..ce95e06
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java
@@ -0,0 +1,105 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.query;
+
+import org.apache.cayenne.map.MapLoader;
+import org.apache.cayenne.map.Procedure;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.Map;
+
+public class ProcedureQueryDescriptor extends QueryDescriptor {
+
+ protected String resultEntityName;
+
+ public ProcedureQueryDescriptor() {
+ this.type = PROCEDURE_QUERY;
+ }
+
+ /**
+ * Returns result entity name.
+ */
+ public String getResultEntityName() {
+ return resultEntityName;
+ }
+
+ /**
+ * Sets result entity name.
+ */
+ public void setResultEntityName(String resultEntityName) {
+ this.resultEntityName = resultEntityName;
+ }
+
+ @Override
+ public ProcedureQuery buildQuery() {
+ ProcedureQuery procedureQuery = new ProcedureQuery();
+
+ if (root != null) {
+ procedureQuery.setRoot(root);
+ }
+
+ procedureQuery.setName(this.getName());
+ procedureQuery.setDataMap(dataMap);
+ procedureQuery.setResultEntityName(this.getResultEntityName());
+ procedureQuery.initWithProperties(this.getProperties());
+
+ return procedureQuery;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ encoder.print("\" root=\"");
+ encoder.print(MapLoader.PROCEDURE_ROOT);
+
+ String rootString = null;
+
+ if (root instanceof String) {
+ rootString = root.toString();
+ }
+ else if (root instanceof Procedure) {
+ rootString = ((Procedure) root).getName();
+ }
+
+ if (rootString != null) {
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ if (resultEntityName != null) {
+ encoder.print("\" result-entity=\"");
+ encoder.print(resultEntityName);
+ }
+
+ encoder.println("\">");
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
index 1e5aca7..ebd5ce0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.map.EntityResolver;
/**
* Defines minimal API of a query descriptor that is executable via Cayenne.
*/
-public interface Query extends Serializable, ConfigurationNode {
+public interface Query extends Serializable {
/**
* Returns query runtime parameters. The method is called at various stages of the
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
index d663268..73516fa 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
import java.util.Collection;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
@@ -70,13 +69,6 @@ public class QueryChain implements Query {
}
/**
- * @since 3.1
- */
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
- /**
* Adds a query to the chain.
*/
public void addQuery(Query query) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java
new file mode 100644
index 0000000..d058820
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java
@@ -0,0 +1,238 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.query;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.map.*;
+import org.apache.cayenne.util.XMLEncoder;
+import org.apache.cayenne.util.XMLSerializable;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Generic descriptor of a Cayenne query.
+ *
+ * @since 4.0
+ */
+public class QueryDescriptor implements Serializable, ConfigurationNode, XMLSerializable {
+
+ public static final String SELECT_QUERY = "SelectQuery";
+ public static final String SQL_TEMPLATE = "SQLTemplate";
+ public static final String EJBQL_QUERY = "EJBQLQuery";
+ public static final String PROCEDURE_QUERY = "ProcedureQuery";
+
+ /**
+ * Creates new SelectQuery query descriptor.
+ */
+ public static SelectQueryDescriptor selectQueryDescriptor() {
+ return new SelectQueryDescriptor();
+ }
+
+ /**
+ * Creates new SQLTemplate query descriptor.
+ */
+ public static SQLTemplateDescriptor sqlTemplateDescriptor() {
+ return new SQLTemplateDescriptor();
+ }
+
+ /**
+ * Creates new ProcedureQuery query descriptor.
+ */
+ public static ProcedureQueryDescriptor procedureQueryDescriptor() {
+ return new ProcedureQueryDescriptor();
+ }
+
+ /**
+ * Creates new EJBQLQuery query descriptor.
+ */
+ public static EJBQLQueryDescriptor ejbqlQueryDescriptor() {
+ return new EJBQLQueryDescriptor();
+ }
+
+ /**
+ * Creates query descriptor of a given type.
+ */
+ public static QueryDescriptor descriptor(String type) {
+ switch (type) {
+ case SELECT_QUERY:
+ return selectQueryDescriptor();
+ case SQL_TEMPLATE:
+ return sqlTemplateDescriptor();
+ case EJBQL_QUERY:
+ return ejbqlQueryDescriptor();
+ case PROCEDURE_QUERY:
+ return procedureQueryDescriptor();
+ default:
+ QueryDescriptor descriptor = new QueryDescriptor();
+ descriptor.setType(type);
+ return descriptor;
+ }
+ }
+
+ protected String name;
+ protected String type;
+ protected DataMap dataMap;
+ protected Object root;
+
+ protected Map<String, String> properties = new HashMap<>();
+
+ protected QueryDescriptor() {
+
+ }
+
+ /**
+ * Returns name of the query.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets name of the query.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Returns type of the query.
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets type of the query.
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
+
+ /**
+ * Returns the root of this query.
+ */
+ public Object getRoot() {
+ return root;
+ }
+
+ /**
+ * Sets the root of this query.
+ */
+ public void setRoot(Object root) {
+ this.root = root;
+ }
+
+ /**
+ * Returns map of query properties set up for this query.
+ */
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
+ /**
+ * Returns query property by its name.
+ */
+ public String getProperty(String name) {
+ return properties.get(name);
+ }
+
+ /**
+ * Sets map of query properties for this query.
+ */
+ public void setProperties(Map<String, String> properties) {
+ this.properties = properties;
+ }
+
+ /**
+ * Sets single query property.
+ */
+ public void setProperty(String name, String value) {
+ this.properties.put(name, value);
+ }
+
+ /**
+ * Assembles Cayenne query instance of appropriate type from this descriptor.
+ */
+ public Query buildQuery() {
+ throw new CayenneRuntimeException("Unable to build query object of this type.");
+ }
+
+ @Override
+ public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
+ return visitor.visitQuery(this);
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ String rootString = null;
+ String rootType = null;
+
+ if (root instanceof String) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = root.toString();
+ } else if (root instanceof ObjEntity) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = ((ObjEntity) root).getName();
+ } else if (root instanceof DbEntity) {
+ rootType = MapLoader.DB_ENTITY_ROOT;
+ rootString = ((DbEntity) root).getName();
+ } else if (root instanceof Procedure) {
+ rootType = MapLoader.PROCEDURE_ROOT;
+ rootString = ((Procedure) root).getName();
+ } else if (root instanceof Class<?>) {
+ rootType = MapLoader.JAVA_CLASS_ROOT;
+ rootString = ((Class<?>) root).getName();
+ }
+
+ if (rootType != null) {
+ encoder.print("\" root=\"");
+ encoder.print(rootType);
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
index 8673c58..6c35fa6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
@@ -77,13 +77,6 @@ public class RefreshQuery implements Query {
public RefreshQuery(String... groupKeys) {
this.groupKeys = groupKeys;
}
-
- /**
- * @since 3.1
- */
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
public QueryMetadata getMetaData(EntityResolver resolver) {
return new BaseQueryMetadata();
@@ -128,10 +121,6 @@ public class RefreshQuery implements Query {
public SQLAction createSQLAction(SQLActionVisitor visitor) {
throw new CayenneRuntimeException("Unsupported");
}
-
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
public QueryMetadata getMetaData(EntityResolver resolver) {
QueryMetadata md = query.getMetaData(resolver);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
index 1c75a5b..62c7a8a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
@@ -73,7 +73,7 @@ public class SQLTemplate extends AbstractQuery implements ParameterizedQuery, XM
private static final long serialVersionUID = -3073521388289663641L;
- static final String COLUMN_NAME_CAPITALIZATION_PROPERTY = "cayenne.SQLTemplate.columnNameCapitalization";
+ public static final String COLUMN_NAME_CAPITALIZATION_PROPERTY = "cayenne.SQLTemplate.columnNameCapitalization";
private static final Transformer nullMapTransformer = new Transformer() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java
new file mode 100644
index 0000000..9728565
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java
@@ -0,0 +1,173 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.query;
+
+import org.apache.cayenne.map.*;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeSet;
+
+public class SQLTemplateDescriptor extends QueryDescriptor {
+
+ protected String sql;
+
+ protected Map<String, String> adapterSql = new HashMap<>();
+
+ public SQLTemplateDescriptor() {
+ this.type = SQL_TEMPLATE;
+ }
+
+ /**
+ * Returns default SQL statement for this query.
+ */
+ public String getSql() {
+ return sql;
+ }
+
+ /**
+ * Sets default SQL statement for this query.
+ */
+ public void setSql(String sql) {
+ this.sql = sql;
+ }
+
+ /**
+ * Returns map of db adapter specific SQL statements.
+ */
+ public Map<String, String> getAdapterSql() {
+ return adapterSql;
+ }
+
+ /**
+ * Sets a map db adapter specific SQL statements for this query.
+ */
+ public void setAdapterSql(Map<String, String> adapterSql) {
+ this.adapterSql = adapterSql;
+ }
+
+ @Override
+ public SQLTemplate buildQuery() {
+ SQLTemplate template = new SQLTemplate();
+
+ if (root != null) {
+ template.setRoot(root);
+ }
+
+ template.setName(name);
+ template.setDataMap(dataMap);
+ template.initWithProperties(this.getProperties());
+
+ // init SQL
+ template.setDefaultTemplate(this.getSql());
+
+ Map<String, String> adapterSql = this.getAdapterSql();
+
+ if (adapterSql != null) {
+ for (Map.Entry<String, String> entry : adapterSql.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
+ if (key != null && value != null) {
+ template.setTemplate(key, value);
+ }
+ }
+ }
+
+ return template;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ String rootString = null;
+ String rootType = null;
+
+ if (root instanceof String) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = root.toString();
+ } else if (root instanceof ObjEntity) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = ((ObjEntity) root).getName();
+ } else if (root instanceof DbEntity) {
+ rootType = MapLoader.DB_ENTITY_ROOT;
+ rootString = ((DbEntity) root).getName();
+ } else if (root instanceof Procedure) {
+ rootType = MapLoader.PROCEDURE_ROOT;
+ rootString = ((Procedure) root).getName();
+ } else if (root instanceof Class<?>) {
+ rootType = MapLoader.JAVA_CLASS_ROOT;
+ rootString = ((Class<?>) root).getName();
+ } else if (root instanceof DataMap) {
+ rootType = MapLoader.DATA_MAP_ROOT;
+ rootString = ((DataMap) root).getName();
+ }
+
+ if (rootType != null) {
+ encoder.print("\" root=\"");
+ encoder.print(rootType);
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ // encode default SQL
+ if (sql != null) {
+ encoder.print("<sql><![CDATA[");
+ encoder.print(sql);
+ encoder.println("]]></sql>");
+ }
+
+ // encode adapter SQL
+ if (adapterSql != null && !adapterSql.isEmpty()) {
+
+ // sorting entries by adapter name
+ TreeSet<String> keys = new TreeSet<String>(adapterSql.keySet());
+ for (String key : keys) {
+ String value = adapterSql.get(key);
+
+ if (key != null && value != null) {
+ String sql = value.trim();
+ if (sql.length() > 0) {
+ encoder.print("<sql adapter-class=\"");
+ encoder.print(key);
+ encoder.print("\"><![CDATA[");
+ encoder.print(sql);
+ encoder.println("]]></sql>");
+ }
+ }
+ }
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
[14/16] cayenne git commit: CAY-2060 Move query descriptor classes to
org.apache.cayenne.map package.
Posted by dk...@apache.org.
CAY-2060 Move query descriptor classes to org.apache.cayenne.map package.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3e2b0649
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3e2b0649
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3e2b0649
Branch: refs/heads/master
Commit: 3e2b0649ce503671dc9fd4809d97226f5ddffb42
Parents: aeabc69
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Fri Feb 19 15:18:07 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:52 2016 +0300
----------------------------------------------------------------------
.../DefaultConfigurationNodeParentGetter.java | 2 +-
.../project/upgrade/v8/UpgradeHandler_V8.java | 2 +-
.../validation/DefaultProjectValidator.java | 13 +-
.../project/validation/EJBQLQueryValidator.java | 4 +-
.../validation/EJBQLStatementValidator.java | 2 +-
.../validation/ProcedureQueryValidator.java | 4 +-
.../validation/SQLTemplateValidator.java | 4 +-
.../validation/SelectQueryValidator.java | 2 +
.../BaseConfigurationNodeVisitor.java | 3 +-
.../configuration/ConfigurationNodeVisitor.java | 3 +-
.../java/org/apache/cayenne/map/DataMap.java | 1 -
.../cayenne/map/EJBQLQueryDescriptor.java | 86 +++++++
.../org/apache/cayenne/map/EntityResolver.java | 1 -
.../org/apache/cayenne/map/MappingCache.java | 2 -
.../apache/cayenne/map/MappingNamespace.java | 2 -
.../cayenne/map/ProcedureQueryDescriptor.java | 107 +++++++++
.../cayenne/map/ProxiedMappingNamespace.java | 1 -
.../org/apache/cayenne/map/QueryDescriptor.java | 238 +++++++++++++++++++
.../cayenne/map/SQLTemplateDescriptor.java | 176 ++++++++++++++
.../cayenne/map/SelectQueryDescriptor.java | 223 +++++++++++++++++
.../cayenne/query/EJBQLQueryDescriptor.java | 82 -------
.../org/apache/cayenne/query/NamedQuery.java | 1 +
.../cayenne/query/ProcedureQueryDescriptor.java | 105 --------
.../java/org/apache/cayenne/query/Query.java | 1 +
.../apache/cayenne/query/QueryDescriptor.java | 238 -------------------
.../cayenne/query/SQLTemplateDescriptor.java | 173 --------------
.../cayenne/query/SelectQueryDescriptor.java | 221 -----------------
.../cayenne/map/DataMapNamespaceTest.java | 1 -
.../org/apache/cayenne/map/DataMapTest.java | 1 -
.../apache/cayenne/map/EntityResolverIT.java | 1 -
.../cayenne/map/MockMappingNamespace.java | 2 -
.../cayenne/map/naming/NameCheckersTest.java | 2 +-
.../cayenne/gen/ClassGenerationAction.java | 2 +-
.../gen/ClientClassGenerationAction.java | 3 +-
.../cayenne/gen/ClientDataMapArtifact.java | 2 +-
.../org/apache/cayenne/gen/DataMapArtifact.java | 2 +-
.../cayenne/gen/ClassGenerationActionTest.java | 2 +-
.../cayenne/configuration/event/QueryEvent.java | 2 +-
.../cayenne/modeler/ProjectController.java | 3 +-
.../cayenne/modeler/ProjectTreeFactory.java | 3 +-
.../apache/cayenne/modeler/ProjectTreeView.java | 2 +-
.../modeler/action/CreateQueryAction.java | 2 +-
.../cayenne/modeler/action/FindAction.java | 2 +-
.../modeler/action/ImportEOModelAction.java | 2 +-
.../cayenne/modeler/action/PasteAction.java | 4 +-
.../cayenne/modeler/action/RemoveAction.java | 2 +-
.../cayenne/modeler/dialog/FindDialog.java | 13 +-
.../cayenne/modeler/dialog/query/QueryType.java | 2 +-
.../modeler/dialog/validator/QueryErrorMsg.java | 2 +-
.../validator/ValidationDisplayHandler.java | 3 +-
.../cayenne/modeler/editor/EditorView.java | 2 +-
.../modeler/editor/EjbqlQueryMainTab.java | 2 +-
.../modeler/editor/EjbqlQueryScriptsTab.java | 4 +-
.../cayenne/modeler/editor/EjbqlTabbedView.java | 2 +-
.../editor/ObjectQueryPropertiesPanel.java | 2 +-
.../modeler/editor/ProcedureQueryView.java | 2 +
.../modeler/editor/RawQueryPropertiesPanel.java | 2 +-
.../modeler/editor/SQLTemplateMainTab.java | 1 +
.../modeler/editor/SQLTemplateScriptsTab.java | 4 +-
.../modeler/editor/SQLTemplateTabbedView.java | 2 +-
.../modeler/editor/SelectPropertiesPanel.java | 2 +-
.../modeler/editor/SelectQueryMainTab.java | 2 +
.../modeler/editor/SelectQueryOrderingTab.java | 2 +
.../modeler/editor/SelectQueryTabbedView.java | 2 +-
.../modeler/event/QueryDisplayEvent.java | 3 +-
.../modeler/undo/CreateQueryUndoableEdit.java | 3 +-
.../cayenne/modeler/undo/PasteUndoableEdit.java | 2 +-
.../modeler/undo/RemoveUndoableEdit.java | 3 +-
.../cayenne/modeler/util/CellRenderers.java | 2 +-
.../cayenne/modeler/util/ProjectUtil.java | 2 +-
.../util/state/QueryDisplayEventType.java | 3 +-
.../cayenne/wocompat/EOModelProcessor.java | 7 +-
.../cayenne/wocompat/EOModelProcessorTest.java | 5 +-
73 files changed, 893 insertions(+), 925 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java b/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
index 6dbe6ef..3458c73 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/DefaultConfigurationNodeParentGetter.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
public class DefaultConfigurationNodeParentGetter implements ConfigurationNodeParentGetter {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
index 939a6e4..592569d 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.project.upgrade.UpgradeHandler;
import org.apache.cayenne.project.upgrade.UpgradeMetaData;
import org.apache.cayenne.project.upgrade.UpgradeType;
import org.apache.cayenne.project.upgrade.v7.ProjectUpgrader_V7;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.resource.Resource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
index 5835a5d..f50ecc5 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DefaultProjectValidator.java
@@ -24,18 +24,7 @@ import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.map.Embeddable;
-import org.apache.cayenne.map.EmbeddableAttribute;
-import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.*;
+import org.apache.cayenne.map.*;
import org.apache.cayenne.validation.ValidationResult;
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
index 20a7b61..d44fb50 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLQueryValidator.java
@@ -20,9 +20,7 @@ package org.apache.cayenne.project.validation;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.project.validation.EJBQLStatementValidator.PositionException;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.EJBQLQueryDescriptor;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.EJBQLQueryDescriptor;
import org.apache.cayenne.validation.ValidationResult;
class EJBQLQueryValidator extends ConfigurationNodeValidator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
index 40a98c9..acd5064 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/EJBQLStatementValidator.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ejbql.EJBQLException;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.EJBQLQueryDescriptor;
+import org.apache.cayenne.map.EJBQLQueryDescriptor;
public class EJBQLStatementValidator {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
index 5a259d1..9f031a5 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/ProcedureQueryValidator.java
@@ -20,8 +20,8 @@ package org.apache.cayenne.project.validation;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.query.ProcedureQueryDescriptor;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.ProcedureQueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
index 2899351..8b55418 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SQLTemplateValidator.java
@@ -19,8 +19,8 @@
package org.apache.cayenne.project.validation;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.query.QueryDescriptor;
-import org.apache.cayenne.query.SQLTemplateDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.SQLTemplateDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
index 7a1425c..c0bb5bc 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/SelectQueryValidator.java
@@ -24,6 +24,8 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionException;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.SelectQueryDescriptor;
import org.apache.cayenne.query.*;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.Util;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
index e8badcd..65365b2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/BaseConfigurationNodeVisitor.java
@@ -29,8 +29,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* A {@link ConfigurationNodeVisitor} that does nothing, used as a convenience superclass
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
index 201bfa7..60d2900 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/ConfigurationNodeVisitor.java
@@ -29,8 +29,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* A visitor interface for implementing operations on different types of
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/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 7c04504..b19ad79 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
@@ -28,7 +28,6 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.event.DbEntityListener;
import org.apache.cayenne.map.event.EntityEvent;
import org.apache.cayenne.map.event.ObjEntityListener;
-import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.util.ToStringBuilder;
import org.apache.cayenne.util.Util;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
new file mode 100644
index 0000000..bb550fe
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
@@ -0,0 +1,86 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.Map;
+
+/**
+ * @since 4.0
+ */
+public class EJBQLQueryDescriptor extends QueryDescriptor {
+
+ protected String ejbql;
+
+ public EJBQLQueryDescriptor() {
+ this.type = EJBQL_QUERY;
+ }
+
+ /**
+ * Returns EJBQL query string for this query.
+ */
+ public String getEjbql() {
+ return ejbql;
+ }
+
+ /**
+ * Sets EJBQL query string for this query.
+ */
+ public void setEjbql(String ejbql) {
+ this.ejbql = ejbql;
+ }
+
+ @Override
+ public EJBQLQuery buildQuery() {
+ EJBQLQuery ejbqlQuery = new EJBQLQuery(this.getEjbql());
+ ejbqlQuery.setName(this.getName());
+ ejbqlQuery.setDataMap(dataMap);
+ ejbqlQuery.initWithProperties(this.getProperties());
+
+ return ejbqlQuery;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+
+ if (ejbql != null) {
+ encoder.print("<ejbql><![CDATA[");
+ encoder.print(ejbql);
+ encoder.println("]]></ejbql>");
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
index 0f4c837..9e59735 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -22,7 +22,6 @@ package org.apache.cayenne.map;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.reflect.ClassDescriptor;
import org.apache.cayenne.reflect.ClassDescriptorMap;
import org.apache.cayenne.reflect.FaultFactory;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
index 4ddbe9c..d2704fd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
@@ -26,8 +26,6 @@ import java.util.Map;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
import org.apache.commons.collections.collection.CompositeCollection;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
index d4f7697..7fd4362 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingNamespace.java
@@ -22,8 +22,6 @@ package org.apache.cayenne.map;
import java.util.Collection;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
/**
* Defines API of a container of DbEntities, ObjEntities, Procedures, Queries
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
new file mode 100644
index 0000000..1ea3ea8
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
@@ -0,0 +1,107 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.query.ProcedureQuery;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.Map;
+
+/**
+ * @since 4.0
+ */
+public class ProcedureQueryDescriptor extends QueryDescriptor {
+
+ protected String resultEntityName;
+
+ public ProcedureQueryDescriptor() {
+ this.type = PROCEDURE_QUERY;
+ }
+
+ /**
+ * Returns result entity name.
+ */
+ public String getResultEntityName() {
+ return resultEntityName;
+ }
+
+ /**
+ * Sets result entity name.
+ */
+ public void setResultEntityName(String resultEntityName) {
+ this.resultEntityName = resultEntityName;
+ }
+
+ @Override
+ public ProcedureQuery buildQuery() {
+ ProcedureQuery procedureQuery = new ProcedureQuery();
+
+ if (root != null) {
+ procedureQuery.setRoot(root);
+ }
+
+ procedureQuery.setName(this.getName());
+ procedureQuery.setDataMap(dataMap);
+ procedureQuery.setResultEntityName(this.getResultEntityName());
+ procedureQuery.initWithProperties(this.getProperties());
+
+ return procedureQuery;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ encoder.print("\" root=\"");
+ encoder.print(MapLoader.PROCEDURE_ROOT);
+
+ String rootString = null;
+
+ if (root instanceof String) {
+ rootString = root.toString();
+ }
+ else if (root instanceof Procedure) {
+ rootString = ((Procedure) root).getName();
+ }
+
+ if (rootString != null) {
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ if (resultEntityName != null) {
+ encoder.print("\" result-entity=\"");
+ encoder.print(resultEntityName);
+ }
+
+ encoder.println("\">");
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/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 79b89a1..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
@@ -21,7 +21,6 @@ package org.apache.cayenne.map;
import java.util.Collection;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.query.QueryDescriptor;
/**
* A proxy for lazy on-demand initialization of the mapping cache.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
new file mode 100644
index 0000000..64fd404
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
@@ -0,0 +1,238 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.util.XMLEncoder;
+import org.apache.cayenne.util.XMLSerializable;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Generic descriptor of a Cayenne query.
+ *
+ * @since 4.0
+ */
+public class QueryDescriptor implements Serializable, ConfigurationNode, XMLSerializable {
+
+ public static final String SELECT_QUERY = "SelectQuery";
+ public static final String SQL_TEMPLATE = "SQLTemplate";
+ public static final String EJBQL_QUERY = "EJBQLQuery";
+ public static final String PROCEDURE_QUERY = "ProcedureQuery";
+
+ /**
+ * Creates new SelectQuery query descriptor.
+ */
+ public static SelectQueryDescriptor selectQueryDescriptor() {
+ return new SelectQueryDescriptor();
+ }
+
+ /**
+ * Creates new SQLTemplate query descriptor.
+ */
+ public static SQLTemplateDescriptor sqlTemplateDescriptor() {
+ return new SQLTemplateDescriptor();
+ }
+
+ /**
+ * Creates new ProcedureQuery query descriptor.
+ */
+ public static ProcedureQueryDescriptor procedureQueryDescriptor() {
+ return new ProcedureQueryDescriptor();
+ }
+
+ /**
+ * Creates new EJBQLQuery query descriptor.
+ */
+ public static EJBQLQueryDescriptor ejbqlQueryDescriptor() {
+ return new EJBQLQueryDescriptor();
+ }
+
+ /**
+ * Creates query descriptor of a given type.
+ */
+ public static QueryDescriptor descriptor(String type) {
+ switch (type) {
+ case SELECT_QUERY:
+ return selectQueryDescriptor();
+ case SQL_TEMPLATE:
+ return sqlTemplateDescriptor();
+ case EJBQL_QUERY:
+ return ejbqlQueryDescriptor();
+ case PROCEDURE_QUERY:
+ return procedureQueryDescriptor();
+ default:
+ QueryDescriptor descriptor = new QueryDescriptor();
+ descriptor.setType(type);
+ return descriptor;
+ }
+ }
+
+ protected String name;
+ protected String type;
+ protected DataMap dataMap;
+ protected Object root;
+
+ protected Map<String, String> properties = new HashMap<>();
+
+ protected QueryDescriptor() {
+
+ }
+
+ /**
+ * Returns name of the query.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets name of the query.
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Returns type of the query.
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets type of the query.
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
+
+ /**
+ * Returns the root of this query.
+ */
+ public Object getRoot() {
+ return root;
+ }
+
+ /**
+ * Sets the root of this query.
+ */
+ public void setRoot(Object root) {
+ this.root = root;
+ }
+
+ /**
+ * Returns map of query properties set up for this query.
+ */
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+
+ /**
+ * Returns query property by its name.
+ */
+ public String getProperty(String name) {
+ return properties.get(name);
+ }
+
+ /**
+ * Sets map of query properties for this query.
+ */
+ public void setProperties(Map<String, String> properties) {
+ this.properties = properties;
+ }
+
+ /**
+ * Sets single query property.
+ */
+ public void setProperty(String name, String value) {
+ this.properties.put(name, value);
+ }
+
+ /**
+ * Assembles Cayenne query instance of appropriate type from this descriptor.
+ */
+ public Query buildQuery() {
+ throw new CayenneRuntimeException("Unable to build query object of this type.");
+ }
+
+ @Override
+ public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
+ return visitor.visitQuery(this);
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ String rootString = null;
+ String rootType = null;
+
+ if (root instanceof String) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = root.toString();
+ } else if (root instanceof ObjEntity) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = ((ObjEntity) root).getName();
+ } else if (root instanceof DbEntity) {
+ rootType = MapLoader.DB_ENTITY_ROOT;
+ rootString = ((DbEntity) root).getName();
+ } else if (root instanceof Procedure) {
+ rootType = MapLoader.PROCEDURE_ROOT;
+ rootString = ((Procedure) root).getName();
+ } else if (root instanceof Class<?>) {
+ rootType = MapLoader.JAVA_CLASS_ROOT;
+ rootString = ((Class<?>) root).getName();
+ }
+
+ if (rootType != null) {
+ encoder.print("\" root=\"");
+ encoder.print(rootType);
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
new file mode 100644
index 0000000..7ceea4c
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
@@ -0,0 +1,176 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeSet;
+
+/**
+ * @since 4.0
+ */
+public class SQLTemplateDescriptor extends QueryDescriptor {
+
+ protected String sql;
+
+ protected Map<String, String> adapterSql = new HashMap<>();
+
+ public SQLTemplateDescriptor() {
+ this.type = SQL_TEMPLATE;
+ }
+
+ /**
+ * Returns default SQL statement for this query.
+ */
+ public String getSql() {
+ return sql;
+ }
+
+ /**
+ * Sets default SQL statement for this query.
+ */
+ public void setSql(String sql) {
+ this.sql = sql;
+ }
+
+ /**
+ * Returns map of db adapter specific SQL statements.
+ */
+ public Map<String, String> getAdapterSql() {
+ return adapterSql;
+ }
+
+ /**
+ * Sets a map db adapter specific SQL statements for this query.
+ */
+ public void setAdapterSql(Map<String, String> adapterSql) {
+ this.adapterSql = adapterSql;
+ }
+
+ @Override
+ public SQLTemplate buildQuery() {
+ SQLTemplate template = new SQLTemplate();
+
+ if (root != null) {
+ template.setRoot(root);
+ }
+
+ template.setName(name);
+ template.setDataMap(dataMap);
+ template.initWithProperties(this.getProperties());
+
+ // init SQL
+ template.setDefaultTemplate(this.getSql());
+
+ Map<String, String> adapterSql = this.getAdapterSql();
+
+ if (adapterSql != null) {
+ for (Map.Entry<String, String> entry : adapterSql.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
+ if (key != null && value != null) {
+ template.setTemplate(key, value);
+ }
+ }
+ }
+
+ return template;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ String rootString = null;
+ String rootType = null;
+
+ if (root instanceof String) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = root.toString();
+ } else if (root instanceof ObjEntity) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = ((ObjEntity) root).getName();
+ } else if (root instanceof DbEntity) {
+ rootType = MapLoader.DB_ENTITY_ROOT;
+ rootString = ((DbEntity) root).getName();
+ } else if (root instanceof Procedure) {
+ rootType = MapLoader.PROCEDURE_ROOT;
+ rootString = ((Procedure) root).getName();
+ } else if (root instanceof Class<?>) {
+ rootType = MapLoader.JAVA_CLASS_ROOT;
+ rootString = ((Class<?>) root).getName();
+ } else if (root instanceof DataMap) {
+ rootType = MapLoader.DATA_MAP_ROOT;
+ rootString = ((DataMap) root).getName();
+ }
+
+ if (rootType != null) {
+ encoder.print("\" root=\"");
+ encoder.print(rootType);
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ // encode default SQL
+ if (sql != null) {
+ encoder.print("<sql><![CDATA[");
+ encoder.print(sql);
+ encoder.println("]]></sql>");
+ }
+
+ // encode adapter SQL
+ if (adapterSql != null && !adapterSql.isEmpty()) {
+
+ // sorting entries by adapter name
+ TreeSet<String> keys = new TreeSet<String>(adapterSql.keySet());
+ for (String key : keys) {
+ String value = adapterSql.get(key);
+
+ if (key != null && value != null) {
+ String sql = value.trim();
+ if (sql.length() > 0) {
+ encoder.print("<sql adapter-class=\"");
+ encoder.print(key);
+ encoder.print("\"><![CDATA[");
+ encoder.print(sql);
+ encoder.println("]]></sql>");
+ }
+ }
+ }
+ }
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
new file mode 100644
index 0000000..fafe15b
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
@@ -0,0 +1,223 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.query.Ordering;
+import org.apache.cayenne.query.PrefetchTreeNode;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @since 4.0
+ */
+public class SelectQueryDescriptor extends QueryDescriptor {
+
+ protected Expression qualifier;
+
+ protected List<Ordering> orderings = new ArrayList<>();
+ protected List<String> prefetches = new ArrayList<>();
+
+ public SelectQueryDescriptor() {
+ this.type = SELECT_QUERY;
+ }
+
+ public void setDistinct(boolean value) {
+ setProperty(SelectQuery.DISTINCT_PROPERTY, String.valueOf(value));
+ }
+
+ public boolean isDistinct() {
+ String distinct = getProperty(SelectQuery.DISTINCT_PROPERTY);
+
+ return distinct != null ? Boolean.valueOf(distinct) : false;
+ }
+
+ /**
+ * Returns qualifier of this query.
+ */
+ public Expression getQualifier() {
+ return qualifier;
+ }
+
+ /**
+ * Sets qualifier for this query.
+ */
+ public void setQualifier(Expression qualifier) {
+ this.qualifier = qualifier;
+ }
+
+ /**
+ * Returns list of orderings for this query.
+ */
+ public List<Ordering> getOrderings() {
+ return orderings;
+ }
+
+ /**
+ * Sets list of orderings for this query.
+ */
+ public void setOrderings(List<Ordering> orderings) {
+ this.orderings = orderings;
+ }
+
+ /**
+ * Adds single ordering for this query.
+ */
+ public void addOrdering(Ordering ordering) {
+ this.orderings.add(ordering);
+ }
+
+ /**
+ * Removes single ordering from this query.
+ */
+ public void removeOrdering(Ordering ordering) {
+ this.orderings.remove(ordering);
+ }
+
+ /**
+ * Returns list of prefetch paths for this query.
+ */
+ public List<String> getPrefetches() {
+ return prefetches;
+ }
+
+ /**
+ * Sets list of prefetch paths for this query.
+ */
+ public void setPrefetches(List<String> prefetches) {
+ this.prefetches = prefetches;
+ }
+
+ /**
+ * Adds single prefetch path to this query.
+ */
+ public void addPrefetch(String prefetchPath) {
+ this.prefetches.add(prefetchPath);
+ }
+
+ /**
+ * Removes single prefetch path from this query.
+ */
+ public void removePrefetch(String prefetchPath) {
+ this.prefetches.remove(prefetchPath);
+ }
+
+ @Override
+ public SelectQuery<?> buildQuery() {
+ SelectQuery<Object> selectQuery = new SelectQuery<>();
+ selectQuery.setRoot(this.getRoot());
+ selectQuery.setName(this.getName());
+ selectQuery.setDataMap(dataMap);
+ selectQuery.setQualifier(this.getQualifier());
+
+ List<Ordering> orderings = this.getOrderings();
+
+ if (orderings != null && !orderings.isEmpty()) {
+ selectQuery.addOrderings(orderings);
+ }
+
+ List<String> prefetches = this.getPrefetches();
+
+ if (prefetches != null && !prefetches.isEmpty()) {
+ for (String prefetch : prefetches) {
+ selectQuery.addPrefetch(prefetch);
+ }
+ }
+
+ // init properties
+ selectQuery.initWithProperties(this.getProperties());
+
+ return selectQuery;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ String rootString = null;
+ String rootType = null;
+
+ if (root instanceof String) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = root.toString();
+ } else if (root instanceof ObjEntity) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = ((ObjEntity) root).getName();
+ } else if (root instanceof DbEntity) {
+ rootType = MapLoader.DB_ENTITY_ROOT;
+ rootString = ((DbEntity) root).getName();
+ } else if (root instanceof Procedure) {
+ rootType = MapLoader.PROCEDURE_ROOT;
+ rootString = ((Procedure) root).getName();
+ } else if (root instanceof Class<?>) {
+ rootType = MapLoader.JAVA_CLASS_ROOT;
+ rootString = ((Class<?>) root).getName();
+ }
+
+ if (rootType != null) {
+ encoder.print("\" root=\"");
+ encoder.print(rootType);
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ // encode qualifier
+ if (qualifier != null) {
+ encoder.print("<qualifier>");
+ qualifier.encodeAsXML(encoder);
+ encoder.println("</qualifier>");
+ }
+
+ // encode orderings
+ if (orderings != null && !orderings.isEmpty()) {
+ for (Ordering ordering : orderings) {
+ ordering.encodeAsXML(encoder);
+ }
+ }
+
+ PrefetchTreeNode prefetchTree = new PrefetchTreeNode();
+
+ for (String prefetchPath : prefetches) {
+ PrefetchTreeNode node = prefetchTree.addPath(prefetchPath);
+ node.setSemantics(PrefetchTreeNode.UNDEFINED_SEMANTICS);
+ node.setPhantom(false);
+ }
+
+ prefetchTree.encodeAsXML(encoder);
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java
deleted file mode 100644
index bc0f550..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQueryDescriptor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-package org.apache.cayenne.query;
-
-import org.apache.cayenne.util.XMLEncoder;
-
-import java.util.Map;
-
-public class EJBQLQueryDescriptor extends QueryDescriptor {
-
- protected String ejbql;
-
- public EJBQLQueryDescriptor() {
- this.type = EJBQL_QUERY;
- }
-
- /**
- * Returns EJBQL query string for this query.
- */
- public String getEjbql() {
- return ejbql;
- }
-
- /**
- * Sets EJBQL query string for this query.
- */
- public void setEjbql(String ejbql) {
- this.ejbql = ejbql;
- }
-
- @Override
- public EJBQLQuery buildQuery() {
- EJBQLQuery ejbqlQuery = new EJBQLQuery(this.getEjbql());
- ejbqlQuery.setName(this.getName());
- ejbqlQuery.setDataMap(dataMap);
- ejbqlQuery.initWithProperties(this.getProperties());
-
- return ejbqlQuery;
- }
-
- @Override
- public void encodeAsXML(XMLEncoder encoder) {
- encoder.print("<query name=\"");
- encoder.print(getName());
- encoder.print("\" type=\"");
- encoder.print(type);
- encoder.println("\">");
-
- encoder.indent(1);
-
- // print properties
- for (Map.Entry<String, String> property : properties.entrySet()) {
- encoder.printProperty(property.getKey(), property.getValue());
- }
-
-
- if (ejbql != null) {
- encoder.print("<ejbql><![CDATA[");
- encoder.print(ejbql);
- encoder.println("]]></ejbql>");
- }
-
- encoder.indent(-1);
- encoder.println("</query>");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
index 7218c41..d24a4ce 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/NamedQuery.java
@@ -24,6 +24,7 @@ import java.util.*;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.EqualsBuilder;
import org.apache.cayenne.util.HashCodeBuilder;
import org.apache.cayenne.util.Util;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java
deleted file mode 100644
index ce95e06..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/ProcedureQueryDescriptor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-package org.apache.cayenne.query;
-
-import org.apache.cayenne.map.MapLoader;
-import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.util.XMLEncoder;
-
-import java.util.Map;
-
-public class ProcedureQueryDescriptor extends QueryDescriptor {
-
- protected String resultEntityName;
-
- public ProcedureQueryDescriptor() {
- this.type = PROCEDURE_QUERY;
- }
-
- /**
- * Returns result entity name.
- */
- public String getResultEntityName() {
- return resultEntityName;
- }
-
- /**
- * Sets result entity name.
- */
- public void setResultEntityName(String resultEntityName) {
- this.resultEntityName = resultEntityName;
- }
-
- @Override
- public ProcedureQuery buildQuery() {
- ProcedureQuery procedureQuery = new ProcedureQuery();
-
- if (root != null) {
- procedureQuery.setRoot(root);
- }
-
- procedureQuery.setName(this.getName());
- procedureQuery.setDataMap(dataMap);
- procedureQuery.setResultEntityName(this.getResultEntityName());
- procedureQuery.initWithProperties(this.getProperties());
-
- return procedureQuery;
- }
-
- @Override
- public void encodeAsXML(XMLEncoder encoder) {
- encoder.print("<query name=\"");
- encoder.print(getName());
- encoder.print("\" type=\"");
- encoder.print(type);
-
- encoder.print("\" root=\"");
- encoder.print(MapLoader.PROCEDURE_ROOT);
-
- String rootString = null;
-
- if (root instanceof String) {
- rootString = root.toString();
- }
- else if (root instanceof Procedure) {
- rootString = ((Procedure) root).getName();
- }
-
- if (rootString != null) {
- encoder.print("\" root-name=\"");
- encoder.print(rootString);
- }
-
- if (resultEntityName != null) {
- encoder.print("\" result-entity=\"");
- encoder.print(resultEntityName);
- }
-
- encoder.println("\">");
- encoder.indent(1);
-
- // print properties
- for (Map.Entry<String, String> property : properties.entrySet()) {
- encoder.printProperty(property.getKey(), property.getValue());
- }
-
- encoder.indent(-1);
- encoder.println("</query>");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
index 62341d8..0dbfc92 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
import org.apache.cayenne.access.QueryEngine;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* Defines minimal API of a query descriptor that is executable via Cayenne.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java
deleted file mode 100644
index d058820..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryDescriptor.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-package org.apache.cayenne.query;
-
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
-import org.apache.cayenne.map.*;
-import org.apache.cayenne.util.XMLEncoder;
-import org.apache.cayenne.util.XMLSerializable;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Generic descriptor of a Cayenne query.
- *
- * @since 4.0
- */
-public class QueryDescriptor implements Serializable, ConfigurationNode, XMLSerializable {
-
- public static final String SELECT_QUERY = "SelectQuery";
- public static final String SQL_TEMPLATE = "SQLTemplate";
- public static final String EJBQL_QUERY = "EJBQLQuery";
- public static final String PROCEDURE_QUERY = "ProcedureQuery";
-
- /**
- * Creates new SelectQuery query descriptor.
- */
- public static SelectQueryDescriptor selectQueryDescriptor() {
- return new SelectQueryDescriptor();
- }
-
- /**
- * Creates new SQLTemplate query descriptor.
- */
- public static SQLTemplateDescriptor sqlTemplateDescriptor() {
- return new SQLTemplateDescriptor();
- }
-
- /**
- * Creates new ProcedureQuery query descriptor.
- */
- public static ProcedureQueryDescriptor procedureQueryDescriptor() {
- return new ProcedureQueryDescriptor();
- }
-
- /**
- * Creates new EJBQLQuery query descriptor.
- */
- public static EJBQLQueryDescriptor ejbqlQueryDescriptor() {
- return new EJBQLQueryDescriptor();
- }
-
- /**
- * Creates query descriptor of a given type.
- */
- public static QueryDescriptor descriptor(String type) {
- switch (type) {
- case SELECT_QUERY:
- return selectQueryDescriptor();
- case SQL_TEMPLATE:
- return sqlTemplateDescriptor();
- case EJBQL_QUERY:
- return ejbqlQueryDescriptor();
- case PROCEDURE_QUERY:
- return procedureQueryDescriptor();
- default:
- QueryDescriptor descriptor = new QueryDescriptor();
- descriptor.setType(type);
- return descriptor;
- }
- }
-
- protected String name;
- protected String type;
- protected DataMap dataMap;
- protected Object root;
-
- protected Map<String, String> properties = new HashMap<>();
-
- protected QueryDescriptor() {
-
- }
-
- /**
- * Returns name of the query.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets name of the query.
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Returns type of the query.
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets type of the query.
- */
- public void setType(String type) {
- this.type = type;
- }
-
- public DataMap getDataMap() {
- return dataMap;
- }
-
- public void setDataMap(DataMap dataMap) {
- this.dataMap = dataMap;
- }
-
- /**
- * Returns the root of this query.
- */
- public Object getRoot() {
- return root;
- }
-
- /**
- * Sets the root of this query.
- */
- public void setRoot(Object root) {
- this.root = root;
- }
-
- /**
- * Returns map of query properties set up for this query.
- */
- public Map<String, String> getProperties() {
- return properties;
- }
-
- /**
- * Returns query property by its name.
- */
- public String getProperty(String name) {
- return properties.get(name);
- }
-
- /**
- * Sets map of query properties for this query.
- */
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-
- /**
- * Sets single query property.
- */
- public void setProperty(String name, String value) {
- this.properties.put(name, value);
- }
-
- /**
- * Assembles Cayenne query instance of appropriate type from this descriptor.
- */
- public Query buildQuery() {
- throw new CayenneRuntimeException("Unable to build query object of this type.");
- }
-
- @Override
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
- @Override
- public void encodeAsXML(XMLEncoder encoder) {
- encoder.print("<query name=\"");
- encoder.print(getName());
- encoder.print("\" type=\"");
- encoder.print(type);
-
- String rootString = null;
- String rootType = null;
-
- if (root instanceof String) {
- rootType = MapLoader.OBJ_ENTITY_ROOT;
- rootString = root.toString();
- } else if (root instanceof ObjEntity) {
- rootType = MapLoader.OBJ_ENTITY_ROOT;
- rootString = ((ObjEntity) root).getName();
- } else if (root instanceof DbEntity) {
- rootType = MapLoader.DB_ENTITY_ROOT;
- rootString = ((DbEntity) root).getName();
- } else if (root instanceof Procedure) {
- rootType = MapLoader.PROCEDURE_ROOT;
- rootString = ((Procedure) root).getName();
- } else if (root instanceof Class<?>) {
- rootType = MapLoader.JAVA_CLASS_ROOT;
- rootString = ((Class<?>) root).getName();
- }
-
- if (rootType != null) {
- encoder.print("\" root=\"");
- encoder.print(rootType);
- encoder.print("\" root-name=\"");
- encoder.print(rootString);
- }
-
- encoder.println("\">");
-
- encoder.indent(1);
-
- for (Map.Entry<String, String> property : properties.entrySet()) {
- encoder.printProperty(property.getKey(), property.getValue());
- }
-
- encoder.indent(-1);
- encoder.println("</query>");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java
deleted file mode 100644
index 9728565..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplateDescriptor.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-package org.apache.cayenne.query;
-
-import org.apache.cayenne.map.*;
-import org.apache.cayenne.util.XMLEncoder;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeSet;
-
-public class SQLTemplateDescriptor extends QueryDescriptor {
-
- protected String sql;
-
- protected Map<String, String> adapterSql = new HashMap<>();
-
- public SQLTemplateDescriptor() {
- this.type = SQL_TEMPLATE;
- }
-
- /**
- * Returns default SQL statement for this query.
- */
- public String getSql() {
- return sql;
- }
-
- /**
- * Sets default SQL statement for this query.
- */
- public void setSql(String sql) {
- this.sql = sql;
- }
-
- /**
- * Returns map of db adapter specific SQL statements.
- */
- public Map<String, String> getAdapterSql() {
- return adapterSql;
- }
-
- /**
- * Sets a map db adapter specific SQL statements for this query.
- */
- public void setAdapterSql(Map<String, String> adapterSql) {
- this.adapterSql = adapterSql;
- }
-
- @Override
- public SQLTemplate buildQuery() {
- SQLTemplate template = new SQLTemplate();
-
- if (root != null) {
- template.setRoot(root);
- }
-
- template.setName(name);
- template.setDataMap(dataMap);
- template.initWithProperties(this.getProperties());
-
- // init SQL
- template.setDefaultTemplate(this.getSql());
-
- Map<String, String> adapterSql = this.getAdapterSql();
-
- if (adapterSql != null) {
- for (Map.Entry<String, String> entry : adapterSql.entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- if (key != null && value != null) {
- template.setTemplate(key, value);
- }
- }
- }
-
- return template;
- }
-
- @Override
- public void encodeAsXML(XMLEncoder encoder) {
- encoder.print("<query name=\"");
- encoder.print(getName());
- encoder.print("\" type=\"");
- encoder.print(type);
-
- String rootString = null;
- String rootType = null;
-
- if (root instanceof String) {
- rootType = MapLoader.OBJ_ENTITY_ROOT;
- rootString = root.toString();
- } else if (root instanceof ObjEntity) {
- rootType = MapLoader.OBJ_ENTITY_ROOT;
- rootString = ((ObjEntity) root).getName();
- } else if (root instanceof DbEntity) {
- rootType = MapLoader.DB_ENTITY_ROOT;
- rootString = ((DbEntity) root).getName();
- } else if (root instanceof Procedure) {
- rootType = MapLoader.PROCEDURE_ROOT;
- rootString = ((Procedure) root).getName();
- } else if (root instanceof Class<?>) {
- rootType = MapLoader.JAVA_CLASS_ROOT;
- rootString = ((Class<?>) root).getName();
- } else if (root instanceof DataMap) {
- rootType = MapLoader.DATA_MAP_ROOT;
- rootString = ((DataMap) root).getName();
- }
-
- if (rootType != null) {
- encoder.print("\" root=\"");
- encoder.print(rootType);
- encoder.print("\" root-name=\"");
- encoder.print(rootString);
- }
-
- encoder.println("\">");
-
- encoder.indent(1);
-
- // print properties
- for (Map.Entry<String, String> property : properties.entrySet()) {
- encoder.printProperty(property.getKey(), property.getValue());
- }
-
- // encode default SQL
- if (sql != null) {
- encoder.print("<sql><![CDATA[");
- encoder.print(sql);
- encoder.println("]]></sql>");
- }
-
- // encode adapter SQL
- if (adapterSql != null && !adapterSql.isEmpty()) {
-
- // sorting entries by adapter name
- TreeSet<String> keys = new TreeSet<String>(adapterSql.keySet());
- for (String key : keys) {
- String value = adapterSql.get(key);
-
- if (key != null && value != null) {
- String sql = value.trim();
- if (sql.length() > 0) {
- encoder.print("<sql adapter-class=\"");
- encoder.print(key);
- encoder.print("\"><![CDATA[");
- encoder.print(sql);
- encoder.println("]]></sql>");
- }
- }
- }
- }
-
- encoder.indent(-1);
- encoder.println("</query>");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java
deleted file mode 100644
index bd50f6f..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-package org.apache.cayenne.query;
-
-import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.MapLoader;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.util.XMLEncoder;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class SelectQueryDescriptor extends QueryDescriptor {
-
- protected Expression qualifier;
-
- protected List<Ordering> orderings = new ArrayList<>();
- protected List<String> prefetches = new ArrayList<>();
-
- public SelectQueryDescriptor() {
- this.type = SELECT_QUERY;
- }
-
- public void setDistinct(boolean value) {
- setProperty(SelectQuery.DISTINCT_PROPERTY, String.valueOf(value));
- }
-
- public boolean isDistinct() {
- String distinct = getProperty(SelectQuery.DISTINCT_PROPERTY);
-
- return distinct != null ? Boolean.valueOf(distinct) : false;
- }
-
- /**
- * Returns qualifier of this query.
- */
- public Expression getQualifier() {
- return qualifier;
- }
-
- /**
- * Sets qualifier for this query.
- */
- public void setQualifier(Expression qualifier) {
- this.qualifier = qualifier;
- }
-
- /**
- * Returns list of orderings for this query.
- */
- public List<Ordering> getOrderings() {
- return orderings;
- }
-
- /**
- * Sets list of orderings for this query.
- */
- public void setOrderings(List<Ordering> orderings) {
- this.orderings = orderings;
- }
-
- /**
- * Adds single ordering for this query.
- */
- public void addOrdering(Ordering ordering) {
- this.orderings.add(ordering);
- }
-
- /**
- * Removes single ordering from this query.
- */
- public void removeOrdering(Ordering ordering) {
- this.orderings.remove(ordering);
- }
-
- /**
- * Returns list of prefetch paths for this query.
- */
- public List<String> getPrefetches() {
- return prefetches;
- }
-
- /**
- * Sets list of prefetch paths for this query.
- */
- public void setPrefetches(List<String> prefetches) {
- this.prefetches = prefetches;
- }
-
- /**
- * Adds single prefetch path to this query.
- */
- public void addPrefetch(String prefetchPath) {
- this.prefetches.add(prefetchPath);
- }
-
- /**
- * Removes single prefetch path from this query.
- */
- public void removePrefetch(String prefetchPath) {
- this.prefetches.remove(prefetchPath);
- }
-
- @Override
- public SelectQuery<?> buildQuery() {
- SelectQuery<Object> selectQuery = new SelectQuery<>();
- selectQuery.setRoot(this.getRoot());
- selectQuery.setName(this.getName());
- selectQuery.setDataMap(dataMap);
- selectQuery.setQualifier(this.getQualifier());
-
- List<Ordering> orderings = this.getOrderings();
-
- if (orderings != null && !orderings.isEmpty()) {
- selectQuery.addOrderings(orderings);
- }
-
- List<String> prefetches = this.getPrefetches();
-
- if (prefetches != null && !prefetches.isEmpty()) {
- for (String prefetch : prefetches) {
- selectQuery.addPrefetch(prefetch);
- }
- }
-
- // init properties
- selectQuery.initWithProperties(this.getProperties());
-
- return selectQuery;
- }
-
- @Override
- public void encodeAsXML(XMLEncoder encoder) {
- encoder.print("<query name=\"");
- encoder.print(getName());
- encoder.print("\" type=\"");
- encoder.print(type);
-
- String rootString = null;
- String rootType = null;
-
- if (root instanceof String) {
- rootType = MapLoader.OBJ_ENTITY_ROOT;
- rootString = root.toString();
- } else if (root instanceof ObjEntity) {
- rootType = MapLoader.OBJ_ENTITY_ROOT;
- rootString = ((ObjEntity) root).getName();
- } else if (root instanceof DbEntity) {
- rootType = MapLoader.DB_ENTITY_ROOT;
- rootString = ((DbEntity) root).getName();
- } else if (root instanceof Procedure) {
- rootType = MapLoader.PROCEDURE_ROOT;
- rootString = ((Procedure) root).getName();
- } else if (root instanceof Class<?>) {
- rootType = MapLoader.JAVA_CLASS_ROOT;
- rootString = ((Class<?>) root).getName();
- }
-
- if (rootType != null) {
- encoder.print("\" root=\"");
- encoder.print(rootType);
- encoder.print("\" root-name=\"");
- encoder.print(rootString);
- }
-
- encoder.println("\">");
-
- encoder.indent(1);
-
- // print properties
- for (Map.Entry<String, String> property : properties.entrySet()) {
- encoder.printProperty(property.getKey(), property.getValue());
- }
-
- // encode qualifier
- if (qualifier != null) {
- encoder.print("<qualifier>");
- qualifier.encodeAsXML(encoder);
- encoder.println("</qualifier>");
- }
-
- // encode orderings
- if (orderings != null && !orderings.isEmpty()) {
- for (Ordering ordering : orderings) {
- ordering.encodeAsXML(encoder);
- }
- }
-
- PrefetchTreeNode prefetchTree = new PrefetchTreeNode();
-
- for (String prefetchPath : prefetches) {
- PrefetchTreeNode node = prefetchTree.addPath(prefetchPath);
- node.setSemantics(PrefetchTreeNode.UNDEFINED_SEMANTICS);
- node.setPhantom(false);
- }
-
- prefetchTree.encodeAsXML(encoder);
-
- encoder.indent(-1);
- encoder.println("</query>");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
index 30ed699..b60dcd1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.query.QueryDescriptor;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
index 4fa8d33..87be992 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
index 058a970..56f28ca 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
@@ -23,7 +23,6 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
index 8c932e8..73cc8ff 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.cayenne.Persistent;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
public class MockMappingNamespace implements MappingNamespace {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
index 03102f5..ad67222 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index d333919..f7471a6 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.access.loader.NamePatternMatcher;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.commons.logging.Log;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
index 1953e34..0b9a555 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
@@ -21,8 +21,7 @@ package org.apache.cayenne.gen;
import java.util.Collection;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* @since 3.0
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
index e5d90d5..0e6da3e 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.naming.NameConverter;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.Util;
public class ClientDataMapArtifact extends DataMapArtifact {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
index 294a381..838f1c6 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.LinkedList;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.query.*;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.map.naming.NameConverter;
import org.apache.velocity.VelocityContext;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
index 0bf1058..9379e21 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
index 2cff378..58150e6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.configuration.event;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.event.MapEvent;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* An event generated when a Query object is added to a DataMap,
[03/16] cayenne git commit: CAY-2060 Ongoing work on replacing actual
query objects stored in the DataMap with query descriptors.
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java
new file mode 100644
index 0000000..bd50f6f
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryDescriptor.java
@@ -0,0 +1,221 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.query;
+
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.MapLoader;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.Procedure;
+import org.apache.cayenne.util.XMLEncoder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class SelectQueryDescriptor extends QueryDescriptor {
+
+ protected Expression qualifier;
+
+ protected List<Ordering> orderings = new ArrayList<>();
+ protected List<String> prefetches = new ArrayList<>();
+
+ public SelectQueryDescriptor() {
+ this.type = SELECT_QUERY;
+ }
+
+ public void setDistinct(boolean value) {
+ setProperty(SelectQuery.DISTINCT_PROPERTY, String.valueOf(value));
+ }
+
+ public boolean isDistinct() {
+ String distinct = getProperty(SelectQuery.DISTINCT_PROPERTY);
+
+ return distinct != null ? Boolean.valueOf(distinct) : false;
+ }
+
+ /**
+ * Returns qualifier of this query.
+ */
+ public Expression getQualifier() {
+ return qualifier;
+ }
+
+ /**
+ * Sets qualifier for this query.
+ */
+ public void setQualifier(Expression qualifier) {
+ this.qualifier = qualifier;
+ }
+
+ /**
+ * Returns list of orderings for this query.
+ */
+ public List<Ordering> getOrderings() {
+ return orderings;
+ }
+
+ /**
+ * Sets list of orderings for this query.
+ */
+ public void setOrderings(List<Ordering> orderings) {
+ this.orderings = orderings;
+ }
+
+ /**
+ * Adds single ordering for this query.
+ */
+ public void addOrdering(Ordering ordering) {
+ this.orderings.add(ordering);
+ }
+
+ /**
+ * Removes single ordering from this query.
+ */
+ public void removeOrdering(Ordering ordering) {
+ this.orderings.remove(ordering);
+ }
+
+ /**
+ * Returns list of prefetch paths for this query.
+ */
+ public List<String> getPrefetches() {
+ return prefetches;
+ }
+
+ /**
+ * Sets list of prefetch paths for this query.
+ */
+ public void setPrefetches(List<String> prefetches) {
+ this.prefetches = prefetches;
+ }
+
+ /**
+ * Adds single prefetch path to this query.
+ */
+ public void addPrefetch(String prefetchPath) {
+ this.prefetches.add(prefetchPath);
+ }
+
+ /**
+ * Removes single prefetch path from this query.
+ */
+ public void removePrefetch(String prefetchPath) {
+ this.prefetches.remove(prefetchPath);
+ }
+
+ @Override
+ public SelectQuery<?> buildQuery() {
+ SelectQuery<Object> selectQuery = new SelectQuery<>();
+ selectQuery.setRoot(this.getRoot());
+ selectQuery.setName(this.getName());
+ selectQuery.setDataMap(dataMap);
+ selectQuery.setQualifier(this.getQualifier());
+
+ List<Ordering> orderings = this.getOrderings();
+
+ if (orderings != null && !orderings.isEmpty()) {
+ selectQuery.addOrderings(orderings);
+ }
+
+ List<String> prefetches = this.getPrefetches();
+
+ if (prefetches != null && !prefetches.isEmpty()) {
+ for (String prefetch : prefetches) {
+ selectQuery.addPrefetch(prefetch);
+ }
+ }
+
+ // init properties
+ selectQuery.initWithProperties(this.getProperties());
+
+ return selectQuery;
+ }
+
+ @Override
+ public void encodeAsXML(XMLEncoder encoder) {
+ encoder.print("<query name=\"");
+ encoder.print(getName());
+ encoder.print("\" type=\"");
+ encoder.print(type);
+
+ String rootString = null;
+ String rootType = null;
+
+ if (root instanceof String) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = root.toString();
+ } else if (root instanceof ObjEntity) {
+ rootType = MapLoader.OBJ_ENTITY_ROOT;
+ rootString = ((ObjEntity) root).getName();
+ } else if (root instanceof DbEntity) {
+ rootType = MapLoader.DB_ENTITY_ROOT;
+ rootString = ((DbEntity) root).getName();
+ } else if (root instanceof Procedure) {
+ rootType = MapLoader.PROCEDURE_ROOT;
+ rootString = ((Procedure) root).getName();
+ } else if (root instanceof Class<?>) {
+ rootType = MapLoader.JAVA_CLASS_ROOT;
+ rootString = ((Class<?>) root).getName();
+ }
+
+ if (rootType != null) {
+ encoder.print("\" root=\"");
+ encoder.print(rootType);
+ encoder.print("\" root-name=\"");
+ encoder.print(rootString);
+ }
+
+ encoder.println("\">");
+
+ encoder.indent(1);
+
+ // print properties
+ for (Map.Entry<String, String> property : properties.entrySet()) {
+ encoder.printProperty(property.getKey(), property.getValue());
+ }
+
+ // encode qualifier
+ if (qualifier != null) {
+ encoder.print("<qualifier>");
+ qualifier.encodeAsXML(encoder);
+ encoder.println("</qualifier>");
+ }
+
+ // encode orderings
+ if (orderings != null && !orderings.isEmpty()) {
+ for (Ordering ordering : orderings) {
+ ordering.encodeAsXML(encoder);
+ }
+ }
+
+ PrefetchTreeNode prefetchTree = new PrefetchTreeNode();
+
+ for (String prefetchPath : prefetches) {
+ PrefetchTreeNode node = prefetchTree.addPath(prefetchPath);
+ node.setSemantics(PrefetchTreeNode.UNDEFINED_SEMANTICS);
+ node.setPhantom(false);
+ }
+
+ prefetchTree.encodeAsXML(encoder);
+
+ encoder.indent(-1);
+ encoder.println("</query>");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
index 436f1d4..94322d2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
@@ -53,13 +53,6 @@ class IncrementalQuery implements Query {
this.query = query;
this.cacheKey = cacheKey;
}
-
- /**
- * @since 3.1
- */
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
public QueryMetadata getMetaData(EntityResolver resolver) {
final QueryMetadata metadata = query.getMetaData(resolver);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
index 868e712..4982d28 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
@@ -68,13 +68,6 @@ class RangeQuery implements Query {
this.originatingQuery = originatingQuery;
}
- /**
- * @since 3.1
- */
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
-
public QueryMetadata getMetaData(EntityResolver resolver) {
final QueryMetadata originatingMetadata = originatingQuery.getMetaData(resolver);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
index 042b0cc..0a74c29 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
@@ -111,17 +111,17 @@ public class DataMapNamespaceTest {
public void testGetQuery() throws Exception {
MockMappingNamespace namespace = new MockMappingNamespace();
map.setNamespace(namespace);
-
- Query q1 = new MockQuery("query");
- Query q2 = new MockQuery("query");
- namespace.addQuery(q1);
-
- assertSame(q1, map.getQuery("query"));
-
- map.addQuery(q2);
- assertSame(q2, map.getQuery("query"));
-
- map.removeQuery("query");
- assertSame(q1, map.getQuery("query"));
+//
+// Query q1 = new MockQuery("query");
+// Query q2 = new MockQuery("query");
+// namespace.addQuery(q1);
+//
+// assertSame(q1, map.getQuery("query"));
+//
+// map.addQuery(q2);
+// assertSame(q2, map.getQuery("query"));
+//
+// map.removeQuery("query");
+// assertSame(q1, map.getQuery("query"));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
index 3d7f3c6..4fa8d33 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapTest.java
@@ -19,9 +19,7 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.MockAbstractQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.junit.Test;
@@ -306,30 +304,33 @@ public class DataMapTest {
}
@Test
- public void testAddQuery() {
- AbstractQuery q = new MockAbstractQuery("a");
+ public void testAddQueryDescriptor() {
+ QueryDescriptor q = QueryDescriptor.selectQueryDescriptor();
+ q.setName("a");
DataMap map = new DataMap();
- map.addQuery(q);
- assertSame(q, map.getQuery("a"));
+ map.addQueryDescriptor(q);
+ assertSame(q, map.getQueryDescriptor("a"));
}
@Test
- public void testRemoveQuery() {
- AbstractQuery q = new MockAbstractQuery("a");
+ public void testRemoveQueryDescriptor() {
+ QueryDescriptor q = QueryDescriptor.selectQueryDescriptor();
+ q.setName("a");
DataMap map = new DataMap();
- map.addQuery(q);
- assertSame(q, map.getQuery("a"));
- map.removeQuery("a");
- assertNull(map.getQuery("a"));
+ map.addQueryDescriptor(q);
+ assertSame(q, map.getQueryDescriptor("a"));
+ map.removeQueryDescriptor("a");
+ assertNull(map.getQueryDescriptor("a"));
}
@Test
public void testGetQueryMap() {
- AbstractQuery q = new MockAbstractQuery("a");
+ QueryDescriptor q = QueryDescriptor.selectQueryDescriptor();
+ q.setName("a");
DataMap map = new DataMap();
- map.addQuery(q);
- Map<String, Query> queries = map.getQueryMap();
+ map.addQueryDescriptor(q);
+ Map<String, QueryDescriptor> queries = map.getQueryDescriptorMap();
assertEquals(1, queries.size());
assertSame(q, queries.get("a"));
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
index c81d88e..058a970 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/EntityResolverIT.java
@@ -23,8 +23,7 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.query.MockQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
@@ -155,18 +154,20 @@ public class EntityResolverIT extends ServerCase {
public void testGetQuery() {
// create a resolver with a single map
DataMap m1 = new DataMap();
- Query q = new MockQuery("query1");
- m1.addQuery(q);
+ QueryDescriptor q = QueryDescriptor.selectQueryDescriptor();
+ q.setName("query1");
+ m1.addQueryDescriptor(q);
EntityResolver resolver = new EntityResolver(Collections.singleton(m1));
- assertSame(q, resolver.getQuery("query1"));
+ assertSame(q, resolver.getQueryDescriptor("query1"));
// check that the query added on-the-fly will be recognized
- assertNull(resolver.getQuery("query2"));
+ assertNull(resolver.getQueryDescriptor("query2"));
- Query q2 = new MockQuery("query2");
- m1.addQuery(q2);
- assertSame(q2, resolver.getQuery("query2"));
+ QueryDescriptor q2 = QueryDescriptor.selectQueryDescriptor();
+ q2.setName("query2");
+ m1.addQueryDescriptor(q2);
+ assertSame(q2, resolver.getQueryDescriptor("query2"));
}
private void assertIsArtistObjEntity(ObjEntity ae) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
index de5053c..cae7d85 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
@@ -19,11 +19,7 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.query.CapsStrategy;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.test.file.FileUtil;
import org.apache.cayenne.testdo.embeddable.Embeddable1;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -135,13 +131,13 @@ public class MapLoaderLoadTest {
}
private void checkLoadedQueries(DataMap map) throws Exception {
- SelectQuery<?> queryWithQualifier = (SelectQuery<?>) map.getQuery("QueryWithQualifier");
+ SelectQueryDescriptor queryWithQualifier = (SelectQueryDescriptor) map.getQueryDescriptor("QueryWithQualifier");
assertNotNull(queryWithQualifier);
assertTrue(queryWithQualifier.getRoot() instanceof ObjEntity);
assertEquals("Artist", ((Entity) queryWithQualifier.getRoot()).getName());
assertNotNull(queryWithQualifier.getQualifier());
- SelectQuery<?> queryWithOrdering = (SelectQuery<?>) map.getQuery("QueryWithOrdering");
+ SelectQueryDescriptor queryWithOrdering = (SelectQueryDescriptor) map.getQueryDescriptor("QueryWithOrdering");
assertNotNull(queryWithOrdering);
assertTrue(queryWithOrdering.getRoot() instanceof ObjEntity);
assertEquals("Artist", ((Entity) queryWithOrdering.getRoot()).getName());
@@ -157,24 +153,23 @@ public class MapLoaderLoadTest {
assertTrue(dobOrdering.isAscending());
assertFalse(dobOrdering.isCaseInsensitive());
- SelectQuery<?> queryWithPrefetch = (SelectQuery<?>) map.getQuery("QueryWithPrefetch");
+ SelectQueryDescriptor queryWithPrefetch = (SelectQueryDescriptor) map.getQueryDescriptor("QueryWithPrefetch");
assertNotNull(queryWithPrefetch);
assertTrue(queryWithPrefetch.getRoot() instanceof ObjEntity);
assertEquals("Gallery", ((Entity) queryWithPrefetch.getRoot()).getName());
- assertNotNull(queryWithPrefetch.getPrefetchTree());
- assertEquals(1, queryWithPrefetch.getPrefetchTree().nonPhantomNodes().size());
- assertNotNull(queryWithPrefetch.getPrefetchTree().getNode(
- Gallery.PAINTING_ARRAY_PROPERTY));
+ assertNotNull(queryWithPrefetch.getPrefetches());
+ assertEquals(1, queryWithPrefetch.getPrefetches().size());
+ assertTrue(queryWithPrefetch.getPrefetches().contains(Gallery.PAINTING_ARRAY.getName()));
- SQLTemplate nonSelectingQuery = (SQLTemplate) map.getQuery("NonSelectingQuery");
+ QueryDescriptor nonSelectingQuery = map.getQueryDescriptor("NonSelectingQuery");
assertNotNull(nonSelectingQuery);
assertEquals("NonSelectingQuery", nonSelectingQuery.getName());
- assertEquals(CapsStrategy.UPPER, nonSelectingQuery.getColumnNamesCapitalization());
+ assertEquals("UPPER", nonSelectingQuery.getProperties().get("cayenne.SQLTemplate.columnNameCapitalization"));
- EJBQLQuery ejbqlQueryTest = (EJBQLQuery) map.getQuery("EjbqlQueryTest");
+ EJBQLQueryDescriptor ejbqlQueryTest = (EJBQLQueryDescriptor) map.getQueryDescriptor("EjbqlQueryTest");
assertNotNull(ejbqlQueryTest);
assertEquals("EjbqlQueryTest", ejbqlQueryTest.getName());
- assertNotNull(ejbqlQueryTest.getEjbqlStatement());
- assertEquals("SHARED_CACHE", ejbqlQueryTest.getCacheStrategy().toString());
+ assertNotNull(ejbqlQueryTest.getEjbql());
+ assertEquals("SHARED_CACHE", ejbqlQueryTest.getProperties().get("cayenne.GenericSelectQuery.cacheStrategy"));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
index 361ad8d..8c932e8 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
@@ -25,12 +25,13 @@ import java.util.Map;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
public class MockMappingNamespace implements MappingNamespace {
private Map<String, DbEntity> dbEntities = new HashMap<>();
private Map<String, ObjEntity> objEntities = new HashMap<>();
- private Map<String, Query> queries = new HashMap<>();
+ private Map<String, QueryDescriptor> queryDescriptors = new HashMap<>();
private Map<String, Procedure> procedures = new HashMap<>();
public Embeddable getEmbeddable(String className) {
@@ -53,8 +54,8 @@ public class MockMappingNamespace implements MappingNamespace {
objEntities.put(entity.getName(), entity);
}
- public void addQuery(Query query) {
- queries.put(query.getName(), query);
+ public void addQueryDescriptor(QueryDescriptor queryDescriptor) {
+ queryDescriptors.put(queryDescriptor.getName(), queryDescriptor);
}
public void addProcedure(Procedure procedure) {
@@ -73,8 +74,8 @@ public class MockMappingNamespace implements MappingNamespace {
return procedures.get(name);
}
- public Query getQuery(String name) {
- return queries.get(name);
+ public QueryDescriptor getQueryDescriptor(String name) {
+ return queryDescriptors.get(name);
}
public Collection<DbEntity> getDbEntities() {
@@ -89,8 +90,8 @@ public class MockMappingNamespace implements MappingNamespace {
return procedures.values();
}
- public Collection<Query> getQueries() {
- return queries.values();
+ public Collection<QueryDescriptor> getQueryDescriptors() {
+ return queryDescriptors.values();
}
public Collection<Embeddable> getEmbeddables() {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
index de21fdb..03102f5 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.QueryDescriptor;
import org.junit.Assert;
import org.junit.Test;
@@ -93,9 +93,9 @@ public class NameCheckersTest {
map.addProcedure(new Procedure("name"));
checkNameAndOther(map, NameCheckers.procedure, "name");
- SelectQuery query = new SelectQuery("name");
+ QueryDescriptor query = QueryDescriptor.selectQueryDescriptor();
query.setName("name");
- map.addQuery(query);
+ map.addQueryDescriptor(query);
checkNameAndOther(map, NameCheckers.query, "name");
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java b/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
index 813879d..1526b13 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
@@ -50,10 +50,6 @@ public class MockQuery implements Query {
public MockQuery(String name) {
this.name = name;
}
-
- public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
- return visitor.visitQuery(this);
- }
public QueryMetadata getMetaData(EntityResolver resolver) {
return DefaultQueryMetadata.defaultMetadata;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/resources/date-time.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/date-time.map.xml b/cayenne-server/src/test/resources/date-time.map.xml
index 4cf4d8b..07b7aa7 100644
--- a/cayenne-server/src/test/resources/date-time.map.xml
+++ b/cayenne-server/src/test/resources/date-time.map.xml
@@ -26,7 +26,7 @@
<obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/>
<obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/>
</obj-entity>
- <query name="SelectDateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="date-time">
+ <query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="date-time">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/resources/multi-tier.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/multi-tier.map.xml b/cayenne-server/src/test/resources/multi-tier.map.xml
index 04257c6..c643813 100644
--- a/cayenne-server/src/test/resources/multi-tier.map.xml
+++ b/cayenne-server/src/test/resources/multi-tier.map.xml
@@ -88,16 +88,16 @@
<obj-relationship name="table2Array" source="MtTable3" target="MtTable2" deleteRule="Deny" db-relationship-path="table2Array"/>
<obj-relationship name="table5s" source="MtTable4" target="MtTable5" db-relationship-path="joins.toTable5"/>
<obj-relationship name="table4s" source="MtTable5" target="MtTable4" db-relationship-path="joins.toTable4"/>
- <query name="AllMtTable1" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
+ <query name="AllMtTable1" type="SelectQuery" root="obj-entity" root-name="MtTable1">
</query>
- <query name="MtQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
+ <query name="MtQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="MtTable1">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
</query>
- <query name="ParameterizedEJBQLMtQuery" factory="org.apache.cayenne.map.EjbqlBuilder">
+ <query name="ParameterizedEJBQLMtQuery" type="EJBQLQuery">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
<ejbql><![CDATA[select a from MtTable1 a where a.globalAttribute1 = :g]]></ejbql>
</query>
- <query name="ParameterizedMtQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
+ <query name="ParameterizedMtQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="MtTable1">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
<qualifier><![CDATA[globalAttribute1 = $g]]></qualifier>
</query>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/resources/return-types.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/return-types.map.xml b/cayenne-server/src/test/resources/return-types.map.xml
index 9edbb70..67266bd 100644
--- a/cayenne-server/src/test/resources/return-types.map.xml
+++ b/cayenne-server/src/test/resources/return-types.map.xml
@@ -75,16 +75,16 @@
<obj-attribute name="clobColumn" type="java.lang.String" db-attribute-path="CLOB_COLUMN"/>
<obj-attribute name="nclobColumn" type="java.lang.String" db-attribute-path="NCLOB_COLUMN"/>
</obj-entity>
- <query name="SelectReturnTypesLobsMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="return-types">
+ <query name="SelectReturnTypesLobsMap1" type="SQLTemplate" root="data-map" root-name="return-types">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_LOBS_TEST1]]></sql>
</query>
- <query name="SelectReturnTypesMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="return-types">
+ <query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="return-types">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql>
</query>
- <query name="SelectReturnTypesMap2" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="return-types">
+ <query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="return-types">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-server/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/testmap.map.xml b/cayenne-server/src/test/resources/testmap.map.xml
index d64eb79..4cdda33 100644
--- a/cayenne-server/src/test/resources/testmap.map.xml
+++ b/cayenne-server/src/test/resources/testmap.map.xml
@@ -243,58 +243,58 @@
<obj-relationship name="painting" source="PaintingInfo" target="Painting" deleteRule="Nullify" db-relationship-path="painting"/>
<obj-relationship name="paintingArray" source="ROArtist" target="Painting" deleteRule="Deny" db-relationship-path="paintingArray"/>
<obj-relationship name="toArtist" source="ROPainting" target="Artist" deleteRule="Nullify" db-relationship-path="toArtist"/>
- <query name="EjbqlQueryTest" factory="org.apache.cayenne.map.EjbqlBuilder">
+ <query name="EjbqlQueryTest" type="EJBQLQuery">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<ejbql><![CDATA[select a from Artist a]]></ejbql>
</query>
- <query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="NonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (512, 'No Painting Like This', 12.5)]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql>
</query>
- <query name="ObjectQuery" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting">
+ <query name="ObjectQuery" type="SelectQuery" root="obj-entity" root-name="Painting">
<qualifier><![CDATA[toArtist = $artist]]></qualifier>
<ordering><![CDATA[paintingTitle]]></ordering>
</query>
- <query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="ParameterizedNonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap">
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title), #bind($price))]]></sql>
</query>
- <query name="ParameterizedQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ParameterizedQueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
+ <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
</query>
- <query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
</query>
- <query name="QueryWithOrdering" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithOrdering" type="SelectQuery" root="obj-entity" root-name="Artist">
<ordering descending="true" ignore-case="true"><![CDATA[artistName]]></ordering>
<ordering><![CDATA[dateOfBirth]]></ordering>
</query>
- <query name="QueryWithPrefetch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Gallery">
+ <query name="QueryWithPrefetch" type="SelectQuery" root="obj-entity" root-name="Gallery">
<prefetch>paintingArray</prefetch>
</query>
- <query name="QueryWithQualifier" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithQualifier" type="SelectQuery" root="obj-entity" root-name="Artist">
<qualifier><![CDATA[artistName = $param1]]></qualifier>
</query>
- <query name="QueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
</query>
- <query name="SelectTestLower" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectTestLower" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="LOWER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <query name="SelectTestUpper" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectTestUpper" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index beee072..d333919 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.access.loader.NamePatternMatcher;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.commons.logging.Log;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -535,7 +535,7 @@ public class ClassGenerationAction {
}
}
- public void addQueries(Collection<Query> queries) {
+ public void addQueries(Collection<QueryDescriptor> queries) {
if (artifactsGenerationMode == ArtifactsGenerationMode.DATAMAP
|| artifactsGenerationMode == ArtifactsGenerationMode.ALL) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
index 79f795d..1953e34 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* @since 3.0
@@ -68,7 +69,7 @@ public class ClientClassGenerationAction extends ClassGenerationAction {
}
@Override
- public void addQueries(Collection<Query> queries) {
+ public void addQueries(Collection<QueryDescriptor> queries) {
if (queries != null) {
artifacts.add(new ClientDataMapArtifact(dataMap, queries));
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
index 7ba22e4..e5d90d5 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/ClientDataMapArtifact.java
@@ -22,13 +22,13 @@ package org.apache.cayenne.gen;
import java.util.Collection;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.query.Query;
import org.apache.cayenne.map.naming.NameConverter;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.Util;
public class ClientDataMapArtifact extends DataMapArtifact {
- public ClientDataMapArtifact(DataMap dataMap, Collection<Query> queries) {
+ public ClientDataMapArtifact(DataMap dataMap, Collection<QueryDescriptor> queries) {
super(dataMap, queries);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java b/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
index 818b213..294a381 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/gen/DataMapArtifact.java
@@ -23,11 +23,7 @@ import java.util.Collection;
import java.util.LinkedList;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.map.naming.NameConverter;
import org.apache.velocity.VelocityContext;
@@ -41,19 +37,19 @@ public class DataMapArtifact implements Artifact {
public static final String DATAMAP_UTILS_KEY = "dataMapUtils";
protected DataMap dataMap;
- protected Collection<SelectQuery> selectQueries;
- protected Collection<SQLTemplate> sqlTemplateQueries;
- protected Collection<ProcedureQuery> procedureQueries;
- protected Collection<EJBQLQuery> ejbqlQueries;
+ protected Collection<QueryDescriptor> selectQueries;
+ protected Collection<QueryDescriptor> sqlTemplateQueries;
+ protected Collection<QueryDescriptor> procedureQueries;
+ protected Collection<QueryDescriptor> ejbqlQueries;
protected Collection<String> queryNames;
- public DataMapArtifact(DataMap dataMap, Collection<Query> queries) {
+ public DataMapArtifact(DataMap dataMap, Collection<QueryDescriptor> queries) {
this.dataMap = dataMap;
- selectQueries = new LinkedList<SelectQuery>();
- sqlTemplateQueries = new LinkedList<SQLTemplate>();
- procedureQueries = new LinkedList<ProcedureQuery>();
- ejbqlQueries = new LinkedList<EJBQLQuery>();
- queryNames = new LinkedList<String>();
+ selectQueries = new LinkedList<>();
+ sqlTemplateQueries = new LinkedList<>();
+ procedureQueries = new LinkedList<>();
+ ejbqlQueries = new LinkedList<>();
+ queryNames = new LinkedList<>();
addQueries(queries);
}
@@ -90,30 +86,37 @@ public class DataMapArtifact implements Artifact {
}
}
- private void addQueries(Collection<Query> queries) {
+ private void addQueries(Collection<QueryDescriptor> queries) {
if (queries != null) {
- for (Query query : queries) {
+ for (QueryDescriptor query : queries) {
addQuery(query);
}
}
}
- private void addQuery(Query query) {
- if (query instanceof SelectQuery) {
- selectQueries.add((SelectQuery) query);
- } else if (query instanceof ProcedureQuery) {
- procedureQueries.add((ProcedureQuery) query);
- } else if (query instanceof SQLTemplate) {
- sqlTemplateQueries.add((SQLTemplate) query);
- } else if (query instanceof EJBQLQuery) {
- ejbqlQueries.add((EJBQLQuery) query);
+ private void addQuery(QueryDescriptor query) {
+
+ switch (query.getType()) {
+ case QueryDescriptor.SELECT_QUERY:
+ selectQueries.add(query);
+ break;
+ case QueryDescriptor.PROCEDURE_QUERY:
+ procedureQueries.add(query);
+ break;
+ case QueryDescriptor.SQL_TEMPLATE:
+ sqlTemplateQueries.add(query);
+ break;
+ case QueryDescriptor.EJBQL_QUERY:
+ ejbqlQueries.add(query);
+ break;
}
+
if (query.getName() != null && !"".equals(query.getName())) {
queryNames.add(query.getName());
}
}
- public Collection<SelectQuery> getSelectQueries() {
+ public Collection<QueryDescriptor> getSelectQueries() {
return selectQueries;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
index 11a0370..6ed29cb 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
@@ -122,7 +122,7 @@ public class CayenneGeneratorTask extends CayenneTask {
generatorAction.setDataMap(dataMap);
generatorAction.addEntities(filterAction.getFilteredEntities(dataMap));
generatorAction.addEmbeddables(filterAction.getFilteredEmbeddables(dataMap));
- generatorAction.addQueries(dataMap.getQueries());
+ generatorAction.addQueries(dataMap.getQueryDescriptors());
generatorAction.execute();
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
index 714e2d3..0bf1058 100644
--- a/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.query.NamedQuery;
+import org.apache.cayenne.query.QueryDescriptor;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -172,16 +172,19 @@ public class ClassGenerationActionTest {
}
private void runDataMapTest(boolean client) throws Exception {
+ QueryDescriptor descriptor = QueryDescriptor.selectQueryDescriptor();
+ descriptor.setName("TestQuery");
+
DataMap map = new DataMap();
- map.addQuery(new NamedQuery("TestQuery"));
+ map.addQueryDescriptor(descriptor);
map.setName("testmap");
List<String> generated;
if (client) {
map.setDefaultClientPackage("testpackage");
- generated = execute(new ClientDataMapArtifact(map, map.getQueries()));
+ generated = execute(new ClientDataMapArtifact(map, map.getQueryDescriptors()));
} else {
map.setDefaultPackage("testpackage");
- generated = execute(new DataMapArtifact(map, map.getQueries()));
+ generated = execute(new DataMapArtifact(map, map.getQueryDescriptors()));
}
assertEquals(2, generated.size());
assertTrue(generated.get(0).contains("public static final String TEST_QUERY_QUERYNAME = \"TestQuery\""));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/cayenne-tools/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/resources/testmap.map.xml b/cayenne-tools/src/test/resources/testmap.map.xml
index 71dfb21..60b94a6 100644
--- a/cayenne-tools/src/test/resources/testmap.map.xml
+++ b/cayenne-tools/src/test/resources/testmap.map.xml
@@ -670,73 +670,73 @@
<obj-relationship name="painting" source="PaintingInfo" target="Painting" deleteRule="Nullify" db-relationship-path="painting"/>
<obj-relationship name="paintingArray" source="ROArtist" target="Painting" deleteRule="Deny" db-relationship-path="paintingArray"/>
<obj-relationship name="toArtist" source="ROPainting" target="Artist" deleteRule="Nullify" db-relationship-path="toArtist"/>
- <query name="EjbqlQueryTest" factory="org.apache.cayenne.map.EjbqlBuilder">
+ <query name="EjbqlQueryTest" type="EJBQLQuery">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<ejbql><![CDATA[select a from Artist a]]></ejbql>
</query>
- <query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="NonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (512, 'No Painting Like This', 12.5)]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql>
</query>
- <query name="ObjectQuery" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting">
+ <query name="ObjectQuery" type="SelectQuery" root="obj-entity" root-name="Painting">
<qualifier><![CDATA[toArtist = $artist]]></qualifier>
<ordering><![CDATA[paintingTitle]]></ordering>
</query>
- <query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="ParameterizedNonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap">
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title), #bind($price))]]></sql>
</query>
- <query name="ParameterizedQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ParameterizedQueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
+ <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
</query>
- <query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
</query>
- <query name="QueryWithOrdering" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithOrdering" type="SelectQuery" root="obj-entity" root-name="Artist">
<ordering descending="true" ignore-case="true"><![CDATA[artistName]]></ordering>
<ordering><![CDATA[dateOfBirth]]></ordering>
</query>
- <query name="QueryWithPrefetch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Gallery">
+ <query name="QueryWithPrefetch" type="SelectQuery" root="obj-entity" root-name="Gallery">
<prefetch>paintingArray</prefetch>
</query>
- <query name="QueryWithQualifier" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithQualifier" type="SelectQuery" root="obj-entity" root-name="Artist">
<qualifier><![CDATA[artistName = $param1]]></qualifier>
</query>
- <query name="QueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
</query>
- <query name="SelectDateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
</query>
- <query name="SelectReturnTypesMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql>
</query>
- <query name="SelectReturnTypesMap2" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
</query>
- <query name="SelectTestLower" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectTestLower" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="LOWER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <query name="SelectTestUpper" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectTestUpper" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml b/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
index ca501db..21fadf7 100644
--- a/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
@@ -670,73 +670,73 @@
<obj-relationship name="painting" source="PaintingInfo" target="Painting" deleteRule="Nullify" db-relationship-path="painting"/>
<obj-relationship name="paintingArray" source="ROArtist" target="Painting" deleteRule="Deny" db-relationship-path="paintingArray"/>
<obj-relationship name="toArtist" source="ROPainting" target="Artist" deleteRule="Nullify" db-relationship-path="toArtist"/>
- <query name="EjbqlQueryTest" factory="org.apache.cayenne.map.EjbqlBuilder">
+ <query name="EjbqlQueryTest" type="EJBQLQuery">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<ejbql><![CDATA[select a from Artist a]]></ejbql>
</query>
- <query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="NonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap-client">
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (512, 'No Painting Like This', 12.5)]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql>
</query>
- <query name="ObjectQuery" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting">
+ <query name="ObjectQuery" type="SelectQuery" root="obj-entity" root-name="Painting">
<qualifier><![CDATA[toArtist = $artist]]></qualifier>
<ordering><![CDATA[paintingTitle]]></ordering>
</query>
- <query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="ParameterizedNonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap-client">
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title), #bind($price))]]></sql>
</query>
- <query name="ParameterizedQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ParameterizedQueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
+ <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
</query>
- <query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
</query>
- <query name="QueryWithOrdering" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithOrdering" type="SelectQuery" root="obj-entity" root-name="Artist">
<ordering descending="true" ignore-case="true"><![CDATA[artistName]]></ordering>
<ordering><![CDATA[dateOfBirth]]></ordering>
</query>
- <query name="QueryWithPrefetch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Gallery">
+ <query name="QueryWithPrefetch" type="SelectQuery" root="obj-entity" root-name="Gallery">
<prefetch>paintingArray</prefetch>
</query>
- <query name="QueryWithQualifier" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithQualifier" type="SelectQuery" root="obj-entity" root-name="Artist">
<qualifier><![CDATA[artistName = $param1]]></qualifier>
</query>
- <query name="QueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
</query>
- <query name="SelectDateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="testmap-client">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
</query>
- <query name="SelectReturnTypesMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="testmap-client">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql>
</query>
- <query name="SelectReturnTypesMap2" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="testmap-client">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
</query>
- <query name="SelectTestLower" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="SelectTestLower" type="SQLTemplate" root="data-map" root-name="testmap-client">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="LOWER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <query name="SelectTestUpper" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap-client">
+ <query name="SelectTestUpper" type="SQLTemplate" root="data-map" root-name="testmap-client">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml b/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
index 71dfb21..60b94a6 100644
--- a/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
@@ -670,73 +670,73 @@
<obj-relationship name="painting" source="PaintingInfo" target="Painting" deleteRule="Nullify" db-relationship-path="painting"/>
<obj-relationship name="paintingArray" source="ROArtist" target="Painting" deleteRule="Deny" db-relationship-path="paintingArray"/>
<obj-relationship name="toArtist" source="ROPainting" target="Artist" deleteRule="Nullify" db-relationship-path="toArtist"/>
- <query name="EjbqlQueryTest" factory="org.apache.cayenne.map.EjbqlBuilder">
+ <query name="EjbqlQueryTest" type="EJBQLQuery">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<ejbql><![CDATA[select a from Artist a]]></ejbql>
</query>
- <query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="NonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (512, 'No Painting Like This', 12.5)]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql>
</query>
- <query name="ObjectQuery" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting">
+ <query name="ObjectQuery" type="SelectQuery" root="obj-entity" root-name="Painting">
<qualifier><![CDATA[toArtist = $artist]]></qualifier>
<ordering><![CDATA[paintingTitle]]></ordering>
</query>
- <query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="ParameterizedNonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap">
<sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title), #bind($price))]]></sql>
</query>
- <query name="ParameterizedQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ParameterizedQueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="ParameterizedQueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
+ <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
</query>
- <query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
</query>
- <query name="QueryWithOrdering" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithOrdering" type="SelectQuery" root="obj-entity" root-name="Artist">
<ordering descending="true" ignore-case="true"><![CDATA[artistName]]></ordering>
<ordering><![CDATA[dateOfBirth]]></ordering>
</query>
- <query name="QueryWithPrefetch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Gallery">
+ <query name="QueryWithPrefetch" type="SelectQuery" root="obj-entity" root-name="Gallery">
<prefetch>paintingArray</prefetch>
</query>
- <query name="QueryWithQualifier" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithQualifier" type="SelectQuery" root="obj-entity" root-name="Artist">
<qualifier><![CDATA[artistName = $param1]]></qualifier>
</query>
- <query name="QueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
+ <query name="QueryWithSharedCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
</query>
- <query name="SelectDateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
</query>
- <query name="SelectReturnTypesMap1" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql>
</query>
- <query name="SelectReturnTypesMap2" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
</query>
- <query name="SelectTestLower" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectTestLower" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="LOWER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
- <query name="SelectTestUpper" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <query name="SelectTestUpper" type="SQLTemplate" root="data-map" root-name="testmap">
<property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[select * from ARTIST]]></sql>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
index 8462131..2cff378 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryEvent.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.configuration.event;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.event.MapEvent;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* An event generated when a Query object is added to a DataMap,
@@ -30,24 +30,24 @@ import org.apache.cayenne.query.Query;
* @since 1.1
*/
public class QueryEvent extends MapEvent {
- protected Query query;
+ protected QueryDescriptor query;
/**
* Data map containing the query
*/
protected DataMap map;
- public QueryEvent(Object source, Query query) {
+ public QueryEvent(Object source, QueryDescriptor query) {
super(source);
setQuery(query);
}
- public QueryEvent(Object source, Query query, String oldName) {
+ public QueryEvent(Object source, QueryDescriptor query, String oldName) {
this(source, query);
setOldName(oldName);
}
- public QueryEvent(Object source, Query query, int type) {
+ public QueryEvent(Object source, QueryDescriptor query, int type) {
this(source, query);
setId(type);
}
@@ -55,7 +55,7 @@ public class QueryEvent extends MapEvent {
/**
* Creates a query event, specifying DataMap, containing the query
*/
- public QueryEvent(Object source, Query query, DataMap map) {
+ public QueryEvent(Object source, QueryDescriptor query, DataMap map) {
this(source, query);
setDataMap(map);
}
@@ -63,7 +63,7 @@ public class QueryEvent extends MapEvent {
/**
* Creates a query event, specifying DataMap, containing the query
*/
- public QueryEvent(Object source, Query query, String oldName, DataMap map) {
+ public QueryEvent(Object source, QueryDescriptor query, String oldName, DataMap map) {
this(source, query, oldName);
setDataMap(map);
}
@@ -71,7 +71,7 @@ public class QueryEvent extends MapEvent {
/**
* Creates a query event, specifying DataMap, containing the query
*/
- public QueryEvent(Object source, Query query, int type, DataMap map) {
+ public QueryEvent(Object source, QueryDescriptor query, int type, DataMap map) {
this(source, query, type);
setDataMap(map);
}
@@ -81,11 +81,11 @@ public class QueryEvent extends MapEvent {
return (query != null) ? query.getName() : null;
}
- public Query getQuery() {
+ public QueryDescriptor getQuery() {
return query;
}
- public void setQuery(Query query) {
+ public void setQuery(QueryDescriptor query) {
this.query = query;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
index fc805c8..e923d57 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
@@ -111,6 +111,7 @@ import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.project.ConfigurationNodeParentGetter;
import org.apache.cayenne.project.Project;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.IDUtil;
import javax.swing.event.EventListenerList;
@@ -158,7 +159,7 @@ public class ProjectController extends CayenneController {
private Procedure procedure;
private ProcedureParameter[] procedureParameters;
- private Query query;
+ private QueryDescriptor query;
/**
* Paths of multiple selection
@@ -556,7 +557,7 @@ public class ProjectController extends CayenneController {
return currentState.dbRels;
}
- public Query getCurrentQuery() {
+ public QueryDescriptor getCurrentQuery() {
return currentState.query;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
index 2db164b..2d5e0be 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* A helper class that wraps a tree of project nodes into Swing tree nodes.
@@ -156,7 +157,7 @@ public class ProjectTreeFactory {
makeNode(procedure);
}
- for (Query query : dataMap.getQueries()) {
+ for (QueryDescriptor query : dataMap.getQueryDescriptors()) {
makeNode(query);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index 4c002b0..999fbb5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -77,7 +77,7 @@ import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.project.Project;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.reflect.PropertyUtils;
import org.apache.cayenne.resource.Resource;
import org.apache.commons.logging.Log;
@@ -455,7 +455,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
return;
}
- Query query = e.getQuery();
+ QueryDescriptor query = e.getQuery();
DefaultMutableTreeNode currentNode = new DefaultMutableTreeNode(query, false);
positionNode(node, currentNode, Comparators.getDataMapChildrenComparator());
showNode(currentNode);
@@ -944,10 +944,10 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
(DataChannelDescriptor) mediator.getProject().getRootNode());
mediator.fireProcedureDisplayEvent(e);
}
- else if (obj instanceof Query) {
+ else if (obj instanceof QueryDescriptor) {
QueryDisplayEvent e = new QueryDisplayEvent(
this,
- (Query) obj,
+ (QueryDescriptor) obj,
(DataMap) data[data.length - 2],
(DataChannelDescriptor) mediator.getProject().getRootNode());
mediator.fireQueryDisplayEvent(e);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
index 312bf63..ff30ce5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.dialog.query.QueryType;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* @since 1.1
@@ -62,8 +62,8 @@ public class CreateQueryAction extends CayenneAction {
new QueryType(getProjectController(),getProjectController().getCurrentDataMap()).startupAction();
}
- public void createQuery(DataChannelDescriptor domain, DataMap dataMap, Query query) {
- dataMap.addQuery(query);
+ public void createQuery(DataChannelDescriptor domain, DataMap dataMap, QueryDescriptor query) {
+ dataMap.addQueryDescriptor(query);
// notify listeners
fireQueryEvent(this, getProjectController(), domain, dataMap, query);
}
@@ -72,7 +72,7 @@ public class CreateQueryAction extends CayenneAction {
* Fires events when a query was added
*/
public static void fireQueryEvent(Object src, ProjectController mediator, DataChannelDescriptor domain,
- DataMap dataMap, Query query) {
+ DataMap dataMap, QueryDescriptor query) {
mediator.fireQueryEvent(new QueryEvent(src, query, MapEvent.ADD, dataMap));
mediator.fireQueryDisplayEvent(new QueryDisplayEvent(src, query, dataMap, domain));
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
index 5f444a8..34332a1 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.FindDialog;
import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import javax.swing.JTextField;
import java.awt.Color;
@@ -75,10 +75,10 @@ public class FindAction extends CayenneAction {
DataMap dm = it.next();
- Iterator<Query> querIterator = dm.getQueries().iterator();
+ Iterator<QueryDescriptor> querIterator = dm.getQueryDescriptors().iterator();
while(querIterator.hasNext()) {
- Query q = querIterator.next();
+ QueryDescriptor q = querIterator.next();
if(matchFound(q.getName(), pattern)){
paths.add(q);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index d7879fc..4544073 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -56,7 +56,7 @@ import org.apache.cayenne.modeler.pref.FSPath;
import org.apache.cayenne.modeler.util.AdapterMapping;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.FileFilters;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.wocompat.EOModelProcessor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.logging.Log;
@@ -222,7 +222,7 @@ public class ImportEOModelAction extends CayenneAction {
Collection originalOE = new ArrayList(currentMap.getObjEntities());
Collection originalDE = new ArrayList(currentMap.getDbEntities());
- Collection originalQueries = new ArrayList(currentMap.getQueries());
+ Collection originalQueries = new ArrayList(currentMap.getQueryDescriptors());
currentMap.mergeWithDataMap(map);
map = currentMap;
@@ -230,7 +230,7 @@ public class ImportEOModelAction extends CayenneAction {
// postprocess changes
Collection newOE = new ArrayList(currentMap.getObjEntities());
Collection newDE = new ArrayList(currentMap.getDbEntities());
- Collection newQueries = new ArrayList(currentMap.getQueries());
+ Collection newQueries = new ArrayList(currentMap.getQueryDescriptors());
EntityEvent entityEvent = new EntityEvent(Application.getFrame(), null);
QueryEvent queryEvent = new QueryEvent(Application.getFrame(), null);
@@ -277,7 +277,7 @@ public class ImportEOModelAction extends CayenneAction {
originalQueries);
it = addedQueries.iterator();
while (it.hasNext()) {
- Query q = (Query) it.next();
+ QueryDescriptor q = (QueryDescriptor) it.next();
queryEvent.setQuery(q);
queryEvent.setId(MapEvent.ADD);
mediator.fireQueryEvent(queryEvent);
@@ -288,7 +288,7 @@ public class ImportEOModelAction extends CayenneAction {
newQueries);
it = removedQueries.iterator();
while (it.hasNext()) {
- Query q = (Query) it.next();
+ QueryDescriptor q = (QueryDescriptor) it.next();
queryEvent.setQuery(q);
queryEvent.setId(MapEvent.REMOVE);
mediator.fireQueryEvent(queryEvent);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index fbddf98..14553c1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -50,6 +50,7 @@ import org.apache.cayenne.modeler.util.CayenneTransferable;
import org.apache.cayenne.query.AbstractQuery;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import javax.swing.KeyStroke;
import javax.swing.undo.UndoableEdit;
@@ -215,8 +216,8 @@ public class PasteAction extends CayenneAction implements FlavorListener {
for (Procedure procedure : dataMap.getProcedures()) {
procedure.setName(DefaultUniqueNameGenerator.generate(NameCheckers.procedure, COPY_PATTERN, dataMap, procedure.getName()));
}
- for (Query query : dataMap.getQueries()) {
- ((AbstractQuery) query).setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, dataMap, query.getName()));
+ for (QueryDescriptor query : dataMap.getQueryDescriptors()) {
+ query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, dataMap, query.getName()));
}
// if an entity was renamed, we rename all links to it too
@@ -287,23 +288,13 @@ public class PasteAction extends CayenneAction implements FlavorListener {
dataMap,
embeddable);
}
- else if (content instanceof EJBQLQuery) {
- EJBQLQuery query = (EJBQLQuery) content;
-
- query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, dataMap, query.getName()));
- query.setDataMap(dataMap);
-
- dataMap.addQuery(query);
- QueryType.fireQueryEvent(this, mediator, dataMap, query);
- }
- else if (content instanceof Query) {
- // paste Query to DataMap
- AbstractQuery query = (AbstractQuery) content;
+ else if (content instanceof QueryDescriptor) {
+ QueryDescriptor query = (QueryDescriptor) content;
query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, dataMap, query.getName()));
query.setDataMap(dataMap);
- dataMap.addQuery(query);
+ dataMap.addQueryDescriptor(query);
QueryType.fireQueryEvent(this, mediator, dataMap, query);
}
else if (content instanceof Procedure) {
[08/16] cayenne git commit: CAY-2060 Update schema version from 7 to
8 in all XML config files throughout the project.
Posted by dk...@apache.org.
CAY-2060 Update schema version from 7 to 8 in all XML config files throughout the project.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8049c968
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8049c968
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8049c968
Branch: refs/heads/master
Commit: 8049c9682793fc5bb6fa75482c56699fcacd5a3a
Parents: e099a21
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Thu Feb 18 19:36:33 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:19 2016 +0300
----------------------------------------------------------------------
cayenne-crypto/src/test/resources/cayenne-crypto.xml | 2 +-
cayenne-crypto/src/test/resources/datamap.map.xml | 6 +++---
cayenne-java8/src/test/resources/cayenne-java8.xml | 2 +-
cayenne-java8/src/test/resources/java8.map.xml | 6 +++---
cayenne-joda/src/test/resources/cayenne-joda.xml | 2 +-
cayenne-joda/src/test/resources/joda.map.xml | 6 +++---
cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml | 2 +-
cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml | 6 +++---
cayenne-server/src/test/resources/array-type.map.xml | 8 ++++----
cayenne-server/src/test/resources/binary-pk.map.xml | 8 ++++----
cayenne-server/src/test/resources/cay743/cayenne-domain.xml | 2 +-
cayenne-server/src/test/resources/cay743/map1.map.xml | 6 +++---
cayenne-server/src/test/resources/cay743/map2.map.xml | 6 +++---
cayenne-server/src/test/resources/cayenne-array-type.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-binary-pk.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-compound.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-date-time.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-delete-rules.xml | 2 +-
cayenne-server/src/test/resources/cayenne-embeddable.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-empty.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-enum.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-extended-type.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-generated.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-generic.xml | 4 ++--
.../src/test/resources/cayenne-inheritance-single-table1.xml | 2 +-
.../src/test/resources/cayenne-inheritance-vertical.xml | 2 +-
cayenne-server/src/test/resources/cayenne-inheritance.xml | 4 ++--
.../src/test/resources/cayenne-lifecycle-callbacks-order.xml | 2 +-
cayenne-server/src/test/resources/cayenne-lifecycles.xml | 2 +-
cayenne-server/src/test/resources/cayenne-lob.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-locking.xml | 2 +-
cayenne-server/src/test/resources/cayenne-map-to-many.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-meaningful-pk.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-misc-types.xml | 4 ++--
.../test/resources/cayenne-mixed-persistence-strategy.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-multi-tier.xml | 2 +-
cayenne-server/src/test/resources/cayenne-multinode.xml | 2 +-
cayenne-server/src/test/resources/cayenne-no-pk.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-numeric-types.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-oneway-rels.xml | 2 +-
...g.apache.cayenne.configuration.rop.server.test-config.xml | 2 +-
cayenne-server/src/test/resources/cayenne-people.xml | 2 +-
cayenne-server/src/test/resources/cayenne-persistent.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-primitive.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-qualified.xml | 2 +-
.../src/test/resources/cayenne-quoted-identifiers.xml | 2 +-
cayenne-server/src/test/resources/cayenne-reflexive.xml | 4 ++--
.../src/test/resources/cayenne-relationships-activity.xml | 2 +-
.../test/resources/cayenne-relationships-child-master.xml | 4 ++--
.../src/test/resources/cayenne-relationships-clob.xml | 4 ++--
.../resources/cayenne-relationships-collection-to-many.xml | 4 ++--
.../test/resources/cayenne-relationships-delete-rules.xml | 4 ++--
.../src/test/resources/cayenne-relationships-flattened.xml | 4 ++--
.../src/test/resources/cayenne-relationships-set-to-many.xml | 4 ++--
.../src/test/resources/cayenne-relationships-to-many-fk.xml | 4 ++--
.../src/test/resources/cayenne-relationships-to-one-fk.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-relationships.xml | 2 +-
cayenne-server/src/test/resources/cayenne-return-types.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-small-testmap.xml | 2 +-
cayenne-server/src/test/resources/cayenne-soft-delete.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-sus.xml | 2 +-
.../src/test/resources/cayenne-table-primitives.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-testmap.xml | 2 +-
cayenne-server/src/test/resources/cayenne-things.xml | 4 ++--
cayenne-server/src/test/resources/cayenne-toone.xml | 4 ++--
.../test/resources/cayenne-unsupported-distinct-types.xml | 2 +-
cayenne-server/src/test/resources/cayenne-uuid.xml | 4 ++--
cayenne-server/src/test/resources/compound.map.xml | 8 ++++----
cayenne-server/src/test/resources/date-time.map.xml | 8 ++++----
cayenne-server/src/test/resources/delete-rules.map.xml | 8 ++++----
cayenne-server/src/test/resources/embeddable.map.xml | 6 +++---
cayenne-server/src/test/resources/empty.map.xml | 8 ++++----
cayenne-server/src/test/resources/enum.map.xml | 8 ++++----
cayenne-server/src/test/resources/extended-type.map.xml | 8 ++++----
cayenne-server/src/test/resources/generated.map.xml | 8 ++++----
cayenne-server/src/test/resources/generic.map.xml | 6 +++---
.../src/test/resources/inheritance-single-table1.map.xml | 6 +++---
.../src/test/resources/inheritance-vertical.map.xml | 6 +++---
cayenne-server/src/test/resources/inheritance.map.xml | 8 ++++----
.../src/test/resources/lifecycle-callbacks-order.map.xml | 8 ++++----
cayenne-server/src/test/resources/lifecycles.map.xml | 8 ++++----
cayenne-server/src/test/resources/lob.map.xml | 8 ++++----
cayenne-server/src/test/resources/locking.map.xml | 6 +++---
cayenne-server/src/test/resources/map-db1.map.xml | 6 +++---
cayenne-server/src/test/resources/map-db2.map.xml | 6 +++---
cayenne-server/src/test/resources/map-to-many.map.xml | 8 ++++----
cayenne-server/src/test/resources/meaningful-pk.map.xml | 8 ++++----
cayenne-server/src/test/resources/misc-types.map.xml | 8 ++++----
.../src/test/resources/mixed-persistence-strategy.map.xml | 8 ++++----
cayenne-server/src/test/resources/multi-tier.map.xml | 6 +++---
cayenne-server/src/test/resources/no-pk.map.xml | 8 ++++----
cayenne-server/src/test/resources/numeric-types.map.xml | 8 ++++----
cayenne-server/src/test/resources/oneway-rels.map.xml | 6 +++---
cayenne-server/src/test/resources/people.map.xml | 6 +++---
cayenne-server/src/test/resources/persistent.map.xml | 8 ++++----
cayenne-server/src/test/resources/primitive.map.xml | 8 ++++----
cayenne-server/src/test/resources/qualified.map.xml | 6 +++---
cayenne-server/src/test/resources/quoted-identifiers.map.xml | 6 +++---
cayenne-server/src/test/resources/reflexive.map.xml | 8 ++++----
.../src/test/resources/relationships-activity.map.xml | 6 +++---
.../src/test/resources/relationships-child-master.map.xml | 8 ++++----
cayenne-server/src/test/resources/relationships-clob.map.xml | 8 ++++----
.../test/resources/relationships-collection-to-many.map.xml | 8 ++++----
.../src/test/resources/relationships-delete-rules.map.xml | 8 ++++----
.../src/test/resources/relationships-flattened.map.xml | 8 ++++----
.../src/test/resources/relationships-set-to-many.map.xml | 8 ++++----
.../src/test/resources/relationships-to-many-fk.map.xml | 8 ++++----
.../src/test/resources/relationships-to-one-fk.map.xml | 8 ++++----
cayenne-server/src/test/resources/relationships.map.xml | 6 +++---
cayenne-server/src/test/resources/return-types.map.xml | 8 ++++----
cayenne-server/src/test/resources/soft-delete.map.xml | 8 ++++----
cayenne-server/src/test/resources/sus-map.map.xml | 6 +++---
cayenne-server/src/test/resources/table-primitives.map.xml | 8 ++++----
cayenne-server/src/test/resources/testmap.map.xml | 6 +++---
cayenne-server/src/test/resources/things.map.xml | 8 ++++----
cayenne-server/src/test/resources/toone.map.xml | 8 ++++----
.../src/test/resources/unsupported-distinct-types.map.xml | 6 +++---
cayenne-server/src/test/resources/uuid.map.xml | 8 ++++----
.../tools/dbimport/build-include-table.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testDefaultPackage.map.xml-result | 6 +++---
.../tools/dbimport/testFilteringWithSchema.map.xml-result | 6 +++---
.../testFlattensManyToManyWithRecursiveLink.map.xml-result | 6 +++---
.../tools/dbimport/testImportAddTableAndColumn.map.xml | 6 +++---
.../dbimport/testImportAddTableAndColumn.map.xml-result | 6 +++---
.../tools/dbimport/testImportNewDataMap.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testImportWithoutChanges.map.xml | 6 +++---
.../tools/dbimport/testImportWithoutChanges.map.xml-result | 6 +++---
.../testOldParamsSchemasAndTableExclude.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testOneToOne.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testPreserveRelationships.map.xml | 6 +++---
.../tools/dbimport/testPreserveRelationships.map.xml-result | 6 +++---
.../tools/dbimport/testSchemasAndTableExclude.map.xml-result | 6 +++---
.../tools/dbimport/testSimpleFiltering.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml | 6 +++---
.../tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result | 6 +++---
.../tools/dbimport/testSkipRelationshipsLoading.map.xml | 6 +++---
.../dbimport/testSkipRelationshipsLoading.map.xml-result | 6 +++---
.../testSupportsCatalogsOnReverseEngineering.map.xml | 8 ++++----
.../cayenne/tools/dbimport/testTableTypes.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml | 6 +++---
.../tools/dbimport/testUnFlattensManyToMany.map.xml-result | 6 +++---
.../cayenne/tools/dbimport/testViewsExclude.map.xml-result | 6 +++---
142 files changed, 380 insertions(+), 380 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-crypto/src/test/resources/cayenne-crypto.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/resources/cayenne-crypto.xml b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
index 64f283b..cf7e20f 100644
--- a/cayenne-crypto/src/test/resources/cayenne-crypto.xml
+++ b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="datamap"/>
<node name="datanode"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-crypto/src/test/resources/datamap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/resources/datamap.map.xml b/cayenne-crypto/src/test/resources/datamap.map.xml
index 6aa3683..2a20be2 100644
--- a/cayenne-crypto/src/test/resources/datamap.map.xml
+++ b/cayenne-crypto/src/test/resources/datamap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.crypto.db"/>
<db-entity name="TABLE1">
<db-attribute name="CRYPTO_STRING" type="CLOB"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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
index 8e07370..d4ad35d 100644
--- a/cayenne-java8/src/test/resources/cayenne-java8.xml
+++ b/cayenne-java8/src/test/resources/cayenne-java8.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="java8"/>
<node name="datanode"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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
index ac170f9..1d8a274 100644
--- a/cayenne-java8/src/test/resources/java8.map.xml
+++ b/cayenne-java8/src/test/resources/java8.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.java8.db"/>
<db-entity name="LOCAL_DATE_TEST">
<db-attribute name="Date" type="DATE"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-joda/src/test/resources/cayenne-joda.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/test/resources/cayenne-joda.xml b/cayenne-joda/src/test/resources/cayenne-joda.xml
index 0ba8345..7c7ef9d 100644
--- a/cayenne-joda/src/test/resources/cayenne-joda.xml
+++ b/cayenne-joda/src/test/resources/cayenne-joda.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="joda"/>
<node name="datanode"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-joda/src/test/resources/joda.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/test/resources/joda.map.xml b/cayenne-joda/src/test/resources/joda.map.xml
index afb9c7a..0234bf8 100644
--- a/cayenne-joda/src/test/resources/joda.map.xml
+++ b/cayenne-joda/src/test/resources/joda.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.joda.db"/>
<db-entity name="DATE_TIME_TEST">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
index 5bfd0a3..cffc16b 100644
--- a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="lifecycle-map"/>
<node name="lifecycle-db"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
index 92a6ab5..312b7ac 100644
--- a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.lifecycle.db"/>
<db-entity name="AUDITABLE1">
<db-attribute name="CHAR_PROPERTY1" type="VARCHAR" length="200"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/array-type.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/array-type.map.xml b/cayenne-server/src/test/resources/array-type.map.xml
index dda7920..dcceed0 100644
--- a/cayenne-server/src/test/resources/array-type.map.xml
+++ b/cayenne-server/src/test/resources/array-type.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.array_type"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -15,4 +15,4 @@
<obj-entity name="ArrayTestEntity" className="org.apache.cayenne.testdo.array_type.ArrayTestEntity" dbEntityName="ARRAY_TEST">
<obj-attribute name="doubleArray" type="java.lang.Double[]" db-attribute-path="DOUBLE_ARRAY"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/binary-pk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/binary-pk.map.xml b/cayenne-server/src/test/resources/binary-pk.map.xml
index ce5ee57..b4f6153 100644
--- a/cayenne-server/src/test/resources/binary-pk.map.xml
+++ b/cayenne-server/src/test/resources/binary-pk.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.binary_pk"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -31,4 +31,4 @@
</db-relationship>
<obj-relationship name="binaryPKDetails" source="BinaryPKTest1" target="BinaryPKTest2" db-relationship-path="binaryPKDetails"/>
<obj-relationship name="toBinaryPKMaster" source="BinaryPKTest2" target="BinaryPKTest1" db-relationship-path="toBinaryPKMaster"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cay743/cayenne-domain.xml b/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
index 088ee91..9c80f2a 100644
--- a/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
+++ b/cayenne-server/src/test/resources/cay743/cayenne-domain.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="map1"/>
<map name="map2"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cay743/map1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cay743/map1.map.xml b/cayenne-server/src/test/resources/cay743/map1.map.xml
index 4033219..b82860f 100644
--- a/cayenne-server/src/test/resources/cay743/map1.map.xml
+++ b/cayenne-server/src/test/resources/cay743/map1.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<obj-entity name="Entity11">
</obj-entity>
<obj-entity name="Entity12" superEntityName="Entity22">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cay743/map2.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cay743/map2.map.xml b/cayenne-server/src/test/resources/cay743/map2.map.xml
index 3dff26a..d635364 100644
--- a/cayenne-server/src/test/resources/cay743/map2.map.xml
+++ b/cayenne-server/src/test/resources/cay743/map2.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<obj-entity name="Entity21" superEntityName="Entity11">
</obj-entity>
<obj-entity name="Entity22">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-array-type.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-array-type.xml b/cayenne-server/src/test/resources/cayenne-array-type.xml
index c224355..6b85e55 100644
--- a/cayenne-server/src/test/resources/cayenne-array-type.xml
+++ b/cayenne-server/src/test/resources/cayenne-array-type.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="array-type"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-binary-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-binary-pk.xml b/cayenne-server/src/test/resources/cayenne-binary-pk.xml
index 0922532..5ca0448 100644
--- a/cayenne-server/src/test/resources/cayenne-binary-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-binary-pk.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="binary-pk"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-compound.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-compound.xml b/cayenne-server/src/test/resources/cayenne-compound.xml
index 28773ec..1dc56a5 100644
--- a/cayenne-server/src/test/resources/cayenne-compound.xml
+++ b/cayenne-server/src/test/resources/cayenne-compound.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="compound"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-date-time.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-date-time.xml b/cayenne-server/src/test/resources/cayenne-date-time.xml
index 9c7e1d3..f8d47d1 100644
--- a/cayenne-server/src/test/resources/cayenne-date-time.xml
+++ b/cayenne-server/src/test/resources/cayenne-date-time.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="date-time"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-delete-rules.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-delete-rules.xml b/cayenne-server/src/test/resources/cayenne-delete-rules.xml
index f6fa557..1d8e159 100644
--- a/cayenne-server/src/test/resources/cayenne-delete-rules.xml
+++ b/cayenne-server/src/test/resources/cayenne-delete-rules.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="delete-rules"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-embeddable.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-embeddable.xml b/cayenne-server/src/test/resources/cayenne-embeddable.xml
index 9ffb2e3..32ab708 100644
--- a/cayenne-server/src/test/resources/cayenne-embeddable.xml
+++ b/cayenne-server/src/test/resources/cayenne-embeddable.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="embeddable"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-empty.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-empty.xml b/cayenne-server/src/test/resources/cayenne-empty.xml
index 00778a5..e3ed459 100644
--- a/cayenne-server/src/test/resources/cayenne-empty.xml
+++ b/cayenne-server/src/test/resources/cayenne-empty.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="empty"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-enum.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-enum.xml b/cayenne-server/src/test/resources/cayenne-enum.xml
index 4b94cd1..a62ba39 100644
--- a/cayenne-server/src/test/resources/cayenne-enum.xml
+++ b/cayenne-server/src/test/resources/cayenne-enum.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="enum"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-extended-type.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-extended-type.xml b/cayenne-server/src/test/resources/cayenne-extended-type.xml
index 84b0670..71ce19f 100644
--- a/cayenne-server/src/test/resources/cayenne-extended-type.xml
+++ b/cayenne-server/src/test/resources/cayenne-extended-type.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="extended-type"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-generated.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-generated.xml b/cayenne-server/src/test/resources/cayenne-generated.xml
index 57bd957..e10820d 100644
--- a/cayenne-server/src/test/resources/cayenne-generated.xml
+++ b/cayenne-server/src/test/resources/cayenne-generated.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="generated"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-generic.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-generic.xml b/cayenne-server/src/test/resources/cayenne-generic.xml
index 0cacadc..4eaaf7b 100644
--- a/cayenne-server/src/test/resources/cayenne-generic.xml
+++ b/cayenne-server/src/test/resources/cayenne-generic.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="generic"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml b/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
index 6578fb6..97c6a53 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="inheritance-single-table1"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
index a482fde..00e60dd 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="inheritance-vertical"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-inheritance.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-inheritance.xml b/cayenne-server/src/test/resources/cayenne-inheritance.xml
index a76c22c..f6fea51 100644
--- a/cayenne-server/src/test/resources/cayenne-inheritance.xml
+++ b/cayenne-server/src/test/resources/cayenne-inheritance.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="inheritance"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml b/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
index 2764943..b9191a4 100644
--- a/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
+++ b/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="lifecycle-callbacks-order"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-lifecycles.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-lifecycles.xml b/cayenne-server/src/test/resources/cayenne-lifecycles.xml
index 0509c40..bcaa2e3 100644
--- a/cayenne-server/src/test/resources/cayenne-lifecycles.xml
+++ b/cayenne-server/src/test/resources/cayenne-lifecycles.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="lifecycles"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-lob.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-lob.xml b/cayenne-server/src/test/resources/cayenne-lob.xml
index 0bca9f9..f575f1b 100644
--- a/cayenne-server/src/test/resources/cayenne-lob.xml
+++ b/cayenne-server/src/test/resources/cayenne-lob.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="lob"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-locking.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-locking.xml b/cayenne-server/src/test/resources/cayenne-locking.xml
index cdbe852..b58f8fd 100644
--- a/cayenne-server/src/test/resources/cayenne-locking.xml
+++ b/cayenne-server/src/test/resources/cayenne-locking.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="locking"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-map-to-many.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-map-to-many.xml b/cayenne-server/src/test/resources/cayenne-map-to-many.xml
index abbb675..f15587b 100644
--- a/cayenne-server/src/test/resources/cayenne-map-to-many.xml
+++ b/cayenne-server/src/test/resources/cayenne-map-to-many.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="map-to-many"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
index d8b9204..1326169 100644
--- a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="meaningful-pk"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-misc-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-misc-types.xml b/cayenne-server/src/test/resources/cayenne-misc-types.xml
index bbc06f2..4821482 100644
--- a/cayenne-server/src/test/resources/cayenne-misc-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-misc-types.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="misc-types"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml b/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
index 84ebf37..b68da04 100644
--- a/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
+++ b/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="mixed-persistence-strategy"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-multi-tier.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-multi-tier.xml b/cayenne-server/src/test/resources/cayenne-multi-tier.xml
index 3673faf..afd9699 100644
--- a/cayenne-server/src/test/resources/cayenne-multi-tier.xml
+++ b/cayenne-server/src/test/resources/cayenne-multi-tier.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="multi-tier"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-multinode.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-multinode.xml b/cayenne-server/src/test/resources/cayenne-multinode.xml
index 7fb7a50..002aebd 100644
--- a/cayenne-server/src/test/resources/cayenne-multinode.xml
+++ b/cayenne-server/src/test/resources/cayenne-multinode.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="map-db1"/>
<map name="map-db2"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-no-pk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-no-pk.xml b/cayenne-server/src/test/resources/cayenne-no-pk.xml
index 3a65de0..523a90b 100644
--- a/cayenne-server/src/test/resources/cayenne-no-pk.xml
+++ b/cayenne-server/src/test/resources/cayenne-no-pk.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="no-pk"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-numeric-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-numeric-types.xml b/cayenne-server/src/test/resources/cayenne-numeric-types.xml
index 52d63c3..9bc5084 100644
--- a/cayenne-server/src/test/resources/cayenne-numeric-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-numeric-types.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="numeric-types"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
index 71af8d9..74f1cbe 100644
--- a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
+++ b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="oneway-rels"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml b/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
index 940d7ec..431d9af 100644
--- a/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
+++ b/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-people.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-people.xml b/cayenne-server/src/test/resources/cayenne-people.xml
index 8e10faf..2909c65 100644
--- a/cayenne-server/src/test/resources/cayenne-people.xml
+++ b/cayenne-server/src/test/resources/cayenne-people.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="people"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-persistent.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-persistent.xml b/cayenne-server/src/test/resources/cayenne-persistent.xml
index bc6e543..4411149 100644
--- a/cayenne-server/src/test/resources/cayenne-persistent.xml
+++ b/cayenne-server/src/test/resources/cayenne-persistent.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="persistent"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-primitive.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-primitive.xml b/cayenne-server/src/test/resources/cayenne-primitive.xml
index a63d770..8940525 100644
--- a/cayenne-server/src/test/resources/cayenne-primitive.xml
+++ b/cayenne-server/src/test/resources/cayenne-primitive.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="primitive"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-qualified.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-qualified.xml b/cayenne-server/src/test/resources/cayenne-qualified.xml
index 812b244..d82657f 100644
--- a/cayenne-server/src/test/resources/cayenne-qualified.xml
+++ b/cayenne-server/src/test/resources/cayenne-qualified.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="qualified"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
index 368da77..642885a 100644
--- a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
+++ b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="quoted-identifiers"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-reflexive.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-reflexive.xml b/cayenne-server/src/test/resources/cayenne-reflexive.xml
index 7e05dcf..389cdcf 100644
--- a/cayenne-server/src/test/resources/cayenne-reflexive.xml
+++ b/cayenne-server/src/test/resources/cayenne-reflexive.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="reflexive"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
index d655ac5..36b039c 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-activity"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml b/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
index bda49f7..4c59d65 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-child-master"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
index a28c631..88196ad 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-clob"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml b/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
index c8ca293..0398dc7 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-collection-to-many"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml b/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
index 7f170a6..6cea4e1 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-delete-rules"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
index 9452a56..7cdccc6 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-flattened"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml b/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
index 10881da..7e92d95 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-set-to-many"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml b/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
index 94792c3..d9e563c 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-to-many-fk"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml b/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
index 46da7b9..82dcd6e 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships-to-one-fk"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-relationships.xml b/cayenne-server/src/test/resources/cayenne-relationships.xml
index b7750ef..24f0c37 100644
--- a/cayenne-server/src/test/resources/cayenne-relationships.xml
+++ b/cayenne-server/src/test/resources/cayenne-relationships.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="relationships"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-return-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-return-types.xml b/cayenne-server/src/test/resources/cayenne-return-types.xml
index b03bf5d..95d67fb 100644
--- a/cayenne-server/src/test/resources/cayenne-return-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-return-types.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="return-types"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-small-testmap.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-small-testmap.xml b/cayenne-server/src/test/resources/cayenne-small-testmap.xml
index 24c2209..d11cf45 100644
--- a/cayenne-server/src/test/resources/cayenne-small-testmap.xml
+++ b/cayenne-server/src/test/resources/cayenne-small-testmap.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="small-testmap"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-soft-delete.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-soft-delete.xml b/cayenne-server/src/test/resources/cayenne-soft-delete.xml
index 15dfc25..f4a4bdc 100644
--- a/cayenne-server/src/test/resources/cayenne-soft-delete.xml
+++ b/cayenne-server/src/test/resources/cayenne-soft-delete.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="soft-delete"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-sus.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-sus.xml b/cayenne-server/src/test/resources/cayenne-sus.xml
index ff93d6c..b830baf 100644
--- a/cayenne-server/src/test/resources/cayenne-sus.xml
+++ b/cayenne-server/src/test/resources/cayenne-sus.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="sus-map"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-table-primitives.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-table-primitives.xml b/cayenne-server/src/test/resources/cayenne-table-primitives.xml
index 642c18b..d87ef95 100644
--- a/cayenne-server/src/test/resources/cayenne-table-primitives.xml
+++ b/cayenne-server/src/test/resources/cayenne-table-primitives.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="table-primitives"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-testmap.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-testmap.xml b/cayenne-server/src/test/resources/cayenne-testmap.xml
index 4028207..8253020 100644
--- a/cayenne-server/src/test/resources/cayenne-testmap.xml
+++ b/cayenne-server/src/test/resources/cayenne-testmap.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="testmap"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-things.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-things.xml b/cayenne-server/src/test/resources/cayenne-things.xml
index 8e9e1de..a5e13c0 100644
--- a/cayenne-server/src/test/resources/cayenne-things.xml
+++ b/cayenne-server/src/test/resources/cayenne-things.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="things"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-toone.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-toone.xml b/cayenne-server/src/test/resources/cayenne-toone.xml
index b856947..f46c8ac 100644
--- a/cayenne-server/src/test/resources/cayenne-toone.xml
+++ b/cayenne-server/src/test/resources/cayenne-toone.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="toone"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml b/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
index 9f0ab1d..6de977f 100644
--- a/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
+++ b/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="unsupported-distinct-types"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-uuid.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/cayenne-uuid.xml b/cayenne-server/src/test/resources/cayenne-uuid.xml
index f3bd2e1..a821d12 100644
--- a/cayenne-server/src/test/resources/cayenne-uuid.xml
+++ b/cayenne-server/src/test/resources/cayenne-uuid.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="7">
+<domain project-version="8">
<map name="uuid"/>
-</domain>
\ No newline at end of file
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/compound.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/compound.map.xml b/cayenne-server/src/test/resources/compound.map.xml
index 47ebbdb..f53832b 100644
--- a/cayenne-server/src/test/resources/compound.map.xml
+++ b/cayenne-server/src/test/resources/compound.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.compound"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -61,4 +61,4 @@
<obj-relationship name="charFKs" source="CharPkTestEntity" target="CharFkTestEntity" db-relationship-path="charFKs"/>
<obj-relationship name="toCompoundPk" source="CompoundFkTestEntity" target="CompoundPkTestEntity" db-relationship-path="toCompoundPk"/>
<obj-relationship name="compoundFkArray" source="CompoundPkTestEntity" target="CompoundFkTestEntity" db-relationship-path="compoundFkArray"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/date-time.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/date-time.map.xml b/cayenne-server/src/test/resources/date-time.map.xml
index 07b7aa7..69fd0ff 100644
--- a/cayenne-server/src/test/resources/date-time.map.xml
+++ b/cayenne-server/src/test/resources/date-time.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.date_time"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -31,4 +31,4 @@
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
</query>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/delete-rules.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/delete-rules.map.xml b/cayenne-server/src/test/resources/delete-rules.map.xml
index 9d6f5ed..85cf165 100644
--- a/cayenne-server/src/test/resources/delete-rules.map.xml
+++ b/cayenne-server/src/test/resources/delete-rules.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.deleterules"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.deleterules"/>
@@ -61,4 +61,4 @@
<obj-relationship name="fromCascade" source="DeleteRule" target="DeleteCascade" db-relationship-path="fromCascade"/>
<obj-relationship name="fromDeny" source="DeleteRule" target="DeleteDeny" db-relationship-path="fromDeny"/>
<obj-relationship name="fromNullify" source="DeleteRule" target="DeleteNullify" db-relationship-path="fromNullify"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/embeddable.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/embeddable.map.xml b/cayenne-server/src/test/resources/embeddable.map.xml
index 50fa2c4..62c245d 100644
--- a/cayenne-server/src/test/resources/embeddable.map.xml
+++ b/cayenne-server/src/test/resources/embeddable.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
<embeddable-attribute name="embedded10" type="java.lang.String" db-attribute-name="EMBEDDED10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/empty.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/empty.map.xml b/cayenne-server/src/test/resources/empty.map.xml
index 20ffbc78..7b88c75 100644
--- a/cayenne-server/src/test/resources/empty.map.xml
+++ b/cayenne-server/src/test/resources/empty.map.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<db-entity name="EMPTY">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
</db-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/enum.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/enum.map.xml b/cayenne-server/src/test/resources/enum.map.xml
index 9233e86..8f6197c 100644
--- a/cayenne-server/src/test/resources/enum.map.xml
+++ b/cayenne-server/src/test/resources/enum.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.enum"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -15,4 +15,4 @@
<obj-entity name="EnumEntity" className="org.apache.cayenne.testdo.enum_test.EnumEntity" dbEntityName="ENUM_ENTITY">
<obj-attribute name="enumAttribute" type="org.apache.cayenne.testdo.enum_test.Enum1" db-attribute-path="ENUM_ATTRIBUTE"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/extended-type.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/extended-type.map.xml b/cayenne-server/src/test/resources/extended-type.map.xml
index cc2a5ee..e743d0b 100644
--- a/cayenne-server/src/test/resources/extended-type.map.xml
+++ b/cayenne-server/src/test/resources/extended-type.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.extended_type"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -15,4 +15,4 @@
<obj-entity name="ExtendedTypeEntity" className="org.apache.cayenne.testdo.extended_type.ExtendedTypeEntity" dbEntityName="EXTENDED_TYPE_TEST">
<obj-attribute name="name" type="org.apache.cayenne.testdo.extended_type.StringET1" db-attribute-path="NAME"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/generated.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/generated.map.xml b/cayenne-server/src/test/resources/generated.map.xml
index 8c0a947..958a1d0 100644
--- a/cayenne-server/src/test/resources/generated.map.xml
+++ b/cayenne-server/src/test/resources/generated.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.generated"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -90,4 +90,4 @@
<obj-relationship name="toDep" source="GeneratedColumnTestEntity" target="GeneratedColumnDep" db-relationship-path="toDep"/>
<obj-relationship name="f2" source="GeneratedF1" target="GeneratedF2" deleteRule="Nullify" db-relationship-path="join.f2"/>
<obj-relationship name="f1" source="GeneratedF2" target="GeneratedF1" deleteRule="Nullify" db-relationship-path="join.f1"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/generic.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/generic.map.xml b/cayenne-server/src/test/resources/generic.map.xml
index a77e23f..184a91d 100644
--- a/cayenne-server/src/test/resources/generic.map.xml
+++ b/cayenne-server/src/test/resources/generic.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.generic"/>
<db-entity name="GENERIC1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance-single-table1.map.xml b/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
index ac28b94..865cced 100644
--- a/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
+++ b/cayenne-server/src/test/resources/inheritance-single-table1.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/>
<db-entity name="GROUP_MEMBERS">
<db-attribute name="group_id" type="BIGINT" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/inheritance-vertical.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance-vertical.map.xml b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
index 7bacee6..78da56e 100644
--- a/cayenne-server/src/test/resources/inheritance-vertical.map.xml
+++ b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance.vertical"/>
<db-entity name="IV1_ROOT">
<db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/inheritance.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance.map.xml b/cayenne-server/src/test/resources/inheritance.map.xml
index b74a97f..a23d40e 100644
--- a/cayenne-server/src/test/resources/inheritance.map.xml
+++ b/cayenne-server/src/test/resources/inheritance.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance"/>
<db-entity name="BASE_ENTITY">
<db-attribute name="BASE_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -43,4 +43,4 @@
<obj-relationship name="subEntities" source="DirectToSubEntity" target="SubEntity" db-relationship-path="subEntity"/>
<obj-relationship name="baseEntities" source="RelatedEntity" target="BaseEntity" db-relationship-path="entities"/>
<obj-relationship name="subEntities" source="RelatedEntity" target="SubEntity" db-relationship-path="entities"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
index 6ca4768..78d2594 100644
--- a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
+++ b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/>
@@ -13,4 +13,4 @@
<obj-entity name="Lifecycle" className="org.apache.cayenne.testdo.lifecycle_callbacks_order.Lifecycle" dbEntityName="LIFECYCLE">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/lifecycles.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/lifecycles.map.xml b/cayenne-server/src/test/resources/lifecycles.map.xml
index fdbfc7e..62c902a 100644
--- a/cayenne-server/src/test/resources/lifecycles.map.xml
+++ b/cayenne-server/src/test/resources/lifecycles.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycles"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycles"/>
@@ -13,4 +13,4 @@
<obj-entity name="Lifecycles" className="org.apache.cayenne.testdo.lifecycles.Lifecycles" clientClassName="org.apache.cayenne.testdo.lifecycles.ClientLifecycles" dbEntityName="LIFECYCLES">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/lob.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/lob.map.xml b/cayenne-server/src/test/resources/lob.map.xml
index 6f44ec7..3ae8644 100644
--- a/cayenne-server/src/test/resources/lob.map.xml
+++ b/cayenne-server/src/test/resources/lob.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.lob"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -50,4 +50,4 @@
</db-relationship>
<obj-relationship name="clobValue" source="ClobTestEntity" target="ClobTestRelation" db-relationship-path="clob"/>
<obj-relationship name="clobId" source="ClobTestRelation" target="ClobTestEntity" db-relationship-path="CLOB_REL"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/locking.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/locking.map.xml b/cayenne-server/src/test/resources/locking.map.xml
index 6bc80f1..9b84cf3 100644
--- a/cayenne-server/src/test/resources/locking.map.xml
+++ b/cayenne-server/src/test/resources/locking.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.locking"/>
<db-entity name="LOCKING_HELPER">
<db-attribute name="LOCKING_HELPER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/map-db1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/map-db1.map.xml b/cayenne-server/src/test/resources/map-db1.map.xml
index deff148..eb0f60e 100644
--- a/cayenne-server/src/test/resources/map-db1.map.xml
+++ b/cayenne-server/src/test/resources/map-db1.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/>
<db-entity name="CROSSDB_M1E1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/map-db2.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/map-db2.map.xml b/cayenne-server/src/test/resources/map-db2.map.xml
index 2c035f1..fa3fcc8 100644
--- a/cayenne-server/src/test/resources/map-db2.map.xml
+++ b/cayenne-server/src/test/resources/map-db2.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/>
<db-entity name="CROSSDB_M2E1">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/map-to-many.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/map-to-many.map.xml b/cayenne-server/src/test/resources/map-to-many.map.xml
index bdfd5a4..d3099da 100644
--- a/cayenne-server/src/test/resources/map-to-many.map.xml
+++ b/cayenne-server/src/test/resources/map-to-many.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.map_to_many"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.map_to_many"/>
@@ -54,4 +54,4 @@
<obj-relationship name="targets" source="MapToMany" target="MapToManyTarget" collection-type="java.util.Map" map-key="name" db-relationship-path="targets"/>
<obj-relationship name="mapToMany" source="MapToManyTarget" target="MapToMany" db-relationship-path="mapToMany"/>
-</data-map>
\ No newline at end of file
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/meaningful-pk.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/meaningful-pk.map.xml b/cayenne-server/src/test/resources/meaningful-pk.map.xml
index 77237a2..3172f04 100644
--- a/cayenne-server/src/test/resources/meaningful-pk.map.xml
+++ b/cayenne-server/src/test/resources/meaningful-pk.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/8/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">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"
+ project-version="8">
<property name="defaultPackage" value="org.apache.cayenne.testdo.meaningful_pk"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.testdo.meaningful_pk"/>
@@ -36,4 +36,4 @@
</db-relationship>
<obj-relationship name="toMeaningfulPK" source="MeaningfulPKDep" target="MeaningfulPKTest1" db-relationship-path="toMeaningfulPK"/>
<obj-relationship name="meaningfulPKDepArray" source="MeaningfulPKTest1" target="MeaningfulPKDep" db-relationship-path="meaningfulPKDepArray"/>
-</data-map>
\ No newline at end of file
+</data-map>
[15/16] cayenne git commit: CAY-2060 Make query type
QueryDescriptor's constructor parameter to ensure all its potential
subclasses initialize it.
Posted by dk...@apache.org.
CAY-2060 Make query type QueryDescriptor's constructor parameter to ensure all its potential subclasses initialize it.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/20e435dc
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/20e435dc
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/20e435dc
Branch: refs/heads/master
Commit: 20e435dc70014882e07265ea9c31ff23aa9ef941
Parents: 3e2b064
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Fri Feb 19 15:25:01 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:57 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/map/EJBQLQueryDescriptor.java | 2 +-
.../java/org/apache/cayenne/map/ProcedureQueryDescriptor.java | 2 +-
.../src/main/java/org/apache/cayenne/map/QueryDescriptor.java | 7 +++----
.../java/org/apache/cayenne/map/SQLTemplateDescriptor.java | 2 +-
.../java/org/apache/cayenne/map/SelectQueryDescriptor.java | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/20e435dc/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
index bb550fe..8e85e44 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
@@ -31,7 +31,7 @@ public class EJBQLQueryDescriptor extends QueryDescriptor {
protected String ejbql;
public EJBQLQueryDescriptor() {
- this.type = EJBQL_QUERY;
+ super(EJBQL_QUERY);
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/20e435dc/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
index 1ea3ea8..0eb50f9 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
@@ -31,7 +31,7 @@ public class ProcedureQueryDescriptor extends QueryDescriptor {
protected String resultEntityName;
public ProcedureQueryDescriptor() {
- this.type = PROCEDURE_QUERY;
+ super(PROCEDURE_QUERY);
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/20e435dc/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
index 64fd404..0731bf5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryDescriptor.java
@@ -83,8 +83,7 @@ public class QueryDescriptor implements Serializable, ConfigurationNode, XMLSeri
case PROCEDURE_QUERY:
return procedureQueryDescriptor();
default:
- QueryDescriptor descriptor = new QueryDescriptor();
- descriptor.setType(type);
+ QueryDescriptor descriptor = new QueryDescriptor(type);
return descriptor;
}
}
@@ -96,8 +95,8 @@ public class QueryDescriptor implements Serializable, ConfigurationNode, XMLSeri
protected Map<String, String> properties = new HashMap<>();
- protected QueryDescriptor() {
-
+ protected QueryDescriptor(String type) {
+ this.type = type;
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/20e435dc/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
index 7ceea4c..8fac3d5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
@@ -35,7 +35,7 @@ public class SQLTemplateDescriptor extends QueryDescriptor {
protected Map<String, String> adapterSql = new HashMap<>();
public SQLTemplateDescriptor() {
- this.type = SQL_TEMPLATE;
+ super(SQL_TEMPLATE);
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/20e435dc/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
index fafe15b..c439ceb 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
@@ -39,7 +39,7 @@ public class SelectQueryDescriptor extends QueryDescriptor {
protected List<String> prefetches = new ArrayList<>();
public SelectQueryDescriptor() {
- this.type = SELECT_QUERY;
+ super(SELECT_QUERY);
}
public void setDistinct(boolean value) {
[02/16] cayenne git commit: CAY-2060 Ongoing work on replacing actual
query objects stored in the DataMap with query descriptors.
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
index 8dc55d0..6985711 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
@@ -61,8 +61,8 @@ import org.apache.cayenne.modeler.undo.RemoveRelationshipUndoableEdit;
import org.apache.cayenne.modeler.undo.RemoveUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.ProjectUtil;
-import org.apache.cayenne.query.AbstractQuery;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import javax.swing.KeyStroke;
import javax.swing.undo.CompoundEdit;
@@ -490,13 +490,13 @@ public class RemoveAction extends CayenneAction {
/**
* Removes current Query from its DataMap and fires "remove" QueryEvent.
*/
- public void removeQuery(DataMap map, Query query) {
+ public void removeQuery(DataMap map, QueryDescriptor query) {
ProjectController mediator = getProjectController();
QueryEvent e = new QueryEvent(Application.getFrame(), query, MapEvent.REMOVE, map);
e.setDomain((DataChannelDescriptor) mediator.getProject().getRootNode());
- map.removeQuery(query.getName());
+ map.removeQueryDescriptor(query.getName());
mediator.fireQueryEvent(e);
}
@@ -532,15 +532,14 @@ public class RemoveAction extends CayenneAction {
// TODO: (Andrus, 09/09/2005) show warning dialog?
// clone to be able to remove within iterator...
- for (Query query : new ArrayList<Query>(map.getQueries())) {
- if (query instanceof AbstractQuery) {
- AbstractQuery next = (AbstractQuery) query;
- Object root = next.getRoot();
+ for (QueryDescriptor query : new ArrayList<>(map.getQueryDescriptors())) {
+ if (!QueryDescriptor.EJBQL_QUERY.equals(query.getType())) {
+ Object root = query.getRoot();
if (root == entity
|| (root instanceof String && root.toString().equals(
entity.getName()))) {
- removeQuery(map, next);
+ removeQuery(map, query);
}
}
}
@@ -651,10 +650,10 @@ public class RemoveAction extends CayenneAction {
removeObjEntity(((ObjEntity) object).getDataMap(), (ObjEntity) object);
}
- else if (object instanceof Query) {
- undo = new RemoveUndoableEdit(((Query) object).getDataMap(), (Query) object);
+ else if (object instanceof QueryDescriptor) {
+ undo = new RemoveUndoableEdit(((Query) object).getDataMap(), (QueryDescriptor) object);
- removeQuery(((Query) object).getDataMap(), (Query) object);
+ removeQuery(((Query) object).getDataMap(), (QueryDescriptor) object);
}
else if (object instanceof Procedure) {
undo = new RemoveUndoableEdit(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
index b5d5b83..8ef72bf 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
@@ -43,9 +43,7 @@ import org.apache.cayenne.modeler.event.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.RelationshipDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.*;
import javax.swing.JDialog;
import javax.swing.JLabel;
@@ -225,21 +223,16 @@ public class FindDialog extends CayenneController {
if (path instanceof DbEntity)
editor.getDbDetailView().currentDbEntityChanged(event);
}
- else if (path instanceof Query) {
+ else if (path instanceof QueryDescriptor) {
DataMap dmForQuery = null;
- if (path instanceof EJBQLQuery) {
- dmForQuery = ((EJBQLQuery) path).getDataMap();
- }
- if (path instanceof AbstractQuery) {
- dmForQuery = ((AbstractQuery) path).getDataMap();
- }
+ dmForQuery = ((QueryDescriptor) path).getDataMap();
Object[] o = new Object[3];
o[0] = domain;
o[1] = dmForQuery;
- o[2] = (Query) path;
+ o[2] = path;
TreePath treePath = buildTreePath(o, editor);
ProjectTreeView projectTreeView = editor.getProjectTreeView();
@@ -251,8 +244,8 @@ public class FindDialog extends CayenneController {
editor.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
QueryDisplayEvent event = new QueryDisplayEvent(
projectTreeView,
- (Query) path,
- (DataMap) dmForQuery,
+ (QueryDescriptor) path,
+ dmForQuery,
domain);
editor.currentQueryChanged(event);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java
index 5bb5b45..0df2a1d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/GeneratorController.java
@@ -181,7 +181,7 @@ public abstract class GeneratorController extends CayenneController {
embeddables.retainAll(getParentController().getSelectedEmbeddables());
generator.addEmbeddables(embeddables);
- generator.addQueries(map.getQueries());
+ generator.addQueries(map.getQueryDescriptors());
Preferences preferences = application.getPreferencesNode(GeneralPreferences.class, "");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
index c00325a..6ca5f9b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
@@ -34,12 +34,7 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.undo.CreateQueryUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
public class QueryType extends CayenneController{
@@ -47,32 +42,18 @@ public class QueryType extends CayenneController{
protected ProjectController mediator;
protected DataMap dataMap;
protected DataChannelDescriptor domain;
- protected Query query;
-
- // query prototypes...
- protected AbstractQuery objectSelectQuery;
- protected AbstractQuery rawSQLQuery;
- protected AbstractQuery procedureQuery;
- protected EJBQLQuery ejbqlQuery;
+
protected QueryTypeView view;
- protected Query selectedQuery;
+ protected String type;
- public QueryType(ProjectController mediator,DataMap root) {
+ public QueryType(ProjectController mediator, DataMap root) {
super(mediator);
-
- // create query prototypes:
- objectSelectQuery = new SelectQuery();
- procedureQuery = new ProcedureQuery();
+
view = new QueryTypeView();
initController();
- SQLTemplate rawSQLQuery = new SQLTemplate();
- rawSQLQuery.setRoot(root);
- rawSQLQuery.setFetchingDataRows(true);
- this.rawSQLQuery = rawSQLQuery;
-
- ejbqlQuery = new EJBQLQuery();
+
// by default use object query...
- selectedQuery = objectSelectQuery;
+ this.type = QueryDescriptor.SELECT_QUERY;
this.mediator = mediator;
this.dataMap = mediator.getCurrentDataMap();
this.domain = (DataChannelDescriptor)mediator.getProject().getRootNode();
@@ -135,22 +116,17 @@ public class QueryType extends CayenneController{
* Action method that creates a query for the specified query type.
*/
public void createQuery() {
- Query query =getSelectedQuery();
- if (query == null) {
- return;
- }
+ String queryType = getSelectedQuery();
// update query...
String queryName = DefaultUniqueNameGenerator.generate(NameCheckers.query, dataMap);
- if (query instanceof EJBQLQuery) {
- ((EJBQLQuery) query).setName(queryName);
- ((EJBQLQuery) query).setDataMap(dataMap);
- } else {
- ((AbstractQuery) query).setName(queryName);
- ((AbstractQuery) query).setDataMap(dataMap);
- }
+
+ QueryDescriptor query = QueryDescriptor.descriptor(queryType);
+
+ query.setName(queryName);
+ query.setDataMap(dataMap);
- dataMap.addQuery(query);
+ dataMap.addQueryDescriptor(query);
mediator.getApplication().getUndoManager().addEdit(
new CreateQueryUndoableEdit(domain, dataMap, query));
@@ -164,38 +140,30 @@ public class QueryType extends CayenneController{
* Fires events when a query was added
*/
public static void fireQueryEvent(Object src, ProjectController mediator,
- DataMap dataMap, Query query) {
+ DataMap dataMap, QueryDescriptor query) {
mediator.fireQueryEvent(new QueryEvent(src, query, MapEvent.ADD,
dataMap));
mediator.fireQueryDisplayEvent(new QueryDisplayEvent(src, query,
dataMap, (DataChannelDescriptor)mediator.getProject().getRootNode()));
}
- public Query getSelectedQuery() {
- return selectedQuery;
- }
-
- public void setSelectedQuery(AbstractQuery selectedQuery) {
- this.selectedQuery = selectedQuery;
+ public String getSelectedQuery() {
+ return type;
}
public void setObjectSelectQuery() {
- selectedQuery = objectSelectQuery;
+ this.type = QueryDescriptor.SELECT_QUERY;
}
public void setRawSQLQuery() {
- selectedQuery = rawSQLQuery;
- }
-
- public boolean isProcedureQuery() {
- return selectedQuery == procedureQuery;
+ this.type = QueryDescriptor.SQL_TEMPLATE;
}
public void setProcedureQuery() {
- selectedQuery = procedureQuery;
+ this.type = QueryDescriptor.PROCEDURE_QUERY;
}
public void setEjbqlQuery() {
- selectedQuery = ejbqlQuery;
+ this.type = QueryDescriptor.EJBQL_QUERY;
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
index 543b83d..1cfdc80 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.validation.ValidationFailure;
/**
@@ -42,7 +42,7 @@ public class QueryErrorMsg extends ValidationDisplayHandler {
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
.getRootNode();
- Query query = (Query) object;
+ QueryDescriptor query = (QueryDescriptor) object;
DataMap map = query.getDataMap();
QueryDisplayEvent event = new QueryDisplayEvent(frame, query, map, domain);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
index bf34c36..24e1919 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
@@ -33,6 +33,7 @@ import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.pref.DataNodeDefaults;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.validation.ValidationFailure;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -86,7 +87,7 @@ public abstract class ValidationDisplayHandler {
else if (validatedObj instanceof ProcedureParameter) {
msg = new ProcedureParameterErrorMsg(result);
}
- else if (validatedObj instanceof Query) {
+ else if (validatedObj instanceof QueryDescriptor) {
msg = new QueryErrorMsg(result);
}
else {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
index 72a42ac..741ea01 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
@@ -46,11 +46,7 @@ import org.apache.cayenne.modeler.event.ProcedureDisplayListener;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
import org.apache.cayenne.modeler.pref.ComponentGeometry;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
import org.apache.commons.logging.LogFactory;
import javax.swing.Action;
@@ -340,22 +336,23 @@ public class EditorView extends JPanel implements ObjEntityDisplayListener,
}
public void currentQueryChanged(QueryDisplayEvent e) {
- Query query = e.getQuery();
-
- if (query instanceof SelectQuery) {
- detailLayout.show(detailPanel, SELECT_QUERY_VIEW);
- }
- else if (query instanceof SQLTemplate) {
- detailLayout.show(detailPanel, SQL_TEMPLATE_VIEW);
- }
- else if (query instanceof ProcedureQuery) {
- detailLayout.show(detailPanel, PROCEDURE_QUERY_VIEW);
- }
- else if (query instanceof EJBQLQuery) {
- detailLayout.show(detailPanel, EJBQL_QUERY_VIEW);
- }
- else {
- detailLayout.show(detailPanel, EMPTY_VIEW);
+ QueryDescriptor query = e.getQuery();
+
+ switch (query.getType()) {
+ case QueryDescriptor.SELECT_QUERY:
+ detailLayout.show(detailPanel, SELECT_QUERY_VIEW);
+ break;
+ case QueryDescriptor.SQL_TEMPLATE:
+ detailLayout.show(detailPanel, SQL_TEMPLATE_VIEW);
+ break;
+ case QueryDescriptor.PROCEDURE_QUERY:
+ detailLayout.show(detailPanel, PROCEDURE_QUERY_VIEW);
+ break;
+ case QueryDescriptor.EJBQL_QUERY:
+ detailLayout.show(detailPanel, EJBQL_QUERY_VIEW);
+ break;
+ default:
+ detailLayout.show(detailPanel, EMPTY_VIEW);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
index 299e7e9..d702cf7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
@@ -27,8 +27,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
import com.jgoodies.forms.builder.PanelBuilder;
@@ -79,22 +78,21 @@ public class EjbqlQueryMainTab extends JPanel{
* query is changed.
*/
void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
- if (!(query instanceof EJBQLQuery)) {
+ if (query == null || !QueryDescriptor.EJBQL_QUERY.equals(query.getType())) {
setVisible(false);
return;
}
- EJBQLQuery ejbqlQuery = (EJBQLQuery) query;
- name.setText(ejbqlQuery.getName());
- properties.initFromModel(ejbqlQuery);
+ name.setText(query.getName());
+ properties.initFromModel(query);
setVisible(true);
}
- protected EJBQLQuery getQuery() {
- Query query = mediator.getCurrentQuery();
- return (query instanceof EJBQLQuery) ? (EJBQLQuery) query : null;
+ protected QueryDescriptor getQuery() {
+ QueryDescriptor query = mediator.getCurrentQuery();
+ return (query != null && QueryDescriptor.EJBQL_QUERY.equals(query.getType())) ? query : null;
}
/**
@@ -105,7 +103,7 @@ public class EjbqlQueryMainTab extends JPanel{
newName = null;
}
- EJBQLQuery query = getQuery();
+ QueryDescriptor query = getQuery();
if (query == null) {
return;
@@ -121,7 +119,7 @@ public class EjbqlQueryMainTab extends JPanel{
DataMap map = mediator.getCurrentDataMap();
- if (map.getQuery(newName) == null) {
+ if (map.getQueryDescriptor(newName) == null) {
// completely new name, set new name for entity
QueryEvent e = new QueryEvent(this, query, query.getName());
ProjectUtil.setQueryName(map, query, newName);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryPropertiesPanel.java
index 989b372..1eaa014 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryPropertiesPanel.java
@@ -20,12 +20,7 @@ package org.apache.cayenne.modeler.editor;
import java.awt.BorderLayout;
-import javax.swing.DefaultComboBoxModel;
-
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryCacheStrategy;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
@@ -65,32 +60,4 @@ public class EjbqlQueryPropertiesPanel extends SelectPropertiesPanel {
this.setLayout(new BorderLayout());
this.add(createPanelBuilder().getPanel(), BorderLayout.CENTER);
}
-
- /**
- * Updates the view from the current model state. Invoked when a currently displayed
- * query is changed.
- */
- public void initFromModel(Query query) {
-
- // instead of metadata lookups, use EJBQLQuery getters to access fields to avoid
- // unneeded EJBQL parsing...
- EJBQLQuery ejbqlQuery = (EJBQLQuery) query;
-
- DefaultComboBoxModel cacheModel = new DefaultComboBoxModel(CACHE_POLICIES);
-
- QueryCacheStrategy selectedStrategy = ejbqlQuery.getCacheStrategy();
-
- cacheModel.setSelectedItem(selectedStrategy != null
- ? selectedStrategy
- : QueryCacheStrategy.getDefaultStrategy());
- cacheStrategy.setModel(cacheModel);
- String[] cacheGroupsArray = ejbqlQuery.getCacheGroups();
- cacheGroups.setText(toCacheGroupsString(cacheGroupsArray));
- setCacheGroupsEnabled(selectedStrategy != null
- && selectedStrategy != QueryCacheStrategy.NO_CACHE);
-
- fetchOffset.setText(String.valueOf(ejbqlQuery.getFetchOffset()));
- fetchLimit.setText(String.valueOf(ejbqlQuery.getFetchLimit()));
- pageSize.setText(String.valueOf(ejbqlQuery.getPageSize()));
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
index 1221e32..e376f7d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
@@ -38,8 +38,8 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.JUndoableCayenneTextPane;
import org.apache.cayenne.project.validation.EJBQLStatementValidator;
import org.apache.cayenne.project.validation.EJBQLStatementValidator.PositionException;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.EJBQLQueryDescriptor;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
import org.apache.cayenne.swing.components.textpane.syntax.EJBQLSyntaxConstant;
import org.apache.cayenne.util.Util;
@@ -57,8 +57,8 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
}
void displayScript() {
- EJBQLQuery query = getQuery();
- scriptArea.setText(query.getEjbqlStatement());
+ EJBQLQueryDescriptor query = getQuery();
+ scriptArea.setText(query.getEjbql());
updateDisabled = false;
}
@@ -75,7 +75,7 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
try {
String text = scriptArea.getDocument().getText(e.getOffset(), 1).toString();
if (text.equals(" ") || text.equals("\n") || text.equals("\t")) {
- getQuery().setEjbqlStatement(scriptArea.getText());
+ getQuery().setEjbql(scriptArea.getText());
validateEJBQL();
}
} catch (BadLocationException e1) {
@@ -84,7 +84,7 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
}
public void removeUpdate(DocumentEvent e) {
- getQuery().setEjbqlStatement(scriptArea.getText());
+ getQuery().setEjbql(scriptArea.getText());
validateEJBQL();
}
});
@@ -111,7 +111,7 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
if (e.getKeyCode() == KeyEvent.VK_END || e.getKeyCode() == KeyEvent.VK_HOME
|| e.getKeyCode() == KeyEvent.VK_LEFT || e.getKeyCode() == KeyEvent.VK_RIGHT
|| e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_UNDO) {
- getQuery().setEjbqlStatement(scriptArea.getText());
+ getQuery().setEjbql(scriptArea.getText());
validateEJBQL();
}
if ((e.getKeyCode() == KeyEvent.VK_V || e.getKeyCode() == KeyEvent.VK_X) && e.isControlDown()) {
@@ -123,7 +123,7 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
if ((pasteOrCut && e.getKeyCode() == KeyEvent.VK_CONTROL) || e.getKeyCode() == KeyEvent.VK_DELETE) {
scriptArea.removeHighlightText();
- getQuery().setEjbqlStatement(scriptArea.getText());
+ getQuery().setEjbql(scriptArea.getText());
validateEJBQL();
pasteOrCut = false;
}
@@ -140,9 +140,9 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
}
public void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
- if (!(query instanceof EJBQLQuery)) {
+ if (query == null || !QueryDescriptor.EJBQL_QUERY.equals(query.getType())) {
setVisible(false);
return;
}
@@ -152,9 +152,10 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
setVisible(true);
}
- EJBQLQuery getQuery() {
- Query query = mediator.getCurrentQuery();
- return (query instanceof EJBQLQuery) ? (EJBQLQuery) query : null;
+ EJBQLQueryDescriptor getQuery() {
+ QueryDescriptor query = mediator.getCurrentQuery();
+ return (query != null && QueryDescriptor.EJBQL_QUERY.equals(query.getType())) ?
+ (EJBQLQueryDescriptor) query : null;
}
void setEJBQL(DocumentEvent e) {
@@ -167,7 +168,7 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
}
void setEJBQL(String text) {
- EJBQLQuery query = getQuery();
+ EJBQLQueryDescriptor query = getQuery();
if (query == null) {
return;
}
@@ -182,8 +183,8 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
// Compare the value before modifying the query - text area
// will call "verify" even if no changes have occured....
- if (!Util.nullSafeEquals(text, query.getEjbqlStatement())) {
- query.setEjbqlStatement(text);
+ if (!Util.nullSafeEquals(text, query.getEjbql())) {
+ query.setEjbql(text);
mediator.fireQueryEvent(new QueryEvent(this, query));
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
index f0501d6..78654ed 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
@@ -26,7 +26,7 @@ import javax.swing.event.ChangeListener;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
-import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.query.QueryDescriptor;
public class EjbqlTabbedView extends JTabbedPane {
@@ -69,7 +69,7 @@ public class EjbqlTabbedView extends JTabbedPane {
}
void initFromModel() {
- if (!(mediator.getCurrentQuery() instanceof EJBQLQuery)) {
+ if (!QueryDescriptor.EJBQL_QUERY.equals(mediator.getCurrentQuery().getType())) {
setVisible(false);
return;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
index 513b15e..b771707 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
@@ -26,8 +26,8 @@ import java.awt.event.ActionListener;
import javax.swing.JCheckBox;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.query.QueryMetadata;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
@@ -85,7 +85,7 @@ public class ObjectQueryPropertiesPanel extends SelectPropertiesPanel {
public void actionPerformed(ActionEvent event) {
Boolean b = dataRows.isSelected() ? Boolean.TRUE : Boolean.FALSE;
- setQueryProperty("fetchingDataRows", b);
+ setQueryProperty(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY, String.valueOf(b));
}
});
}
@@ -94,9 +94,9 @@ public class ObjectQueryPropertiesPanel extends SelectPropertiesPanel {
* Updates the view from the current model state. Invoked when a currently displayed
* query is changed.
*/
- public void initFromModel(Query query) {
+ public void initFromModel(QueryDescriptor query) {
super.initFromModel(query);
- dataRows.setSelected(((SelectQuery) query).isFetchingDataRows());
+ dataRows.setSelected(Boolean.valueOf(query.getProperty(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY)));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
index 9bbf92e..5cf446e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
@@ -45,10 +45,7 @@ import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.CapsStrategy;
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
@@ -127,7 +124,7 @@ public class ProcedureQueryView extends JPanel {
queryRoot.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
- AbstractQuery query = (AbstractQuery) mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
if (query != null) {
query.setRoot(queryRoot.getModel().getSelectedItem());
mediator.fireQueryEvent(new QueryEvent(this, query));
@@ -148,17 +145,15 @@ public class ProcedureQueryView extends JPanel {
* query is changed.
*/
void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
- if (!(query instanceof ProcedureQuery)) {
+ if (query == null || !QueryDescriptor.PROCEDURE_QUERY.equals(query.getType())) {
setVisible(false);
return;
}
- ProcedureQuery procedureQuery = (ProcedureQuery) query;
-
properties.setEnabled(true);
- name.setText(procedureQuery.getName());
+ name.setText(query.getName());
// init root choices and title label..
@@ -176,10 +171,10 @@ public class ProcedureQueryView extends JPanel {
}
DefaultComboBoxModel model = new DefaultComboBoxModel(roots);
- model.setSelectedItem(procedureQuery.getRoot());
+ model.setSelectedItem(query.getRoot());
queryRoot.setModel(model);
- properties.initFromModel(procedureQuery);
+ properties.initFromModel(query);
setVisible(true);
}
@@ -191,7 +186,7 @@ public class ProcedureQueryView extends JPanel {
newName = null;
}
- AbstractQuery query = (AbstractQuery) mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
if (query == null) {
return;
}
@@ -206,7 +201,7 @@ public class ProcedureQueryView extends JPanel {
DataMap map = mediator.getCurrentDataMap();
- if (map.getQuery(newName) == null) {
+ if (map.getQueryDescriptor(newName) == null) {
// completely new name, set new name for entity
QueryEvent e = new QueryEvent(this, query, query.getName(), map);
ProjectUtil.setQueryName(map, query, newName);
@@ -223,7 +218,7 @@ public class ProcedureQueryView extends JPanel {
/**
* Returns an entity that maps to a procedure query result class.
*/
- ObjEntity getEntity(ProcedureQuery query) {
+ ObjEntity getEntity(ProcedureQueryDescriptor query) {
String entityName = query.getResultEntityName();
if (entityName == null) {
return null;
@@ -238,12 +233,10 @@ public class ProcedureQueryView extends JPanel {
}
void setEntity(ObjEntity entity) {
- Query query = mediator.getCurrentQuery();
- if (query instanceof ProcedureQuery) {
- ProcedureQuery procedureQuery = (ProcedureQuery) query;
-
- procedureQuery.setResultEntityName(entity != null ? entity.getName() : null);
- mediator.fireQueryEvent(new QueryEvent(this, procedureQuery));
+ QueryDescriptor query = mediator.getCurrentQuery();
+ if (query != null && QueryDescriptor.PROCEDURE_QUERY.equals(query.getType())) {
+ ((ProcedureQueryDescriptor) query).setResultEntityName(entity != null ? entity.getName() : null);
+ mediator.fireQueryEvent(new QueryEvent(this, query));
}
}
@@ -276,7 +269,7 @@ public class ProcedureQueryView extends JPanel {
public void actionPerformed(ActionEvent event) {
Object value = labelCase.getModel().getSelectedItem();
- setQueryProperty("columnNamesCapitalization", value);
+ setQueryProperty(ProcedureQuery.COLUMN_NAME_CAPITALIZATION_PROPERTY, (String) value);
}
});
@@ -294,15 +287,17 @@ public class ProcedureQueryView extends JPanel {
return builder;
}
- public void initFromModel(Query query) {
+ public void initFromModel(QueryDescriptor query) {
super.initFromModel(query);
- if (query instanceof ProcedureQuery) {
- ProcedureQuery template = (ProcedureQuery) query;
+ if (query != null && QueryDescriptor.PROCEDURE_QUERY.equals(query.getType())) {
DefaultComboBoxModel labelCaseModel = new DefaultComboBoxModel(
LABEL_CAPITALIZATION);
- labelCaseModel.setSelectedItem(template.getColumnNamesCapitalization());
+ String columnNameCapitalization = query.getProperty(SQLTemplate.COLUMN_NAME_CAPITALIZATION_PROPERTY);
+
+ labelCaseModel.setSelectedItem(columnNameCapitalization != null ?
+ CapsStrategy.valueOf(columnNameCapitalization) : CapsStrategy.DEFAULT);
labelCase.setModel(labelCaseModel);
}
}
@@ -311,12 +306,12 @@ public class ProcedureQueryView extends JPanel {
ProcedureQueryView.this.setEntity(entity);
}
- public ObjEntity getEntity(Query query) {
- if (query instanceof ProcedureQuery) {
- return ProcedureQueryView.this.getEntity((ProcedureQuery) query);
+ public ObjEntity getEntity(QueryDescriptor query) {
+ if (query != null && QueryDescriptor.PROCEDURE_QUERY.equals(query.getType())) {
+ return ProcedureQueryView.this.getEntity((ProcedureQueryDescriptor) query);
}
return null;
}
- };
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
index 6efc02f..6106cea 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
@@ -43,6 +43,8 @@ import org.apache.cayenne.query.Query;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.query.QueryMetadata;
/**
* A panel that supports editing the properties a query not based on ObjEntity, but still
@@ -122,12 +124,12 @@ public abstract class RawQueryPropertiesPanel extends SelectPropertiesPanel {
* Updates the view from the current model state. Invoked when a currently displayed
* query is changed.
*/
- public void initFromModel(Query query) {
+ public void initFromModel(QueryDescriptor query) {
super.initFromModel(query);
- EntityResolver entRes = new EntityResolver(((DataChannelDescriptor) mediator
- .getProject()
- .getRootNode()).getDataMaps());
- boolean fetchingDO = !query.getMetaData(entRes).isFetchingDataRows();
+// EntityResolver entRes = new EntityResolver(((DataChannelDescriptor) mediator
+// .getProject()
+// .getRootNode()).getDataMaps());
+ boolean fetchingDO = !Boolean.valueOf(query.getProperties().get(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY));
dataObjects.setSelected(fetchingDO);
// TODO: now we only allow ObjEntities from the current map,
@@ -150,7 +152,7 @@ public abstract class RawQueryPropertiesPanel extends SelectPropertiesPanel {
protected abstract void setEntity(ObjEntity selectedEntity);
- protected abstract ObjEntity getEntity(Query query);
+ protected abstract ObjEntity getEntity(QueryDescriptor query);
protected void setFetchingDataObjects(boolean dataObjects) {
entities.setEnabled(dataObjects && isEnabled());
@@ -159,6 +161,7 @@ public abstract class RawQueryPropertiesPanel extends SelectPropertiesPanel {
entities.getModel().setSelectedItem(null);
}
- setQueryProperty("fetchingDataRows", dataObjects ? Boolean.FALSE : Boolean.TRUE);
+ setQueryProperty(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY,
+ dataObjects ? Boolean.FALSE.toString() : Boolean.TRUE.toString());
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
index 65377e0..32cbdde 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
@@ -40,9 +40,7 @@ import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.CapsStrategy;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
@@ -116,24 +114,22 @@ public class SQLTemplateMainTab extends JPanel {
* query is changed.
*/
void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
- if (!(query instanceof SQLTemplate)) {
+ if (query == null || !QueryDescriptor.SQL_TEMPLATE.equals(query.getType())) {
setVisible(false);
return;
}
- SQLTemplate sqlQuery = (SQLTemplate) query;
-
- name.setText(sqlQuery.getName());
- properties.initFromModel(sqlQuery);
+ name.setText(query.getName());
+ properties.initFromModel(query);
setVisible(true);
}
- protected SQLTemplate getQuery() {
- Query query = mediator.getCurrentQuery();
- return (query instanceof SQLTemplate) ? (SQLTemplate) query : null;
+ protected QueryDescriptor getQuery() {
+ QueryDescriptor query = mediator.getCurrentQuery();
+ return (query != null && QueryDescriptor.SQL_TEMPLATE.equals(query.getType())) ? query : null;
}
/**
@@ -144,7 +140,7 @@ public class SQLTemplateMainTab extends JPanel {
newName = null;
}
- SQLTemplate query = getQuery();
+ QueryDescriptor query = getQuery();
if (query == null) {
return;
@@ -160,7 +156,7 @@ public class SQLTemplateMainTab extends JPanel {
DataMap map = mediator.getCurrentDataMap();
- if (map.getQuery(newName) == null) {
+ if (map.getQueryDescriptor(newName) == null) {
// completely new name, set new name for entity
QueryEvent e = new QueryEvent(this, query, query.getName());
ProjectUtil.setQueryName(map, query, newName);
@@ -177,13 +173,13 @@ public class SQLTemplateMainTab extends JPanel {
/**
* Returns an entity that maps to a procedure query result class.
*/
- ObjEntity getEntity(SQLTemplate query) {
+ ObjEntity getEntity(QueryDescriptor query) {
return query != null && query.getRoot() instanceof ObjEntity ? (ObjEntity) query
.getRoot() : null;
}
void setEntity(ObjEntity entity) {
- SQLTemplate template = getQuery();
+ QueryDescriptor template = getQuery();
if (template != null) {
// in case of null entity, set root to DataMap
Object root = entity != null ? entity : mediator.getCurrentDataMap();
@@ -221,8 +217,8 @@ public class SQLTemplateMainTab extends JPanel {
labelCase.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
- Object value = labelCase.getModel().getSelectedItem();
- setQueryProperty("columnNamesCapitalization", value);
+ CapsStrategy value = (CapsStrategy) labelCase.getModel().getSelectedItem();
+ setQueryProperty(SQLTemplate.COLUMN_NAME_CAPITALIZATION_PROPERTY, value.name());
}
});
@@ -240,15 +236,17 @@ public class SQLTemplateMainTab extends JPanel {
return builder;
}
- public void initFromModel(Query query) {
+ public void initFromModel(QueryDescriptor query) {
super.initFromModel(query);
- if (query instanceof SQLTemplate) {
- SQLTemplate template = (SQLTemplate) query;
+ if (query != null && QueryDescriptor.SQL_TEMPLATE.equals(query.getType())) {
DefaultComboBoxModel labelCaseModel = new DefaultComboBoxModel(
LABEL_CAPITALIZATION);
- labelCaseModel.setSelectedItem(template.getColumnNamesCapitalization());
+ String columnNameCapitalization = query.getProperty(SQLTemplate.COLUMN_NAME_CAPITALIZATION_PROPERTY);
+
+ labelCaseModel.setSelectedItem(columnNameCapitalization != null ?
+ CapsStrategy.valueOf(columnNameCapitalization) : CapsStrategy.DEFAULT);
labelCase.setModel(labelCaseModel);
}
}
@@ -257,9 +255,9 @@ public class SQLTemplateMainTab extends JPanel {
SQLTemplateMainTab.this.setEntity(entity);
}
- public ObjEntity getEntity(Query query) {
- if (query instanceof SQLTemplate) {
- return SQLTemplateMainTab.this.getEntity((SQLTemplate) query);
+ public ObjEntity getEntity(QueryDescriptor query) {
+ if (query != null && QueryDescriptor.SQL_TEMPLATE.equals(query.getType())) {
+ return SQLTemplateMainTab.this.getEntity(query);
}
return null;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
index 48833d3..a281cc9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
@@ -26,8 +26,8 @@ import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.DbAdapterInfo;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.query.SQLTemplateDescriptor;
import org.apache.cayenne.util.Util;
import org.syntax.jedit.JEditTextArea;
import org.syntax.jedit.KeywordMap;
@@ -162,9 +162,9 @@ public class SQLTemplateScriptsTab extends JPanel implements DocumentListener {
}
void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
- if (!(query instanceof SQLTemplate)) {
+ if (query == null || !QueryDescriptor.SQL_TEMPLATE.equals(query.getType())) {
setVisible(false);
return;
}
@@ -187,18 +187,19 @@ public class SQLTemplateScriptsTab extends JPanel implements DocumentListener {
return null;
}
- SQLTemplate query = getQuery();
+ SQLTemplateDescriptor query = getQuery();
if (query == null) {
return null;
}
- return (key.equals(DEFAULT_LABEL)) ? query.getDefaultTemplate() : query
- .getCustomTemplate(key);
+ return (key.equals(DEFAULT_LABEL)) ? query.getSql() : query
+ .getAdapterSql().get(key);
}
- SQLTemplate getQuery() {
- Query query = mediator.getCurrentQuery();
- return (query instanceof SQLTemplate) ? (SQLTemplate) query : null;
+ SQLTemplateDescriptor getQuery() {
+ QueryDescriptor query = mediator.getCurrentQuery();
+ return (query != null && QueryDescriptor.SQL_TEMPLATE.equals(query.getType())) ?
+ (SQLTemplateDescriptor) query : null;
}
/**
@@ -206,7 +207,7 @@ public class SQLTemplateScriptsTab extends JPanel implements DocumentListener {
*/
void displayScript() {
- SQLTemplate query = getQuery();
+ SQLTemplateDescriptor query = getQuery();
if (query == null) {
disableEditor();
return;
@@ -220,8 +221,8 @@ public class SQLTemplateScriptsTab extends JPanel implements DocumentListener {
enableEditor();
- String text = (key.equals(DEFAULT_LABEL)) ? query.getDefaultTemplate() : query
- .getCustomTemplate(key);
+ String text = (key.equals(DEFAULT_LABEL)) ? query.getSql() : query
+ .getAdapterSql().get(key);
updateDisabled = true;
scriptArea.setText(text);
@@ -257,7 +258,7 @@ public class SQLTemplateScriptsTab extends JPanel implements DocumentListener {
* Sets the value of SQL template for the currently selected script.
*/
void setSQL(String text) {
- SQLTemplate query = getQuery();
+ SQLTemplateDescriptor query = getQuery();
if (query == null) {
return;
}
@@ -277,14 +278,14 @@ public class SQLTemplateScriptsTab extends JPanel implements DocumentListener {
// Compare the value before modifying the query - text area
// will call "verify" even if no changes have occured....
if (key.equals(DEFAULT_LABEL)) {
- if (!Util.nullSafeEquals(text, query.getDefaultTemplate())) {
- query.setDefaultTemplate(text);
+ if (!Util.nullSafeEquals(text, query.getSql())) {
+ query.setSql(text);
mediator.fireQueryEvent(new QueryEvent(this, query));
}
}
else {
- if (!Util.nullSafeEquals(text, query.getTemplate(key))) {
- query.setTemplate(key, text);
+ if (!Util.nullSafeEquals(text, query.getAdapterSql().get(key))) {
+ query.getAdapterSql().put(key, text);
mediator.fireQueryEvent(new QueryEvent(this, query));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
index 8c273cc..76a8113 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
@@ -28,7 +28,7 @@ import javax.swing.event.ChangeListener;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
-import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.query.QueryDescriptor;
/**
*/
@@ -74,13 +74,13 @@ public class SQLTemplateTabbedView extends JTabbedPane {
}
void initFromModel() {
- if (!(mediator.getCurrentQuery() instanceof SQLTemplate)) {
+ if (!QueryDescriptor.SQL_TEMPLATE.equals(mediator.getCurrentQuery().getType())) {
setVisible(false);
return;
}
// if no root, reset tabs to show the first panel..
- if (((SQLTemplate) mediator.getCurrentQuery()).getRoot() == null) {
+ if (mediator.getCurrentQuery().getRoot() == null) {
lastSelectionIndex = 0;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
index 5b3b387..50d8176 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
@@ -24,7 +24,6 @@ import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Map;
-import java.util.StringTokenizer;
import java.util.TreeMap;
import javax.swing.DefaultComboBoxModel;
@@ -39,11 +38,12 @@ import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryCacheStrategy;
-import org.apache.cayenne.reflect.PropertyUtils;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -128,7 +128,7 @@ public abstract class SelectPropertiesPanel extends JPanel {
QueryCacheStrategy strategy = (QueryCacheStrategy) cacheStrategy
.getModel()
.getSelectedItem();
- setQueryProperty("cacheStrategy", strategy);
+ setQueryProperty(QueryMetadata.CACHE_STRATEGY_PROPERTY, strategy.name());
setCacheGroupsEnabled(strategy != null
&& strategy != QueryCacheStrategy.NO_CACHE);
}
@@ -139,33 +139,30 @@ public abstract class SelectPropertiesPanel extends JPanel {
* Updates the view from the current model state. Invoked when a currently displayed
* query is changed.
*/
- public void initFromModel(Query query) {
+ public void initFromModel(QueryDescriptor query) {
DefaultComboBoxModel cacheModel = new DefaultComboBoxModel(CACHE_POLICIES);
- // TODO (andrey, 15/12/09)
- // do not use metadata, as it triggers CDO class loading (CAY-1334)
- // to avoid this evil hack, we need some common interface for SelectQuery, EJBQL
- // & SQLTemplate, but 3.0 API is frozen now
- QueryCacheStrategy selectedStrategy = (QueryCacheStrategy) PropertyUtils
- .getProperty(query, "cacheStrategy");
+ String selectedStrategyString = query.getProperty(QueryMetadata.CACHE_STRATEGY_PROPERTY);
+
+ QueryCacheStrategy selectedStrategy = selectedStrategyString != null ?
+ QueryCacheStrategy.valueOf(selectedStrategyString) : null;
+
+ cacheModel.setSelectedItem(selectedStrategy != null ?
+ selectedStrategy : QueryCacheStrategy.getDefaultStrategy());
- cacheModel.setSelectedItem(selectedStrategy != null
- ? selectedStrategy
- : QueryCacheStrategy.getDefaultStrategy());
cacheStrategy.setModel(cacheModel);
- String[] cacheGroupsArray = (String[]) PropertyUtils.getProperty(
- query,
- "cacheGroups");
- cacheGroups.setText(toCacheGroupsString(cacheGroupsArray));
+ cacheGroups.setText(query.getProperty(QueryMetadata.CACHE_GROUPS_PROPERTY));
setCacheGroupsEnabled(selectedStrategy != null
&& selectedStrategy != QueryCacheStrategy.NO_CACHE);
- fetchOffset.setText(String.valueOf(PropertyUtils
- .getProperty(query, "fetchOffset")));
- fetchLimit
- .setText(String.valueOf(PropertyUtils.getProperty(query, "fetchLimit")));
- pageSize.setText(String.valueOf(PropertyUtils.getProperty(query, "pageSize")));
+ String fetchOffsetStr = query.getProperty(QueryMetadata.FETCH_OFFSET_PROPERTY);
+ String fetchLimitStr = query.getProperty(QueryMetadata.FETCH_LIMIT_PROPERTY);
+ String pageSizeStr = query.getProperty(QueryMetadata.PAGE_SIZE_PROPERTY);
+
+ fetchOffset.setText(fetchOffsetStr != null ? fetchOffsetStr : ZERO.toString());
+ fetchLimit.setText(fetchLimitStr != null ? fetchLimitStr : ZERO.toString());
+ pageSize.setText(pageSizeStr != null ? pageSizeStr : ZERO.toString());
}
protected String toCacheGroupsString(String[] groups) {
@@ -189,13 +186,13 @@ public abstract class SelectPropertiesPanel extends JPanel {
string = (string == null) ? "" : string.trim();
if (string.length() == 0) {
- setQueryProperty("fetchOffset", ZERO);
+ setQueryProperty(QueryMetadata.FETCH_OFFSET_PROPERTY, ZERO.toString());
}
else {
- try {
- setQueryProperty("fetchOffset", new Integer(string));
+ if (StringUtils.isNumeric(string)) {
+ setQueryProperty(QueryMetadata.FETCH_OFFSET_PROPERTY, string);
}
- catch (NumberFormatException nfex) {
+ else {
throw new ValidationException("Fetch offset must be an integer: "
+ string);
}
@@ -206,13 +203,13 @@ public abstract class SelectPropertiesPanel extends JPanel {
string = (string == null) ? "" : string.trim();
if (string.length() == 0) {
- setQueryProperty("fetchLimit", ZERO);
+ setQueryProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, ZERO.toString());
}
else {
- try {
- setQueryProperty("fetchLimit", new Integer(string));
+ if (StringUtils.isNumeric(string)) {
+ setQueryProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, string);
}
- catch (NumberFormatException nfex) {
+ else {
throw new ValidationException("Fetch limit must be an integer: " + string);
}
}
@@ -222,13 +219,13 @@ public abstract class SelectPropertiesPanel extends JPanel {
string = (string == null) ? "" : string.trim();
if (string.length() == 0) {
- setQueryProperty("pageSize", ZERO);
+ setQueryProperty(QueryMetadata.PAGE_SIZE_PROPERTY, ZERO.toString());
}
else {
- try {
- setQueryProperty("pageSize", new Integer(string));
+ if (StringUtils.isNumeric(string)) {
+ setQueryProperty(QueryMetadata.PAGE_SIZE_PROPERTY, string);
}
- catch (NumberFormatException nfex) {
+ else {
throw new ValidationException("Page size must be an integer: " + string);
}
}
@@ -236,17 +233,10 @@ public abstract class SelectPropertiesPanel extends JPanel {
void setCacheGroups(String string) {
string = (string == null) ? "" : string.trim();
-
- StringTokenizer toks = new StringTokenizer(string, ", \t");
- String[] cacheGroups = new String[toks.countTokens()];
- for (int i = 0; i < cacheGroups.length; i++) {
- cacheGroups[i] = toks.nextToken();
- }
-
- setQueryProperty("cacheGroups", cacheGroups);
+ setQueryProperty(QueryMetadata.CACHE_GROUPS_PROPERTY, string);
}
- Query getQuery() {
+ QueryDescriptor getQuery() {
return mediator.getCurrentQuery();
}
@@ -266,15 +256,15 @@ public abstract class SelectPropertiesPanel extends JPanel {
cacheGroupsLabel.setEnabled(enabled);
}
- void setQueryProperty(String property, Object value) {
- Query query = getQuery();
+ void setQueryProperty(String property, String value) {
+ QueryDescriptor query = getQuery();
if (query != null) {
try {
- Object old = PropertyUtils.getProperty(query, property);
+ Object old = query.getProperty(property);
if (Util.nullSafeEquals(value, old)) {
return;
}
- PropertyUtils.setProperty(query, property, value);
+ query.setProperty(property, value);
mediator.fireQueryEvent(new QueryEvent(this, query));
}
catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
index 4c7553e..f9d349d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
@@ -48,9 +48,7 @@ import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
import org.apache.cayenne.modeler.util.ValidatorTextAdapter;
import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
@@ -144,9 +142,9 @@ public class SelectQueryMainTab extends JPanel {
distinct.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
- SelectQuery query = getQuery();
+ QueryDescriptor query = getQuery();
if (query != null) {
- query.setDistinct(distinct.isSelected());
+ query.setProperty(SelectQuery.DISTINCT_PROPERTY, Boolean.toString(distinct.isSelected()));
mediator.fireQueryEvent(new QueryEvent(this, query));
}
}
@@ -159,18 +157,18 @@ public class SelectQueryMainTab extends JPanel {
* query is changed.
*/
void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor descriptor = mediator.getCurrentQuery();
- if (!(query instanceof SelectQuery)) {
+ if (descriptor == null || !QueryDescriptor.SELECT_QUERY.equals(descriptor.getType())) {
setVisible(false);
return;
}
- SelectQuery selectQuery = (SelectQuery) query;
+ SelectQueryDescriptor query = (SelectQueryDescriptor) descriptor;
name.setText(query.getName());
- distinct.setSelected(selectQuery.isDistinct());
- qualifier.setText(selectQuery.getQualifier() != null ? selectQuery
+ distinct.setSelected(Boolean.valueOf(query.getProperties().get(SelectQuery.DISTINCT_PROPERTY)));
+ qualifier.setText(query.getQualifier() != null ? query
.getQualifier()
.toString() : null);
@@ -190,17 +188,17 @@ public class SelectQueryMainTab extends JPanel {
}
DefaultComboBoxModel model = new DefaultComboBoxModel(roots);
- model.setSelectedItem(selectQuery.getRoot());
+ model.setSelectedItem(query.getRoot());
queryRoot.setModel(model);
- properties.initFromModel(selectQuery);
+ properties.initFromModel(query);
setVisible(true);
}
- protected SelectQuery getQuery() {
- return (mediator.getCurrentQuery() instanceof SelectQuery)
- ? (SelectQuery) mediator.getCurrentQuery()
+ protected SelectQueryDescriptor getQuery() {
+ return QueryDescriptor.SELECT_QUERY.equals(mediator.getCurrentQuery().getType())
+ ? (SelectQueryDescriptor) mediator.getCurrentQuery()
: null;
}
@@ -230,7 +228,7 @@ public class SelectQueryMainTab extends JPanel {
*/
Expression createQualifier(String text) throws ValidationException
{
- SelectQuery query = getQuery();
+ SelectQueryDescriptor query = getQuery();
if (query == null) {
return null;
}
@@ -267,7 +265,7 @@ public class SelectQueryMainTab extends JPanel {
newName = null;
}
- AbstractQuery query = getQuery();
+ QueryDescriptor query = getQuery();
if (query == null) {
return;
@@ -282,7 +280,7 @@ public class SelectQueryMainTab extends JPanel {
}
DataMap map = mediator.getCurrentDataMap();
- Query matchingQuery = map.getQuery(newName);
+ QueryDescriptor matchingQuery = map.getQueryDescriptor(newName);
if (matchingQuery == null) {
// completely new name, set new name for entity
@@ -343,7 +341,7 @@ public class SelectQueryMainTab extends JPanel {
boolean needChangeName;
public void actionPerformed(ActionEvent ae) {
- SelectQuery query = getQuery();
+ QueryDescriptor query = getQuery();
if (query != null) {
Entity root = (Entity) queryRoot.getModel().getSelectedItem();
@@ -360,7 +358,7 @@ public class SelectQueryMainTab extends JPanel {
DataMap map = mediator.getCurrentDataMap();
long postfix = 1;
- while (map.getQuery(newName) != null) {
+ while (map.getQueryDescriptor(newName) != null) {
newName = newPrefix + (postfix++);
}
@@ -374,7 +372,7 @@ public class SelectQueryMainTab extends JPanel {
//reset new name tracking
newName = null;
- SelectQuery query = getQuery();
+ QueryDescriptor query = getQuery();
if (query != null) {
needChangeName = hasDefaultName(query);
}
@@ -398,7 +396,7 @@ public class SelectQueryMainTab extends JPanel {
*
* We cannot follow user input because tab might be opened many times
*/
- boolean hasDefaultName(SelectQuery query) {
+ boolean hasDefaultName(QueryDescriptor query) {
String prefix = query.getRoot() == null ? "UntitledQuery" :
CellRenderers.asString(query.getRoot()) + "Query";
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
index 6ca9f8d..c4d03a2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
@@ -51,10 +51,7 @@ import org.apache.cayenne.modeler.util.EntityTreeModel;
import org.apache.cayenne.modeler.util.ModelerUtil;
import org.apache.cayenne.modeler.util.MultiColumnBrowser;
import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
-import org.apache.cayenne.query.SortOrder;
+import org.apache.cayenne.query.*;
import org.apache.cayenne.util.CayenneMapEntry;
/**
@@ -77,7 +74,7 @@ public class SelectQueryOrderingTab extends JPanel implements PropertyChangeList
static final String PLACEHOLDER_PANEL = "placeholder";
protected ProjectController mediator;
- protected SelectQuery<?> selectQuery;
+ protected SelectQueryDescriptor selectQuery;
protected MultiColumnBrowser browser;
protected JTable table;
@@ -133,19 +130,19 @@ public class SelectQueryOrderingTab extends JPanel implements PropertyChangeList
}
protected void initFromModel() {
- Query query = mediator.getCurrentQuery();
+ QueryDescriptor query = mediator.getCurrentQuery();
- if (!(query instanceof SelectQuery)) {
+ if (query == null || !QueryDescriptor.SELECT_QUERY.equals(query.getType())) {
processInvalidModel("Unknown query.");
return;
}
- if (!(((SelectQuery<?>) query).getRoot() instanceof Entity)) {
+ if (!(query.getRoot() instanceof Entity)) {
processInvalidModel("SelectQuery has no root set.");
return;
}
- this.selectQuery = (SelectQuery<?>) query;
+ this.selectQuery = (SelectQueryDescriptor) query;
browser.setModel(createBrowserModel((Entity) selectQuery.getRoot()));
table.setModel(createTableModel());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java
index c538a16..fe02245 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryPrefetchTab.java
@@ -21,8 +21,6 @@ package org.apache.cayenne.modeler.editor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.Collection;
-import java.util.Iterator;
import javax.swing.JButton;
import javax.swing.JComponent;
@@ -43,7 +41,6 @@ import org.apache.cayenne.modeler.undo.AddPrefetchUndoableEdit;
import org.apache.cayenne.modeler.util.EntityTreeFilter;
import org.apache.cayenne.modeler.util.EntityTreeModel;
import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.query.PrefetchTreeNode;
/**
* Subclass of the SelectQueryOrderingTab configured to work with prefetches.
@@ -122,12 +119,8 @@ public class SelectQueryPrefetchTab extends SelectQueryOrderingTab {
public void addPrefetch(String prefetch) {
// check if such prefetch already exists
- if (selectQuery.getPrefetchTree() != null) {
-
- PrefetchTreeNode node = selectQuery.getPrefetchTree().getNode(prefetch);
- if (node != null && !node.isPhantom()) {
- return;
- }
+ if (!selectQuery.getPrefetches().isEmpty() && selectQuery.getPrefetches().contains(prefetch)) {
+ return;
}
selectQuery.addPrefetch(prefetch);
@@ -178,20 +171,11 @@ public class SelectQueryPrefetchTab extends SelectQueryOrderingTab {
PrefetchModel() {
if (selectQuery != null) {
+ prefetches = new String[selectQuery.getPrefetches().size()];
- if (selectQuery.getPrefetchTree() == null) {
- prefetches = new String[0];
- }
- else {
- Collection c = selectQuery.getPrefetchTree().nonPhantomNodes();
- prefetches = new String[c.size()];
-
- Iterator it = c.iterator();
- for (int i = 0; i < prefetches.length; i++) {
- prefetches[i] = ((PrefetchTreeNode) it.next()).getPath();
- }
+ for (int i = 0; i < prefetches.length; i++) {
+ prefetches[i] = selectQuery.getPrefetches().get(i);
}
-
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
index 266ce4f..db5a6f6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
@@ -27,7 +27,7 @@ import javax.swing.event.ChangeListener;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
-import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* A tabbed view for configuring a select query.
@@ -79,13 +79,13 @@ public class SelectQueryTabbedView extends JTabbedPane {
}
void initFromModel() {
- if (!(mediator.getCurrentQuery() instanceof SelectQuery)) {
+ if (!QueryDescriptor.SELECT_QUERY.equals(mediator.getCurrentQuery().getType())) {
setVisible(false);
return;
}
// if no root, reset tabs to show the first panel..
- if (((SelectQuery) mediator.getCurrentQuery()).getRoot() == null) {
+ if (mediator.getCurrentQuery().getRoot() == null) {
lastSelectionIndex = 0;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
index a8c6512..e7588e3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
@@ -23,24 +23,25 @@ package org.apache.cayenne.modeler.event;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
/**
* @since 1.1
*/
public class QueryDisplayEvent extends DataMapDisplayEvent {
- protected Query query;
+ protected QueryDescriptor query;
protected boolean queryChanged = true;
- public QueryDisplayEvent(Object src, Query query, DataMap map, DataChannelDescriptor domain) {
+ public QueryDisplayEvent(Object src, QueryDescriptor query, DataMap map, DataChannelDescriptor domain) {
super(src, map, domain);
this.query = query;
}
- public Query getQuery() {
+ public QueryDescriptor getQuery() {
return query;
}
- public void setQuery(Query query) {
+ public void setQuery(QueryDescriptor query) {
this.query = query;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
index d5234a9..7e277dd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
@@ -26,14 +26,15 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.RemoveAction;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
public class CreateQueryUndoableEdit extends CayenneUndoableEdit {
private DataChannelDescriptor domain;
private DataMap map;
- private Query query;
+ private QueryDescriptor query;
- public CreateQueryUndoableEdit(DataChannelDescriptor domain, DataMap map, Query query) {
+ public CreateQueryUndoableEdit(DataChannelDescriptor domain, DataMap map, QueryDescriptor query) {
this.domain = domain;
this.map = map;
this.query = query;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
index fa5ca15..e15649c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.modeler.action.RemoveCallbackMethodAction;
import org.apache.cayenne.modeler.action.RemoveProcedureParameterAction;
import org.apache.cayenne.modeler.action.RemoveRelationshipAction;
import org.apache.cayenne.modeler.editor.ObjCallbackMethod;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
public class PasteUndoableEdit extends CayenneUndoableEdit {
@@ -110,8 +110,8 @@ public class PasteUndoableEdit extends CayenneUndoableEdit {
else if (content instanceof Embeddable) {
rAction.removeEmbeddable(map, (Embeddable) content);
}
- else if (content instanceof Query) {
- rAction.removeQuery(map, (Query) content);
+ else if (content instanceof QueryDescriptor) {
+ rAction.removeQuery(map, (QueryDescriptor) content);
}
else if (content instanceof Procedure) {
rAction.removeProcedure(map, (Procedure) content);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
index 0791acf..7452caa 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
@@ -51,13 +51,14 @@ import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.action.RemoveAction;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
public class RemoveUndoableEdit extends CayenneUndoableEdit {
private DataMap map;
private DbEntity dbEntity;
private ObjEntity objEntity;
- private Query query;
+ private QueryDescriptor query;
private Procedure procedure;
private DataNodeDescriptor dataNode;
@@ -151,7 +152,7 @@ public class RemoveUndoableEdit extends CayenneUndoableEdit {
}
}
- public RemoveUndoableEdit(DataMap map, Query query) {
+ public RemoveUndoableEdit(DataMap map, QueryDescriptor query) {
this.map = map;
this.query = query;
this.mode = REMOVE_MODE.QUERY;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
index 85cb647..a04a87a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
@@ -46,7 +46,7 @@ import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.CayenneMapEntry;
/**
@@ -107,7 +107,7 @@ public final class CellRenderers {
else if (object instanceof Procedure) {
return procedureIcon;
}
- else if (object instanceof Query) {
+ else if (object instanceof QueryDescriptor) {
return queryIcon;
}
else if (object instanceof Relationship) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
index fc7735d..4bc03a7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
@@ -38,9 +38,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.apache.cayenne.util.Util;
import java.util.ArrayList;
@@ -111,7 +109,7 @@ public class ProjectUtil {
}
}
- public static void setQueryName(DataMap map, Query query, String newName) {
+ public static void setQueryName(DataMap map, QueryDescriptor query, String newName) {
String oldName = query.getName();
@@ -120,16 +118,11 @@ public class ProjectUtil {
return;
}
- if (query instanceof AbstractQuery) {
- ((AbstractQuery) query).setName(newName);
- ((AbstractQuery) query).setDataMap(map);
- }
- if (query instanceof EJBQLQuery) {
- ((EJBQLQuery) query).setName(newName);
- ((EJBQLQuery) query).setDataMap(map);
- }
- map.removeQuery(oldName);
- map.addQuery(query);
+ query.setName(newName);
+ query.setDataMap(map);
+
+ map.removeQueryDescriptor(oldName);
+ map.addQueryDescriptor(query);
// important - clear parent namespace:
MappingNamespace ns = map.getNamespace();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/MultipleObjectsDisplayEventType.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/MultipleObjectsDisplayEventType.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/MultipleObjectsDisplayEventType.java
index bc7251e..9aa5b2b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/MultipleObjectsDisplayEventType.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/MultipleObjectsDisplayEventType.java
@@ -135,8 +135,8 @@ class MultipleObjectsDisplayEventType extends DisplayEventType {
configurationNodeList.add(dataMap.getEmbeddable(objectName));
} else if (dataMap.getProcedure(objectName) != null) {
configurationNodeList.add(dataMap.getProcedure(objectName));
- } else if (dataMap.getQuery(objectName) != null) {
- configurationNodeList.add(dataMap.getQuery(objectName));
+ } else if (dataMap.getQueryDescriptor(objectName) != null) {
+ configurationNodeList.add(dataMap.getQueryDescriptor(objectName));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a265b3ab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
index e9b5817..cbe16ab 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
@@ -24,6 +24,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
class QueryDisplayEventType extends DisplayEventType {
@@ -43,7 +44,7 @@ class QueryDisplayEventType extends DisplayEventType {
return;
}
- Query query = dataMap.getQuery(preferences.getQuery());
+ QueryDescriptor query = dataMap.getQueryDescriptor(preferences.getQuery());
if (query == null) {
return;
}
[05/16] cayenne git commit: CAY-2060 Clean up query builders which
are no longer used.
Posted by dk...@apache.org.
CAY-2060 Clean up query builders which are no longer used.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bc00eb21
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bc00eb21
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bc00eb21
Branch: refs/heads/master
Commit: bc00eb210ae0b0d5e961e29c3eec1caeee7374de
Parents: a265b3a
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Wed Feb 17 18:34:07 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:02 2016 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/map/EjbqlBuilder.java | 36 ----
.../cayenne/map/ProcedureQueryBuilder.java | 52 ------
.../cayenne/map/QueryDescriptorLoader.java | 4 +
.../org/apache/cayenne/map/QueryLoader.java | 186 -------------------
.../apache/cayenne/map/SQLTemplateBuilder.java | 65 -------
.../apache/cayenne/map/SelectQueryBuilder.java | 58 ------
.../cayenne/map/QueryDescriptorLoaderTest.java | 71 +++++++
.../org/apache/cayenne/map/QueryLoaderTest.java | 78 --------
.../cayenne/map/SQLTemplateBuilderTest.java | 105 -----------
.../cayenne/map/SQLTemplateDescriptorTest.java | 95 ++++++++++
.../cayenne/map/SelectQueryBuilderTest.java | 95 ----------
.../cayenne/map/SelectQueryDescriptorTest.java | 89 +++++++++
12 files changed, 259 insertions(+), 675 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java
deleted file mode 100644
index 8ed3967..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-package org.apache.cayenne.map;
-
-import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.query.Query;
-
-
-public class EjbqlBuilder extends QueryLoader{
-
- @Override
- Query getQuery() {
- EJBQLQuery query = new EJBQLQuery(ejbql);
- query.setName(name);
- query.setDataMap(dataMap);
- query.initWithProperties(properties);
- return query;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
deleted file mode 100644
index 44cb938..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import org.apache.cayenne.query.ProcedureQuery;
-import org.apache.cayenne.query.Query;
-
-/**
- * A QueryBuilder for stored procedure-based queries.
- *
- * @since 1.1
- */
-class ProcedureQueryBuilder extends QueryLoader {
-
- /**
- * Returns a ProcedureQuery.
- */
- @Override
- public Query getQuery() {
- ProcedureQuery query = new ProcedureQuery();
- Object root = getRoot();
-
- if (root != null) {
- query.setRoot(root);
- }
-
- query.setName(name);
- query.setDataMap(dataMap);
- query.setResultEntityName(resultEntity);
- query.initWithProperties(properties);
-
- return query;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/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 0ea6476..83c7fdb 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
@@ -28,6 +28,10 @@ import java.util.List;
import java.util.Map;
/**
+ * A builder that constructs Cayenne queries from abstract configuration information
+ * defined in cayenne-data-map*.dtd. This abstract builder supports values declared in the
+ * DTD, allowing subclasses to define their own Query creation logic.
+ *
* @since 4.0
*/
public class QueryDescriptorLoader {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/main/java/org/apache/cayenne/map/QueryLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/map/QueryLoader.java
deleted file mode 100644
index 7be828f..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/QueryLoader.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SortOrder;
-
-/**
- * A builder that constructs Cayenne queries from abstract configuration information
- * defined in cayenne-data-map*.dtd. This abstract builder supports values declared in the
- * DTD, allowing subclasses to define their own Query creation logic.
- *
- * @since 3.0
- */
-abstract class QueryLoader {
-
- protected String name;
- protected Map<String, String> properties;
- protected String sql;
- protected String ejbql;
- protected Map<String, String> adapterSql;
- protected Expression qualifier;
- protected List<Ordering> orderings;
- protected List<String> prefetches;
- protected DataMap dataMap;
- protected String rootType;
- protected String rootName;
- protected String resultEntity;
-
- /**
- * Builds a Query object based on internal configuration information.
- */
- abstract Query getQuery();
-
- void setName(String name) {
- this.name = name;
- }
-
- /**
- * Determines query root based on configuration info, falls back to a DataMap root if
- * the data is invalid.
- *
- * @throws CayenneRuntimeException if a valid root can't be established.
- */
- protected Object getRoot() {
-
- Object root = null;
-
- if (rootType == null
- || MapLoader.DATA_MAP_ROOT.equals(rootType)
- || rootName == null) {
- root = dataMap;
- }
- else if (MapLoader.OBJ_ENTITY_ROOT.equals(rootType)) {
- root = dataMap.getObjEntity(rootName);
- }
- else if (MapLoader.DB_ENTITY_ROOT.equals(rootType)) {
- root = dataMap.getDbEntity(rootName);
- }
- else if (MapLoader.PROCEDURE_ROOT.equals(rootType)) {
- root = dataMap.getProcedure(rootName);
- }
- else if (MapLoader.JAVA_CLASS_ROOT.equals(rootType)) {
- // setting root to ObjEntity, since creating a Class requires
- // the knowledge of the ClassLoader
- root = dataMap.getObjEntityForJavaClass(rootName);
- }
-
- return (root != null) ? root : dataMap;
- }
-
- void setResultEntity(String resultEntity) {
- this.resultEntity = resultEntity;
- }
-
- /**
- * Sets the information pertaining to the root of the query.
- */
- void setRoot(DataMap dataMap, String rootType, String rootName) {
- this.dataMap = dataMap;
- this.rootType = rootType;
- this.rootName = rootName;
- }
-
- void setEjbql(String ejbql) {
- this.ejbql = ejbql;
- }
-
- /**
- * Adds raw sql. If adapterClass parameter is not null, sets the SQL string to be
- * adapter-specific. Otherwise it is used as a default SQL string.
- */
- void addSql(String sql, String adapterClass) {
- if (adapterClass == null) {
- this.sql = sql;
- }
- else {
- if (adapterSql == null) {
- adapterSql = new HashMap<>();
- }
-
- adapterSql.put(adapterClass, sql);
- }
- }
-
- void setQualifier(String qualifier) {
- if (qualifier == null || qualifier.trim().length() == 0) {
- this.qualifier = null;
- }
- else {
- this.qualifier = Expression.fromString(qualifier.trim());
- }
- }
-
- void addProperty(String name, String value) {
- if (properties == null) {
- properties = new HashMap<>();
- }
-
- properties.put(name, value);
- }
-
- void addOrdering(String path, String descending, String ignoreCase) {
- if (orderings == null) {
- orderings = new ArrayList<Ordering>();
- }
-
- if (path != null && path.trim().length() == 0) {
- path = null;
- }
- boolean isDescending = "true".equalsIgnoreCase(descending);
- boolean isIgnoringCase = "true".equalsIgnoreCase(ignoreCase);
-
- SortOrder order;
-
- if (isDescending) {
- order = isIgnoringCase
- ? SortOrder.DESCENDING_INSENSITIVE
- : SortOrder.DESCENDING;
- }
- else {
- order = isIgnoringCase
- ? SortOrder.ASCENDING_INSENSITIVE
- : SortOrder.ASCENDING;
- }
-
- orderings.add(new Ordering(path, order));
- }
-
- void addPrefetch(String path) {
- if (path == null || (path != null && path.trim().length() == 0)) {
- // throw??
- return;
- }
-
- if (prefetches == null) {
- prefetches = new ArrayList<String>();
- }
- prefetches.add(path.trim());
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
deleted file mode 100644
index c9f8b82..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import java.util.Map;
-
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLTemplate;
-
-/**
- * QueryBuilder for the SQLTemplates.
- *
- * @since 1.1
- */
-class SQLTemplateBuilder extends QueryLoader {
-
- /**
- * Builds a SQLTemplate query.
- */
- @Override
- public Query getQuery() {
-
- SQLTemplate template = new SQLTemplate();
- Object root = getRoot();
-
- if (root != null) {
- template.setRoot(root);
- }
-
- template.setName(name);
- template.setDataMap(dataMap);
- template.initWithProperties(properties);
-
- // init SQL
- template.setDefaultTemplate(sql);
- if (adapterSql != null) {
- for (Map.Entry<String, String> entry : adapterSql.entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- if (key != null && value != null) {
- template.setTemplate(key, value);
- }
- }
- }
-
- return template;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
deleted file mode 100644
index c341832..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
-
-/**
- * QueryBuilder for SelectQueries.
- *
- * @since 1.1
- */
-class SelectQueryBuilder extends QueryLoader {
-
- /**
- * Creates a SelectQuery.
- */
- @Override
- public Query getQuery() {
- SelectQuery<Object> query = new SelectQuery<Object>();
- query.setRoot(getRoot());
- query.setName(name);
- query.setDataMap(dataMap);
- query.setQualifier(qualifier);
-
- if (orderings != null && !orderings.isEmpty()) {
- query.addOrderings(orderings);
- }
-
- if (prefetches != null && !prefetches.isEmpty()) {
- for (String prefetch : prefetches) {
- query.addPrefetch(prefetch);
- }
- }
-
- // init properties
- query.initWithProperties(properties);
-
- return query;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java
new file mode 100644
index 0000000..4ca4843
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryDescriptorLoaderTest.java
@@ -0,0 +1,71 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+
+package org.apache.cayenne.map;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ */
+public class QueryDescriptorLoaderTest {
+
+ protected QueryDescriptorLoader builder;
+
+ @Before
+ public void setUp() throws Exception {
+ builder = new QueryDescriptorLoader();
+ }
+
+ @Test
+ public void testSetName() throws Exception {
+ builder.setName("aaa");
+ assertEquals("aaa", builder.name);
+ }
+
+ @Test
+ public void testSetRootInfoDbEntity() throws Exception {
+ DataMap map = new DataMap("map");
+ DbEntity entity = new DbEntity("DB1");
+ map.addDbEntity(entity);
+
+ builder.setRoot(map, MapLoader.DB_ENTITY_ROOT, "DB1");
+ assertSame(entity, builder.getRoot());
+ }
+
+ @Test
+ public void testSetRootObjEntity() throws Exception {
+ DataMap map = new DataMap("map");
+ ObjEntity entity = new ObjEntity("OBJ1");
+ map.addObjEntity(entity);
+
+ builder.setRoot(map, MapLoader.OBJ_ENTITY_ROOT, "OBJ1");
+ assertSame(entity, builder.getRoot());
+ }
+
+ @Test
+ public void testSetRootDataMap() throws Exception {
+ DataMap map = new DataMap("map");
+
+ builder.setRoot(map, MapLoader.DATA_MAP_ROOT, null);
+ assertSame(map, builder.getRoot());
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
deleted file mode 100644
index 829025d..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/QueryLoaderTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import org.apache.cayenne.query.Query;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- */
-public class QueryLoaderTest {
-
- protected QueryLoader builder;
-
- @Before
- public void setUp() throws Exception {
- builder = new QueryLoader() {
-
- @Override
- public Query getQuery() {
- return null;
- }
- };
- }
-
- @Test
- public void testSetName() throws Exception {
- builder.setName("aaa");
- assertEquals("aaa", builder.name);
- }
-
- @Test
- public void testSetRootInfoDbEntity() throws Exception {
- DataMap map = new DataMap("map");
- DbEntity entity = new DbEntity("DB1");
- map.addDbEntity(entity);
-
- builder.setRoot(map, MapLoader.DB_ENTITY_ROOT, "DB1");
- assertSame(entity, builder.getRoot());
- }
-
- @Test
- public void testSetRootObjEntity() throws Exception {
- DataMap map = new DataMap("map");
- ObjEntity entity = new ObjEntity("OBJ1");
- map.addObjEntity(entity);
-
- builder.setRoot(map, MapLoader.OBJ_ENTITY_ROOT, "OBJ1");
- assertSame(entity, builder.getRoot());
- }
-
- @Test
- public void testSetRootDataMap() throws Exception {
- DataMap map = new DataMap("map");
-
- builder.setRoot(map, MapLoader.DATA_MAP_ROOT, null);
- assertSame(map, builder.getRoot());
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
deleted file mode 100644
index b05ab21..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryMetadata;
-import org.apache.cayenne.query.SQLTemplate;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-/**
- */
-public class SQLTemplateBuilderTest {
-
- @Test
- public void testGetQueryType() throws Exception {
- SQLTemplateBuilder builder = new MockupRootQueryBuilder();
- assertTrue(builder.getQuery() instanceof SQLTemplate);
- }
-
- @Test
- public void testGetQueryName() throws Exception {
- SQLTemplateBuilder builder = new MockupRootQueryBuilder();
- builder.setName("xyz");
-
- assertEquals("xyz", builder.getQuery().getName());
- }
-
- @Test
- public void testGetQueryRoot() throws Exception {
- DataMap map = new DataMap();
- ObjEntity entity = new ObjEntity("A");
- map.addObjEntity(entity);
-
- SQLTemplateBuilder builder = new SQLTemplateBuilder();
- builder.setRoot(map, MapLoader.OBJ_ENTITY_ROOT, "A");
-
- Query query = builder.getQuery();
- assertTrue(query instanceof SQLTemplate);
- assertSame(entity, ((SQLTemplate) query).getRoot());
- }
-
- @Test
- public void testGetQueryProperties() throws Exception {
- SQLTemplateBuilder builder = new MockupRootQueryBuilder();
- builder.addProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
- builder.addProperty(QueryMetadata.STATEMENT_FETCH_SIZE_PROPERTY, "6");
-
- Query query = builder.getQuery();
- assertTrue(query instanceof SQLTemplate);
- assertEquals(5, ((SQLTemplate) query).getFetchLimit());
-
- assertEquals(6, ((SQLTemplate) query).getStatementFetchSize());
-
- // TODO: test other properties...
- }
-
- @Test
- public void testGetQuerySql() throws Exception {
- SQLTemplateBuilder builder = new MockupRootQueryBuilder();
- builder.addSql("abc", null);
-
- SQLTemplate query = (SQLTemplate) builder.getQuery();
- assertEquals("abc", query.getDefaultTemplate());
- }
-
- @Test
- public void testGetQueryAdapterSql() throws Exception {
- SQLTemplateBuilder builder = new MockupRootQueryBuilder();
- builder.addSql("abc", "adapter");
-
- SQLTemplate query = (SQLTemplate) builder.getQuery();
- assertNull(query.getDefaultTemplate());
- assertEquals("abc", query.getTemplate("adapter"));
- }
-
- class MockupRootQueryBuilder extends SQLTemplateBuilder {
-
- @Override
- public Object getRoot() {
- return "FakeRoot";
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java
new file mode 100644
index 0000000..7bb3631
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/SQLTemplateDescriptorTest.java
@@ -0,0 +1,95 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.query.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+/**
+ */
+public class SQLTemplateDescriptorTest {
+
+ @Test
+ public void testGetQueryType() throws Exception {
+ SQLTemplateDescriptor builder = QueryDescriptor.sqlTemplateDescriptor();
+ assertTrue(builder.buildQuery() instanceof SQLTemplate);
+ }
+
+ @Test
+ public void testGetQueryName() throws Exception {
+ SQLTemplateDescriptor builder = QueryDescriptor.sqlTemplateDescriptor();
+ builder.setName("xyz");
+
+ assertEquals("xyz", builder.buildQuery().getName());
+ }
+
+ @Test
+ public void testGetQueryRoot() throws Exception {
+ DataMap map = new DataMap();
+ ObjEntity entity = new ObjEntity("A");
+ map.addObjEntity(entity);
+
+ SQLTemplateDescriptor builder = QueryDescriptor.sqlTemplateDescriptor();
+ builder.setRoot(entity);
+
+ Query query = builder.buildQuery();
+ assertTrue(query instanceof SQLTemplate);
+ assertSame(entity, ((SQLTemplate) query).getRoot());
+ }
+
+ @Test
+ public void testGetQueryProperties() throws Exception {
+ SQLTemplateDescriptor builder = QueryDescriptor.sqlTemplateDescriptor();
+ builder.setProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
+ builder.setProperty(QueryMetadata.STATEMENT_FETCH_SIZE_PROPERTY, "6");
+
+ Query query = builder.buildQuery();
+ assertTrue(query instanceof SQLTemplate);
+ assertEquals(5, ((SQLTemplate) query).getFetchLimit());
+
+ assertEquals(6, ((SQLTemplate) query).getStatementFetchSize());
+
+ // TODO: test other properties...
+ }
+
+ @Test
+ public void testGetQuerySql() throws Exception {
+ SQLTemplateDescriptor builder = QueryDescriptor.sqlTemplateDescriptor();
+ builder.setSql("abc");
+
+ SQLTemplate query = builder.buildQuery();
+ assertEquals("abc", query.getDefaultTemplate());
+ }
+
+ @Test
+ public void testGetQueryAdapterSql() throws Exception {
+ SQLTemplateDescriptor builder = QueryDescriptor.sqlTemplateDescriptor();
+ builder.getAdapterSql().put("adapter", "abc");
+
+ SQLTemplate query = builder.buildQuery();
+ assertNull(query.getDefaultTemplate());
+ assertEquals("abc", query.getTemplate("adapter"));
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
deleted file mode 100644
index fac8027..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************
- * 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.
- ****************************************************************/
-
-package org.apache.cayenne.map;
-
-import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryMetadata;
-import org.apache.cayenne.query.SelectQuery;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-/**
- */
-public class SelectQueryBuilderTest {
-
- @Test
- public void testGetQueryType() throws Exception {
- SelectQueryBuilder builder = new MockupRootQueryBuilder();
- assertTrue(builder.getQuery() instanceof SelectQuery);
- }
-
- @Test
- public void testGetQueryName() throws Exception {
- SelectQueryBuilder builder = new MockupRootQueryBuilder();
- builder.setName("xyz");
-
- assertEquals("xyz", builder.getQuery().getName());
- }
-
- @Test
- public void testGetQueryRoot() throws Exception {
- DataMap map = new DataMap();
- ObjEntity entity = new ObjEntity("A");
- map.addObjEntity(entity);
-
- SelectQueryBuilder builder = new SelectQueryBuilder();
- builder.setRoot(map, MapLoader.OBJ_ENTITY_ROOT, "A");
-
- assertTrue(builder.getQuery() instanceof SelectQuery);
- assertSame(entity, ((SelectQuery) builder.getQuery()).getRoot());
- }
-
- @Test
- public void testGetQueryQualifier() throws Exception {
- SelectQueryBuilder builder = new MockupRootQueryBuilder();
- builder.setQualifier("abc = 5");
-
- SelectQuery query = (SelectQuery) builder.getQuery();
-
- assertEquals(Expression.fromString("abc = 5"), query.getQualifier());
- }
-
- @Test
- public void testGetQueryProperties() throws Exception {
- SelectQueryBuilder builder = new MockupRootQueryBuilder();
- builder.addProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
- builder.addProperty(QueryMetadata.STATEMENT_FETCH_SIZE_PROPERTY, "6");
-
- Query query = builder.getQuery();
- assertTrue(query instanceof SelectQuery);
- assertEquals(5, ((SelectQuery) query).getFetchLimit());
-
- assertEquals(6, ((SelectQuery) query).getStatementFetchSize());
-
- // TODO: test other properties...
- }
-
- class MockupRootQueryBuilder extends SelectQueryBuilder {
-
- @Override
- public Object getRoot() {
- return "FakeRoot";
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc00eb21/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java
new file mode 100644
index 0000000..085f73f
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/SelectQueryDescriptorTest.java
@@ -0,0 +1,89 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+
+package org.apache.cayenne.map;
+
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.query.*;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+/**
+ */
+public class SelectQueryDescriptorTest {
+
+ @Test
+ public void testGetQueryType() throws Exception {
+ SelectQueryDescriptor builder = QueryDescriptor.selectQueryDescriptor();
+ builder.setRoot("FakeRoot");
+ assertTrue(builder.buildQuery() instanceof SelectQuery);
+ }
+
+ @Test
+ public void testGetQueryName() throws Exception {
+ SelectQueryDescriptor builder = QueryDescriptor.selectQueryDescriptor();
+ builder.setRoot("FakeRoot");
+ builder.setName("xyz");
+
+ assertEquals("xyz", builder.buildQuery().getName());
+ }
+
+ @Test
+ public void testGetQueryRoot() throws Exception {
+ DataMap map = new DataMap();
+ ObjEntity entity = new ObjEntity("A");
+ map.addObjEntity(entity);
+
+ SelectQueryDescriptor builder = QueryDescriptor.selectQueryDescriptor();
+ builder.setRoot(entity);
+
+ assertTrue(builder.buildQuery() instanceof SelectQuery);
+ assertSame(entity, ((SelectQuery) builder.buildQuery()).getRoot());
+ }
+
+ @Test
+ public void testGetQueryQualifier() throws Exception {
+ SelectQueryDescriptor builder = QueryDescriptor.selectQueryDescriptor();
+ builder.setRoot("FakeRoot");
+ builder.setQualifier(Expression.fromString("abc = 5"));
+
+ SelectQuery query = (SelectQuery) builder.buildQuery();
+
+ assertEquals(Expression.fromString("abc = 5"), query.getQualifier());
+ }
+
+ @Test
+ public void testGetQueryProperties() throws Exception {
+ SelectQueryDescriptor builder = QueryDescriptor.selectQueryDescriptor();
+ builder.setRoot("FakeRoot");
+ builder.setProperty(QueryMetadata.FETCH_LIMIT_PROPERTY, "5");
+ builder.setProperty(QueryMetadata.STATEMENT_FETCH_SIZE_PROPERTY, "6");
+
+ Query query = builder.buildQuery();
+ assertTrue(query instanceof SelectQuery);
+ assertEquals(5, ((SelectQuery) query).getFetchLimit());
+
+ assertEquals(6, ((SelectQuery) query).getStatementFetchSize());
+
+ // TODO: test other properties...
+ }
+}
[06/16] cayenne git commit: CAY-2060 Add upgrader for Cayenne project
XML files.
Posted by dk...@apache.org.
CAY-2060 Add upgrader for Cayenne project XML files.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e099a213
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e099a213
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e099a213
Branch: refs/heads/master
Commit: e099a21362c2999212ebb56101c85d5b57b3d1a9
Parents: bc00eb2
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Thu Feb 18 19:09:16 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:14 2016 +0300
----------------------------------------------------------------------
.../cayenne/project/CayenneProjectModule.java | 4 +-
.../cayenne/project/FileProjectSaver.java | 2 +-
.../project/upgrade/v8/ProjectUpgrader_V8.java | 42 ++++
.../project/upgrade/v8/UpgradeHandler_V8.java | 190 +++++++++++++++++++
.../upgrade/v8/ProjectUpgrader_V8Test.java | 179 +++++++++++++++++
.../project/upgrade/v8/7a/cayenne-PROJECT1.xml | 15 ++
.../upgrade/v8/7a/testProjectMap1_1.map.xml | 31 +++
.../upgrade/v8/7a/testProjectMap1_2.map.xml | 7 +
.../java/org/apache/cayenne/map/DataMap.java | 4 +-
.../org/apache/cayenne/schema/7/modelMap.xsd | 8 +-
10 files changed, 473 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java b/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java
index 3f13704..f066e2f 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.project;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.upgrade.ProjectUpgrader;
-import org.apache.cayenne.project.upgrade.v7.ProjectUpgrader_V7;
+import org.apache.cayenne.project.upgrade.v8.ProjectUpgrader_V8;
import org.apache.cayenne.project.validation.DefaultProjectValidator;
import org.apache.cayenne.project.validation.ProjectValidator;
@@ -36,7 +36,7 @@ public class CayenneProjectModule implements Module {
public void configure(Binder binder) {
binder.bind(ProjectLoader.class).to(DataChannelProjectLoader.class);
binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
- binder.bind(ProjectUpgrader.class).to(ProjectUpgrader_V7.class);
+ binder.bind(ProjectUpgrader.class).to(ProjectUpgrader_V8.class);
binder.bind(ProjectValidator.class).to(DefaultProjectValidator.class);
binder.bind(ConfigurationNodeParentGetter.class).to(
DefaultConfigurationNodeParentGetter.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
index 98249d4..95ef738 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
@@ -62,7 +62,7 @@ public class FileProjectSaver implements ProjectSaver {
}
public String getSupportedVersion() {
- return "7";
+ return "8";
}
public void save(Project project) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8.java
new file mode 100644
index 0000000..461d118
--- /dev/null
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8.java
@@ -0,0 +1,42 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.project.upgrade.v8;
+
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.project.upgrade.ProjectUpgrader;
+import org.apache.cayenne.project.upgrade.UpgradeHandler;
+import org.apache.cayenne.resource.Resource;
+
+/**
+ * A ProjectUpgrader that handles project upgrades from version 4.0.M3 and 7
+ * to version 8.
+ */
+public class ProjectUpgrader_V8 implements ProjectUpgrader {
+
+ @Inject
+ protected Injector injector;
+
+ @Override
+ public UpgradeHandler getUpgradeHandler(Resource projectSource) {
+ UpgradeHandler_V8 handler = new UpgradeHandler_V8(projectSource);
+ injector.injectMembers(handler);
+ return handler;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
new file mode 100644
index 0000000..a6381d1
--- /dev/null
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
@@ -0,0 +1,190 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
+package org.apache.cayenne.project.upgrade.v8;
+
+
+import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.configuration.ConfigurationTree;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.configuration.XMLDataChannelDescriptorLoader;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.project.Project;
+import org.apache.cayenne.project.ProjectSaver;
+import org.apache.cayenne.project.upgrade.BaseUpgradeHandler;
+import org.apache.cayenne.project.upgrade.UpgradeHandler;
+import org.apache.cayenne.project.upgrade.UpgradeMetaData;
+import org.apache.cayenne.project.upgrade.UpgradeType;
+import org.apache.cayenne.project.upgrade.v7.ProjectUpgrader_V7;
+import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.resource.Resource;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+public class UpgradeHandler_V8 extends BaseUpgradeHandler {
+
+ static final String TO_VERSION = "8";
+ static final String MIN_SUPPORTED_VERSION = "7";
+
+ @Inject
+ protected Injector injector;
+
+ @Inject
+ private ProjectSaver projectSaver;
+
+ public UpgradeHandler_V8(Resource source) {
+ super(source);
+ }
+
+ @Override
+ protected Resource doPerformUpgrade(UpgradeMetaData metaData) throws ConfigurationException {
+ if (compareVersions(metaData.getProjectVersion(), MIN_SUPPORTED_VERSION) == 0) {
+ ProjectUpgrader_V7 upgraderV7 = new ProjectUpgrader_V7();
+ injector.injectMembers(upgraderV7);
+ UpgradeHandler handlerV7 = upgraderV7.getUpgradeHandler(projectSource);
+ projectSource = handlerV7.performUpgrade();
+ }
+
+ upgradeFactories(projectSource);
+
+ XMLDataChannelDescriptorLoader loader = new XMLDataChannelDescriptorLoader();
+ injector.injectMembers(loader);
+ ConfigurationTree<DataChannelDescriptor> tree = loader.load(projectSource);
+ Project project = new Project(tree);
+
+ // load and safe cycle updates project version
+ projectSaver.save(project);
+ return project.getConfigurationResource();
+ }
+
+ private void upgradeFactories(Resource projectSource) {
+ Document projectDoc = readDOMDocument(projectSource);
+
+ try {
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ NodeList nodes = (NodeList) xpath.evaluate("/domain/map/@name", projectDoc, XPathConstants.NODESET);
+
+ TransformerFactory transformerFactory = TransformerFactory.newInstance();
+ Transformer transformer = transformerFactory.newTransformer();
+
+ for (int i = 0; i < nodes.getLength(); i++) {
+ Node mapNode = nodes.item(i);
+
+ Resource mapResource = projectSource.getRelativeResource(mapNode.getNodeValue() + ".map.xml");
+
+ Document datamapDoc = readDOMDocument(mapResource);
+
+ NodeList queryNodes = (NodeList) xpath.evaluate("/data-map/query", datamapDoc, XPathConstants.NODESET);
+
+ for (int j = 0; j < queryNodes.getLength(); j++) {
+ Element queryElement = (Element) queryNodes.item(j);
+ String factory = queryElement.getAttribute("factory");
+
+ String queryType;
+
+ switch (factory) {
+ case "org.apache.cayenne.map.SelectQueryBuilder":
+ queryType = QueryDescriptor.SELECT_QUERY;
+ break;
+ case "org.apache.cayenne.map.SQLTemplateBuilder":
+ queryType = QueryDescriptor.SQL_TEMPLATE;
+ break;
+ case "org.apache.cayenne.map.EjbqlBuilder":
+ queryType = QueryDescriptor.EJBQL_QUERY;
+ break;
+ case "org.apache.cayenne.map.ProcedureQueryBuilder":
+ queryType = QueryDescriptor.PROCEDURE_QUERY;
+ break;
+ default:
+ throw new ConfigurationException("Unknown query factory: " + factory);
+ }
+
+ queryElement.setAttribute("type", queryType);
+ queryElement.removeAttribute("factory");
+ }
+
+ DOMSource domSource = new DOMSource(datamapDoc);
+ StreamResult result = new StreamResult(new FileOutputStream(new File(mapResource.getURL().toURI())));
+ transformer.transform(domSource, result);
+ }
+
+ } catch (Exception e) {
+ throw new ConfigurationException("Unable to parse Cayenne XML configuration files.", e);
+ }
+ }
+
+ private Document readDOMDocument(Resource resource) {
+ DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ try {
+ DocumentBuilder domBuilder = documentBuilderFactory.newDocumentBuilder();
+
+ try (InputStream inputStream = resource.getURL().openStream()) {
+ return domBuilder.parse(inputStream);
+ } catch (IOException | SAXException e) {
+ throw new ConfigurationException("Error loading configuration from %s", e, resource);
+ }
+ } catch (ParserConfigurationException e) {
+ throw new ConfigurationException(e);
+ }
+ }
+
+ @Override
+ protected UpgradeMetaData loadMetaData() {
+ String version = loadProjectVersion();
+
+ UpgradeMetaData metadata = new UpgradeMetaData();
+ metadata.setSupportedVersion(TO_VERSION);
+ metadata.setProjectVersion(version);
+
+ int c1 = compareVersions(version, MIN_SUPPORTED_VERSION);
+ int c2 = compareVersions(TO_VERSION, version);
+
+ if (c1 < 0) {
+ metadata.setIntermediateUpgradeVersion(MIN_SUPPORTED_VERSION);
+ metadata.setUpgradeType(UpgradeType.INTERMEDIATE_UPGRADE_NEEDED);
+ } else if (c2 < 0) {
+ metadata.setUpgradeType(UpgradeType.DOWNGRADE_NEEDED);
+ } else if (c2 == 0) {
+ metadata.setUpgradeType(UpgradeType.UPGRADE_NOT_NEEDED);
+ } else {
+ metadata.setUpgradeType(UpgradeType.UPGRADE_NEEDED);
+ }
+
+ return metadata;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java
new file mode 100644
index 0000000..ceb87a8
--- /dev/null
+++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v8/ProjectUpgrader_V8Test.java
@@ -0,0 +1,179 @@
+package org.apache.cayenne.project.upgrade.v8;
+
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
+import org.apache.cayenne.configuration.DataMapLoader;
+import org.apache.cayenne.configuration.DefaultConfigurationNameMapper;
+import org.apache.cayenne.configuration.XMLDataMapLoader;
+import org.apache.cayenne.di.*;
+import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory;
+import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
+import org.apache.cayenne.project.FileProjectSaver;
+import org.apache.cayenne.project.ProjectSaver;
+import org.apache.cayenne.project.unit.Project2Case;
+import org.apache.cayenne.project.upgrade.UpgradeHandler;
+import org.apache.cayenne.resource.Resource;
+import org.apache.cayenne.resource.URLResource;
+import org.apache.cayenne.test.file.FileUtil;
+import org.apache.cayenne.test.resource.ResourceUtil;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class ProjectUpgrader_V8Test extends Project2Case {
+
+ protected File setupTestDirectory(String subfolder) {
+ String classPath = getClass().getName().replace('.', '/');
+ String location = "target/testrun/" + classPath + "/" + subfolder;
+ File testDirectory = new File(location);
+
+ // delete old tests
+ if (testDirectory.exists()) {
+ if (!FileUtil.delete(location, true)) {
+ throw new CayenneRuntimeException(
+ "Error deleting test directory '%s'",
+ location);
+ }
+ }
+
+ if (!testDirectory.mkdirs()) {
+ throw new CayenneRuntimeException(
+ "Error creating test directory '%s'",
+ location);
+ }
+
+ return testDirectory;
+ }
+
+ @Test
+ public void testPerformUpgrade() throws Exception {
+
+ File testFolder = setupTestDirectory("testPerformUpgrade_7");
+ String sourceUrl = getClass().getPackage().getName().replace('.', '/') + "/7a/";
+
+ List<String> sources = new ArrayList<>();
+
+ sources.add("cayenne-PROJECT1.xml");
+ sources.add("testProjectMap1_1.map.xml");
+ sources.add("testProjectMap1_2.map.xml");
+
+ // upgrades are done in-place, so copy it first
+ List<File> targetsBefore = new ArrayList<>();
+ for (String source : sources) {
+
+ URL url = getClass().getClassLoader().getResource(sourceUrl + source);
+ File target = new File(testFolder, source);
+ assertNotNull(source);
+ ResourceUtil.copyResourceToFile(url, target);
+ targetsBefore.add(target);
+ }
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(ClassLoaderManager.class).to(DefaultClassLoaderManager.class);
+ binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
+ binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+ binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
+ binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
+ }
+ };
+
+ ProjectUpgrader_V8 upgrader = new ProjectUpgrader_V8();
+ Injector injector = DIBootstrap.createInjector(testModule);
+ injector.injectMembers(upgrader);
+
+ Resource source = new URLResource(targetsBefore.get(0).toURL());
+ UpgradeHandler handler = upgrader.getUpgradeHandler(source);
+
+ Resource upgraded = handler.performUpgrade();
+ assertNotNull(upgraded);
+ assertNotSame(source, upgrader);
+
+ // check that all the new files are created...
+ String[] targetsAfterNames = new String[] {
+ "cayenne-PROJECT1.xml", "testProjectMap1_1.map.xml", "testProjectMap1_2.map.xml"
+ };
+
+ File[] targetsAfter = new File[targetsAfterNames.length];
+ for (int i = 0; i < targetsAfter.length; i++) {
+ targetsAfter[i] = new File(testFolder, targetsAfterNames[i]);
+ assertTrue("File was not created: " + targetsAfter[i].getAbsolutePath(), targetsAfter[i].exists());
+ }
+
+ // assert XML structure of the generated files
+ assertPerformUpgrade_7_cayenne(targetsAfter[0]);
+ assertPerformUpgrade_map1_1(targetsAfter[1]);
+ assertPerformUpgrade_map1_2(targetsAfter[2]);
+ }
+
+ private void assertPerformUpgrade_7_cayenne(File file) throws Exception {
+ Document document = toDOMTree(file);
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ assertEquals("", xpath.evaluate("/domain/@name", document));
+ assertEquals("8", xpath.evaluate("/domain/@project-version", document));
+
+ NodeList maps = (NodeList) xpath.evaluate("/domain/map", document, XPathConstants.NODESET);
+ assertNotNull(maps);
+ assertEquals(2, maps.getLength());
+
+ Node map1 = maps.item(0);
+ Node map2 = maps.item(1);
+
+ assertEquals("testProjectMap1_1", xpath.evaluate("@name", map1));
+ assertEquals("testProjectMap1_2", xpath.evaluate("@name", map2));
+
+ NodeList nodes = (NodeList) xpath.evaluate("/domain/node", document, XPathConstants.NODESET);
+ assertNotNull(nodes);
+ assertEquals(1, nodes.getLength());
+ }
+
+ private void assertPerformUpgrade_map1_1(File file) throws Exception {
+ Document document = toDOMTree(file);
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
+
+ NodeList queryNodes = (NodeList) xpath.evaluate("/data-map/query", document, XPathConstants.NODESET);
+ assertNotNull(queryNodes);
+
+ Map<String, Element> queries = new HashMap<>();
+
+ for (int i = 0; i < queryNodes.getLength(); i++) {
+ Element query = (Element) queryNodes.item(i);
+ queries.put(query.getAttribute("name"), query);
+ }
+
+ assertEquals("", queries.get("EjbqlQueryTest").getAttribute("factory"));
+ assertEquals("", queries.get("SQLTemplateTest").getAttribute("factory"));
+ assertEquals("", queries.get("SelectQueryTest").getAttribute("factory"));
+ assertEquals("", queries.get("ProcedureQueryTest").getAttribute("factory"));
+
+ assertEquals("EJBQLQuery", queries.get("EjbqlQueryTest").getAttribute("type"));
+ assertEquals("SQLTemplate", queries.get("SQLTemplateTest").getAttribute("type"));
+ assertEquals("SelectQuery", queries.get("SelectQueryTest").getAttribute("type"));
+ assertEquals("ProcedureQuery", queries.get("ProcedureQueryTest").getAttribute("type"));
+ }
+
+ private void assertPerformUpgrade_map1_2(File file) throws Exception {
+ Document document = toDOMTree(file);
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/cayenne-PROJECT1.xml
----------------------------------------------------------------------
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/cayenne-PROJECT1.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/cayenne-PROJECT1.xml
new file mode 100644
index 0000000..7b4a247
--- /dev/null
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/cayenne-PROJECT1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<domain project-version="7">
+
+ <map name="testProjectMap1_1" />
+ <map name="testProjectMap1_2" />
+
+ <node name="testProjectNode1"
+ adapter="org.example.test.Adapter" factory="org.example.test.DataSourceFactory">
+ <data-source>
+ <connectionPool min="1" max="1" />
+ <login />
+ </data-source>
+ <map-ref name="testProjectMap1_1" />
+ </node>
+</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_1.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_1.map.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_1.map.xml
new file mode 100644
index 0000000..dcc9580
--- /dev/null
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_1.map.xml
@@ -0,0 +1,31 @@
+<?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">
+ <db-entity name="Artist">
+ <db-attribute name="untitledAttr" type="CHAR" isPrimaryKey="true" isMandatory="true" length="10"/>
+ <db-attribute name="untitledAttr1" type="DATE"/>
+ </db-entity>
+ <obj-entity name="Artist" dbEntityName="Artist">
+ <entity-listener class="NowyListener">
+ </entity-listener>
+ </obj-entity>
+ <query name="EjbqlQueryTest" factory="org.apache.cayenne.map.EjbqlBuilder">
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
+ <property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
+ <ejbql><![CDATA[select a from Artist a]]></ejbql>
+ </query>
+ <query name="SQLTemplateTest" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap">
+ <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
+ <sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE)
+VALUES (512, 'No Painting Like This', 12.5)]]></sql>
+ <sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql>
+ </query>
+ <query name="SelectQueryTest" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting">
+ <qualifier><![CDATA[toArtist = $artist]]></qualifier>
+ <ordering><![CDATA[paintingTitle]]></ordering>
+ </query>
+ <query name="ProcedureQueryTest" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
+ </query>
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_2.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_2.map.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_2.map.xml
new file mode 100644
index 0000000..66f6f2d
--- /dev/null
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v8/7a/testProjectMap1_2.map.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+ project-version="7">
+
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/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 10d38a2..7c04504 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
@@ -120,7 +120,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
* The namespace in which the data map XML file will be created. This is
* also the URI to locate a copy of the schema document.
*/
- public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/7/modelMap";
+ public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/8/modelMap";
protected String name;
protected String location;
@@ -311,7 +311,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable
* @since 1.1
*/
public void encodeAsXML(XMLEncoder encoder) {
- encoder.println("<data-map xmlns=\"http://cayenne.apache.org/schema/7/modelMap\"");
+ encoder.println("<data-map xmlns=\"http://cayenne.apache.org/schema/8/modelMap\"");
encoder.indent(1);
encoder.println(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e099a213/cayenne-server/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd b/cayenne-server/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd
index e1748ec..df665ea 100644
--- a/cayenne-server/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd
+++ b/cayenne-server/src/main/resources/org/apache/cayenne/schema/7/modelMap.xsd
@@ -25,9 +25,9 @@
are usually combined in one shared namespace, so the elements of the DataMap
may reference objects from other DataMaps.
-->
-<xs:schema targetNamespace="http://cayenne.apache.org/schema/7/modelMap"
- xmlns:cay="http://cayenne.apache.org/schema/7/modelMap"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="7">
+<xs:schema targetNamespace="http://cayenne.apache.org/schema/8/modelMap"
+ xmlns:cay="http://cayenne.apache.org/schema/8/modelMap"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="8">
<xs:element name="data-map">
<xs:complexType>
<xs:sequence>
@@ -172,7 +172,7 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:ordering"/>
<xs:element name="prefetch" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
</xs:sequence>
- <xs:attribute name="factory" use="required"/>
+ <xs:attribute name="type" use="required" type="xs:string"/>
<xs:attribute name="name" use="required" type="xs:string"/>
<xs:attribute name="root" use="optional" type="xs:string"/>
<xs:attribute name="root-name" use="optional" type="xs:string"/>
[13/16] cayenne git commit: CAY-2060 Move query descriptor classes to
org.apache.cayenne.map package.
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
index e923d57..1872fb9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
@@ -110,8 +110,7 @@ import org.apache.cayenne.modeler.util.CircularArray;
import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.project.ConfigurationNodeParentGetter;
import org.apache.cayenne.project.Project;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.IDUtil;
import javax.swing.event.EventListenerList;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
index 2d5e0be..2abd045 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeFactory.java
@@ -35,8 +35,7 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* A helper class that wraps a tree of project nodes into Swing tree nodes.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index 999fbb5..f281c80 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -77,7 +77,7 @@ import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.project.Project;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.reflect.PropertyUtils;
import org.apache.cayenne.resource.Resource;
import org.apache.commons.logging.Log;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
index ff30ce5..4595214 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.dialog.query.QueryType;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* @since 1.1
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
index 34332a1..37356eb 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.FindDialog;
import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import javax.swing.JTextField;
import java.awt.Color;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index 4544073..5466d3b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -56,7 +56,7 @@ import org.apache.cayenne.modeler.pref.FSPath;
import org.apache.cayenne.modeler.util.AdapterMapping;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.FileFilters;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.wocompat.EOModelProcessor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.logging.Log;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index 14553c1..e1885b9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -47,10 +47,8 @@ import org.apache.cayenne.modeler.undo.PasteCompoundUndoableEdit;
import org.apache.cayenne.modeler.undo.PasteUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.CayenneTransferable;
-import org.apache.cayenne.query.AbstractQuery;
-import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import javax.swing.KeyStroke;
import javax.swing.undo.UndoableEdit;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
index 6985711..282b7a1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
@@ -62,7 +62,7 @@ import org.apache.cayenne.modeler.undo.RemoveUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import javax.swing.KeyStroke;
import javax.swing.undo.CompoundEdit;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
index 8ef72bf..aeb6dca 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialog.java
@@ -19,18 +19,7 @@
package org.apache.cayenne.modeler.dialog;
import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.Attribute;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.map.Embeddable;
-import org.apache.cayenne.map.EmbeddableAttribute;
-import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.Relationship;
+import org.apache.cayenne.map.*;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectTreeModel;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
index 6ca5f9b..41a0e2f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
@@ -27,6 +27,7 @@ import javax.swing.WindowConstants;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.map.event.MapEvent;
import org.apache.cayenne.map.naming.DefaultUniqueNameGenerator;
import org.apache.cayenne.map.naming.NameCheckers;
@@ -34,7 +35,6 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.undo.CreateQueryUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneController;
-import org.apache.cayenne.query.*;
public class QueryType extends CayenneController{
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
index 1cfdc80..6cb38e0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.validation.ValidationFailure;
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
index 24e1919..17df282 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
@@ -32,8 +32,7 @@ import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.pref.DataNodeDefaults;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.validation.ValidationFailure;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
index 741ea01..09ee599 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.modeler.editor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.ProjectTreeView;
@@ -46,7 +47,6 @@ import org.apache.cayenne.modeler.event.ProcedureDisplayListener;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
import org.apache.cayenne.modeler.pref.ComponentGeometry;
-import org.apache.cayenne.query.*;
import org.apache.commons.logging.LogFactory;
import javax.swing.Action;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
index d702cf7..699511d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryMainTab.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
import com.jgoodies.forms.builder.PanelBuilder;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
index e376f7d..146b372 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
@@ -38,8 +38,8 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.JUndoableCayenneTextPane;
import org.apache.cayenne.project.validation.EJBQLStatementValidator;
import org.apache.cayenne.project.validation.EJBQLStatementValidator.PositionException;
-import org.apache.cayenne.query.EJBQLQueryDescriptor;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.EJBQLQueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
import org.apache.cayenne.swing.components.textpane.syntax.EJBQLSyntaxConstant;
import org.apache.cayenne.util.Util;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
index 78654ed..5c8e9da 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlTabbedView.java
@@ -26,7 +26,7 @@ import javax.swing.event.ChangeListener;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
public class EjbqlTabbedView extends JTabbedPane {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
index b771707..a5d5815 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjectQueryPropertiesPanel.java
@@ -26,7 +26,7 @@ import java.awt.event.ActionListener;
import javax.swing.JCheckBox;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.query.QueryMetadata;
import com.jgoodies.forms.builder.PanelBuilder;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
index 5cf446e..b6aa3bc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureQueryView.java
@@ -37,6 +37,8 @@ import javax.swing.JTextField;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ProcedureQueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
index dfae45d..616c628 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.modeler.util.Comparators;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.query.QueryMetadata;
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
index 32cbdde..e5d2a75 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
@@ -36,6 +36,7 @@ import javax.swing.JTextField;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.ProjectUtil;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
index a281cc9..2276fb1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateScriptsTab.java
@@ -26,8 +26,8 @@ import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.DbAdapterInfo;
-import org.apache.cayenne.query.QueryDescriptor;
-import org.apache.cayenne.query.SQLTemplateDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.SQLTemplateDescriptor;
import org.apache.cayenne.util.Util;
import org.syntax.jedit.JEditTextArea;
import org.syntax.jedit.KeywordMap;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
index 76a8113..48c7bc7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateTabbedView.java
@@ -28,7 +28,7 @@ import javax.swing.event.ChangeListener;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
index 50d8176..4cfa0e7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.TextAdapter;
import org.apache.cayenne.query.QueryCacheStrategy;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
index f9d349d..4be3395 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryMainTab.java
@@ -39,6 +39,8 @@ import org.apache.cayenne.exp.ExpressionException;
import org.apache.cayenne.exp.parser.ASTPath;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.SelectQueryDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CellRenderers;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
index c4d03a2..c6328d2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryOrderingTab.java
@@ -45,6 +45,8 @@ import javax.swing.tree.TreeModel;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.SelectQueryDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.EntityTreeModel;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
index db5a6f6..0ec7655 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectQueryTabbedView.java
@@ -27,7 +27,7 @@ import javax.swing.event.ChangeListener;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.QueryDisplayListener;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* A tabbed view for configuring a select query.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
index e7588e3..04b655c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/QueryDisplayEvent.java
@@ -22,8 +22,7 @@ package org.apache.cayenne.modeler.event;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
/**
* @since 1.1
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
index 7e277dd..d03d375 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
@@ -25,8 +25,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.RemoveAction;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
public class CreateQueryUndoableEdit extends CayenneUndoableEdit {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
index e15649c..6b3b59f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.modeler.action.RemoveCallbackMethodAction;
import org.apache.cayenne.modeler.action.RemoveProcedureParameterAction;
import org.apache.cayenne.modeler.action.RemoveRelationshipAction;
import org.apache.cayenne.modeler.editor.ObjCallbackMethod;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
public class PasteUndoableEdit extends CayenneUndoableEdit {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
index 7452caa..d5dde14 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
@@ -50,8 +50,7 @@ import org.apache.cayenne.modeler.action.CreateProcedureAction;
import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.action.RemoveAction;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
public class RemoveUndoableEdit extends CayenneUndoableEdit {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
index a04a87a..7169694 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
@@ -46,7 +46,7 @@ import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.CayenneMapEntry;
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
index 4bc03a7..28ea313 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.util.Util;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
index cbe16ab..442007a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/state/QueryDisplayEventType.java
@@ -23,8 +23,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.QueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
class QueryDisplayEventType extends DisplayEventType {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
index 179dae2..1e7cf02 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
@@ -33,12 +33,7 @@ import java.util.StringTokenizer;
import org.apache.cayenne.dba.TypesMapping;
import org.apache.cayenne.exp.ExpressionException;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbJoin;
-import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.map.ObjRelationship;
+import org.apache.cayenne.map.*;
import org.apache.cayenne.map.naming.DefaultUniqueNameGenerator;
import org.apache.cayenne.map.naming.NameCheckers;
import org.apache.cayenne.query.*;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/3e2b0649/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
index f511d18..4010a9b 100644
--- a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
+++ b/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
@@ -26,15 +26,14 @@ import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.query.QueryDescriptor;
-import org.apache.cayenne.query.SelectQueryDescriptor;
+import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.SelectQueryDescriptor;
import org.apache.cayenne.util.XMLEncoder;
import org.junit.Before;
import org.junit.Test;
import java.io.PrintWriter;
import java.net.URL;
-import java.util.Collection;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
[09/16] cayenne git commit: CAY-2060 Current project version is now 8,
which means project XML files will be generated with schema version 8 all the
time.
Posted by dk...@apache.org.
CAY-2060 Current project version is now 8, which means project XML files will be generated with schema version 8 all the time.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2880ed95
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2880ed95
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2880ed95
Branch: refs/heads/master
Commit: 2880ed95004d96b6a8b9cc7f1893d0f0d919a4e0
Parents: 8049c96
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Thu Feb 18 20:03:21 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:25 2016 +0300
----------------------------------------------------------------------
.../upgrade/v7/ProjectUpgrader_V7Test.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2880ed95/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
index 250ae29..7fa997b 100644
--- a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
+++ b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
@@ -274,7 +274,7 @@ public class ProjectUpgrader_V7Test extends Project2Case {
XPath xpath = XPathFactory.newInstance().newXPath();
assertEquals("", xpath.evaluate("/domain/@name", document));
- assertEquals("7", xpath.evaluate("/domain/@project-version", document));
+ assertEquals("8", xpath.evaluate("/domain/@project-version", document));
NodeList maps = (NodeList) xpath.evaluate("/domain/map", document, XPathConstants.NODESET);
assertNotNull(maps);
@@ -316,7 +316,7 @@ public class ProjectUpgrader_V7Test extends Project2Case {
XPath xpath = XPathFactory.newInstance().newXPath();
assertEquals("", xpath.evaluate("/domain/@name", document));
- assertEquals("7", xpath.evaluate("/domain/@project-version", document));
+ assertEquals("8", xpath.evaluate("/domain/@project-version", document));
NodeList maps = (NodeList) xpath.evaluate("/domain/map", document, XPathConstants.NODESET);
assertNotNull(maps);
@@ -350,14 +350,14 @@ public class ProjectUpgrader_V7Test extends Project2Case {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
}
private void assertPerformUpgrade_3_0_0_1_d1Map2(File file) throws Exception {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
}
@Test
@@ -408,7 +408,7 @@ public class ProjectUpgrader_V7Test extends Project2Case {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
NodeList maps = (NodeList) xpath.evaluate("/data-map/obj-entity/entity-listener", document,
XPathConstants.NODESET);
@@ -420,14 +420,14 @@ public class ProjectUpgrader_V7Test extends Project2Case {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/domain/@project-version", document));
+ assertEquals("8", xpath.evaluate("/domain/@project-version", document));
}
private void assertPerformUpgradeMap2(File file) throws Exception {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
}
@Test
@@ -483,7 +483,7 @@ public class ProjectUpgrader_V7Test extends Project2Case {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
String xpathValue = "/data-map/obj-entity[@name='GreatArtist']/obj-attribute";
XPathExpression expr = xpath.compile(xpathValue);
@@ -496,7 +496,7 @@ public class ProjectUpgrader_V7Test extends Project2Case {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("8", xpath.evaluate("/data-map/@project-version", document));
String xpath_1 = "/data-map/obj-entity[@name='House']/obj-attribute/@name";
String xpath_2 = "/data-map/obj-entity[@name='Penthouse']/obj-attribute/@name";
[16/16] cayenne git commit: CAY-2060 Add note about upgrading
*.map.xml files in 4.0.M4.
Posted by dk...@apache.org.
CAY-2060 Add note about upgrading *.map.xml files in 4.0.M4.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a6c43835
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a6c43835
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a6c43835
Branch: refs/heads/master
Commit: a6c438354ff1d80e8d9a60e50df76f7c9af644b6
Parents: 20e435d
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Fri Feb 19 15:31:37 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:58:02 2016 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/UPGRADE.txt | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6c43835/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index 5e30bce..6887e19 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -4,6 +4,11 @@ Apache Cayenne Upgrade Information
IMPORTANT: be sure to read all notes for the intermediate releases between your
current release and the release you are upgrading to.
-------------------------------------------------------------------------------
+UPGRADING TO 4.0.M4
+
+* 4.0.M4 changes the way queries are stored in the mapping files, so all existing *.map.xml files should be upgraded.
+ To do that open each of your existing projects in the new CayenneModeler. Agree to perform an upgrade when asked.
+
UPGRADING TO 4.0.M3
* Per CAY-2026 minimal Java version is now 1.7. If you are still need Java 1.6, you can use Cayenne 3.1 or 4.0.M2 until your
[11/16] cayenne git commit: CAY-2060 Restore code which was left
commented out by accident.
Posted by dk...@apache.org.
CAY-2060 Restore code which was left commented out by accident.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/74f65f97
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/74f65f97
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/74f65f97
Branch: refs/heads/master
Commit: 74f65f9756ef49b2d830fe1ef19f18f74547387d
Parents: 7a43168
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Fri Feb 19 14:09:24 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:36 2016 +0300
----------------------------------------------------------------------
.../cayenne/map/DataMapNamespaceTest.java | 29 ++++++++++----------
.../modeler/editor/RawQueryPropertiesPanel.java | 7 +----
2 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/74f65f97/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
index 0a74c29..30ed699 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/DataMapNamespaceTest.java
@@ -19,8 +19,7 @@
package org.apache.cayenne.map;
-import org.apache.cayenne.query.MockQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.QueryDescriptor;
import org.junit.Before;
import org.junit.Test;
@@ -111,17 +110,19 @@ public class DataMapNamespaceTest {
public void testGetQuery() throws Exception {
MockMappingNamespace namespace = new MockMappingNamespace();
map.setNamespace(namespace);
-//
-// Query q1 = new MockQuery("query");
-// Query q2 = new MockQuery("query");
-// namespace.addQuery(q1);
-//
-// assertSame(q1, map.getQuery("query"));
-//
-// map.addQuery(q2);
-// assertSame(q2, map.getQuery("query"));
-//
-// map.removeQuery("query");
-// assertSame(q1, map.getQuery("query"));
+
+ QueryDescriptor q1 = QueryDescriptor.selectQueryDescriptor();
+ q1.setName("query");
+ QueryDescriptor q2 = QueryDescriptor.selectQueryDescriptor();
+ q2.setName("query");
+ namespace.addQueryDescriptor(q1);
+
+ assertSame(q1, map.getQueryDescriptor("query"));
+
+ map.addQueryDescriptor(q2);
+ assertSame(q2, map.getQueryDescriptor("query"));
+
+ map.removeQueryDescriptor("query");
+ assertSame(q1, map.getQueryDescriptor("query"));
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/74f65f97/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
index 6106cea..dfae45d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/RawQueryPropertiesPanel.java
@@ -30,15 +30,12 @@ import javax.swing.DefaultComboBoxModel;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
-import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CellRenderers;
import org.apache.cayenne.modeler.util.Comparators;
-import org.apache.cayenne.query.Query;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
@@ -126,9 +123,7 @@ public abstract class RawQueryPropertiesPanel extends SelectPropertiesPanel {
*/
public void initFromModel(QueryDescriptor query) {
super.initFromModel(query);
-// EntityResolver entRes = new EntityResolver(((DataChannelDescriptor) mediator
-// .getProject()
-// .getRootNode()).getDataMaps());
+
boolean fetchingDO = !Boolean.valueOf(query.getProperties().get(QueryMetadata.FETCHING_DATA_ROWS_PROPERTY));
dataObjects.setSelected(fetchingDO);
[10/16] cayenne git commit: CAY-2060 Use URL.getPath() instead of
URL.toURI() to get local file system path since toURI() method fails for URLs
containing spaces.
Posted by dk...@apache.org.
CAY-2060 Use URL.getPath() instead of URL.toURI() to get local file system path since toURI() method fails for URLs containing spaces.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7a43168d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7a43168d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7a43168d
Branch: refs/heads/master
Commit: 7a43168dc468e8a0afeb266576248ed32dd7f0d1
Parents: 2880ed9
Author: Dzmitry Kazimirchyk <dk...@gmail.com>
Authored: Fri Feb 19 11:32:59 2016 +0300
Committer: Dzmitry Kazimirchyk <dk...@gmail.com>
Committed: Fri Feb 19 16:57:32 2016 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/7a43168d/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
index a6381d1..939a6e4 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v8/UpgradeHandler_V8.java
@@ -139,7 +139,8 @@ public class UpgradeHandler_V8 extends BaseUpgradeHandler {
}
DOMSource domSource = new DOMSource(datamapDoc);
- StreamResult result = new StreamResult(new FileOutputStream(new File(mapResource.getURL().toURI())));
+ StreamResult result = new StreamResult(
+ new FileOutputStream(new File(mapResource.getURL().getPath())));
transformer.transform(domSource, result);
}