Skip to content

Add Missing LocalTime Coercing #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2019
Merged

Add Missing LocalTime Coercing #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f6d908
fix: clean up comments
igdianov Jan 26, 2019
7ce8513
fix: add LocalTime GraphQL coercing support
igdianov Jan 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
274 changes: 168 additions & 106 deletions ...query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/JavaScalars.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Collections;
import java.util.Date;
Expand All @@ -35,9 +38,6 @@
import java.util.UUID;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import graphql.Assert;
import graphql.Scalars;
import graphql.language.ArrayValue;
Expand All @@ -51,7 +51,11 @@
import graphql.language.StringValue;
import graphql.language.Value;
import graphql.schema.Coercing;
import graphql.schema.CoercingParseValueException;
import graphql.schema.CoercingSerializeException;
import graphql.schema.GraphQLScalarType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Provides Registry to resolve GraphQL Query Java Scalar Types
Expand Down Expand Up @@ -100,6 +104,7 @@ public class JavaScalars {

scalarsRegistry.put(LocalDateTime.class, new GraphQLScalarType("LocalDateTime", "LocalDateTime type", new GraphQLLocalDateTimeCoercing()));
scalarsRegistry.put(LocalDate.class, new GraphQLScalarType("LocalDate", "LocalDate type", new GraphQLLocalDateCoercing()));
scalarsRegistry.put(LocalTime.class, new GraphQLScalarType("LocalTime", "LocalTime type", new GraphQLLocalTimeCoercing()));
scalarsRegistry.put(Date.class, new GraphQLScalarType("Date", "Date type", new GraphQLDateCoercing()));
scalarsRegistry.put(UUID.class, new GraphQLScalarType("UUID", "UUID type", new GraphQLUUIDCoercing()));
scalarsRegistry.put(Object.class, new GraphQLScalarType("Object", "Object type", new GraphQLObjectCoercing()));
Expand Down Expand Up @@ -212,6 +217,51 @@ private LocalDate parseStringToLocalDate(String input) {
}
}
};

public static class GraphQLLocalTimeCoercing implements Coercing<LocalTime, String> {

public static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_TIME.withZone(ZoneOffset.UTC);

private LocalTime convertImpl(Object input) {
if (input instanceof String) {
try {
return LocalTime.parse((String) input, FORMATTER);
} catch (DateTimeParseException ignored) {
}
}
return null;
}

@Override
public String serialize(Object input) {
if (input instanceof LocalTime) {
return DateTimeFormatter.ISO_LOCAL_TIME.format((LocalTime) input);
} else {
LocalTime result = convertImpl(input);
if (result == null) {
throw new CoercingSerializeException("Invalid value '" + input + "' for LocalTime");
}
return DateTimeFormatter.ISO_LOCAL_TIME.format(result);
}
}

@Override
public LocalTime parseValue(Object input) {
LocalTime result = convertImpl(input);
if (result == null) {
throw new CoercingParseValueException("Invalid value '" + input + "' for LocalTime");
}
return result;
}

@Override
public LocalTime parseLiteral(Object input) {
if (!(input instanceof StringValue)) return null;
String value = ((StringValue) input).getValue();
LocalTime result = convertImpl(value);
return result;
}
}

public static class GraphQLDateCoercing implements Coercing<Object, Object> {
final DateFormat df;
Expand Down Expand Up @@ -328,111 +378,125 @@ public Object parseLiteral(Object input) {
};

public static class GraphQLSqlDateCoercing implements Coercing<Object, Object> {

@Override
public Object serialize(Object input) {
if (input instanceof String) {
return parseStringToDate((String) input);
} else if (input instanceof Date) {
return new java.sql.Date(((Date) input).getTime());
} else if (input instanceof Long) {
return new java.sql.Date(((Long) input).longValue());
} else if (input instanceof Integer) {
return new java.sql.Date(((Integer) input).longValue());
}
return null;
}
public Object serialize(Object input) {
if (input instanceof String) {
return parseStringToDate((String) input);
} else if (input instanceof Date) {
return new java.sql.Date(((Date) input).getTime());
} else if (input instanceof Long) {
return new java.sql.Date(((Long) input).longValue());
} else if (input instanceof Integer) {
return new java.sql.Date(((Integer) input).longValue());
}
return null;
}

@Override
public Object parseValue(Object input) {
return serialize(input);
}
public Object parseValue(Object input) {
return serialize(input);
}

@Override
public Object parseLiteral(Object input) {
if (input instanceof StringValue) {
return parseStringToDate(((StringValue) input).getValue());
} else if (input instanceof IntValue) {
BigInteger value = ((IntValue) input).getValue();
return new java.sql.Date(value.longValue());
}
return null;
}
public Object parseLiteral(Object input) {
if (input instanceof StringValue) {
return parseStringToDate(((StringValue) input).getValue());
} else if (input instanceof IntValue) {
BigInteger value = ((IntValue) input).getValue();
return new java.sql.Date(value.longValue());
}
return null;
}

private java.sql.Date parseStringToDate(String input) {
try {
return new java.sql.Date(DateFormat.getInstance().parse(input).getTime());
} catch (ParseException e) {
log.warn("Failed to parse SQL Date from input: " + input, e);
return null;
}
}
}
try {
return new java.sql.Date(DateFormat.getInstance().parse(input).getTime());
} catch (ParseException e) {
log.warn("Failed to parse SQL Date from input: " + input, e);
return null;
}
}
}

public static class GraphQLSqlTimestampCoercing implements Coercing<Object, Object> {

@Override
public Object serialize(Object input) {
if (input instanceof String) {
return parseStringToTimestamp((String) input);
} else if (input instanceof Date) {
return new java.sql.Timestamp(((Date) input).getTime());
} else if (input instanceof Long) {
return new java.sql.Timestamp(((Long) input).longValue());
} else if (input instanceof Integer) {
return new java.sql.Timestamp(((Integer) input).longValue());
}
return null;
}
public Object serialize(Object input) {
if (input instanceof String) {
return parseStringToTimestamp((String) input);
} else if (input instanceof Date) {
return new java.sql.Timestamp(((Date) input).getTime());
} else if (input instanceof Long) {
return new java.sql.Timestamp(((Long) input).longValue());
} else if (input instanceof Integer) {
return new java.sql.Timestamp(((Integer) input).longValue());
}
return null;
}

@Override
public Object parseValue(Object input) {
return serialize(input);
}
public Object parseValue(Object input) {
return serialize(input);
}

@Override
public Object parseLiteral(Object input) {
if (input instanceof StringValue) {
return parseStringToTimestamp(((StringValue) input).getValue());
} else if (input instanceof IntValue) {
BigInteger value = ((IntValue) input).getValue();
return new java.sql.Date(value.longValue());
}
return null;
}
public Object parseLiteral(Object input) {
if (input instanceof StringValue) {
return parseStringToTimestamp(((StringValue) input).getValue());
} else if (input instanceof IntValue) {
BigInteger value = ((IntValue) input).getValue();
return new java.sql.Date(value.longValue());
}
return null;
}

private java.sql.Timestamp parseStringToTimestamp(String input) {
try {
return new java.sql.Timestamp(DateFormat.getInstance().parse(input).getTime());
} catch (ParseException e) {
log.warn("Failed to parse Timestamp from input: " + input, e);
return null;
}
}
}
try {
return new java.sql.Timestamp(DateFormat.getInstance().parse(input).getTime());
} catch (ParseException e) {
log.warn("Failed to parse Timestamp from input: " + input, e);
return null;
}
}
}

public static class GraphQLLOBCoercing implements Coercing<Object, Object> {

@Override
public Object serialize(Object input) {
if (input.getClass() == byte[].class) {
return input;
}
return null;
}
public Object serialize(Object input) {
if (input.getClass() == byte[].class) {
return input;
}
return null;
}

@Override
public Object parseValue(Object input) {
if (input instanceof String) {
return parseStringToByteArray((String) input);
}
return null;
}
public Object parseValue(Object input) {
if (input instanceof String) {
return parseStringToByteArray((String) input);
}
return null;
}

@Override
public Object parseLiteral(Object input) {
if (input instanceof StringValue) {
return parseStringToByteArray(((StringValue) input).getValue());
}
return null;
}
public Object parseLiteral(Object input) {
if (input instanceof StringValue) {
return parseStringToByteArray(((StringValue) input).getValue());
}
return null;
}

private byte[] parseStringToByteArray(String input) {
try {
return input.getBytes(StandardCharsets.UTF_8);
} catch (IllegalArgumentException e) {
log.warn("Failed to parse byte[] from input: " + input, e);
return null;
}
}
}
try {
return input.getBytes(StandardCharsets.UTF_8);
} catch (IllegalArgumentException e) {
log.warn("Failed to parse byte[] from input: " + input, e);
return null;
}
}
}

public static class GraphQLObjectCoercing implements Coercing<Object, Object> {

@Override
Expand All @@ -447,17 +511,16 @@ public Object parseValue(Object input) {

@Override
public Object parseLiteral(Object input) {
return parseFieldValue((Value) input, Collections.emptyMap());
return parseFieldValue((Value) input, Collections.emptyMap());
}

//recursively parse the input into a Map
private Object parseFieldValue(Object value, Map<String, Object> variables) {
if (!(value instanceof Value)) {
throw new IllegalArgumentException(
"Expected AST type 'StringValue' but was '" + value + "'."
);
}

"Expected AST type 'StringValue' but was '" + value + "'.");
}

if (value instanceof StringValue) {
return ((StringValue) value).getValue();
}
Expand All @@ -477,27 +540,26 @@ private Object parseFieldValue(Object value, Map<String, Object> variables) {
return null;
}
if (value instanceof ArrayValue) {
List<Value> values = ((ArrayValue) value).getValues();
List<Value> values = ((ArrayValue) value).getValues();
return values.stream()
.map(v -> parseFieldValue(v, variables))
.collect(Collectors.toList());
.map(v -> parseFieldValue(v, variables))
.collect(Collectors.toList());
}
if (value instanceof ObjectValue) {
List<ObjectField> values = ((ObjectValue) value).getObjectFields();
List<ObjectField> values = ((ObjectValue) value).getObjectFields();
Map<String, Object> parsedValues = new LinkedHashMap<>();

values.forEach(field -> {
Object parsedValue = parseFieldValue(field.getValue(), variables);
parsedValues.put(field.getName(), parsedValue);
});
return parsedValues;
}

//Should never happen, as it would mean the variable was not replaced by the parser
throw new IllegalArgumentException("Unsupported scalar value type: " + value.getClass().getName());
}

}


}
16 changes: 0 additions & 16 deletions ...n/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,22 +195,6 @@ private Page extractPageArgument(DataFetchingEnvironment environment, Field fiel
Integer limit = pagex.get(GraphQLJpaSchemaBuilder.PAGE_LIMIT_PARAM_NAME);

return new Page(start, limit);

// ObjectValue paginationValues = (ObjectValue) paginationRequest.get().getValue();
//
// IntValue page = (IntValue) paginationValues.getObjectFields().stream()
// .filter(it -> GraphQLJpaSchemaBuilder.PAGE_START_PARAM_NAME.equals(it.getName()))
// .findFirst()
// .get()
// .getValue();
//
// IntValue size = (IntValue) paginationValues.getObjectFields().stream()
// .filter(it -> GraphQLJpaSchemaBuilder.PAGE_LIMIT_PARAM_NAME.equals(it.getName()))
// .findFirst()
// .get()
// .getValue();
//
// return new Page(page.getValue().intValue(), size.getValue().intValue());
}

return new Page(1, Integer.MAX_VALUE);
Expand Down
Loading