You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2021/09/14 08:50:04 UTC
[unomi] branch draft-dependency-upgrades updated: Revert back to
old date/JSON functions
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch draft-dependency-upgrades
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/draft-dependency-upgrades by this push:
new 9b0bbbc Revert back to old date/JSON functions
9b0bbbc is described below
commit 9b0bbbc84afae63b6bd034827cc7715051d7dc71
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Tue Sep 14 10:49:57 2021 +0200
Revert back to old date/JSON functions
---
.../main/java/org/apache/unomi/graphql/scalars/DateFunction.java | 8 +++-----
.../main/java/org/apache/unomi/graphql/scalars/JSONFunction.java | 4 +---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/DateFunction.java b/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/DateFunction.java
index 5c16ea2..6b24212 100644
--- a/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/DateFunction.java
+++ b/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/DateFunction.java
@@ -18,9 +18,7 @@ package org.apache.unomi.graphql.scalars;
import graphql.annotations.processor.ProcessingElementsContainer;
import graphql.annotations.processor.typeFunctions.TypeFunction;
-import graphql.scalars.ExtendedScalars;
import graphql.scalars.datetime.DateScalar;
-import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLType;
import java.lang.reflect.AnnotatedType;
@@ -28,14 +26,14 @@ import java.time.LocalDate;
public class DateFunction implements TypeFunction {
- public static final GraphQLScalarType DATE_SCALAR = ExtendedScalars.Date;
+ public static final DateScalar DATE_SCALAR = new DateScalar();
public DateFunction() {
}
@Override
public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
- return ExtendedScalars.Date.getName();
+ return DATE_SCALAR.getName();
}
@Override
@@ -45,7 +43,7 @@ public class DateFunction implements TypeFunction {
@Override
public GraphQLType buildType(boolean input, Class<?> aClass, AnnotatedType annotatedType, ProcessingElementsContainer container) {
- return ExtendedScalars.Date;
+ return DATE_SCALAR;
}
}
diff --git a/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/JSONFunction.java b/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/JSONFunction.java
index a676e3e..b3590b8 100644
--- a/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/JSONFunction.java
+++ b/graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/scalars/JSONFunction.java
@@ -18,16 +18,14 @@ package org.apache.unomi.graphql.scalars;
import graphql.annotations.processor.ProcessingElementsContainer;
import graphql.annotations.processor.typeFunctions.TypeFunction;
-import graphql.scalars.ExtendedScalars;
import graphql.scalars.object.JsonScalar;
-import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLType;
import java.lang.reflect.AnnotatedType;
public class JSONFunction implements TypeFunction {
- public static final GraphQLScalarType JSON_SCALAR = ExtendedScalars.Json;
+ public static final JsonScalar JSON_SCALAR = new JsonScalar();
@Override
public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {