fixed to work with new functional-utils

solita · Aug 17, 2014 · 9b38991 · 9b38991
1 parent 3fb23e9
commit 9b38991
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/main/java/fi/solita/utils/query/backend/hibernate/HibernateTypeProvider.java b/src/main/java/fi/solita/utils/query/backend/hibernate/HibernateTypeProvider.java
@@ -21,7 +21,6 @@
 import org.hibernate.usertype.CompositeUserType;
 import org.hibernate.usertype.UserType;
 
-import fi.solita.utils.functional.Apply;
 import fi.solita.utils.functional.Function0;
 import fi.solita.utils.functional.Functional;
 import fi.solita.utils.functional.Pair;

diff --git a/src/main/java/fi/solita/utils/query/meta/JpaConstructorProcessor.java b/src/main/java/fi/solita/utils/query/meta/JpaConstructorProcessor.java
@@ -38,6 +38,8 @@ public static class Options {
     public ExtendedGeneratorOptions generatorOptions() {
         final boolean makeFieldsPublic = JpaConstructorProcessor.this.makeFieldsPublic();
         final boolean onlyPublicMembers = JpaConstructorProcessor.this.onlyPublicMembers();
+        final String generatedPackagePattern = JpaConstructorProcessor.this.generatedPackagePattern();
+        final String generatedClassNamePattern = JpaConstructorProcessor.this.generatedClassNamePattern();
         return new ExtendedGeneratorOptions() {
             @Override
             public boolean makeFieldsPublic() {
@@ -46,10 +48,18 @@ public boolean makeFieldsPublic() {
             public boolean onlyPublicMembers() {
                 return onlyPublicMembers;
             }
+            @Override
+            public String generatedPackagePattern() {
+                return generatedPackagePattern;
+            }
+            @Override
+            public String generatedClassNamePattern() {
+                return generatedClassNamePattern;
+            }
         };
     }
 
-    public static class ExtendedGeneratorOptions extends CommonMetadataProcessor.CombinedGeneratorOptions implements ConstructorsAsJpaProjections.Options {
+    public static abstract class ExtendedGeneratorOptions extends CommonMetadataProcessor.CombinedGeneratorOptions implements ConstructorsAsJpaProjections.Options {
         @SuppressWarnings("rawtypes")
         @Override
         public Class<? extends Apply> getClassForJpaConstructors(int argCount) {

diff --git a/src/main/java/fi/solita/utils/query/meta/JpaMetamodelProcessor.java b/src/main/java/fi/solita/utils/query/meta/JpaMetamodelProcessor.java
@@ -38,14 +38,26 @@ public static class Options {
     @Override
     public ExtendedGeneratorOptions generatorOptions() {
         final boolean onlyPublicMembers = JpaMetamodelProcessor.this.onlyPublicMembers();
+        final String generatedPackagePattern = JpaMetamodelProcessor.this.generatedPackagePattern();
+        final String generatedClassNamePattern = JpaMetamodelProcessor.this.generatedClassNamePattern();
         return new ExtendedGeneratorOptions() {
             public boolean onlyPublicMembers() {
                 return onlyPublicMembers;
             }
+
+            @Override
+            public String generatedPackagePattern() {
+                return generatedPackagePattern;
+            }
+
+            @Override
+            public String generatedClassNamePattern() {
+                return generatedClassNamePattern;
+            }
         };
     }
 
-    public static class ExtendedGeneratorOptions extends CommonMetadataProcessor.CombinedGeneratorOptions implements JpaMetamodel.Options {
+    public static abstract class ExtendedGeneratorOptions extends CommonMetadataProcessor.CombinedGeneratorOptions implements JpaMetamodel.Options {
     }
 
     public List<Generator<? super ExtendedGeneratorOptions>> generators() {