fixup! Make use of union types from blaze-domain for some numeric fun…

…ctions
Blazebit · Feb 28, 2022 · abd052f · abd052f
1 parent 3e2a203
commit abd052f
Show file tree

Hide file tree

Showing 22 changed files with 19,278 additions and 8,902 deletions.
diff --git a/base/src/main/java/com/blazebit/expression/base/BaseContributor.java b/base/src/main/java/com/blazebit/expression/base/BaseContributor.java
@@ -111,7 +111,7 @@ public class BaseContributor implements DomainContributor, ExpressionServiceCont
     public static final String DATE_TYPE_NAME = "Date";
     public static final Class<?> DATE = LocalDate.class;
 
-    public static final String NUMERIC_OR_INTEGER_TYPE_NAME = NUMERIC_TYPE_NAME + "|" + INTEGER_TYPE_NAME;
+    public static final String INTEGER_OR_NUMERIC_TYPE_NAME = INTEGER_TYPE_NAME + "|" + NUMERIC_TYPE_NAME;
 
     public static final BooleanLiteralResolver BOOLEAN_LITERAL_TYPE_RESOLVER = new BooleanLiteralResolverImpl();
     public static final NumericLiteralResolver NUMERIC_LITERAL_TYPE_RESOLVER = new NumericLiteralResolverImpl();

diff --git a/base/src/main/java/com/blazebit/expression/base/function/AbsFunction.java b/base/src/main/java/com/blazebit/expression/base/function/AbsFunction.java
@@ -52,7 +52,7 @@ public static void addFunction(DomainBuilder domainBuilder, ClassLoader classLoa
                 .withMetadata(new FunctionInvokerMetadataDefinition(INSTANCE))
                 .withMetadata(DocumentationMetadataDefinition.localized("ABS", classLoader))
                 .withExactArgumentCount(1)
-                .withArgument("number", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("ABS_ARG", classLoader))
+                .withArgument("number", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("ABS_ARG", classLoader))
                 .build();
         domainBuilder.withFunctionTypeResolver("ABS", StaticDomainFunctionTypeResolvers.FIRST_ARGUMENT_TYPE);
     }

diff --git a/base/src/main/java/com/blazebit/expression/base/function/Atan2Function.java b/base/src/main/java/com/blazebit/expression/base/function/Atan2Function.java
@@ -49,8 +49,8 @@ public static void addFunction(DomainBuilder domainBuilder, ClassLoader classLoa
         domainBuilder.createFunction("ATAN2")
                 .withMetadata(new FunctionInvokerMetadataDefinition(INSTANCE))
                 .withMetadata(DocumentationMetadataDefinition.localized("ATAN2", classLoader))
-                .withArgument("y", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("ATAN2_Y", classLoader))
-                .withArgument("x", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("ATAN2_X", classLoader))
+                .withArgument("y", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("ATAN2_Y", classLoader))
+                .withArgument("x", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("ATAN2_X", classLoader))
                 .build();
         domainBuilder.withFunctionTypeResolver("ATAN2", StaticDomainFunctionTypeResolvers.returning(BaseContributor.NUMERIC_TYPE_NAME));
     }

diff --git a/base/src/main/java/com/blazebit/expression/base/function/CeilFunction.java b/base/src/main/java/com/blazebit/expression/base/function/CeilFunction.java
@@ -51,7 +51,7 @@ public static void addFunction(DomainBuilder domainBuilder, ClassLoader classLoa
                 .withMetadata(new FunctionInvokerMetadataDefinition(INSTANCE))
                 .withMetadata(DocumentationMetadataDefinition.localized("CEIL", classLoader))
                 .withExactArgumentCount(1)
-                .withArgument("number", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("CEIL_ARG", classLoader))
+                .withArgument("number", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("CEIL_ARG", classLoader))
                 .build();
         domainBuilder.withFunctionTypeResolver("CEIL", StaticDomainFunctionTypeResolvers.returning(BaseContributor.INTEGER_TYPE_NAME));
     }

diff --git a/base/src/main/java/com/blazebit/expression/base/function/FloorFunction.java b/base/src/main/java/com/blazebit/expression/base/function/FloorFunction.java
@@ -51,7 +51,7 @@ public static void addFunction(DomainBuilder domainBuilder, ClassLoader classLoa
                 .withMetadata(new FunctionInvokerMetadataDefinition(INSTANCE))
                 .withMetadata(DocumentationMetadataDefinition.localized("FLOOR", classLoader))
                 .withExactArgumentCount(1)
-                .withArgument("number", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("FLOOR_ARG", classLoader))
+                .withArgument("number", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("FLOOR_ARG", classLoader))
                 .build();
         domainBuilder.withFunctionTypeResolver("FLOOR", StaticDomainFunctionTypeResolvers.returning(BaseContributor.INTEGER_TYPE_NAME));
     }

diff --git a/base/src/main/java/com/blazebit/expression/base/function/NumericFunction.java b/base/src/main/java/com/blazebit/expression/base/function/NumericFunction.java
@@ -124,7 +124,7 @@ public static void addFunction(DomainBuilder domainBuilder, ClassLoader classLoa
                     .withMetadata(new FunctionInvokerMetadataDefinition(f))
                     .withMetadata(DocumentationMetadataDefinition.localized(f.name, classLoader))
                     .withExactArgumentCount(1)
-                    .withArgument("number", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized(f.name + "_ARG", classLoader))
+                    .withArgument("number", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized(f.name + "_ARG", classLoader))
                     .build();
             domainBuilder.withFunctionTypeResolver(f.name, StaticDomainFunctionTypeResolvers.returning(BaseContributor.NUMERIC_TYPE_NAME));
         }

diff --git a/base/src/main/java/com/blazebit/expression/base/function/PowFunction.java b/base/src/main/java/com/blazebit/expression/base/function/PowFunction.java
@@ -49,8 +49,8 @@ public static void addFunction(DomainBuilder domainBuilder, ClassLoader classLoa
         domainBuilder.createFunction("POW")
                 .withMetadata(new FunctionInvokerMetadataDefinition(INSTANCE))
                 .withMetadata(DocumentationMetadataDefinition.localized("POW", classLoader))
-                .withArgument("base", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("POW_BASE", classLoader))
-                .withArgument("power", BaseContributor.NUMERIC_OR_INTEGER_TYPE_NAME, DocumentationMetadataDefinition.localized("POW_POWER", classLoader))
+                .withArgument("base", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("POW_BASE", classLoader))
+                .withArgument("power", BaseContributor.INTEGER_OR_NUMERIC_TYPE_NAME, DocumentationMetadataDefinition.localized("POW_POWER", classLoader))
                 .build();
         domainBuilder.withFunctionTypeResolver("POW", StaticDomainFunctionTypeResolvers.returning(BaseContributor.NUMERIC_TYPE_NAME));
     }

diff --git a/core/impl/src/main/java/com/blazebit/expression/impl/PredicateModelGenerator.java b/core/impl/src/main/java/com/blazebit/expression/impl/PredicateModelGenerator.java
@@ -537,7 +537,7 @@ public Expression visitCollectionLiteral(PredicateParser.CollectionLiteralContex
         if (literalList.isEmpty()) {
             collectionDomainType = domainModel.getCollectionType(null);
         } else {
-            collectionDomainType = domainModel.getCollectionType(literalList.get(0).getType());
+            collectionDomainType = domainModel.getCollectionType(literalList.get(0).getType().getName());
         }
 
         return new CollectionLiteral(literalList, literalFactory.ofCollectionValues(compileContext, collectionDomainType, literalList));

diff --git a/...blazebit/expression/declarative/impl/TypeAdapterDeclarativeFunctionMetadataProcessor.java b/...blazebit/expression/declarative/impl/TypeAdapterDeclarativeFunctionMetadataProcessor.java
@@ -49,6 +49,9 @@ public MetadataDefinition<?> process(Class<?> annotatedClass, Method method, Ann
         if (typeAdapter != null || collection) {
             return typeAdapter;
         }
+        if (typeName == null) {
+            return null;
+        }
         DomainBuilder domainBuilder = serviceProvider.getService(DomainBuilder.class);
         DomainTypeDefinition type = domainBuilder.getType(typeName);
         if (type == null) {

diff --git a/...expression/declarative/impl/TypeAdapterDeclarativeFunctionParameterMetadataProcessor.java b/...expression/declarative/impl/TypeAdapterDeclarativeFunctionParameterMetadataProcessor.java
@@ -50,6 +50,9 @@ public MetadataDefinition<?> process(Class<?> annotatedClass, Method method, Par
         if (typeAdapter != null || collection) {
             return typeAdapter;
         }
+        if (typeName == null) {
+            return null;
+        }
         DomainBuilder domainBuilder = serviceProvider.getService(DomainBuilder.class);
         DomainTypeDefinition type = domainBuilder.getType(typeName);
         if (type == null) {