[dna-commits] DNA SVN: r480 - trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java.
dna-commits at lists.jboss.org
dna-commits at lists.jboss.org
Thu Aug 28 16:25:25 EDT 2008
Author: spagop
Date: 2008-08-28 16:25:25 -0400 (Thu, 28 Aug 2008)
New Revision: 480
Modified:
trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java
trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataUtil.java
trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/MethodMetadataSequencer.java
trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/ParameterizedTypeFieldMetadataSequencer.java
trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/SimpleTypeMetadataSequencer.java
Log:
more type support and some utils / refactory
Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java
===================================================================
--- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java 2008-08-28 19:50:10 UTC (rev 479)
+++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java 2008-08-28 20:25:25 UTC (rev 480)
@@ -26,7 +26,6 @@
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.jboss.dna.common.monitor.ProgressMonitor;
-import org.jboss.dna.common.util.JcrUtil;
import org.jboss.dna.sequencer.java.metadata.AnnotationMetadata;
import org.jboss.dna.sequencer.java.metadata.ArrayTypeFieldMetadata;
import org.jboss.dna.sequencer.java.metadata.ClassMetadata;
@@ -336,7 +335,7 @@
if (fieldMetadata instanceof PrimitiveFieldMetadata) {
// primitive type
PrimitiveFieldMetadata primitiveFieldMetadata = (PrimitiveFieldMetadata)fieldMetadata;
- String primitiveFieldRootPath = JcrUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE
+ String primitiveFieldRootPath = JavaMetadataUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE
+ SLASH
+ JAVA_UNIT_TYPE_CHILD_NODE
+ SLASH
@@ -359,7 +358,7 @@
List<ModifierMetadata> modifiers = primitiveFieldMetadata.getModifiers();
int primitiveModifierIndex = 1;
for (ModifierMetadata modifierMetadata : modifiers) {
- String modifierPath = JcrUtil.createPathWithIndex(primitiveFieldRootPath + SLASH
+ String modifierPath = JavaMetadataUtil.createPathWithIndex(primitiveFieldRootPath + SLASH
+ JAVA_MODIFIER_CHILD_NODE + SLASH
+ JAVA_MODIFIER_DECLARATION_CHILD_NODE,
primitiveModifierIndex);
@@ -373,7 +372,7 @@
List<Variable> variables = primitiveFieldMetadata.getVariables();
int primitiveVariableIndex = 1;
for (Variable variable : variables) {
- String variablePath = JcrUtil.createPathWithIndex(primitiveFieldRootPath + SLASH
+ String variablePath = JavaMetadataUtil.createPathWithIndex(primitiveFieldRootPath + SLASH
+ JAVA_PRIMITIVE_TYPE_VARIABLE + SLASH
+ JAVA_VARIABLE, primitiveVariableIndex);
Path primitiveChildNode = pathFactory.create(variablePath);
@@ -391,7 +390,7 @@
// Simple type
if (fieldMetadata instanceof SimpleTypeFieldMetadata) {
SimpleTypeFieldMetadata simpleTypeFieldMetadata = (SimpleTypeFieldMetadata)fieldMetadata;
- String simpleTypeFieldRootPath = JcrUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE
+ String simpleTypeFieldRootPath = JavaMetadataUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE
+ SLASH
+ JAVA_UNIT_TYPE_CHILD_NODE
+ SLASH
@@ -414,7 +413,7 @@
List<ModifierMetadata> simpleModifiers = simpleTypeFieldMetadata.getModifiers();
int simpleTypeModifierIndex = 1;
for (ModifierMetadata modifierMetadata : simpleModifiers) {
- String simpleTypeModifierPath = JcrUtil.createPathWithIndex(simpleTypeFieldRootPath
+ String simpleTypeModifierPath = JavaMetadataUtil.createPathWithIndex(simpleTypeFieldRootPath
+ SLASH
+ JAVA_SIMPLE_TYPE_MODIFIER_CHILD_NODE
+ SLASH
@@ -431,7 +430,7 @@
List<Variable> variables = simpleTypeFieldMetadata.getVariables();
int simpleTypeVariableIndex = 1;
for (Variable variable : variables) {
- String variablePath = JcrUtil.createPathWithIndex(simpleTypeFieldRootPath + SLASH
+ String variablePath = JavaMetadataUtil.createPathWithIndex(simpleTypeFieldRootPath + SLASH
+ JAVA_SIMPLE_TYPE_VARIABLE + SLASH
+ JAVA_VARIABLE, simpleTypeVariableIndex);
Path primitiveChildNode = pathFactory.create(variablePath);
@@ -495,7 +494,7 @@
if (methodMetadata.isContructor()) {
// process constructor
ConstructorMetadata constructorMetadata = (ConstructorMetadata)methodMetadata;
- String constructorRootPath = JcrUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE + SLASH
+ String constructorRootPath = JavaMetadataUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE + SLASH
+ JAVA_UNIT_TYPE_CHILD_NODE + SLASH
+ JAVA_CLASS_DECLARATION_CHILD_NODE + SLASH
+ JAVA_NORMAL_CLASS_CHILD_NODE + SLASH
@@ -512,7 +511,7 @@
// modifiers
int constructorModifierIndex = 1;
for (ModifierMetadata modifierMetadata : modifiers) {
- String contructorModifierPath = JcrUtil.createPathWithIndex(constructorRootPath
+ String contructorModifierPath = JavaMetadataUtil.createPathWithIndex(constructorRootPath
+ SLASH
+ JAVA_MODIFIER_CHILD_NODE
+ SLASH
@@ -530,7 +529,7 @@
int constructorParameterIndex = 1;
for (FieldMetadata fieldMetadata : constructorMetadata.getParameters()) {
- String constructorParameterRootPath = JcrUtil.createPathWithIndex(constructorRootPath + SLASH
+ String constructorParameterRootPath = JavaMetadataUtil.createPathWithIndex(constructorRootPath + SLASH
+ JAVA_PARAMETER + SLASH
+ JAVA_FORMAL_PARAMETER,
constructorParameterIndex);
@@ -576,7 +575,7 @@
// normal method
MethodTypeMemberMetadata methodTypeMemberMetadata = (MethodTypeMemberMetadata)methodMetadata;
- String methodRootPath = JcrUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE + SLASH
+ String methodRootPath = JavaMetadataUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE + SLASH
+ JAVA_UNIT_TYPE_CHILD_NODE + SLASH
+ JAVA_CLASS_DECLARATION_CHILD_NODE + SLASH
+ JAVA_NORMAL_CLASS_CHILD_NODE + SLASH
@@ -591,7 +590,7 @@
// method modifiers
int methodModierIndex = 1;
for (ModifierMetadata modifierMetadata : methodTypeMemberMetadata.getModifiers()) {
- String methodModifierPath = JcrUtil.createPathWithIndex(methodRootPath + SLASH
+ String methodModifierPath = JavaMetadataUtil.createPathWithIndex(methodRootPath + SLASH
+ JAVA_MODIFIER_CHILD_NODE + SLASH
+ JAVA_MODIFIER_DECLARATION_CHILD_NODE,
methodModierIndex);
@@ -605,7 +604,7 @@
int methodParameterIndex = 1;
for (FieldMetadata fieldMetadata : methodMetadata.getParameters()) {
- String methodParamRootPath = JcrUtil.createPathWithIndex(methodRootPath + SLASH + JAVA_PARAMETER
+ String methodParamRootPath = JavaMetadataUtil.createPathWithIndex(methodRootPath + SLASH + JAVA_PARAMETER
+ SLASH + JAVA_FORMAL_PARAMETER,
methodParameterIndex);
@@ -613,7 +612,7 @@
PrimitiveFieldMetadata primitive = (PrimitiveFieldMetadata)fieldMetadata;
- String methodPrimitiveFormalParamRootPath = JcrUtil.createPath(methodParamRootPath
+ String methodPrimitiveFormalParamRootPath = JavaMetadataUtil.createPath(methodParamRootPath
+ SLASH
+ JAVA_TYPE_CHILD_NODE
+ SLASH
@@ -651,7 +650,7 @@
if (methodReturnType instanceof PrimitiveFieldMetadata) {
PrimitiveFieldMetadata methodReturnPrimitiveType = (PrimitiveFieldMetadata)methodReturnType;
- String methodReturnPrimitiveTypePath = JcrUtil.createPath(methodRootPath + SLASH
+ String methodReturnPrimitiveTypePath = JavaMetadataUtil.createPath(methodRootPath + SLASH
+ JAVA_RETURN_TYPE + SLASH
+ JAVA_PRIMITIVE_TYPE_CHILD_NODE);
Path methodReturnPrimitiveTypeChildNode = pathFactory.create(methodReturnPrimitiveTypePath);
Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataUtil.java
===================================================================
--- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataUtil.java 2008-08-28 19:50:10 UTC (rev 479)
+++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataUtil.java 2008-08-28 20:25:25 UTC (rev 480)
@@ -68,7 +68,34 @@
ArgCheck.isNotNull(name, "name");
return name.getFullyQualifiedName();
}
+
+ /**
+ * Create a path for the tree with index.
+ *
+ * @param path the path.
+ * @param index the index begin with 1.
+ * @return the string
+ * @throws IllegalArgumentException if the path is null, blank or empty, or if the index is not a positive value
+ */
+ public static String createPathWithIndex( String path,
+ int index ) {
+ ArgCheck.isNotEmpty(path, "path");
+ ArgCheck.isPositive(index, "index");
+ return path + "[" + index + "]";
+ }
+ /**
+ * Create a path for the tree without index.
+ *
+ * @param path - the path.
+ * @return the string
+ * @throws IllegalArgumentException if the path is null, blank or empty
+ */
+ public static String createPath( String path ) {
+ ArgCheck.isNotEmpty(path, "path");
+ return path;
+ }
+
// prevent construction
private JavaMetadataUtil() {
}
Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/MethodMetadataSequencer.java
===================================================================
--- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/MethodMetadataSequencer.java 2008-08-28 19:50:10 UTC (rev 479)
+++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/MethodMetadataSequencer.java 2008-08-28 20:25:25 UTC (rev 480)
@@ -21,7 +21,6 @@
*/
package org.jboss.dna.sequencer.java;
-import org.jboss.dna.common.util.JcrUtil;
import org.jboss.dna.sequencer.java.metadata.MethodMetadata;
import org.jboss.dna.spi.graph.Path;
import org.jboss.dna.spi.graph.PathFactory;
@@ -42,7 +41,7 @@
*/
public static Path createMethodParamPath( PathFactory pathFactory,
String rootPath ) {
- String methodPrimitiveParamVariablePath = JcrUtil.createPath(rootPath
+ String methodPrimitiveParamVariablePath = JavaMetadataUtil.createPath(rootPath
+ SLASH
+ JAVA_PRIMITIVE_TYPE_VARIABLE
+ SLASH + JAVA_VARIABLE);
@@ -57,7 +56,7 @@
* @return root path for a method parameter.
*/
public static String createMethodParamRootPath( String constructorParameterRootPath ) {
- String constructPrimitiveFormalParamRootPath = JcrUtil.createPath(constructorParameterRootPath + SLASH
+ String constructPrimitiveFormalParamRootPath = JavaMetadataUtil.createPath(constructorParameterRootPath + SLASH
+ JAVA_TYPE_CHILD_NODE + SLASH
+ JAVA_PRIMITIVE_TYPE_CHILD_NODE);
return constructPrimitiveFormalParamRootPath;
Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/ParameterizedTypeFieldMetadataSequencer.java
===================================================================
--- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/ParameterizedTypeFieldMetadataSequencer.java 2008-08-28 19:50:10 UTC (rev 479)
+++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/ParameterizedTypeFieldMetadataSequencer.java 2008-08-28 20:25:25 UTC (rev 480)
@@ -21,7 +21,6 @@
*/
package org.jboss.dna.sequencer.java;
-import org.jboss.dna.common.util.JcrUtil;
import org.jboss.dna.sequencer.java.metadata.ModifierMetadata;
import org.jboss.dna.sequencer.java.metadata.ParameterizedTypeFieldMetadata;
import org.jboss.dna.spi.graph.NameFactory;
@@ -43,7 +42,7 @@
* @return a path with a index starting by 1.
*/
public static String getParameterizedTypeFieldRootPath( int parameterizedIndex ) {
- String simpleTypeFieldRootPath = JcrUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE + SLASH
+ String simpleTypeFieldRootPath = JavaMetadataUtil.createPathWithIndex(JAVA_COMPILATION_UNIT_NODE + SLASH
+ JAVA_UNIT_TYPE_CHILD_NODE + SLASH
+ JAVA_CLASS_DECLARATION_CHILD_NODE + SLASH
+ JAVA_NORMAL_CLASS_CHILD_NODE + SLASH
@@ -83,7 +82,7 @@
*/
public static String getParameterizedTypeFieldRModifierPath( String parameterizedTypeFieldRootPath,
int parameterizedTypeModifierIndex ) {
- String parameterizedTypeModifierPath = JcrUtil.createPathWithIndex(parameterizedTypeFieldRootPath + SLASH
+ String parameterizedTypeModifierPath = JavaMetadataUtil.createPathWithIndex(parameterizedTypeFieldRootPath + SLASH
+ JAVA_PARAMETERIZED_TYPE_MODIFIER_CHILD_NODE + SLASH
+ JAVA_MODIFIER_DECLARATION_CHILD_NODE,
parameterizedTypeModifierIndex);
@@ -119,7 +118,7 @@
public static Path getParameterizedTypeFieldVariablePath( PathFactory pathFactory,
String parameterizedTypeFieldRootPath,
int parameterizedTypeVariableIndex ) {
- String variablePath = JcrUtil.createPathWithIndex(parameterizedTypeFieldRootPath + SLASH
+ String variablePath = JavaMetadataUtil.createPathWithIndex(parameterizedTypeFieldRootPath + SLASH
+ JAVA_PARAMETERIZED_TYPE_VARIABLE + SLASH + JAVA_VARIABLE,
parameterizedTypeVariableIndex);
Path parameterizedTypeVariableChildNode = pathFactory.create(variablePath);
Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/SimpleTypeMetadataSequencer.java
===================================================================
--- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/SimpleTypeMetadataSequencer.java 2008-08-28 19:50:10 UTC (rev 479)
+++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/SimpleTypeMetadataSequencer.java 2008-08-28 20:25:25 UTC (rev 480)
@@ -21,7 +21,6 @@
*/
package org.jboss.dna.sequencer.java;
-import org.jboss.dna.common.util.JcrUtil;
import org.jboss.dna.sequencer.java.metadata.SimpleTypeFieldMetadata;
import org.jboss.dna.spi.graph.NameFactory;
import org.jboss.dna.spi.graph.Path;
@@ -46,7 +45,7 @@
* @return the root path, that is compose from other base path.
*/
public static String createRootPath( String basePath ) {
- return JcrUtil.createPath(basePath + SLASH + JAVA_TYPE_CHILD_NODE + SLASH + JAVA_SIMPLE_TYPE_CHILD_NODE);
+ return JavaMetadataUtil.createPath(basePath + SLASH + JAVA_TYPE_CHILD_NODE + SLASH + JAVA_SIMPLE_TYPE_CHILD_NODE);
}
/**
@@ -80,7 +79,7 @@
*/
public static Path createSimpleTypeParamPath( PathFactory pathFactory,
String rootPath ) {
- String paramVariablePath = JcrUtil.createPath(rootPath + SLASH + JAVA_SIMPLE_TYPE_VARIABLE + SLASH + JAVA_VARIABLE);
+ String paramVariablePath = JavaMetadataUtil.createPath(rootPath + SLASH + JAVA_SIMPLE_TYPE_VARIABLE + SLASH + JAVA_VARIABLE);
return pathFactory.create(paramVariablePath);
}
More information about the dna-commits
mailing list