Skip to content
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

Jump to bottom

3.x: Remove duplicated methods from CustomScalars #9541

Merged
merged 1 commit into from
Nov 28, 2024
Merged

3.x: Remove duplicated methods from CustomScalars #9541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 3 additions & 37 deletions ...le/graphql/server/src/main/java/io/helidon/microprofile/graphql/server/CustomScalars.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2022 Oracle and/or its affiliates.
* Copyright (c) 2020, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -103,13 +103,13 @@ private CustomScalars() {
* An instance of a custom offset date/time scalar (with default formatting).
*/
static final GraphQLScalarType CUSTOM_OFFSET_DATE_TIME_SCALAR =
newOffsetDateTimeScalar(FORMATTED_OFFSET_DATETIME_SCALAR);
newDateTimeScalar(FORMATTED_OFFSET_DATETIME_SCALAR);

/**
* An instance of a custom offset date/time scalar (with default formatting).
*/
static final GraphQLScalarType CUSTOM_ZONED_DATE_TIME_SCALAR =
newZonedDateTimeScalar(FORMATTED_ZONED_DATETIME_SCALAR);
newDateTimeScalar(FORMATTED_ZONED_DATETIME_SCALAR);

/**
* An instance of a custom time scalar (with default formatting).
Expand Down Expand Up @@ -137,40 +137,6 @@ static GraphQLScalarType newDateTimeScalar(String name) {
.build();
}

/**
* Return a new custom offset date/time scalar.
*
* @param name the name of the scalar
* @return a new custom date/time scalar
*/
@SuppressWarnings("unchecked")
static GraphQLScalarType newOffsetDateTimeScalar(String name) {
GraphQLScalarType originalScalar = ExtendedScalars.DateTime;

return GraphQLScalarType.newScalar()
.coercing(new DateTimeCoercing())
.name(name)
.description("Custom: " + originalScalar.getDescription())
.build();
}

/**
* Return a new custom zoned date/time scalar.
*
* @param name the name of the scalar
* @return a new custom date/time scalar
*/
@SuppressWarnings("unchecked")
static GraphQLScalarType newZonedDateTimeScalar(String name) {
GraphQLScalarType originalScalar = ExtendedScalars.DateTime;

return GraphQLScalarType.newScalar()
.coercing(new DateTimeCoercing())
.name(name)
.description("Custom: " + originalScalar.getDescription())
.build();
}

/**
* Return a new custom time scalar.
*
Expand Down
Loading