diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java index fe7b61628..c711d5c34 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java @@ -20,8 +20,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; @@ -90,38 +93,45 @@ protected GraphQLCodegen(List schemas, initDefaultValues(mappingConfig); validateConfigs(mappingConfig); - sanitizeValues(mappingConfig); + sanitize(mappingConfig); } - private static void sanitizeValues(MappingConfig mappingConfig) { + private static void sanitize(MappingConfig mappingConfig) { mappingConfig.setModelValidationAnnotation( Utils.replaceLeadingAtSign(mappingConfig.getModelValidationAnnotation())); - - if (mappingConfig.getResolverArgumentAnnotations() != null) { - mappingConfig.setResolverArgumentAnnotations(mappingConfig.getResolverArgumentAnnotations().stream() - .map(Utils::replaceLeadingAtSign).collect(Collectors.toSet())); + mappingConfig.setResolverArgumentAnnotations(sanitizeSet(mappingConfig.getResolverArgumentAnnotations())); + mappingConfig.setParametrizedResolverAnnotations( + sanitizeSet(mappingConfig.getParametrizedResolverAnnotations())); + mappingConfig.setCustomAnnotationsMapping(sanitizeMap(mappingConfig.getCustomAnnotationsMapping())); + mappingConfig.setDirectiveAnnotationsMapping(sanitizeMap(mappingConfig.getDirectiveAnnotationsMapping())); + if (mappingConfig.getCustomTypesMapping() != null) { + mappingConfig.setCustomTypesMapping(new HashMap<>(mappingConfig.getCustomTypesMapping())); } - if (mappingConfig.getParametrizedResolverAnnotations() != null) { - mappingConfig.setParametrizedResolverAnnotations(mappingConfig.getParametrizedResolverAnnotations().stream() - .map(Utils::replaceLeadingAtSign).collect(Collectors.toSet())); + if (mappingConfig.getCustomTemplates() != null) { + mappingConfig.setCustomTemplates(new HashMap<>(mappingConfig.getCustomTemplates())); } + } - Map> customAnnotationsMapping = mappingConfig.getCustomAnnotationsMapping(); - if (customAnnotationsMapping != null) { - for (Map.Entry> entry : customAnnotationsMapping.entrySet()) { - if (entry.getValue() != null) { - entry.setValue(entry.getValue().stream().map(Utils::replaceLeadingAtSign).collect(toList())); - } - } + private static Set sanitizeSet(Set originalSet) { + if (originalSet == null) { + return new HashSet<>(); + } + return originalSet.stream().map(Utils::replaceLeadingAtSign).collect(Collectors.toSet()); + } + + private static Map> sanitizeMap(Map> multiValueMap) { + if (multiValueMap == null) { + return new HashMap<>(); } - Map> directiveAnnotationsMapping = mappingConfig.getDirectiveAnnotationsMapping(); - if (directiveAnnotationsMapping != null) { - for (Map.Entry> entry : directiveAnnotationsMapping.entrySet()) { - if (entry.getValue() != null) { - entry.setValue(entry.getValue().stream().map(Utils::replaceLeadingAtSign).collect(toList())); - } + Map> sanitizedMultiValueMap = new HashMap<>(multiValueMap.size()); + for (Map.Entry> entry : multiValueMap.entrySet()) { + List sanitizedValues = null; + if (entry.getValue() != null) { + sanitizedValues = entry.getValue().stream().map(Utils::replaceLeadingAtSign).collect(toList()); } + sanitizedMultiValueMap.put(entry.getKey(), sanitizedValues); } + return sanitizedMultiValueMap; } protected void initDefaultValues(MappingConfig mappingConfig) { diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java index 3da5bd337..5c2b6329e 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenAnnotationsTest.java @@ -46,11 +46,10 @@ void cleanup() { @Test void generate_CustomAnnotationMappings() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>( - singletonMap("Event.createdDateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Event.createdDateTime", + mappingConfig.setCustomTypesMapping(singletonMap("Event.createdDateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Event.createdDateTime", singletonList("@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -63,10 +62,10 @@ void generate_CustomAnnotationMappings() throws Exception { @Test void generate_CustomAnnotationMappings_Type() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("DateTime", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("DateTime", singletonList("com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -92,10 +91,10 @@ void generate_CustomAnnotationMappings_Input() throws Exception { @Test void generate_CustomAnnotationMappings_Regexp() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Date.*", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Date.*", singletonList("com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -108,10 +107,10 @@ void generate_CustomAnnotationMappings_Regexp() throws Exception { @Test void generate_CustomAnnotationMappings_FieldType() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Event.createdDateTime", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Event.createdDateTime", singletonList("@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -124,10 +123,10 @@ void generate_CustomAnnotationMappings_FieldType() throws Exception { @Test void generate_CustomAnnotationMappings_FieldType_Regexp() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Event..*Date.*", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Event..*Date.*", singletonList("@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenCustomScalarMappingTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenCustomScalarMappingTest.java index 9a6654278..978f529a8 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenCustomScalarMappingTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenCustomScalarMappingTest.java @@ -38,7 +38,7 @@ void cleanup() { @Test void generate_CustomTypeMapping_WholeScalar() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("ZonedDateTime", "String"))); + mappingConfig.setCustomTypesMapping(singletonMap("ZonedDateTime", "String")); generate("src/test/resources/schemas/date-scalar.graphqls"); @@ -74,7 +74,7 @@ void generate_CustomTypeMapping_ScalarOnQueryOnly() throws Exception { @Test void generate_CustomTypeMapping_ForExtensionProperty() throws Exception { mappingConfig.setGenerateExtensionFieldsResolvers(true); - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("External", "com.example.External"))); + mappingConfig.setCustomTypesMapping(singletonMap("External", "com.example.External")); mappingConfig.setGenerateClient(false); generate("src/test/resources/schemas/external-type-extend.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenDefaultsTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenDefaultsTest.java index f8df4d969..470c818d2 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenDefaultsTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenDefaultsTest.java @@ -10,7 +10,6 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -87,7 +86,7 @@ void generate_CheckFiles_WithPrefixSuffix() throws Exception { @Test void generate_CheckFiles_OnLongDefault() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("Long", "java.lang.Long"))); + mappingConfig.setCustomTypesMapping(singletonMap("Long", "java.lang.Long")); mappingConfig.setModelNameSuffix("DTO"); generate("src/test/resources/schemas/defaults-with-Long.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenOptionalTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenOptionalTest.java index da31a5d93..ffd11d7ed 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenOptionalTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenOptionalTest.java @@ -12,13 +12,12 @@ import java.io.File; import java.io.IOException; import java.nio.file.Paths; -import java.util.Collections; -import java.util.HashMap; import java.util.Objects; import static com.kobylynskyi.graphql.codegen.TestUtils.assertFileContainsElements; import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent; import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName; +import static java.util.Collections.singletonMap; @ExtendWith(MaxQueryTokensExtension.class) class GraphQLCodegenOptionalTest { @@ -106,7 +105,7 @@ void generate_OptionalFieldInInterfaceAndMandatoryInType() throws Exception { */ @Test void generate_ObjectsInsteadOfPrimitives() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(Collections.singletonMap("Int!", "Integer"))); + mappingConfig.setCustomTypesMapping(singletonMap("Int!", "Integer")); schemaFinder.setIncludePattern("optional-vs-mandatory-types.graphqls"); generate(); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java index 29d02cd1a..7dde0c851 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTest.java @@ -14,7 +14,6 @@ import java.io.IOException; import java.nio.file.NoSuchFileException; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -93,7 +92,7 @@ void generate_NoBuilder() throws Exception { @Test void generate_CustomMappings() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "java.util.Date"))); + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "java.util.Date")); generate("src/test/resources/schemas/test.graphqls"); @@ -103,8 +102,7 @@ void generate_CustomMappings() throws Exception { @Test void generate_CustomMappings_Nested() throws Exception { - mappingConfig - .setCustomTypesMapping(new HashMap<>(singletonMap("EventProperty.intVal", "java.math.BigInteger"))); + mappingConfig.setCustomTypesMapping(singletonMap("EventProperty.intVal", "java.math.BigInteger")); generate("src/test/resources/schemas/test.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenAnnotationsTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenAnnotationsTest.java index fa86b3c28..6b47f9e34 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenAnnotationsTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenAnnotationsTest.java @@ -12,7 +12,6 @@ import java.io.File; import java.io.IOException; -import java.util.HashMap; import java.util.Objects; import static com.kobylynskyi.graphql.codegen.TestUtils.assertFileContainsElements; @@ -43,11 +42,10 @@ void cleanup() { @Test void generate_CustomAnnotationMappings() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>( - singletonMap("Event.createdDateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Event.createdDateTime", + mappingConfig.setCustomTypesMapping(singletonMap("Event.createdDateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Event.createdDateTime", singletonList("@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -60,10 +58,10 @@ void generate_CustomAnnotationMappings() throws Exception { @Test void generate_CustomAnnotationMappings_Type() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("DateTime", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("DateTime", singletonList("com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -76,8 +74,8 @@ void generate_CustomAnnotationMappings_Type() throws Exception { @Test void generate_CustomAnnotationMappings_Input() throws Exception { - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("ReproInput.reproField", - singletonList("@com.fasterxml.jackson.annotation.JsonProperty(\"reproField\")")))); + mappingConfig.setCustomAnnotationsMapping(singletonMap("ReproInput.reproField", + singletonList("@com.fasterxml.jackson.annotation.JsonProperty(\"reproField\")"))); generate("src/test/resources/schemas/input.graphqls"); @@ -89,10 +87,10 @@ void generate_CustomAnnotationMappings_Input() throws Exception { @Test void generate_CustomAnnotationMappings_Regexp() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Date.*", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Date.*", singletonList("com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -105,10 +103,10 @@ void generate_CustomAnnotationMappings_Regexp() throws Exception { @Test void generate_CustomAnnotationMappings_FieldType() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("DateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Event.createdDateTime", + mappingConfig.setCustomTypesMapping(singletonMap("DateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Event.createdDateTime", singletonList("@com.fasterxml.jackson.databind.annotation.JsonDeserialize(" + - "using = com.example.json.DateTimeScalarDeserializer.class)")))); + "using = com.example.json.DateTimeScalarDeserializer.class)"))); generate("src/test/resources/schemas/test.graphqls"); @@ -121,10 +119,9 @@ void generate_CustomAnnotationMappings_FieldType() throws Exception { @Test void generate_CustomAnnotationMappings_With_Annotations() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>( - singletonMap("CAMS", "com.intuit.identity.manage.enum.CamsGroup::class"))); - mappingConfig.setDirectiveAnnotationsMapping(new HashMap<>(singletonMap("NotNull", - singletonList("@javax.validation.constraints.NotNull(message = {{message}}, groups = {{groups}})")))); + mappingConfig.setCustomTypesMapping(singletonMap("CAMS", "com.intuit.identity.manage.enum.CamsGroup::class")); + mappingConfig.setDirectiveAnnotationsMapping(singletonMap("NotNull", + singletonList("@javax.validation.constraints.NotNull(message = {{message}}, groups = {{groups}})"))); generate("src/test/resources/schemas/kt/customTypesMapping-directive.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenCustomScalarMappingTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenCustomScalarMappingTest.java index 8277ee1b7..d1e9155a0 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenCustomScalarMappingTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenCustomScalarMappingTest.java @@ -42,7 +42,7 @@ void cleanup() { @Test void generate_CustomTypeMapping_WholeScalar() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("ZonedDateTime", "String"))); + mappingConfig.setCustomTypesMapping(singletonMap("ZonedDateTime", "String")); generate("src/test/resources/schemas/date-scalar.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenNullableTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenNullableTest.java index 6b60f632b..4ef05967d 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenNullableTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenNullableTest.java @@ -12,7 +12,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Paths; -import java.util.HashMap; import java.util.Objects; import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent; @@ -117,7 +116,7 @@ void generate_OptionalFieldInInterfaceAndMandatoryInType() throws Exception { void generate_NullableCustomTypeWithApiReturnType() throws Exception { mappingConfig.setGenerateApis(true); mappingConfig.setApiReturnType("reactor.core.publisher.Mono"); - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("ZonedDateTime", "String"))); + mappingConfig.setCustomTypesMapping(singletonMap("ZonedDateTime", "String")); schemaFinder.setIncludePattern("nullable-custom-type-with-api-return-type.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java index 786ee9e92..9d07e7b80 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java @@ -26,9 +26,9 @@ private static Map hashMap(AbstractMap.SimpleEntry... private static MappingConfig buildMappingConfig() { MappingConfig config = new MappingConfig(); - config.setCustomTypesMapping(new HashMap<>(singletonMap("1", "2"))); - config.setCustomAnnotationsMapping(new HashMap<>(singletonMap("3", singletonList("4")))); - config.setDirectiveAnnotationsMapping(new HashMap<>(singletonMap("5", singletonList("6")))); + config.setCustomTypesMapping(singletonMap("1", "2")); + config.setCustomAnnotationsMapping(singletonMap("3", singletonList("4"))); + config.setDirectiveAnnotationsMapping(singletonMap("5", singletonList("6"))); config.setApiPackageName("ApiPackageName"); config.setGenerateBuilder(true); config.setGenerateApis(true); @@ -74,9 +74,9 @@ private static MappingConfig buildMappingConfig() { private static MappingConfig buildMappingConfig2() { MappingConfig config = new MappingConfig(); - config.setCustomTypesMapping(new HashMap<>(singletonMap("11", "22"))); - config.setCustomAnnotationsMapping(new HashMap<>(singletonMap("33", singletonList("44")))); - config.setDirectiveAnnotationsMapping(new HashMap<>(singletonMap("55", singletonList("66")))); + config.setCustomTypesMapping(singletonMap("11", "22")); + config.setCustomAnnotationsMapping(singletonMap("33", singletonList("44"))); + config.setDirectiveAnnotationsMapping(singletonMap("55", singletonList("66"))); config.setApiPackageName("ApiPackageName2"); config.setGenerateBuilder(false); config.setGenerateApis(false); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenAnnotationsTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenAnnotationsTest.java index 1230f47e4..c8c1e1d11 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenAnnotationsTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenAnnotationsTest.java @@ -47,14 +47,13 @@ void cleanup() { @Test void generate_CustomAnnotationMappings() throws Exception { - mappingConfig - .setCustomTypesMapping(new HashMap<>(singletonMap("Event.createdDateTime", "org.joda.time.DateTime"))); - mappingConfig.setCustomAnnotationsMapping(new HashMap<>(singletonMap("Event.createdDateTime", + mappingConfig.setCustomTypesMapping(singletonMap("Event.createdDateTime", "org.joda.time.DateTime")); + mappingConfig.setCustomAnnotationsMapping(singletonMap("Event.createdDateTime", singletonList( "@com.fasterxml.jackson.databind" + ".annotation.JsonDeserialize(using =" + " classOf[com.example.json" + - ".DateTimeScalarDeserializer])")))); + ".DateTimeScalarDeserializer])"))); generate("src/test/resources/schemas/test.graphqls"); diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenCustomScalarMappingTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenCustomScalarMappingTest.java index e62d04e98..b856135fe 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenCustomScalarMappingTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenCustomScalarMappingTest.java @@ -42,7 +42,7 @@ void cleanup() { @Test void generate_CustomTypeMapping_WholeScalar() throws Exception { - mappingConfig.setCustomTypesMapping(new HashMap<>(singletonMap("ZonedDateTime", "String"))); + mappingConfig.setCustomTypesMapping(singletonMap("ZonedDateTime", "String")); generate();