HBX-3195: Improve the implementation of ImportContext and ImportContextImpl

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

Author: koentsje

orm/src/main/java/org/hibernate/tool/internal/export/java/ImportContext.java

@@ -22,13 +22,12 @@ public interface ImportContext {
 	/**
 	 * Add fqcn to the import list. Returns fqcn as needed in source code.
 	 * Attempts to handle fqcn with array and generics references.
-	 * 
+	 * <p>
 	 * e.g.
 	 * java.util.Collection<org.marvel.Hulk> imports java.util.Collection and returns Collection
 	 * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk
 	 * 
 	 * 
-	 * @param fqcn
 	 * @return import string
 	 */
 	public abstract String importType(String fqcn);

orm/src/main/java/org/hibernate/tool/internal/export/java/ImportContextImpl.java

@@ -18,7 +18,6 @@
 package org.hibernate.tool.internal.export.java;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -57,13 +56,12 @@ public ImportContextImpl(String basePackage) {
 	/**
 	 * Add fqcn to the import list. Returns fqcn as needed in source code.
 	 * Attempts to handle fqcn with array and generics references.
-	 * 
+	 * <p>
 	 * e.g.
 	 * java.util.Collection<org.marvel.Hulk> imports java.util.Collection and returns Collection
 	 * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk
 	 * 
 	 * 
-	 * @param fqcn
 	 * @return import string
 	 */
 	public String importType(String fqcn) {
@@ -88,14 +86,9 @@ public String importType(String fqcn) {
 		String simpleName = StringHelper.unqualify(fqcn);
 		if(simpleNames.containsKey(simpleName)) {
 			String existingFqcn = (String) simpleNames.get(simpleName);
-			if(existingFqcn.equals(pureFqcn)) {
-				canBeSimple = true;
-			} else {
-				canBeSimple = false;
-			}
+            canBeSimple = existingFqcn.equals(pureFqcn);
 		} else {
-			canBeSimple = true;
-			simpleNames.put(simpleName, pureFqcn);
+            simpleNames.put(simpleName, pureFqcn);
 			imports.add( pureFqcn );
 		}
 
@@ -127,38 +120,32 @@ public String staticImport(String fqcn, String member) {
 	}
 
 	private boolean inDefaultPackage(String className) {
-		return className.indexOf( "." ) < 0;
+		return !className.contains(".");
 	}
 
 	private boolean isPrimitive(String className) {
 		return PRIMITIVES.containsKey( className );
 	}
 
 	private boolean inSamePackage(String className) {
-		String other = StringHelper.qualifier( className );
-		return other == basePackage
-				|| (other != null && other.equals( basePackage ) );
+		return StringHelper.qualifier( className ).equals(basePackage);
 	}
 
 	private boolean inJavaLang(String className) {
 		return "java.lang".equals( StringHelper.qualifier( className ) );
 	}
 
 	public String generateImports() {
-		StringBuffer buf = new StringBuffer();
-		
-		for ( Iterator<String> imps = imports.iterator(); imps.hasNext(); ) {
-				String next = imps.next();
-				if(isPrimitive(next) || inDefaultPackage(next) || inJavaLang(next) || inSamePackage(next)) {
-					// dont add automatically "imported" stuff
-				} else {
-					if(staticImports.contains(next)) {
-						buf.append("import static " + next + ";\r\n");
-					} else {
-						buf.append("import " + next + ";\r\n");
-					}
-				}
-		}
+		StringBuilder buf = new StringBuilder();
+        for (String next : imports) {
+            if (!(isPrimitive(next) || inDefaultPackage(next) || inJavaLang(next) || inSamePackage(next))) {
+                 if (staticImports.contains(next)) {
+                    buf.append("import static ").append(next).append(";\r\n");
+                } else {
+                    buf.append("import ").append(next).append(";\r\n");
+                }
+            }
+        }
 
 		if(buf.indexOf( "$" )>=0) {
 			return buf.toString();