Remove all use of import static

Author: rbygrave

src/main/java/io/ebean/querybean/generator/FindDbName.java

@@ -11,8 +11,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static io.ebean.querybean.generator.Constants.DBNAME;
-
 class FindDbName {
 
   /**
@@ -48,7 +46,7 @@ private static AnnotationMirror findDbNameMirror(TypeElement element) {
     final List<? extends AnnotationMirror> mirrors = element.getAnnotationMirrors();
     for (AnnotationMirror mirror : mirrors) {
       final String name = mirror.getAnnotationType().asElement().toString();
-      if (DBNAME.equals(name)) {
+      if (Constants.DBNAME.equals(name)) {
         return mirror;
       }
     }

src/main/java/io/ebean/querybean/generator/ProcessingContext.java

@@ -23,6 +23,7 @@
 import javax.tools.Diagnostic;
 import javax.tools.FileObject;
 import javax.tools.JavaFileObject;
+import javax.tools.StandardLocation;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.LineNumberReader;
@@ -36,8 +37,6 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import static javax.tools.StandardLocation.CLASS_OUTPUT;
-
 /**
  * Context for the source generation.
  */
@@ -465,7 +464,7 @@ FileObject createManifestWriter() throws IOException {
   }
 
   FileObject createMetaInfWriter(String target) throws IOException {
-    return filer.createResource(CLASS_OUTPUT, "", target);
+    return filer.createResource(StandardLocation.CLASS_OUTPUT, "", target);
   }
 
   Set<String> getPrefixEntities() {
@@ -495,7 +494,7 @@ String getFactoryPackage() {
    */
   String loadMetaInfServices() {
     try {
-      FileObject fileObject = processingEnv.getFiler().getResource(CLASS_OUTPUT, "", METAINF_SERVICES_MODULELOADER);
+      FileObject fileObject = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, "", METAINF_SERVICES_MODULELOADER);
       if (fileObject != null) {
         Reader reader = fileObject.openReader(true);
         LineNumberReader lineReader = new LineNumberReader(reader);

src/main/java/io/ebean/querybean/generator/ReadModuleInfo.java

@@ -9,8 +9,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import static io.ebean.querybean.generator.Constants.MODULEINFO;
-
 /**
  * Helper to read the current/existing prefixed entity classes.
  * <p>
@@ -30,7 +28,7 @@ List<String> read(Element element) {
 
     for (AnnotationMirror mirror : mirrors) {
       final String name = mirror.getAnnotationType().asElement().toString();
-      if (MODULEINFO.equals(name)) {
+      if (Constants.MODULEINFO.equals(name)) {
         return readEntities(mirror);
       }
     }

src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -13,18 +13,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import static io.ebean.querybean.generator.Constants.AT_GENERATED;
-import static io.ebean.querybean.generator.Constants.AT_TYPEQUERYBEAN;
-import static io.ebean.querybean.generator.Constants.DATABASE;
-import static io.ebean.querybean.generator.Constants.DB;
-import static io.ebean.querybean.generator.Constants.FETCHGROUP;
-import static io.ebean.querybean.generator.Constants.QUERY;
-import static io.ebean.querybean.generator.Constants.TQASSOCBEAN;
-import static io.ebean.querybean.generator.Constants.TQPROPERTY;
-import static io.ebean.querybean.generator.Constants.TQROOTBEAN;
-import static io.ebean.querybean.generator.Constants.TRANSACTION;
-import static io.ebean.querybean.generator.Constants.TYPEQUERYBEAN;
-
 /**
  * A simple implementation that generates and writes query beans.
  */
@@ -104,14 +92,14 @@ private void gatherPropertyDetails() {
       importTypes.add(generated);
     }
     importTypes.add(beanFullName);
-    importTypes.add(TQROOTBEAN);
-    importTypes.add(TYPEQUERYBEAN);
-    importTypes.add(DATABASE);
-    importTypes.add(FETCHGROUP);
-    importTypes.add(QUERY);
-    importTypes.add(TRANSACTION);
+    importTypes.add(Constants.TQROOTBEAN);
+    importTypes.add(Constants.TYPEQUERYBEAN);
+    importTypes.add(Constants.DATABASE);
+    importTypes.add(Constants.FETCHGROUP);
+    importTypes.add(Constants.QUERY);
+    importTypes.add(Constants.TRANSACTION);
     if (dbName != null) {
-      importTypes.add(DB);
+      importTypes.add(Constants.DB);
     }
     addClassProperties();
   }
@@ -206,14 +194,14 @@ void writeAssocBean() throws IOException {
    */
   private void prepareAssocBeanImports() {
 
-    importTypes.remove(DB);
-    importTypes.remove(TQROOTBEAN);
-    importTypes.remove(DATABASE);
-    importTypes.remove(FETCHGROUP);
-    importTypes.remove(QUERY);
-    importTypes.add(TQASSOCBEAN);
+    importTypes.remove(Constants.DB);
+    importTypes.remove(Constants.TQROOTBEAN);
+    importTypes.remove(Constants.DATABASE);
+    importTypes.remove(Constants.FETCHGROUP);
+    importTypes.remove(Constants.QUERY);
+    importTypes.add(Constants.TQASSOCBEAN);
     if (isEntity()) {
-      importTypes.add(TQPROPERTY);
+      importTypes.add(Constants.TQPROPERTY);
       importTypes.add(origDestPackage + ".Q" + origShortName);
     }
 
@@ -287,9 +275,9 @@ private void writeClass() {
       writer.append(" * THIS IS A GENERATED OBJECT, DO NOT MODIFY THIS CLASS.").eol();
       writer.append(" */").eol();
       if (processingContext.isGeneratedAvailable()) {
-        writer.append(AT_GENERATED).eol();
+        writer.append(Constants.AT_GENERATED).eol();
       }
-      writer.append(AT_TYPEQUERYBEAN).eol();
+      writer.append(Constants.AT_TYPEQUERYBEAN).eol();
       lang().beginAssocClass(writer, shortName, origShortName);
 
     } else {
@@ -299,9 +287,9 @@ private void writeClass() {
       writer.append(" * THIS IS A GENERATED OBJECT, DO NOT MODIFY THIS CLASS.").eol();
       writer.append(" */").eol();
       if (processingContext.isGeneratedAvailable()) {
-        writer.append(AT_GENERATED).eol();
+        writer.append(Constants.AT_GENERATED).eol();
       }
-      writer.append(AT_TYPEQUERYBEAN).eol();
+      writer.append(Constants.AT_TYPEQUERYBEAN).eol();
       lang().beginClass(writer, shortName);
     }