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 2010/03/11 15:17:31 UTC
svn commit: r921859 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/
cayenne-jdk1.5-unpublished/src/test/java/org/apa...
Author: aadamchik
Date: Thu Mar 11 14:17:30 2010
New Revision: 921859
URL: http://svn.apache.org/viewvc?rev=921859&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
* removing project.validator package
Added:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/NameValidationHelper.java
- copied, changed from r921858, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/validator/
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-tools/pom.xml
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/StringUtils.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java Thu Mar 11 14:17:30 2010
@@ -28,7 +28,6 @@ import java.util.List;
import org.apache.cayenne.conf.ConfigStatus;
import org.apache.cayenne.conf.Configuration;
-import org.apache.cayenne.project.validator.Validator;
/**
* Describes a model of Cayenne project. Project is a set of files in the filesystem
@@ -184,12 +183,7 @@ public abstract class Project {
return projectFiles;
}
- /**
- * Creates an instance of Validator for validating this project.
- */
- public Validator getValidator() {
- return new Validator(this);
- }
+
/**
* Looks up and returns a file wrapper for a project object. Returns null if no file
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ProjectTest.java Thu Mar 11 14:17:30 2010
@@ -24,7 +24,6 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
-import org.apache.cayenne.project.validator.Validator;
import org.apache.cayenne.unit.CayenneCase;
/**
@@ -35,8 +34,8 @@ public class ProjectTest extends Cayenne
protected File f;
/**
- * @see junit.framework.TestCase#setUp()
- */
+ * @see junit.framework.TestCase#setUp()
+ */
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -45,19 +44,9 @@ public class ProjectTest extends Cayenne
}
public void testModified() throws Exception {
- assertFalse(p.isModified());
- p.setModified(true);
- assertTrue(p.isModified());
- }
-
- public void testValidator() throws Exception {
- Validator v1 = p.getValidator();
- assertSame(p, v1.getProject());
-
- Validator v2 = p.getValidator();
- assertSame(p, v2.getProject());
-
- assertTrue(v1 != v2);
+ assertFalse(p.isModified());
+ p.setModified(true);
+ assertTrue(p.isModified());
}
public void testProcessSave() throws Exception {
@@ -80,7 +69,8 @@ public class ProjectTest extends Cayenne
try {
p.processSave(list);
fail("Save must have failed.");
- } catch (ProjectException ex) {
+ }
+ catch (ProjectException ex) {
// exception expected
assertEquals(1, file.saveTempCount);
assertEquals(0, file.commitCount);
@@ -88,8 +78,8 @@ public class ProjectTest extends Cayenne
}
}
-
class SaveEmulator extends ProjectFile {
+
protected int commitCount;
protected int undoCount;
protected int deleteCount;
@@ -161,9 +151,9 @@ public class ProjectTest extends Cayenne
@Override
public void saveTemp() throws Exception {
saveTempCount++;
-
- if(shouldFail) {
- throw new Exception("You forced me to fail...");
+
+ if (shouldFail) {
+ throw new Exception("You forced me to fail...");
}
}
@@ -183,7 +173,6 @@ public class ProjectTest extends Cayenne
return null;
}
-
/**
* @see org.apache.cayenne.project.ProjectFile#getOldFileName()
*/
@@ -192,7 +181,6 @@ public class ProjectTest extends Cayenne
return null;
}
-
/**
* @see org.apache.cayenne.project.ProjectFile#resolveFile()
*/
@@ -201,7 +189,6 @@ public class ProjectTest extends Cayenne
return new File("abc");
}
-
/**
* @see org.apache.cayenne.project.ProjectFile#resolveOldFile()
*/
@@ -210,6 +197,5 @@ public class ProjectTest extends Cayenne
return new File("xyz");
}
-
}
}
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java Thu Mar 11 14:17:30 2010
@@ -20,7 +20,6 @@ package org.apache.cayenne.project2.vali
import org.apache.cayenne.dba.TypesMapping;
import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.project.validator.MappingNamesHelper;
import org.apache.cayenne.util.Util;
class DbAttributeValidator {
@@ -33,7 +32,7 @@ class DbAttributeValidator {
validationVisitor.registerError("Unnamed DbAttribute.", object);
}
else {
- MappingNamesHelper helper = MappingNamesHelper.getInstance();
+ NameValidationHelper helper = NameValidationHelper.getInstance();
String invalidChars = helper.invalidCharsInDbPathComponent(attribute
.getName());
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java Thu Mar 11 14:17:30 2010
@@ -20,7 +20,6 @@ package org.apache.cayenne.project2.vali
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.project.validator.MappingNamesHelper;
import org.apache.cayenne.util.Util;
class DbRelationshipValidator {
@@ -72,7 +71,7 @@ class DbRelationshipValidator {
+ " has the same name as one of DbAttributes", object);
}
else {
- MappingNamesHelper helper = MappingNamesHelper.getInstance();
+ NameValidationHelper helper = NameValidationHelper.getInstance();
String invalidChars = helper.invalidCharsInDbPathComponent(rel.getName());
if (invalidChars != null) {
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/NameValidationHelper.java (from r921858, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/NameValidationHelper.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/NameValidationHelper.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java&r1=921858&r2=921859&rev=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/NameValidationHelper.java Thu Mar 11 14:17:30 2010
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.project.validator;
+package org.apache.cayenne.project2.validation;
import java.util.Arrays;
import java.util.Collection;
@@ -28,35 +28,80 @@ import java.util.StringTokenizer;
*
* @since 1.1
*/
-public class MappingNamesHelper {
+public class NameValidationHelper {
- // TODO: used by StringUtils and ClassGenerationInfo... need to refactor..
static final Collection<String> RESERVED_JAVA_KEYWORDS = Arrays.asList(
- "abstract", "assert", "default", "if", "private", "this", "boolean", "do",
- "implements", "protected", "throw", "break", "double", "import", "public",
- "throws", "byte", "else", "instanceof", "return", "transient", "case",
- "extends", "int", "short", "try", "catch", "final", "interface", "static",
- "void", "char", "finally", "long", "strictfp", "volatile", "class", "float",
- "native", "super", "while", "const", "for", "new", "switch", "continue",
- "goto", "package", "synchronized"
- );
+ "abstract",
+ "assert",
+ "default",
+ "if",
+ "private",
+ "this",
+ "boolean",
+ "do",
+ "implements",
+ "protected",
+ "throw",
+ "break",
+ "double",
+ "import",
+ "public",
+ "throws",
+ "byte",
+ "else",
+ "instanceof",
+ "return",
+ "transient",
+ "case",
+ "extends",
+ "int",
+ "short",
+ "try",
+ "catch",
+ "final",
+ "interface",
+ "static",
+ "void",
+ "char",
+ "finally",
+ "long",
+ "strictfp",
+ "volatile",
+ "class",
+ "float",
+ "native",
+ "super",
+ "while",
+ "const",
+ "for",
+ "new",
+ "switch",
+ "continue",
+ "goto",
+ "package",
+ "synchronized");
- public boolean isReservedJavaKeyword(String word)
- {
+ public boolean isReservedJavaKeyword(String word) {
return RESERVED_JAVA_KEYWORDS.contains(word);
}
-
+
// a property is considered invalid if there is a getter or a setter for it in
// java.lang.Object or CayenneDataObject
- static final Collection INVALID_JAVA_PROPERTIES = Arrays.asList("class", "committedSnapshot", "currentSnapshot",
- "dataContext", "objectId", "persistenceState", "snapshotVersion");
+ static final Collection<String> INVALID_JAVA_PROPERTIES = Arrays.asList(
+ "class",
+ "committedSnapshot",
+ "currentSnapshot",
+ "dataContext",
+ "objectId",
+ "persistenceState",
+ "snapshotVersion");
- static final MappingNamesHelper sharedInstance = new MappingNamesHelper();
+ static final NameValidationHelper sharedInstance = new NameValidationHelper();
/**
* Returns shared instance of the validator.
*/
- public static MappingNamesHelper getInstance() {
+ public static NameValidationHelper getInstance() {
return sharedInstance;
}
@@ -107,7 +152,8 @@ public class MappingNamesHelper {
}
private String validateJavaIdentifier(String id, String invalidChars) {
- // TODO: Java spec seems to allow "$" char in identifiers... Cayenne expressions do
+ // TODO: Java spec seems to allow "$" char in identifiers... Cayenne expressions
+ // do
// not, so we should probably check for this char presence...
int len = (id != null) ? id.length() : 0;
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java Thu Mar 11 14:17:30 2010
@@ -27,7 +27,6 @@ import org.apache.cayenne.map.Embeddable
import org.apache.cayenne.map.EmbeddedAttribute;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.project.validator.MappingNamesHelper;
import org.apache.cayenne.util.Util;
class ObjAttributeValidator {
@@ -40,7 +39,7 @@ class ObjAttributeValidator {
validationVisitor.registerError("Unnamed ObjAttribute.", object);
}
else {
- MappingNamesHelper helper = MappingNamesHelper.getInstance();
+ NameValidationHelper helper = NameValidationHelper.getInstance();
String invalidChars = helper.invalidCharsInObjPathComponent(attribute
.getName());
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java Thu Mar 11 14:17:30 2010
@@ -21,7 +21,6 @@ package org.apache.cayenne.project2.vali
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.project.validator.MappingNamesHelper;
import org.apache.cayenne.util.Util;
class ObjEntityValidator {
@@ -52,7 +51,7 @@ class ObjEntityValidator {
return;
}
- MappingNamesHelper helper = MappingNamesHelper.getInstance();
+ NameValidationHelper helper = NameValidationHelper.getInstance();
String invalidChars = helper.invalidCharsInJavaClassName(className);
if (invalidChars != null) {
@@ -81,7 +80,7 @@ class ObjEntityValidator {
return; // null is Ok
}
- MappingNamesHelper helper = MappingNamesHelper.getInstance();
+ NameValidationHelper helper = NameValidationHelper.getInstance();
String invalidChars = helper.invalidCharsInJavaClassName(superClassName);
if (invalidChars != null) {
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjRelationshipValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjRelationshipValidator.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjRelationshipValidator.java Thu Mar 11 14:17:30 2010
@@ -27,7 +27,6 @@ import org.apache.cayenne.map.DbRelation
import org.apache.cayenne.map.DeleteRule;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.project.validator.MappingNamesHelper;
import org.apache.cayenne.util.Util;
class ObjRelationshipValidator {
@@ -45,7 +44,7 @@ class ObjRelationshipValidator {
+ " has the same name as one of ObjAttributes", object);
}
else {
- MappingNamesHelper helper = MappingNamesHelper.getInstance();
+ NameValidationHelper helper = NameValidationHelper.getInstance();
String invalidChars = helper.invalidCharsInObjPathComponent(rel.getName());
if (invalidChars != null) {
Modified: cayenne/main/trunk/framework/cayenne-tools/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/pom.xml?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-tools/pom.xml Thu Mar 11 14:17:30 2010
@@ -96,6 +96,13 @@
<version>${version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.unpublished</groupId>
+ <artifactId>cayenne-project-unpublished</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>ognl</groupId>
Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/StringUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/StringUtils.java?rev=921859&r1=921858&r2=921859&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/StringUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/gen/StringUtils.java Thu Mar 11 14:17:30 2010
@@ -19,7 +19,7 @@
package org.apache.cayenne.gen;
-import org.apache.cayenne.project.validator.MappingNamesHelper;
+import org.apache.cayenne.project2.validation.NameValidationHelper;
import org.apache.cayenne.util.NameConverter;
import org.apache.cayenne.util.Util;
@@ -44,7 +44,7 @@ public class StringUtils {
* keywords.
*/
public String formatVariableName(String variableName) {
- if (MappingNamesHelper.getInstance().isReservedJavaKeyword(variableName)) {
+ if (NameValidationHelper.getInstance().isReservedJavaKeyword(variableName)) {
return "_" + variableName;
}
else {