diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index d4cb53bb4..ab3059117 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -19,8 +19,6 @@ interface Constants { String DBJSONB = "io.ebean.annotation.DbJsonB"; String DBNAME = "io.ebean.annotation.DbName"; - String DB = "io.ebean.DB"; - String MODULEINFO = "io.ebean.config.ModuleInfo"; String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf"; String METAINF_SERVICES_MODULELOADER = "META-INF/services/io.ebean.config.EntityClassRegister"; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java index 425d7fb49..3ccd4db0e 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java @@ -85,9 +85,6 @@ class SimpleQueryBeanWriter { importTypes.add(Constants.JAVA_COLLECTION); importTypes.add(implementsInterfaceFullName); } - if (dbName != null) { - importTypes.add(Constants.DB); - } addClassProperties(); } @@ -164,7 +161,7 @@ class SimpleQueryBeanWriter { if (dbName == null) { writer.append(" super(%s.class);", shortName).eol(); } else { - writer.append(" super(%s.class, DB.byName(\"%s\"));", shortName, dbName).eol(); + writer.append(" super(%s.class, io.ebean.DB.byName(\"%s\"));", shortName, dbName).eol(); } writer.append(" }").eol(); writer.eol(); @@ -174,7 +171,7 @@ class SimpleQueryBeanWriter { if (dbName == null) { writer.append(" super(%s.class, transaction);", shortName).eol(); } else { - writer.append(" super(%s.class, DB.byName(\"%s\"), transaction);", shortName, dbName).eol(); + writer.append(" super(%s.class, io.ebean.DB.byName(\"%s\"), transaction);", shortName, dbName).eol(); } writer.append(" }").eol();