HBX-3204: Improve the implementation of classes JDBCConfigurationTask, JPAConfigurationTask, JavaFormatterTask and ExporterTask

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java

@@ -133,6 +133,7 @@ public void setEntityResolver(String entityResolverName) {
 	}
 
 	public void setNamingStrategy(String namingStrategy) {
+		log("setting unused naming strategy: " + namingStrategy);
 	}
 
 	@Override

ant/src/main/java/org/hibernate/tool/ant/ExporterTask.java

@@ -74,9 +74,6 @@ public void setTemplatePath(Path path) {
 		templatePath = path;
 	}
 
-	public void setTemplatePrefix(String s) {
-	}
-	
 	public void validateParameters() {
 		if(getDestdir()==null) {
 			throw new BuildException("destdir must be set, either locally or on <hibernatetool>");

ant/src/main/java/org/hibernate/tool/ant/JDBCConfigurationTask.java

@@ -20,40 +20,35 @@
 package org.hibernate.tool.ant;
 
 import java.io.File;
-import java.lang.reflect.Constructor;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Path;
 import org.hibernate.boot.cfgxml.internal.ConfigLoader;
-import org.hibernate.boot.cfgxml.spi.LoadedConfig;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.tool.api.metadata.MetadataDescriptor;
 import org.hibernate.tool.api.metadata.MetadataDescriptorFactory;
 import org.hibernate.tool.api.metadata.MetadataConstants;
 import org.hibernate.tool.api.reveng.RevengSettings;
 import org.hibernate.tool.api.reveng.RevengStrategy;
 import org.hibernate.tool.api.reveng.RevengStrategyFactory;
-import org.hibernate.tool.util.ReflectionUtil;
 
 
 /**
  * @author max
  * @author <a href='mailto:[email protected]'>Alexandru Popescu</a>
  */
 public class JDBCConfigurationTask extends ConfigurationTask {
-	//not expfosed here.
-    private boolean preferBasicCompositeIds = true;
+
+	boolean preferBasicCompositeIds = true;
 
-    private String reverseEngineeringStrategyClass;
-    private String packageName;
-	private Path revengFiles;
+	String reverseEngineeringStrategyClass;
+	String packageName;
+	Path revengFiles;
 
-	private boolean detectOneToOne = true;
-	private boolean detectManyToMany = true;
-	private boolean detectOptimisticLock = true;
+	boolean detectOneToOne = true;
+	boolean detectManyToMany = true;
+	boolean detectOptimisticLock = true;
 
 	public JDBCConfigurationTask() {
 		setDescription("JDBC Configuration (for reverse engineering)");
@@ -138,4 +133,16 @@ private Properties loadProperties() {
 		}
 		return result;
 	}
+
+	public Object clone() throws CloneNotSupportedException {
+		JDBCConfigurationTask jct = (JDBCConfigurationTask) super.clone();
+		jct.preferBasicCompositeIds = this.preferBasicCompositeIds;
+		jct.reverseEngineeringStrategyClass = this.reverseEngineeringStrategyClass;
+		jct.packageName = this.packageName;
+		jct.revengFiles = this.revengFiles;
+		jct.detectOneToOne = this.detectOneToOne;
+		jct.detectManyToMany = this.detectManyToMany;
+		jct.detectOptimisticLock = this.detectOptimisticLock;
+		return jct;
+	}
 }

ant/src/main/java/org/hibernate/tool/ant/JPAConfigurationTask.java

@@ -29,7 +29,7 @@
 
 public class JPAConfigurationTask extends ConfigurationTask {
 
-	private String persistenceUnit = null;
+	String persistenceUnit = null;
 
 	public JPAConfigurationTask() {
 		setDescription("JPA Configuration");
@@ -49,7 +49,8 @@ protected MetadataDescriptor createMetadataDescriptor() {
 			Throwable cause = t.getCause();
 			if (cause != null) {
 				throw new BuildException(cause);
-			} else {
+			}
+			else {
 				throw new BuildException("Problems in creating a configuration for JPA. Have you remembered to add hibernate EntityManager jars to the classpath ?",t);	
 			}
 		}
@@ -65,11 +66,17 @@ public void setPersistenceUnit(String persistenceUnit) {
 	}
 
 	public void setConfigurationFile(File configurationFile) {
-		complain("configurationfile");
+		complain();
+	}
+
+	private void complain() {
+		throw new BuildException("<" + getTaskName() + "> currently only support autodiscovery from META-INF/persistence.xml. Thus setting the configurationfile attribute is not allowed");
 	}
 
-	private void complain(String param) {
-		throw new BuildException("<" + getTaskName() + "> currently only support autodiscovery from META-INF/persistence.xml. Thus setting the " + param + " attribute is not allowed");
+	public Object clone() throws CloneNotSupportedException {
+		JPAConfigurationTask jct = (JPAConfigurationTask) super.clone();
+		jct.persistenceUnit = this.persistenceUnit;
+		return jct;
 	}
 
 

ant/src/main/java/org/hibernate/tool/ant/JavaFormatterTask.java

@@ -37,8 +37,8 @@
 
 public class JavaFormatterTask extends Task {
 
-	private final List<FileSet> fileSets = new ArrayList<FileSet>();
-	private boolean failOnError;
+	final List<FileSet> fileSets = new ArrayList<FileSet>();
+	boolean failOnError;
 
 	public void addConfiguredFileSet(FileSet fileSet) {
 		fileSets.add(fileSet);
@@ -68,14 +68,17 @@ public void execute() throws BuildException {
                     if (!ok) {
                         failed++;
                         getProject().log(this, "Formatting failed - skipping " + file, Project.MSG_WARN);
-                    } else {
+                    }
+                    else {
                         getProject().log(this, "Formatted " + file, Project.MSG_VERBOSE);
                     }
-                } catch (RuntimeException ee) {
+                }
+                catch (RuntimeException ee) {
                     failed++;
                     if (failOnError) {
                         throw new BuildException("Java formatting failed on " + file, ee);
-                    } else {
+                    }
+                    else {
                         getProject().log(this, "Java formatting failed on " + file + ", " + ee.getLocalizedMessage(), Project.MSG_ERR);
                     }
                 }
@@ -104,7 +107,14 @@ private File[] getFiles() {
             }
         }
 
-		return (File[]) files.toArray(new File[0]);
+		return files.toArray(new File[0]);
 	}
 
+    public Object clone() throws CloneNotSupportedException {
+        JavaFormatterTask jft = (JavaFormatterTask) super.clone();
+        jft.fileSets.addAll(this.fileSets);
+        jft.failOnError = this.failOnError;
+        return jft;
+    }
+
 }

orm/src/main/java/org/hibernate/tool/internal/export/common/AbstractExporter.java

@@ -99,7 +99,6 @@ protected void cleanUpContext() {
 			iterator = getProperties().entrySet().iterator();
 			while ( iterator.hasNext() ) {
 				Entry<Object, Object> element = iterator.next();
-				Object value = transformValue(element.getValue());
 				String key = element.getKey().toString();
 				if(key.startsWith(ExporterSettings.PREFIX_KEY)) {
 					getTemplateHelper().removeFromContext(key.substring(ExporterSettings.PREFIX_KEY.length()));

test/common/src/main/resources/org/hibernate/tool/ant/GenericExport/build.xml

@@ -17,8 +17,7 @@
 			</configuration>
 
 			<hbmtemplate 
-				templateprefix="pojo/" 
-				template="pojo/Pojo.ftl" 
+				template="pojo/Pojo.ftl"
 				filepattern="X{package-name}/{class-name}.java" 
 				foreach="entity">
 				<property key="jdk5" value="false" />