diff --git a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java index 675e06d83..45982aacc 100644 --- a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java +++ b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/FeaturesDom4jGeneratorTest.java @@ -49,7 +49,7 @@ public void testJavaGenerator() throws Throwable { addDependency("dom4j", "dom4j"); addDependency("org.xmlunit", "xmlunit-core"); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.dom4j.Dom4jFeaturesVerifier"); } diff --git a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java index 5445328b0..897773db8 100644 --- a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java +++ b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java @@ -549,8 +549,7 @@ private void processField( if (ModelDefault.SET.equals(type)) { key = "?"; } else { - key = (hasJavaSourceSupport(5) ? "Integer.valueOf" : "new java.lang.Integer") + "( " - + associationName + ".size() )"; + key = "Integer.valueOf(" + associationName + ".size())"; } writePrimitiveField( association, diff --git a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java index 8199eb92f..809c1447b 100644 --- a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java +++ b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java @@ -195,8 +195,6 @@ private void writeClass(ModelClass modelClass, JClass jClass) throws ModelloExce List modelFields = getFieldsForXml(modelClass, getGeneratedVersion()); - final boolean useJava5 = hasJavaSourceSupport(5); - // XML tags for (ModelField field : modelFields) { XmlFieldMetadata xmlFieldMetadata = (XmlFieldMetadata) field.getMetadata(XmlFieldMetadata.ID); @@ -237,19 +235,11 @@ private void writeClass(ModelClass modelClass, JClass jClass) throws ModelloExce sc.add("generator.writeArrayFieldStart( \"" + fieldTagName + "\" );"); - if (useJava5) { - sc.add("for ( " + toType + " o : " + value + " )"); - } else { - sc.add("for ( java.util.Iterator it = " + value + ".iterator(); it.hasNext(); )"); - } + sc.add("for ( " + toType + " o : " + value + " )"); sc.add("{"); sc.indent(); - if (!useJava5) { - sc.add(toType + " o = (" + toType + " ) it.next();"); - } - if (isClassInModel(association.getTo(), modelClass.getModel())) { sc.add("write" + toType + "( o, generator );"); } else { @@ -279,32 +269,21 @@ private void writeClass(ModelClass modelClass, JClass jClass) throws ModelloExce StringBuilder entryTypeBuilder = new StringBuilder("java.util.Map.Entry"); - if (useJava5) { - entryTypeBuilder.append('<'); - - if (association.getType().equals(ModelDefault.PROPERTIES)) { - entryTypeBuilder.append("Object, Object"); - } else { - entryTypeBuilder.append("String, ").append(association.getTo()); - } + entryTypeBuilder.append('<'); - entryTypeBuilder.append('>'); - } - - if (useJava5) { - sc.add("for ( " + entryTypeBuilder + " entry : " + value + ".entrySet() )"); + if (association.getType().equals(ModelDefault.PROPERTIES)) { + entryTypeBuilder.append("Object, Object"); } else { - sc.add("for ( java.util.Iterator it = " + value - + ".entrySet().iterator(); it.hasNext(); )"); + entryTypeBuilder.append("String, ").append(association.getTo()); } + entryTypeBuilder.append('>'); + + sc.add("for ( " + entryTypeBuilder + " entry : " + value + ".entrySet() )"); + sc.add("{"); sc.indent(); - if (!useJava5) { - sc.add(entryTypeBuilder + " entry = (" + entryTypeBuilder + ") it.next();"); - } - sc.add("final String key = String.valueOf( entry.getKey() );"); sc.add("final String value = String.valueOf( entry.getValue() );"); diff --git a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java index 8ddb009e2..972977f06 100644 --- a/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java +++ b/modello-plugins/modello-plugin-jackson/src/test/java/org/codehaus/modello/plugin/jackson/JacksonGeneratorTest.java @@ -50,7 +50,7 @@ public void testJacksonGenerator() throws Throwable { assertEquals(28, classesList.size()); // now generate sources and test them - Properties parameters = getModelloParameters("4.0.0", 5); + Properties parameters = getModelloParameters("4.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "jackson-writer", parameters); @@ -60,7 +60,7 @@ public void testJacksonGenerator() throws Throwable { addDependency("com.fasterxml.jackson.core", "jackson-databind"); // looks like jackson-databind requires jackson-annotations to run... addDependency("com.fasterxml.jackson.core", "jackson-annotations"); - compileGeneratedSources(5); + compileGeneratedSources(8); // TODO: see why without this, version system property is set to "2.4.1" value after verify System.setProperty("version", getModelloVersion()); diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java index 1446a0131..806b80d79 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/AbstractJavaModelloGenerator.java @@ -31,7 +31,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.Optional; import java.util.Properties; import org.codehaus.modello.ModelloException; @@ -56,6 +55,8 @@ import org.codehaus.modello.plugin.model.ModelClassMetadata; import org.codehaus.plexus.util.StringUtils; +import static org.codehaus.plexus.util.StringUtils.replaceOnce; + /** * AbstractJavaModelloGenerator - similar in scope to {@link AbstractModelloGenerator} but with features that * java generators can use. @@ -63,16 +64,11 @@ * @author Joakim Erdfelt */ public abstract class AbstractJavaModelloGenerator extends AbstractModelloGenerator { - private Optional javaSource; protected boolean domAsXpp3 = true; protected void initialize(Model model, Properties parameters) throws ModelloException { super.initialize(model, parameters); - - javaSource = Optional.ofNullable(getParameter(parameters, ModelloParameterConstants.OUTPUT_JAVA_SOURCE, null)) - .map(Integer::valueOf); - domAsXpp3 = !"false".equals(parameters.getProperty(ModelloParameterConstants.DOM_AS_XPP3)); } @@ -110,14 +106,10 @@ protected void initHeader(JInterface interfaze) { interfaze.setHeader(getHeaderComment()); } - protected final boolean hasJavaSourceSupport(int source) { - return javaSource.map(i -> i >= source).orElse(false); - } - protected void suppressAllWarnings(Model objectModel, JStructure structure) { JavaModelMetadata javaModelMetadata = (JavaModelMetadata) objectModel.getMetadata(JavaModelMetadata.ID); - if (hasJavaSourceSupport(5) && javaModelMetadata.isSuppressAllWarnings()) { + if (javaModelMetadata.isSuppressAllWarnings()) { structure.appendAnnotation("@SuppressWarnings( \"all\" )"); } } @@ -152,13 +144,7 @@ protected String getPrefix(JavaFieldMetadata javaFieldMetadata) { } protected String getDefaultValue(ModelAssociation association) { - String value = association.getDefaultValue(); - - if (hasJavaSourceSupport(5)) { - value = StringUtils.replaceOnce(StringUtils.replaceOnce(value, "/*", ""), "*/", ""); - } - - return value; + return replaceOnce(replaceOnce(association.getDefaultValue(), "/*", ""), "*/", ""); } protected static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS"; @@ -183,38 +169,29 @@ protected String getJavaDefaultValue(ModelField modelField) throws ModelloExcept } catch (ParseException pe) { throw new ModelloException("Unparseable default date: " + value, pe); } - } else if (value != null && value.length() > 0) { - boolean useJava5 = hasJavaSourceSupport(5); + } else if (value != null && !value.isEmpty()) { if ("Character".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, "'" + escapeStringLiteral(value) + "'", useJava5); + return "Character.valueOf( " + "'" + escapeStringLiteral(value) + "'" + ")"; } else if ("Boolean".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, value, true); + return "Boolean.valueOf( " + value + ")"; } else if ("Byte".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, "(byte) " + value, useJava5); + return "Byte.valueOf((byte) " + value + ")"; } else if ("Short".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, "(short) " + value, useJava5); + return "Short.valueOf((short) " + value + ")"; } else if ("Integer".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, value, useJava5); + return "Integer.valueOf(" + value + ")"; } else if ("Long".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, value + 'L', useJava5); + return "Long.valueOf(" + value + 'L' + ")"; } else if ("Float".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, value + 'f', useJava5); + return "Float.valueOf(" + value + 'f' + ")"; } else if ("Double".equals(type) && !value.contains(type)) { - return newPrimitiveWrapper(type, value, useJava5); + return "Double.valueOf(" + value + ")"; } } return value; } - private String newPrimitiveWrapper(String type, String value, boolean useJava5) { - if (useJava5) { - return type + ".valueOf( " + value + " )"; - } else { - return "new " + type + "( " + value + " )"; - } - } - private String escapeStringLiteral(String str) { StringBuilder buffer = new StringBuilder(str.length() + 32); diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java index 7a8360588..de3960177 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java @@ -158,7 +158,7 @@ private void generateJava() throws ModelloException, IOException { jClass.addInterface(Serializable.class.getName()); - if (hasJavaSourceSupport(5) && !modelClass.getAnnotations().isEmpty()) { + if (!modelClass.getAnnotations().isEmpty()) { for (String annotation : modelClass.getAnnotations()) { jClass.appendAnnotation(annotation); } @@ -312,7 +312,7 @@ private void generateInterface(ModelInterface modelInterface) throws ModelloExce } } - if (hasJavaSourceSupport(5) && !modelInterface.getAnnotations().isEmpty()) { + if (!modelInterface.getAnnotations().isEmpty()) { for (String annotation : modelInterface.getAnnotations()) { jInterface.appendAnnotation(annotation); } @@ -458,14 +458,7 @@ private JMethod[] generateClone(ModelClass modelClass, ModelClass locationClass) return new JMethod[0]; } - boolean useJava5 = hasJavaSourceSupport(5); - - JType returnType; - if (useJava5) { - returnType = new JClass(modelClass.getName()); - } else { - returnType = new JClass("Object"); - } + JType returnType = new JClass(modelClass.getName()); JMethod cloneMethod = new JMethod("clone", returnType, null); @@ -535,18 +528,10 @@ private JMethod[] generateClone(ModelClass modelClass, ModelClass locationClass) if (isCollection(modelField.getType())) { if (deepClone) { - if (useJava5) { - sc.add("for ( " + componentType.getName() + " item : " + thisField + " )"); - } else { - sc.add("for ( java.util.Iterator it = " + thisField + ".iterator(); it.hasNext(); )"); - } + sc.add("for ( " + componentType.getName() + " item : " + thisField + " )"); sc.add("{"); sc.indent(); - if (useJava5) { - sc.add(copyField + ".add( ( (" + modelAssociation.getTo() + ") item).clone() );"); - } else { - sc.add(copyField + ".add( ( (" + modelAssociation.getTo() + ") it.next() ).clone() );"); - } + sc.add(copyField + ".add( ( (" + modelAssociation.getTo() + ") item).clone() );"); sc.unindent(); sc.add("}"); } else { @@ -715,10 +700,8 @@ private void generateLocationTracking(JClass jClass, ModelClass modelClass, Mode String locationField = metadata.getLocationTracker(); boolean hasModeSuperClass = StringUtils.isNotEmpty(superClass) && isClassInModel(superClass, getModel()); if (!hasModeSuperClass) { - boolean useJava5 = hasJavaSourceSupport(5); - String fieldType = "java.util.Map" + (useJava5 ? "" : ""); - String fieldImpl = - "java.util.LinkedHashMap" + (useJava5 ? "" : ""); + String fieldType = "java.util.Map"; + String fieldImpl = "java.util.LinkedHashMap"; // private java.util.Map locations; JField jField = new JField(new JType(fieldType), locationField); @@ -770,63 +753,36 @@ private void generateLocationTracking(JClass jClass, ModelClass modelClass, Mode getterSc.add("if ( key instanceof String )"); getterSc.add("{"); getterSc.indent(); - if (hasJavaSourceSupport(7)) { - getterSc.add("switch ( ( String ) key )"); - getterSc.add("{"); - getterSc.indent(); - getterSc.add("case \"\" :"); - getterSc.add("{"); - getterSc.indent(); - getterSc.add("return this." + singular(locationField) + ";"); - getterSc.unindent(); - getterSc.add("}"); - for (ModelField field : modelClass.getAllFields()) { - getterSc.add("case \"" + field.getName() + "\" :"); - getterSc.add("{"); - getterSc.indent(); - getterSc.add("return " + field.getName() + capitalise(singular(locationField)) + ";"); - getterSc.unindent(); - getterSc.add("}"); - } - getterSc.add("default :"); + getterSc.add("switch ( ( String ) key )"); + getterSc.add("{"); + getterSc.indent(); + getterSc.add("case \"\" :"); + getterSc.add("{"); + getterSc.indent(); + getterSc.add("return this." + singular(locationField) + ";"); + getterSc.unindent(); + getterSc.add("}"); + for (ModelField field : modelClass.getAllFields()) { + getterSc.add("case \"" + field.getName() + "\" :"); getterSc.add("{"); getterSc.indent(); - if (hasModeSuperClass) { - getterSc.add("return super.get" + capitalise(singular(locationField)) + "( key );"); - } else { - getterSc.add("return getOther" + capitalise(singular(locationField)) + "( key );"); - } + getterSc.add("return " + field.getName() + capitalise(singular(locationField)) + ";"); getterSc.unindent(); getterSc.add("}"); - getterSc.add("}"); + } + getterSc.add("default :"); + getterSc.add("{"); + getterSc.indent(); + if (hasModeSuperClass) { + getterSc.add("return super.get" + capitalise(singular(locationField)) + "( key );"); } else { - getterSc.add("if ( \"\".equals( key ) )"); - getterSc.add("{"); - getterSc.indent(); - getterSc.add("return this." + singular(locationField) + ";"); - getterSc.unindent(); - getterSc.add("}"); - for (ModelField field : modelClass.getAllFields()) { - getterSc.add("else if ( \"" + field.getName() + "\".equals( key ) )"); - getterSc.add("{"); - getterSc.indent(); - getterSc.add("return " + field.getName() + capitalise(singular(locationField)) + ";"); - getterSc.unindent(); - getterSc.add("}"); - } - getterSc.add("else"); - getterSc.add("{"); - getterSc.indent(); - if (hasModeSuperClass) { - getterSc.add("return super.get" + capitalise(singular(locationField)) + "( key );"); - } else { - getterSc.add("return getOther" + capitalise(singular(locationField)) + "( key );"); - } - getterSc.unindent(); - getterSc.add("}"); + getterSc.add("return getOther" + capitalise(singular(locationField)) + "( key );"); } getterSc.unindent(); getterSc.add("}"); + getterSc.add("}"); + getterSc.unindent(); + getterSc.add("}"); getterSc.add("else"); getterSc.add("{"); getterSc.indent(); @@ -849,74 +805,40 @@ private void generateLocationTracking(JClass jClass, ModelClass modelClass, Mode setterSc.add("if ( key instanceof String )"); setterSc.add("{"); setterSc.indent(); - if (hasJavaSourceSupport(7)) { - setterSc.add("switch ( ( String ) key )"); - setterSc.add("{"); - setterSc.indent(); - setterSc.add("case \"\" :"); - setterSc.add("{"); - setterSc.indent(); - setterSc.add("this." + singular(locationField) + " = " + singular(locationField) + ";"); - setterSc.add("return;"); - setterSc.unindent(); - setterSc.add("}"); - for (ModelField field : modelClass.getAllFields()) { - setterSc.add("case \"" + field.getName() + "\" :"); - setterSc.add("{"); - setterSc.indent(); - setterSc.add( - field.getName() + capitalise(singular(locationField)) + " = " + singular(locationField) + ";"); - setterSc.add("return;"); - setterSc.unindent(); - setterSc.add("}"); - } - setterSc.add("default :"); + setterSc.add("switch ( ( String ) key )"); + setterSc.add("{"); + setterSc.indent(); + setterSc.add("case \"\" :"); + setterSc.add("{"); + setterSc.indent(); + setterSc.add("this." + singular(locationField) + " = " + singular(locationField) + ";"); + setterSc.add("return;"); + setterSc.unindent(); + setterSc.add("}"); + for (ModelField field : modelClass.getAllFields()) { + setterSc.add("case \"" + field.getName() + "\" :"); setterSc.add("{"); setterSc.indent(); - if (hasModeSuperClass) { - setterSc.add("super.set" + capitalise(singular(locationField)) + "( key, " + singular(locationField) - + " );"); - } else { - setterSc.add( - "setOther" + capitalise(singular(locationField)) + "( key, " + singular(locationField) + " );"); - } + setterSc.add(field.getName() + capitalise(singular(locationField)) + " = " + singular(locationField) + ";"); setterSc.add("return;"); setterSc.unindent(); setterSc.add("}"); - setterSc.unindent(); - setterSc.add("}"); + } + setterSc.add("default :"); + setterSc.add("{"); + setterSc.indent(); + if (hasModeSuperClass) { + setterSc.add( + "super.set" + capitalise(singular(locationField)) + "( key, " + singular(locationField) + " );"); } else { - setterSc.add("if ( \"\".equals( key ) )"); - setterSc.add("{"); - setterSc.indent(); - setterSc.add("this." + singular(locationField) + " = " + singular(locationField) + ";"); - setterSc.add("return;"); - setterSc.unindent(); - setterSc.add("}"); - for (ModelField field : modelClass.getAllFields()) { - setterSc.add("else if ( \"" + field.getName() + "\".equals( key ) )"); - setterSc.add("{"); - setterSc.indent(); - setterSc.add( - field.getName() + capitalise(singular(locationField)) + " = " + singular(locationField) + ";"); - setterSc.add("return;"); - setterSc.unindent(); - setterSc.add("}"); - } - setterSc.add("else"); - setterSc.add("{"); - setterSc.indent(); - if (hasModeSuperClass) { - setterSc.add("super.set" + capitalise(singular(locationField)) + "( key, " + singular(locationField) - + " );"); - } else { - setterSc.add( - "setOther" + capitalise(singular(locationField)) + "( key, " + singular(locationField) + " );"); - } - setterSc.add("return;"); - setterSc.unindent(); - setterSc.add("}"); + setterSc.add( + "setOther" + capitalise(singular(locationField)) + "( key, " + singular(locationField) + " );"); } + setterSc.add("return;"); + setterSc.unindent(); + setterSc.add("}"); + setterSc.unindent(); + setterSc.add("}"); setterSc.unindent(); setterSc.add("}"); @@ -995,9 +917,8 @@ private void generateLocationBean(JClass jClass, ModelClass locationClass, Model sc.add("this." + source.getName() + " = " + source.getName() + ";"); } - boolean useJava5 = hasJavaSourceSupport(5); - JType fieldType = new JMapType("java.util.Map", new JType(locationClass.getName()), useJava5); - JType fieldImpl = new JMapType("java.util.LinkedHashMap", new JType(locationClass.getName()), useJava5); + JType fieldType = new JMapType("java.util.Map", new JType(locationClass.getName())); + JType fieldImpl = new JMapType("java.util.LinkedHashMap", new JType(locationClass.getName())); // public Map getLocations() JMethod jMethod = new JMethod("get" + capitalise(locationsField), fieldType, null); @@ -1062,8 +983,7 @@ private void generateLocationBean(JClass jClass, ModelClass locationClass, Model jMethod.addParameter(new JParameter(new JType(locationClass.getName()), "target")); jMethod.addParameter(new JParameter(new JType(locationClass.getName()), "source")); jMethod.addParameter( - new JParameter(new JCollectionType("java.util.Collection", new JType("Integer"), useJava5), "indices")); - String intWrap = useJava5 ? "Integer.valueOf" : "new Integer"; + new JParameter(new JCollectionType("java.util.Collection", new JType("Integer")), "indices")); sc = jMethod.getSourceCode(); sc.add("if ( source == null )"); sc.add("{"); @@ -1093,21 +1013,20 @@ private void generateLocationBean(JClass jClass, ModelClass locationClass, Model sc.add("{"); sc.indent(); sc.add("locations = new " + fieldImpl + "();"); - sc.add("for ( java.util.Iterator" + (useJava5 ? "" : "") - + " it = indices.iterator(); it.hasNext(); )"); + sc.add("for ( java.util.Iterator it = indices.iterator(); it.hasNext(); )"); sc.add("{"); sc.indent(); sc.add(locationClass.getName() + " location;"); - sc.add("Integer index = " + (useJava5 ? "" : "(Integer) ") + "it.next();"); + sc.add("Integer index = it.next();"); sc.add("if ( index.intValue() < 0 )"); sc.add("{"); - sc.addIndented("location = sourceLocations.get( " + intWrap + "( ~index.intValue() ) );"); + sc.addIndented("location = sourceLocations.get(Integer.valueOf(~index.intValue()));"); sc.add("}"); sc.add("else"); sc.add("{"); sc.addIndented("location = targetLocations.get( index );"); sc.add("}"); - sc.add("locations.put( " + intWrap + "( locations.size() ), location );"); + sc.add("locations.put(Integer.valueOf(locations.size()), location);"); sc.unindent(); sc.add("}"); sc.unindent(); @@ -1206,9 +1125,8 @@ private JField createField(ModelField modelField) throws ModelloException { type = new JClass(baseType); } - boolean useJava5 = hasJavaSourceSupport(5); if (modelField.isArray()) { - type = new JArrayType(type, useJava5); + type = new JArrayType(type); } JField field = new JField(type, modelField.getName()); @@ -1225,7 +1143,7 @@ private JField createField(ModelField modelField) throws ModelloException { field.setComment(appendPeriod(modelField.getDescription())); } - if (useJava5 && !modelField.getAnnotations().isEmpty()) { + if (!modelField.getAnnotations().isEmpty()) { for (String annotation : modelField.getAnnotations()) { field.appendAnnotation(annotation); } @@ -1434,8 +1352,6 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation, JavaAssociationMetadata javaAssociationMetadata = getJavaAssociationMetadata(modelAssociation); - boolean useJava5 = hasJavaSourceSupport(5); - if (modelAssociation.isManyMultiplicity()) { JType componentType = getComponentType(modelAssociation, javaAssociationMetadata); @@ -1443,9 +1359,9 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation, JType type; if (modelAssociation.isGenericType()) { - type = new JCollectionType(modelAssociation.getType(), componentType, useJava5); + type = new JCollectionType(modelAssociation.getType(), componentType); } else if (ModelDefault.MAP.equals(modelAssociation.getType())) { - JMapType mapType = new JMapType(modelAssociation.getType(), defaultValue, componentType, useJava5); + JMapType mapType = new JMapType(modelAssociation.getType(), defaultValue, componentType); defaultValue = mapType.getInstanceName(); type = mapType; } else { @@ -1458,7 +1374,7 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation, jField.setComment(modelAssociation.getComment()); } - if (useJava5 && !modelAssociation.getAnnotations().isEmpty()) { + if (!modelAssociation.getAnnotations().isEmpty()) { for (String annotation : modelAssociation.getAnnotations()) { jField.appendAnnotation(annotation); } @@ -1528,13 +1444,7 @@ private String getDefaultValue(ModelAssociation modelAssociation, JType componen if (modelAssociation.isGenericType()) { ModelDefault modelDefault = getModel().getDefault(modelAssociation.getType()); - - if (hasJavaSourceSupport(5)) { - defaultValue = StringUtils.replace(modelDefault.getValue(), "", "<" + componentType.getName() + ">"); - } else { - defaultValue = - StringUtils.replace(modelDefault.getValue(), "", "/*<" + componentType.getName() + ">*/"); - } + defaultValue = StringUtils.replace(modelDefault.getValue(), "", "<" + componentType.getName() + ">"); } return defaultValue; } @@ -1878,7 +1788,7 @@ private JType getDesiredType(ModelField modelField, boolean useTo) throws Modell type = new JClass(javaAssociationMetadata.getInterfaceName()); } else if (modelAssociation.isManyMultiplicity() && modelAssociation.isGenericType()) { JType componentType = getComponentType(modelAssociation, javaAssociationMetadata); - type = new JCollectionType(modelAssociation.getType(), componentType, hasJavaSourceSupport(5)); + type = new JCollectionType(modelAssociation.getType(), componentType); } else if (useTo) { type = new JClass(modelAssociation.getTo()); } @@ -2033,15 +1943,13 @@ private void createBuilderAssociation(JClass jClass, ModelAssociation modelAssoc if (modelAssociation.isManyMultiplicity()) { JType componentType = getComponentType(modelAssociation, javaAssociationMetadata); - boolean useJava5 = hasJavaSourceSupport(5); - String defaultValue = getDefaultValue(modelAssociation, componentType); JType type; if (modelAssociation.isGenericType()) { - type = new JCollectionType(modelAssociation.getType(), componentType, useJava5); + type = new JCollectionType(modelAssociation.getType(), componentType); } else if (ModelDefault.MAP.equals(modelAssociation.getType())) { - JMapType mapType = new JMapType(modelAssociation.getType(), defaultValue, componentType, useJava5); + JMapType mapType = new JMapType(modelAssociation.getType(), defaultValue, componentType); defaultValue = mapType.getInstanceName(); type = mapType; } else { @@ -2055,7 +1963,7 @@ private void createBuilderAssociation(JClass jClass, ModelAssociation modelAssoc jField.setComment(modelAssociation.getComment()); } - if (useJava5 && !modelAssociation.getAnnotations().isEmpty()) { + if (!modelAssociation.getAnnotations().isEmpty()) { for (String annotation : modelAssociation.getAnnotations()) { jField.appendAnnotation(annotation); } @@ -2114,8 +2022,6 @@ else if (javaFieldMetadata.isGetter()) { String itemType; String targetField = modelAssociation.getName(); - boolean useJava5 = hasJavaSourceSupport(5); - if (StringUtils.isNotEmpty(javaAssociationMetadata.getInterfaceName())) { itemType = javaAssociationMetadata.getInterfaceName(); } else if (modelAssociation.getToClass() != null) { @@ -2124,18 +2030,16 @@ else if (javaFieldMetadata.isGetter()) { || modelAssociation.getType().equals(ModelDefault.MAP)) { StringBuilder itemTypeBuilder = new StringBuilder("java.util.Map.Entry"); - if (useJava5) { - itemTypeBuilder.append('<'); + itemTypeBuilder.append('<'); - if (modelAssociation.getType().equals(ModelDefault.PROPERTIES)) { - itemTypeBuilder.append("Object, Object"); - } else { - itemTypeBuilder.append("String, ").append(modelAssociation.getTo()); - } - - itemTypeBuilder.append('>'); + if (modelAssociation.getType().equals(ModelDefault.PROPERTIES)) { + itemTypeBuilder.append("Object, Object"); + } else { + itemTypeBuilder.append("String, ").append(modelAssociation.getTo()); } + itemTypeBuilder.append('>'); + itemType = itemTypeBuilder.toString(); targetField += ".entrySet()"; @@ -2143,19 +2047,11 @@ else if (javaFieldMetadata.isGetter()) { itemType = "String"; } - if (useJava5) { - sc.add("for ( " + itemType + " item : " + targetField + " )"); - } else { - sc.add("for ( java.util.Iterator it = " + targetField + ".iterator(); it.hasNext(); )"); - } + sc.add("for ( " + itemType + " item : " + targetField + " )"); sc.add("{"); sc.indent(); - if (!useJava5) { - sc.add(itemType + " item = (" + itemType + ") it.next();"); - } - StringBuilder adder = new StringBuilder("instance.add") .append(capitalise(singular(modelAssociation.getName()))) .append("( "); @@ -2182,7 +2078,7 @@ else if (javaFieldMetadata.isGetter()) { private void appendEntryMethod( String type, String method, StringBuilder target, ModelAssociation modelAssociation) { - if (!hasJavaSourceSupport(5) || modelAssociation.getType().equals(ModelDefault.PROPERTIES)) { + if (modelAssociation.getType().equals(ModelDefault.PROPERTIES)) { target.append('(').append(type).append(") "); } diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JArrayType.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JArrayType.java index 5069fef62..befb57240 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JArrayType.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JArrayType.java @@ -29,10 +29,9 @@ public final class JArrayType extends JComponentizedType { * Creates an instance of a array type, of type 'name'. * * @param componentType Component type. - * @param useJava50 True if Java 5.0 should be generated. */ - public JArrayType(final JType componentType, final boolean useJava50) { - super(componentType.getName(), componentType, useJava50); + public JArrayType(final JType componentType) { + super(componentType.getName(), componentType); } // -------------------------------------------------------------------------- diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCollectionType.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCollectionType.java index 4cf602885..5a0bf912a 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCollectionType.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCollectionType.java @@ -35,10 +35,9 @@ public final class JCollectionType extends JComponentizedType { * * @param typeName Name of the collection type interface. * @param componentType Component type. - * @param useJava50 True if Java 5.0 should be used. */ - public JCollectionType(final String typeName, final JType componentType, final boolean useJava50) { - super(typeName, componentType, useJava50); + public JCollectionType(final String typeName, final JType componentType) { + super(typeName, componentType); } /** @@ -47,11 +46,9 @@ public JCollectionType(final String typeName, final JType componentType, final b * @param typeName Name of the collection type interface. * @param instanceName Name of the actual collection type instance. * @param componentType Component type. - * @param useJava50 True if Java 5.0 should be used. */ - public JCollectionType( - final String typeName, final String instanceName, final JType componentType, final boolean useJava50) { - super(typeName, componentType, useJava50); + public JCollectionType(final String typeName, final String instanceName, final JType componentType) { + super(typeName, componentType); _instanceName = instanceName; } @@ -64,11 +61,7 @@ public JCollectionType( */ public String getInstanceName() { if (_instanceName != null) { - if (isUseJava50()) { - return _instanceName + "<" + getComponentType().toString() + ">"; - } - - return _instanceName + "/*<" + getComponentType().toString() + ">*/"; + return _instanceName + "<" + getComponentType().toString() + ">"; } return toString(); @@ -78,11 +71,7 @@ public String getInstanceName() { * Returns the String representation of this JType. */ public String toString() { - if (isUseJava50()) { - return getName() + "<" + getComponentType().toString() + ">"; - } - - return getName() + "/*<" + getComponentType().toString() + ">*/"; + return getName() + "<" + getComponentType().toString() + ">"; } // -------------------------------------------------------------------------- diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JComponentizedType.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JComponentizedType.java index 9975487a9..fc2ce1948 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JComponentizedType.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JComponentizedType.java @@ -28,9 +28,6 @@ public class JComponentizedType extends JType { /** Indicates the data type contained in this collection. */ private JType _componentType; - /** Indicates whether Java 5.0 compliant code is required. */ - private boolean _useJava50; - // -------------------------------------------------------------------------- /** @@ -38,13 +35,11 @@ public class JComponentizedType extends JType { * * @param name Type name for this componentized type. * @param componentType Component type. - * @param useJava50 True if Java 5.0 should be used. */ - protected JComponentizedType(final String name, final JType componentType, final boolean useJava50) { + protected JComponentizedType(final String name, final JType componentType) { super(name); _componentType = componentType; - _useJava50 = useJava50; } // -------------------------------------------------------------------------- @@ -58,14 +53,5 @@ public final JType getComponentType() { return _componentType; } - /** - * Indicates whether Java 5.0 is used. - * - * @return True if Java 5.0 is used. - */ - public final boolean isUseJava50() { - return _useJava50; - } - // -------------------------------------------------------------------------- } diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMapType.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMapType.java index 000d35d1c..c6879d50c 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMapType.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMapType.java @@ -43,10 +43,9 @@ public final class JMapType extends JComponentizedType { * * @param typeName Name of the map type interface. * @param componentType Component type. - * @param useJava50 True if Java 5.0 should be used. */ - public JMapType(final String typeName, final JType componentType, final boolean useJava50) { - super(typeName, componentType, useJava50); + public JMapType(final String typeName, final JType componentType) { + super(typeName, componentType); } /** @@ -55,11 +54,9 @@ public JMapType(final String typeName, final JType componentType, final boolean * @param typeName Name of the map type interface. * @param instanceName Name of the actual map type instance. * @param componentType Component type. - * @param useJava50 True if Java 5.0 should be used. */ - public JMapType( - final String typeName, final String instanceName, final JType componentType, final boolean useJava50) { - super(typeName, componentType, useJava50); + public JMapType(final String typeName, final String instanceName, final JType componentType) { + super(typeName, componentType); _instanceName = instanceName; } @@ -84,12 +81,7 @@ public String getInstanceName() { } else { instance = _instanceName; } - - if (isUseJava50()) { - return instance + "()"; - } - - return instance + "/**/()"; + return instance + "()"; } return toString(); @@ -102,12 +94,7 @@ public String toString() { if (ModelDefault.PROPERTIES.equals(getName())) { return getName(); } - - if (isUseJava50()) { - return getName() + ""; - } - - return getName() + "/**/"; + return getName() + ""; } // -------------------------------------------------------------------------- diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJava4GeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJava4GeneratorTest.java deleted file mode 100644 index 7ed30ebdf..000000000 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJava4GeneratorTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.codehaus.modello.plugin.java; - -/* - * Copyright (c) 2004, Codehaus.org - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import java.util.Properties; - -import org.codehaus.modello.AbstractModelloJavaGeneratorTest; -import org.codehaus.modello.core.ModelloCore; -import org.codehaus.modello.model.Model; - -/** - * Check that annotations are not added to generated sources when Java 5 features are not enabled. - */ -public class AnnotationsJava4GeneratorTest extends AbstractModelloJavaGeneratorTest { - public AnnotationsJava4GeneratorTest() { - super("annotations-java4"); - } - - public void testJava4GeneratorWithAnnotations() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - - Model model = modello.loadModel(getXmlResourceReader("/models/annotations.mdo")); - - Properties parameters = getModelloParameters("1.0.0"); - - modello.generate(model, "java", parameters); - - compileGeneratedSources(); - } -} diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java index 9732f816b..77aca5516 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/AnnotationsJavaGeneratorTest.java @@ -37,21 +37,17 @@ public AnnotationsJavaGeneratorTest() { } public void testJavaGeneratorWithAnnotations() throws Throwable { - if (skipJava5FeatureTest()) { - return; - } - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); Model model = modello.loadModel(getXmlResourceReader("/models/annotations.mdo")); - Properties parameters = getModelloParameters("1.0.0", 5); + Properties parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); addDependency("javax.xml.bind", "jaxb-api"); addDependency("javax.persistence", "persistence-api"); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("AnnotationsVerifier"); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java index c13d149e8..815809b93 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/FeaturesJava5GeneratorTest.java @@ -37,19 +37,15 @@ public FeaturesJava5GeneratorTest() { } public void testJavaGenerator() throws Throwable { - if (skipJava5FeatureTest()) { - return; - } - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); Model model = modello.loadModel(getXmlResourceReader("/features.mdo")); - Properties parameters = getModelloParameters("2.0.0", 5); + Properties parameters = getModelloParameters("2.0.0", 8); modello.generate(model, "java", parameters); - compileGeneratedSources("features", 5); + compileGeneratedSources("features", 8); verifyCompiledGeneratedSources("JavaVerifier"); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java index 538e8cf36..6347fc70c 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/InterfaceAssociationTest.java @@ -12,19 +12,15 @@ public InterfaceAssociationTest() { } public void testJavaGenerator() throws Throwable { - if (skipJava5FeatureTest()) { - return; - } - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); Model model = modello.loadModel(getXmlResourceReader("/models/interfaceAssociation.mdo")); - Properties parameters = getModelloParameters("4.0.0", 5); + Properties parameters = getModelloParameters("4.0.0", 8); modello.generate(model, "java", parameters); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("InterfaceAssociationVerifier"); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java index 1a9bf2779..59d1e869c 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/LocationsJavaGeneratorTest.java @@ -42,11 +42,11 @@ public void testLocations() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/locations.mdo")); - Properties parameters = getModelloParameters("1.0.0", 7); + Properties parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); - compileGeneratedSources(7); + compileGeneratedSources(8); verifyCompiledGeneratedSources("JavaLocationsVerifier"); } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java index 68c449ed6..7f2dc0b04 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JMapTypeTestCase.java @@ -8,39 +8,21 @@ */ public final class JMapTypeTestCase extends TestCase { - public void testJava5PropertiesType() { - JMapType mapType = new JMapType("java.util.Properties", new JClass("String"), true); + public void testJavaPropertiesType() { + JMapType mapType = new JMapType("java.util.Properties", new JClass("String")); assertEquals("java.util.Properties", mapType.toString()); } - public void testJava4PropertiesType() { - JMapType mapType = new JMapType("java.util.Properties", new JClass("String"), false); - - assertEquals("java.util.Properties", mapType.toString()); - } - - public void testJava5MapType() { - JMapType mapType = new JMapType("java.util.Map", new JClass("String"), true); + public void testJavaMapType() { + JMapType mapType = new JMapType("java.util.Map", new JClass("String")); assertEquals("java.util.Map", mapType.toString()); } - public void testJava5MapInitialization() { - JMapType mapType = new JMapType("java.util.Map", "new java.util.HashMap()", new JClass("String"), true); + public void testJavaMapInitialization() { + JMapType mapType = new JMapType("java.util.Map", "new java.util.HashMap()", new JClass("String")); assertEquals("new java.util.HashMap()", mapType.getInstanceName()); } - - public void testJava4MapType() { - JMapType mapType = new JMapType("java.util.Map", new JClass("String"), false); - - assertEquals("java.util.Map/**/", mapType.toString()); - } - - public void testJava4MapInitialization() { - JMapType mapType = new JMapType("java.util.Map", "new java.util.HashMap()", new JClass("String"), false); - - assertEquals("new java.util.HashMap/**/()", mapType.getInstanceName()); - } } diff --git a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java index 430e486bb..44c728449 100644 --- a/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java +++ b/modello-plugins/modello-plugin-java/src/test/java/org/codehaus/modello/plugin/java/javasource/JavaSourceTest.java @@ -40,11 +40,11 @@ private void checkJClass() { testClass.addMember(field); // generics test - JType type = new JCollectionType("java.util.List", jcString, true); + JType type = new JCollectionType("java.util.List", jcString); field = new JField(type, "generics"); testClass.addMember(field); - type = new JCollectionType("java.util.List", jcString, false); + type = new JCollectionType("java.util.List", jcString); field = new JField(type, "noGenerics"); testClass.addMember(field); diff --git a/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java b/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java index 7283f8a7f..4a5eb555e 100644 --- a/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java +++ b/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java @@ -367,17 +367,9 @@ private JMethod[] generateDomMethods() { findRSDom2.getModifiers().makeProtected(); sc = findRSDom2.getSourceCode(); - if (hasJavaSourceSupport(5)) { - sc.add("for( String attributeName : parentDom.getAttributeNames() )"); - sc.add("{"); - sc.indent(); - } else { - sc.add("for ( Iterator i = Arrays.asList( parentDom.getAttributeNames() ).iterator(); i.hasNext(); )"); - sc.add("{"); - sc.indent(); - - sc.add("String attributeName = (String) i.next();"); - } + sc.add("for( String attributeName : parentDom.getAttributeNames() )"); + sc.add("{"); + sc.indent(); sc.add("String[] attrDetails = attributeName.split( \":\", 2 );"); sc.add("if ( attrDetails.length == 2 )"); sc.add("{"); diff --git a/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java b/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java index 53af30404..7da5605b7 100644 --- a/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java +++ b/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java @@ -122,11 +122,7 @@ private void generateSaxWriter() throws ModelloException, IOException { JConstructor saxWriterConstructor = new JConstructor(jClass); JSourceCode sc = saxWriterConstructor.getSourceCode(); - if (hasJavaSourceSupport(5)) { - sc.add("transformerFactory.setAttribute( \"indent-number\", 2 );"); - } else { - sc.add("transformerFactory.setAttribute( \"indent-number\", new Integer( 2 ) );"); - } + sc.add("transformerFactory.setAttribute( \"indent-number\", 2 );"); jClass.addConstructor(saxWriterConstructor); diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java index 78f5c3485..8e3959a36 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java @@ -617,8 +617,7 @@ private void processField( if (ModelDefault.SET.equals(type)) { key = "?"; } else { - key = (hasJavaSourceSupport(5) ? "Integer.valueOf" : "new java.lang.Integer") + "( " - + associationName + ".size() )"; + key = "Integer.valueOf(" + associationName + ".size())"; } writePrimitiveField( association, diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java index 33e2112ca..31359f77c 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java @@ -237,8 +237,6 @@ private void writeClass(ModelClass modelClass, JClass jClass) throws ModelloExce writeScalar(sc, getValue(contentField.getType(), contentValue, xmlFieldMetadata)); } - final boolean useJava5 = hasJavaSourceSupport(5); - // XML tags for (ModelField field : modelFields) { XmlFieldMetadata xmlFieldMetadata = (XmlFieldMetadata) field.getMetadata(XmlFieldMetadata.ID); @@ -293,19 +291,11 @@ private void writeClass(ModelClass modelClass, JClass jClass) throws ModelloExce writeScalarKey(sc, fieldTagName); sc.add("generator.emit( new SequenceStartEvent( null, null, true, null, null, false ) );"); - if (useJava5) { - sc.add("for ( " + toType + " o : " + value + " )"); - } else { - sc.add("for ( java.util.Iterator it = " + value + ".iterator(); it.hasNext(); )"); - } + sc.add("for ( " + toType + " o : " + value + " )"); sc.add("{"); sc.indent(); - if (!useJava5) { - sc.add(toType + " o = (" + toType + " ) it.next();"); - } - if (isClassInModel(association.getTo(), modelClass.getModel())) { sc.add("write" + toType + "( o, generator );"); } else { @@ -338,32 +328,21 @@ private void writeClass(ModelClass modelClass, JClass jClass) throws ModelloExce StringBuilder entryTypeBuilder = new StringBuilder("java.util.Map.Entry"); - if (useJava5) { - entryTypeBuilder.append('<'); - - if (association.getType().equals(ModelDefault.PROPERTIES)) { - entryTypeBuilder.append("Object, Object"); - } else { - entryTypeBuilder.append("String, ").append(association.getTo()); - } + entryTypeBuilder.append('<'); - entryTypeBuilder.append('>'); - } - - if (useJava5) { - sc.add("for ( " + entryTypeBuilder + " entry : " + value + ".entrySet() )"); + if (association.getType().equals(ModelDefault.PROPERTIES)) { + entryTypeBuilder.append("Object, Object"); } else { - sc.add("for ( java.util.Iterator it = " + value - + ".entrySet().iterator(); it.hasNext(); )"); + entryTypeBuilder.append("String, ").append(association.getTo()); } + entryTypeBuilder.append('>'); + + sc.add("for ( " + entryTypeBuilder + " entry : " + value + ".entrySet() )"); + sc.add("{"); sc.indent(); - if (!useJava5) { - sc.add(entryTypeBuilder + " entry = (" + entryTypeBuilder + ") it.next();"); - } - sc.add("final String key = String.valueOf( entry.getKey() );"); sc.add("final String value = String.valueOf( entry.getValue() );"); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java index d3acbda7d..e9eba8767 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/BooleanTypeStaxGeneratorTest.java @@ -35,12 +35,12 @@ public void testBooleanType() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/boolean.mdo")); - Properties parameters = getModelloParameters("1.0.0", 5); + Properties parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "stax-reader", parameters); modello.generate(model, "stax-writer", parameters); - compileGeneratedSources(5); + compileGeneratedSources(8); } } diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java index 8eeee0618..e673d3c86 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java @@ -52,7 +52,7 @@ public void testJavaGenerator() throws Throwable { addDependency("com.fasterxml.woodstox", "woodstox-core"); addDependency("org.xmlunit", "xmlunit-core"); - compileGeneratedSources(5); + compileGeneratedSources(8); // TODO: see why without this, version system property is set to "2.4.1" value after verify System.setProperty("version", getModelloVersion()); diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java index bf422122d..39a3c6e46 100644 --- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java +++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java @@ -51,7 +51,7 @@ public void testJavaGenerator() throws Throwable { addDependency("com.fasterxml.woodstox", "woodstox-core"); addDependency("org.xmlunit", "xmlunit-core"); - compileGeneratedSources(5); + compileGeneratedSources(8); // TODO: see why without this, version system property is set to "2.4.1" value after verify System.setProperty("version", getModelloVersion()); diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java index 69e271e47..787266e57 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java @@ -497,15 +497,8 @@ private void writeClassParser(ModelClass modelClass, JClass jClass, boolean root sc); } else { // Write other fields - - if (hasJavaSourceSupport(5)) { - sc.add("java.util.Set parsed = new java.util.HashSet();"); - } else { - sc.add("java.util.Set parsed = new java.util.HashSet();"); - } - + sc.add("java.util.Set parsed = new java.util.HashSet();"); sc.add("while ( ( strict ? parser.nextTag() : nextTag( parser ) ) == XmlPullParser.START_TAG )"); - sc.add("{"); sc.indent(); @@ -687,8 +680,6 @@ private void processField( JavaFieldMetadata javaFieldMetadata = (JavaFieldMetadata) association.getMetadata(JavaFieldMetadata.ID); - final boolean useJava5 = hasJavaSourceSupport(5); - String adder; boolean requireSetter = false; @@ -702,12 +693,10 @@ private void processField( if (javaFieldMetadata.isSetter()) { String associationType = type; String defaultValue = association.getDefaultValue(); - if (useJava5) { - // defaultValue looks like java.util.ArrayList/**/() - defaultValue = defaultValue.replace("/*", "").replace("*/", ""); + // defaultValue looks like java.util.ArrayList/**/() + defaultValue = defaultValue.replace("/*", "").replace("*/", ""); - associationType = type + '<' + association.getTo() + '>'; - } + associationType = type + '<' + association.getTo() + '>'; sc.add(associationType + " " + associationName + " = " + defaultValue + ";"); requireSetter = true; @@ -741,12 +730,10 @@ private void processField( if (javaFieldMetadata.isGetter() && javaFieldMetadata.isSetter()) { String associationType = type; String defaultValue = association.getDefaultValue(); - if (useJava5) { - // defaultValue looks like java.util.ArrayList/**/() - defaultValue = defaultValue.replace("/*", "").replace("*/", ""); + // defaultValue looks like java.util.ArrayList/**/() + defaultValue = defaultValue.replace("/*", "").replace("*/", ""); - associationType = type + '<' + association.getTo() + '>'; - } + associationType = type + '<' + association.getTo() + '>'; sc.add(associationType + " " + associationName + " = " + objectName + ".get" + capFieldName + "();"); @@ -788,8 +775,7 @@ private void processField( if (ModelDefault.SET.equals(type)) { key = "?"; } else { - key = (useJava5 ? "Integer.valueOf" : "new java.lang.Integer") + "( " + associationName - + ".size() )"; + key = "Integer.valueOf(" + associationName + ".size())"; } writePrimitiveField( association, association.getTo(), associationName, LOCATION_VAR + "s", key, "add", sc); @@ -945,11 +931,7 @@ private void writePrimitiveField( String keyCapture = ""; writeNewLocation(null, sc); if (locationTracker != null && "?".equals(locationKey)) { - if (hasJavaSourceSupport(5)) { - sc.add(type + " _key;"); - } else { - sc.add("Object _key;"); - } + sc.add(type + " _key;"); locationKey = "_key"; keyCapture = "_key = "; } else { @@ -1293,8 +1275,7 @@ private JMethod getCheckFieldWithDuplicateMethod() { method.addParameter(new JParameter(new JClass("XmlPullParser"), "parser")); method.addParameter(new JParameter(new JClass("String"), "tagName")); method.addParameter(new JParameter(new JClass("String"), "alias")); - method.addParameter(new JParameter( - new JCollectionType("java.util.Set", new JType("String"), hasJavaSourceSupport(5)), "parsed")); + method.addParameter(new JParameter(new JCollectionType("java.util.Set", new JType("String")), "parsed")); method.addException(new JClass("XmlPullParserException")); sc = method.getSourceCode(); diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java index 91b6285a3..2aa847316 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/BooleanTypeXpp3GeneratorTest.java @@ -35,11 +35,11 @@ public void testBooleanType() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/boolean.mdo")); - Properties parameters = getModelloParameters("1.0.0", 5); // autoboxing + Properties parameters = getModelloParameters("1.0.0", 8); // autoboxing modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); - compileGeneratedSources(5); + compileGeneratedSources(8); } } diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java index 0af3f5265..ff93f7c91 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3DomGeneratorTest.java @@ -49,7 +49,7 @@ public void testJavaGenerator() throws Throwable { modello.generate(model, "xpp3-reader", parameters); addDependency("org.xmlunit", "xmlunit-core"); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3FeaturesVerifier"); } diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java index 7babc12a8..b06ca72c2 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/FeaturesXpp3GeneratorTest.java @@ -48,7 +48,7 @@ public void testJavaGenerator() throws Throwable { modello.generate(model, "xpp3-reader", parameters); addDependency("org.xmlunit", "xmlunit-core"); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3FeaturesVerifier"); } diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java index 591e5128f..d0b37665d 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsSourceXpp3GeneratorTest.java @@ -42,13 +42,13 @@ public void testLocationsWithSource() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/locations+source.mdo")); - Properties parameters = getModelloParameters("1.0.0", 5); + Properties parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); modello.generate(model, "xpp3-extended-reader", parameters); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3LocationsSourceVerifier"); } diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java index 8c53db3c3..0854e41f2 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/LocationsXpp3GeneratorTest.java @@ -42,13 +42,13 @@ public void testLocationsOnly() throws Throwable { Model model = modello.loadModel(getXmlResourceReader("/locations.mdo")); - Properties parameters = getModelloParameters("1.0.0", 5); + Properties parameters = getModelloParameters("1.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); modello.generate(model, "xpp3-extended-reader", parameters); - compileGeneratedSources(5); + compileGeneratedSources(8); verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3LocationsVerifier"); } diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java index 5853a3512..5cd3d0e9e 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/StandaloneReadXpp3GeneratorTest.java @@ -43,22 +43,7 @@ public void testStandaloneRead() throws Throwable { modello.generate(model, "java", parameters); modello.generate(model, "xpp3-reader", parameters); - compileGeneratedSources(5); // enhanced for loops in Xpp3StandaloneReadVerifier - - verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3StandaloneReadVerifier"); - } - - public void testStandaloneReadJava5() throws Throwable { - ModelloCore modello = (ModelloCore) lookup(ModelloCore.ROLE); - - Model model = modello.loadModel(getXmlResourceReader("/standaloneRead.mdo")); - - Properties parameters = getModelloParameters("1.0.0", 5); - - modello.generate(model, "java", parameters); - modello.generate(model, "xpp3-reader", parameters); - - compileGeneratedSources(5); + compileGeneratedSources(8); // enhanced for loops in Xpp3StandaloneReadVerifier verifyCompiledGeneratedSources("org.codehaus.modello.generator.xml.xpp3.Xpp3StandaloneReadVerifier"); } diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java index db6138120..77344fd8a 100644 --- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java +++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/Xpp3GeneratorTest.java @@ -79,14 +79,14 @@ public void testXpp3Generator() throws Throwable { assertEquals("builder", xml.getTagName()); // now generate sources and test them - Properties parameters = getModelloParameters("4.0.0", 5); + Properties parameters = getModelloParameters("4.0.0", 8); modello.generate(model, "java", parameters); modello.generate(model, "xpp3-writer", parameters); modello.generate(model, "xpp3-reader", parameters); addDependency("org.xmlunit", "xmlunit-core"); - compileGeneratedSources(5); + compileGeneratedSources(8); // TODO: see why without this, version system property is set to "2.4.1" value after verify System.setProperty("version", getModelloVersion()); diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java index 98d90e8cb..50a8b9c87 100644 --- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java @@ -76,9 +76,7 @@ protected Properties getModelloParameters() { } protected Properties getModelloParameters(String version) { - Properties parameters = getModelloParameters(version, null); - - return parameters; + return getModelloParameters(version, null); } protected Properties getModelloParameters(String version, Integer javaSource) { diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java index b1248b52e..33d675a0f 100755 --- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java +++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloJavaGeneratorTest.java @@ -118,34 +118,13 @@ protected String getModelloVersion() throws IOException { } protected void compileGeneratedSources() throws IOException, CompilerException { - compileGeneratedSources(getName()); + compileGeneratedSources(getName(), 8); } protected void compileGeneratedSources(int minJavaSource) throws IOException, CompilerException { compileGeneratedSources(getName(), minJavaSource); } - protected void compileGeneratedSources(String verifierId) throws IOException, CompilerException { - String runtimeVersion = System.getProperty("java.specification.version"); - if (runtimeVersion.startsWith("1.")) { - runtimeVersion = runtimeVersion.substring(2); - } - int runtimeSource = Integer.parseInt(runtimeVersion); - - String javaSource; - if (runtimeSource <= 8) { - javaSource = "1.3"; - } else if (runtimeSource <= 11) { - javaSource = "6"; - } else if (runtimeSource <= 17) { - javaSource = "7"; - } else { - javaSource = "8"; - } - - compileGeneratedSources(verifierId, javaSource); - } - protected void compileGeneratedSources(String verifierId, int minJavaSource) throws IOException, CompilerException { String runtimeVersion = System.getProperty("java.specification.version"); if (runtimeVersion.startsWith("1.")) { @@ -154,15 +133,11 @@ protected void compileGeneratedSources(String verifierId, int minJavaSource) thr int runtimeSource = Integer.parseInt(runtimeVersion); String javaSource; - if (runtimeSource <= 8) { - javaSource = "1." + Math.max(minJavaSource, 3); - } else if (runtimeSource <= 11) { - javaSource = Integer.toString(Math.max(minJavaSource, 6)); - } else if (runtimeSource <= 17) { - javaSource = Integer.toString(Math.max(minJavaSource, 7)); + // review when Java will drop support for Java 8 as source + if (runtimeSource <= 21) { + javaSource = Integer.toString(Math.max(minJavaSource, 8)); } else { javaSource = Integer.toString(Math.max(minJavaSource, 8)); - ; } compileGeneratedSources(verifierId, javaSource); @@ -286,23 +261,6 @@ protected void assertGeneratedFileExists(String filename) { assertTrue("The generated file is empty.", file.length() > 0); } - /** - * Check if a Java 5 feature test should be skipped, since it is not supported by current test environment. - * - * @return true if Java 5 is not available, then feature test should be skipped by caller - */ - protected boolean skipJava5FeatureTest() { - String javaVersion = System.getProperty("java.specification.version", "1.5"); - - if ("1.5".compareTo(javaVersion) > 0) { - System.out.println( - "Skipped Java 5 feature test, not supported by current test environment (" + javaVersion + ")"); - return true; - } - - return false; - } - protected List getClassPathElements() { return classPathElements; }