You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/22 10:08:06 UTC
svn commit: r606426 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/map/ main/java/org/apache/cayenne/query/
test/java/org/apache/cayenne/map/
Author: aadamchik
Date: Sat Dec 22 01:08:04 2007
New Revision: 606426
URL: http://svn.apache.org/viewvc?rev=606426&view=rev
Log:
refactoring - renamed QueryBuilder to QueryLoader, as QueryBuilder name may be used for other purposes
(step 1 ... renaming... will add deprecation shortly)
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryLoader.java
- copied, changed from r606412, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryBuilder.java
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryBuilder.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java Sat Dec 22 01:08:04 2007
@@ -124,7 +124,7 @@
private ObjRelationship objRelationship;
private DbAttribute attrib;
private Procedure procedure;
- private QueryBuilder queryBuilder;
+ private QueryLoader queryBuilder;
private String sqlKey;
private String descending;
private String ignoreCase;
@@ -999,7 +999,7 @@
}
try {
- queryBuilder = (QueryBuilder) Class.forName(builder).newInstance();
+ queryBuilder = (QueryLoader) Class.forName(builder).newInstance();
}
catch (Exception ex) {
throw new SAXException(
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java Sat Dec 22 01:08:04 2007
@@ -28,7 +28,7 @@
* @since 1.1
* @author Andrus Adamchik
*/
-class ProcedureQueryBuilder extends QueryBuilder {
+class ProcedureQueryBuilder extends QueryLoader {
/**
* Returns a ProcedureQuery.
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryLoader.java (from r606412, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryBuilder.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryLoader.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryLoader.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryBuilder.java&r1=606412&r2=606426&rev=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/QueryLoader.java Sat Dec 22 01:08:04 2007
@@ -34,10 +34,10 @@
* 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 1.1
+ * @since 3.0
* @author Andrus Adamchik
*/
-public abstract class QueryBuilder {
+public abstract class QueryLoader {
public static final String OBJ_ENTITY_ROOT = "obj-entity";
public static final String DB_ENTITY_ROOT = "db-entity";
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java Sat Dec 22 01:08:04 2007
@@ -30,7 +30,7 @@
* @since 1.1
* @author Andrus Adamchik
*/
-class SQLTemplateBuilder extends QueryBuilder {
+class SQLTemplateBuilder extends QueryLoader {
/**
* Builds a SQLTemplate query.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java Sat Dec 22 01:08:04 2007
@@ -28,7 +28,7 @@
* @since 1.1
* @author Andrus Adamchik
*/
-class SelectQueryBuilder extends QueryBuilder {
+class SelectQueryBuilder extends QueryLoader {
/**
* Creates a SelectQuery.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java Sat Dec 22 01:08:04 2007
@@ -29,7 +29,7 @@
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.map.QueryBuilder;
+import org.apache.cayenne.map.QueryLoader;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
@@ -231,7 +231,7 @@
encoder.print("org.apache.cayenne.map.ProcedureQueryBuilder");
encoder.print("\" root=\"");
- encoder.print(QueryBuilder.PROCEDURE_ROOT);
+ encoder.print(QueryLoader.PROCEDURE_ROOT);
String rootString = null;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java Sat Dec 22 01:08:04 2007
@@ -30,7 +30,7 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.map.QueryBuilder;
+import org.apache.cayenne.map.QueryLoader;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
@@ -183,27 +183,27 @@
String rootType = null;
if (root instanceof String) {
- rootType = QueryBuilder.OBJ_ENTITY_ROOT;
+ rootType = QueryLoader.OBJ_ENTITY_ROOT;
rootString = root.toString();
}
else if (root instanceof ObjEntity) {
- rootType = QueryBuilder.OBJ_ENTITY_ROOT;
+ rootType = QueryLoader.OBJ_ENTITY_ROOT;
rootString = ((ObjEntity) root).getName();
}
else if (root instanceof DbEntity) {
- rootType = QueryBuilder.DB_ENTITY_ROOT;
+ rootType = QueryLoader.DB_ENTITY_ROOT;
rootString = ((DbEntity) root).getName();
}
else if (root instanceof Procedure) {
- rootType = QueryBuilder.PROCEDURE_ROOT;
+ rootType = QueryLoader.PROCEDURE_ROOT;
rootString = ((Procedure) root).getName();
}
else if (root instanceof Class) {
- rootType = QueryBuilder.JAVA_CLASS_ROOT;
+ rootType = QueryLoader.JAVA_CLASS_ROOT;
rootString = ((Class<?>) root).getName();
}
else if (root instanceof DataMap) {
- rootType = QueryBuilder.DATA_MAP_ROOT;
+ rootType = QueryLoader.DATA_MAP_ROOT;
rootString = ((DataMap) root).getName();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java Sat Dec 22 01:08:04 2007
@@ -30,7 +30,7 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.map.QueryBuilder;
+import org.apache.cayenne.map.QueryLoader;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
@@ -222,23 +222,23 @@
String rootType = null;
if (root instanceof String) {
- rootType = QueryBuilder.OBJ_ENTITY_ROOT;
+ rootType = QueryLoader.OBJ_ENTITY_ROOT;
rootString = root.toString();
}
else if (root instanceof ObjEntity) {
- rootType = QueryBuilder.OBJ_ENTITY_ROOT;
+ rootType = QueryLoader.OBJ_ENTITY_ROOT;
rootString = ((ObjEntity) root).getName();
}
else if (root instanceof DbEntity) {
- rootType = QueryBuilder.DB_ENTITY_ROOT;
+ rootType = QueryLoader.DB_ENTITY_ROOT;
rootString = ((DbEntity) root).getName();
}
else if (root instanceof Procedure) {
- rootType = QueryBuilder.PROCEDURE_ROOT;
+ rootType = QueryLoader.PROCEDURE_ROOT;
rootString = ((Procedure) root).getName();
}
else if (root instanceof Class) {
- rootType = QueryBuilder.JAVA_CLASS_ROOT;
+ rootType = QueryLoader.JAVA_CLASS_ROOT;
rootString = ((Class<?>) root).getName();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryBuilderTest.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/QueryBuilderTest.java Sat Dec 22 01:08:04 2007
@@ -27,10 +27,10 @@
*/
public class QueryBuilderTest extends BasicCase {
- protected QueryBuilder builder;
+ protected QueryLoader builder;
protected void setUp() throws Exception {
- builder = new QueryBuilder() {
+ builder = new QueryLoader() {
public Query getQuery() {
return null;
@@ -48,7 +48,7 @@
DbEntity entity = new DbEntity("DB1");
map.addDbEntity(entity);
- builder.setRoot(map, QueryBuilder.DB_ENTITY_ROOT, "DB1");
+ builder.setRoot(map, QueryLoader.DB_ENTITY_ROOT, "DB1");
assertSame(entity, builder.getRoot());
}
@@ -57,14 +57,14 @@
ObjEntity entity = new ObjEntity("OBJ1");
map.addObjEntity(entity);
- builder.setRoot(map, QueryBuilder.OBJ_ENTITY_ROOT, "OBJ1");
+ builder.setRoot(map, QueryLoader.OBJ_ENTITY_ROOT, "OBJ1");
assertSame(entity, builder.getRoot());
}
public void testSetRootDataMap() throws Exception {
DataMap map = new DataMap("map");
- builder.setRoot(map, QueryBuilder.DATA_MAP_ROOT, null);
+ builder.setRoot(map, QueryLoader.DATA_MAP_ROOT, null);
assertSame(map, builder.getRoot());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SQLTemplateBuilderTest.java Sat Dec 22 01:08:04 2007
@@ -48,7 +48,7 @@
map.addObjEntity(entity);
SQLTemplateBuilder builder = new SQLTemplateBuilder();
- builder.setRoot(map, QueryBuilder.OBJ_ENTITY_ROOT, "A");
+ builder.setRoot(map, QueryLoader.OBJ_ENTITY_ROOT, "A");
Query query = builder.getQuery();
assertTrue(query instanceof SQLTemplate);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java?rev=606426&r1=606425&r2=606426&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/SelectQueryBuilderTest.java Sat Dec 22 01:08:04 2007
@@ -49,7 +49,7 @@
map.addObjEntity(entity);
SelectQueryBuilder builder = new SelectQueryBuilder();
- builder.setRoot(map, QueryBuilder.OBJ_ENTITY_ROOT, "A");
+ builder.setRoot(map, QueryLoader.OBJ_ENTITY_ROOT, "A");
assertTrue(builder.getQuery() instanceof SelectQuery);
assertSame(entity, ((SelectQuery) builder.getQuery()).getRoot());