Skip to content

Commit

Permalink
4.x: Remove duplicated methods from CustomScalars (#9474)
Browse files Browse the repository at this point in the history
  • Loading branch information
Captain1653 authored Nov 27, 2024
1 parent b5759b3 commit f192013
Showing 1 changed file with 3 additions and 37 deletions.
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

0 comments on commit f192013

Please sign in to comment.