From 57086a815094e9a59281be2ec2ae2f866df992cc Mon Sep 17 00:00:00 2001 From: Bogdan Kobylynskyi <92bogdan@gmail.com> Date: Fri, 26 Mar 2021 18:05:08 -0500 Subject: [PATCH] Revert "Add ability to generate particular types as Java interfaces #606 (#610)" (#613) This reverts commit 994f6feef8589c4cbf2e6b35f74bcb239fd48c90. --- docs/codegen-options.md | 1 - gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 58694 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 - gradlew.bat | 192 ++++++++++-------- .../graphql/codegen/GraphQLCodegenMojo.java | 9 - .../graphql/codegen/GraphQLCodegen.java | 18 +- .../model/GraphQLCodegenConfiguration.java | 15 -- .../graphql/codegen/model/MappingConfig.java | 12 -- .../graphql/codegen/model/MappingContext.java | 5 - .../GraphQLCodegenTypesAsInterfacesTest.java | 83 -------- .../GraphQLCodegenTypesAsInterfacesTest.java | 84 -------- .../codegen/model/MappingConfigTest.java | 5 - .../GraphQLCodegenTypesAsInterfacesTest.java | 85 -------- .../Node.kt.txt | 10 - .../Profile.kt.txt | 13 -- .../QueryResolver.kt.txt | 13 -- .../User.kt.txt | 16 -- .../UserCurrentQueryResolver.kt.txt | 13 -- .../kt/types-as-interfaces/Order.kt.txt | 14 -- .../types-as-interfaces/QueryResolver.kt.txt | 13 -- .../kt/types-as-interfaces/User.kt.txt | 14 -- .../UserCurrentQueryResolver.kt.txt | 13 -- .../types-as-interfaces/UserResolver.kt.txt | 16 -- .../Node.scala.txt | 10 - .../Profile.scala.txt | 17 -- .../QueryResolver.scala.txt | 13 -- .../User.scala.txt | 18 -- .../UserCurrentQueryResolver.scala.txt | 13 -- .../scala/types-as-interfaces/Order.scala.txt | 16 -- .../QueryResolver.scala.txt | 13 -- .../scala/types-as-interfaces/User.scala.txt | 16 -- .../UserCurrentQueryResolver.scala.txt | 13 -- .../UserResolver.scala.txt | 17 -- .../Node.java.txt | 10 - .../Profile.java.txt | 67 ------ .../QueryResolver.java.txt | 12 -- .../User.java.txt | 18 -- .../UserCurrentQueryResolver.java.txt | 12 -- .../types-as-interfaces/Order.java.txt | 16 -- .../QueryResolver.java.txt | 12 -- .../types-as-interfaces/User.java.txt | 16 -- .../UserCurrentQueryResolver.java.txt | 12 -- .../types-as-interfaces/UserResolver.java.txt | 16 -- ...s-as-interfaces-extends-interface.graphqls | 26 --- .../schemas/types-as-interfaces.graphqls | 23 --- 46 files changed, 106 insertions(+), 928 deletions(-) delete mode 100644 src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTypesAsInterfacesTest.java delete mode 100644 src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenTypesAsInterfacesTest.java delete mode 100644 src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenTypesAsInterfacesTest.java delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Node.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Profile.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/QueryResolver.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/User.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/UserCurrentQueryResolver.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces/Order.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces/QueryResolver.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces/User.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces/UserCurrentQueryResolver.kt.txt delete mode 100644 src/test/resources/expected-classes/kt/types-as-interfaces/UserResolver.kt.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Node.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Profile.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/QueryResolver.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/User.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/UserCurrentQueryResolver.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces/Order.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces/QueryResolver.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces/User.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces/UserCurrentQueryResolver.scala.txt delete mode 100644 src/test/resources/expected-classes/scala/types-as-interfaces/UserResolver.scala.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces-extends-interface/Node.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces-extends-interface/Profile.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces-extends-interface/QueryResolver.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces-extends-interface/User.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces-extends-interface/UserCurrentQueryResolver.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces/Order.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces/QueryResolver.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces/User.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces/UserCurrentQueryResolver.java.txt delete mode 100644 src/test/resources/expected-classes/types-as-interfaces/UserResolver.java.txt delete mode 100644 src/test/resources/schemas/types-as-interfaces-extends-interface.graphqls delete mode 100644 src/test/resources/schemas/types-as-interfaces.graphqls diff --git a/docs/codegen-options.md b/docs/codegen-options.md index b86853c6..d678b3ad 100644 --- a/docs/codegen-options.md +++ b/docs/codegen-options.md @@ -54,7 +54,6 @@ See [DirectiveAnnotationsMapping](#option-directiveannotationsmapping)* | | `responseProjectionMaxDepth` | Integer | 3 | Sets max depth when use `all$()` which for facilitating the construction of projection automatically, the fields on all projections are provided when it be invoked. This is a global configuration, of course, you can use `all$(max)` to set for each method. For self recursive types, too big depth may result in a large number of returned data!| | `generatedLanguage` | Enum | GeneratedLanguage.JAVA | Choose which language you want to generate, Java,Scala,Kotlin were supported. Note that due to language features, there are slight differences in default values between languages.| | `generateModelOpenClasses` | Boolean | false | The class type of the generated model. If true, generate normal classes, else generate data classes. It only support in kotlin(```data class```) and scala(```case class```). Maybe we will consider to support Java ```record``` in the future.| -| `typesAsInterfaces` | Set(String) | Empty | Types that must generated as interfaces should be defined here in format: `TypeName` or `@directive`. E.g.: `User`, `@asInterface`. | ### Option `graphqlSchemas` diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..490fda8577df6c95960ba7077c43220e5bb2c0d9 100644 GIT binary patch delta 6251 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 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java b/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java index a71f45a9..b77bb9db 100644 --- a/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java +++ b/plugins/maven/graphql-java-codegen-maven-plugin/src/main/java/io/github/kobylynskyi/graphql/codegen/GraphQLCodegenMojo.java @@ -179,9 +179,6 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo @Parameter private String[] useObjectMapperForRequestSerialization; - @Parameter - private String[] typesAsInterfaces; - @Parameter(defaultValue = MappingConfigConstants.DEFAULT_RESPONSE_PROJECTION_MAX_DEPTH_STRING) private int responseProjectionMaxDepth; @@ -250,7 +247,6 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo mappingConfig.setParametrizedInputSuffix(parametrizedInputSuffix); mappingConfig.setResponseProjectionMaxDepth(responseProjectionMaxDepth); mappingConfig.setUseObjectMapperForRequestSerialization(mapToHashSet(useObjectMapperForRequestSerialization)); - mappingConfig.setTypesAsInterfaces(mapToHashSet(typesAsInterfaces)); mappingConfig.setResolverParentInterface(getResolverParentInterface()); mappingConfig.setQueryResolverParentInterface(getQueryResolverParentInterface()); @@ -550,11 +546,6 @@ public class GraphQLCodegenMojo extends AbstractMojo implements GraphQLCodegenCo return mapToHashSet(useObjectMapperForRequestSerialization); } - @Override - public Set getTypesAsInterfaces() { - return mapToHashSet(typesAsInterfaces); - } - @Override public String getQueryResolverParentInterface() { return parentInterfaces.getQueryResolver(); diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java index 52c1e620..06ed30da 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/GraphQLCodegen.java @@ -454,22 +454,8 @@ public abstract class GraphQLCodegen { List generatedFiles = new ArrayList<>(); Map dataModel = dataModelMapperFactory.getTypeDefinitionMapper() .map(mappingContext, definition); - - boolean typeAsInterface = mappingConfig.getTypesAsInterfaces().contains(definition.getName()); - - if (!typeAsInterface) { - typeAsInterface = definition.getDirectiveNames().stream().anyMatch(directiveName -> - mappingConfig.getTypesAsInterfaces().contains("@" + directiveName) - ); - } - - if (typeAsInterface) { - generatedFiles.add(GraphQLCodegenFileCreator.generateFile(mappingContext, - FreeMarkerTemplateType.INTERFACE, dataModel, outputDir)); - } else { - generatedFiles.add(GraphQLCodegenFileCreator.generateFile(mappingContext, - FreeMarkerTemplateType.TYPE, dataModel, outputDir)); - } + generatedFiles.add(GraphQLCodegenFileCreator.generateFile(mappingContext, + FreeMarkerTemplateType.TYPE, dataModel, outputDir)); if (Boolean.TRUE.equals(mappingConfig.getGenerateClient())) { Map responseProjDataModel = dataModelMapperFactory.getRequestResponseDefinitionMapper() diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java index 8bfaf68b..2095db19 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/GraphQLCodegenConfiguration.java @@ -401,21 +401,6 @@ public interface GraphQLCodegenConfiguration { */ Set getUseObjectMapperForRequestSerialization(); - /** - * Types that must generated as interfaces. - * - *

Values should be defined here in format: TypeName, @directive - * - *

E.g.: - *

    - *
  • {@code Person}
    • - *
  • {@code @asInterface}
    • - *
- * - * @return Set of types that should generated as interfaces. - */ - Set getTypesAsInterfaces(); - /** * Generate code with lang * diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java index e0b927b8..c1dab933 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingConfig.java @@ -73,8 +73,6 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable useObjectMapperForRequestSerialization = new HashSet<>(); - private Set typesAsInterfaces = new HashSet<>(); - private boolean generateModelOpenClasses; private GeneratedLanguage generatedLanguage; @@ -175,7 +173,6 @@ public class MappingConfig implements GraphQLCodegenConfiguration, Combinable getTypesAsInterfaces() { - return typesAsInterfaces; - } - - public void setTypesAsInterfaces(Set typesAsInterfaces) { - this.typesAsInterfaces = typesAsInterfaces; - } - @Override public GeneratedLanguage getGeneratedLanguage() { return generatedLanguage; diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java index 451e1c7b..2103de6c 100644 --- a/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java +++ b/src/main/java/com/kobylynskyi/graphql/codegen/model/MappingContext.java @@ -277,11 +277,6 @@ public class MappingContext implements GraphQLCodegenConfiguration { return config.getUseObjectMapperForRequestSerialization(); } - @Override - public Set getTypesAsInterfaces() { - return config.getTypesAsInterfaces(); - } - public ExtendedDocument getDocument() { return document; } diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTypesAsInterfacesTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTypesAsInterfacesTest.java deleted file mode 100644 index 91d063ec..00000000 --- a/src/test/java/com/kobylynskyi/graphql/codegen/GraphQLCodegenTypesAsInterfacesTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.kobylynskyi.graphql.codegen; - -import com.kobylynskyi.graphql.codegen.java.JavaGraphQLCodegen; -import com.kobylynskyi.graphql.codegen.model.MappingConfig; -import com.kobylynskyi.graphql.codegen.utils.Utils; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.Collections; -import java.util.HashSet; -import java.util.Objects; - -import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent; -import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName; -import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; - -class GraphQLCodegenTypesAsInterfacesTest { - - private final File outputBuildDir = new File("build/generated"); - private final File outputJavaClassesDir = new File("build/generated/com/github/graphql"); - private final MappingConfig mappingConfig = new MappingConfig(); - - @BeforeEach - void init() { - mappingConfig.setPackageName("com.github.graphql"); - mappingConfig.setFieldsWithResolvers(Collections.singleton("@customResolver")); - } - - @AfterEach - void cleanup() { - Utils.deleteDir(outputBuildDir); - } - - @Test - void generate_typesAsInterfaces() throws Exception { - mappingConfig.setTypesAsInterfaces(new HashSet<>(asList("@asInterface", "Order"))); - - new JavaGraphQLCodegen(singletonList("src/test/resources/schemas/types-as-interfaces.graphqls"), - outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate(); - - File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); - - assertSameTrimmedContent(new File("src/test/resources/expected-classes/types-as-interfaces/" + - "Order.java.txt"), getFileByName(files, "Order.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/types-as-interfaces/" + - "QueryResolver.java.txt"), getFileByName(files, "QueryResolver.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/types-as-interfaces/" + - "User.java.txt"), getFileByName(files, "User.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/types-as-interfaces/" + - "UserCurrentQueryResolver.java.txt"), getFileByName(files, "UserCurrentQueryResolver.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/types-as-interfaces/" + - "UserResolver.java.txt"), getFileByName(files, "UserResolver.java")); - } - - @Test - void generate_typesAsInterfacesExtendsInterface() throws Exception { - mappingConfig.setTypesAsInterfaces(new HashSet<>(asList("@asInterface"))); - - new JavaGraphQLCodegen(singletonList("src/test/resources/schemas/" + - "types-as-interfaces-extends-interface.graphqls"), - outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate(); - - File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); - - assertSameTrimmedContent(new File("src/test/resources/expected-classes/" + - "types-as-interfaces-extends-interface/Node.java.txt"), getFileByName(files, "Node.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/" + - "types-as-interfaces-extends-interface/Profile.java.txt"), - getFileByName(files, "Profile.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/" + - "types-as-interfaces-extends-interface/QueryResolver.java.txt"), - getFileByName(files, "QueryResolver.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/" + - "types-as-interfaces-extends-interface/User.java.txt"), getFileByName(files, "User.java")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/" + - "types-as-interfaces-extends-interface/UserCurrentQueryResolver.java.txt"), - getFileByName(files, "UserCurrentQueryResolver.java")); - } - -} diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenTypesAsInterfacesTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenTypesAsInterfacesTest.java deleted file mode 100644 index 94393542..00000000 --- a/src/test/java/com/kobylynskyi/graphql/codegen/kotlin/GraphQLCodegenTypesAsInterfacesTest.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.kobylynskyi.graphql.codegen.kotlin; - -import com.kobylynskyi.graphql.codegen.TestUtils; -import com.kobylynskyi.graphql.codegen.model.GeneratedLanguage; -import com.kobylynskyi.graphql.codegen.model.MappingConfig; -import com.kobylynskyi.graphql.codegen.utils.Utils; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.Collections; -import java.util.HashSet; -import java.util.Objects; - -import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent; -import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName; -import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; - -class GraphQLCodegenTypesAsInterfacesTest { - - private final File outputBuildDir = new File("build/generated"); - private final File outputJavaClassesDir = new File("build/generated/com/github/graphql"); - private final MappingConfig mappingConfig = new MappingConfig(); - - @BeforeEach - void init() { - mappingConfig.setPackageName("com.github.graphql"); - mappingConfig.setFieldsWithResolvers(Collections.singleton("@customResolver")); - mappingConfig.setGeneratedLanguage(GeneratedLanguage.KOTLIN); - } - - @AfterEach - void cleanup() { - Utils.deleteDir(outputBuildDir); - } - - @Test - void generate_typesAsInterfaces() throws Exception { - mappingConfig.setTypesAsInterfaces(new HashSet<>(asList("@asInterface", "Order"))); - - new KotlinGraphQLCodegen(singletonList("src/test/resources/schemas/types-as-interfaces.graphqls"), - outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate(); - - File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); - - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/types-as-interfaces/" + - "Order.kt.txt"), getFileByName(files, "Order.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/types-as-interfaces/" + - "QueryResolver.kt.txt"), getFileByName(files, "QueryResolver.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/types-as-interfaces/" + - "User.kt.txt"), getFileByName(files, "User.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/types-as-interfaces/" + - "UserCurrentQueryResolver.kt.txt"), getFileByName(files, "UserCurrentQueryResolver.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/types-as-interfaces/" + - "UserResolver.kt.txt"), getFileByName(files, "UserResolver.kt")); - } - - @Test - void generate_typesAsInterfacesExtendsInterface() throws Exception { - mappingConfig.setTypesAsInterfaces(new HashSet<>(asList("@asInterface"))); - - new KotlinGraphQLCodegen(singletonList("src/test/resources/schemas/" + - "types-as-interfaces-extends-interface.graphqls"), - outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate(); - - File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); - - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/" + - "types-as-interfaces-extends-interface/Node.kt.txt"), getFileByName(files, "Node.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/" + - "types-as-interfaces-extends-interface/Profile.kt.txt"), getFileByName(files, "Profile.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/" + - "types-as-interfaces-extends-interface/QueryResolver.kt.txt"), - getFileByName(files, "QueryResolver.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/" + - "types-as-interfaces-extends-interface/User.kt.txt"), getFileByName(files, "User.kt")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/kt/" + - "types-as-interfaces-extends-interface/UserCurrentQueryResolver.kt.txt"), - getFileByName(files, "UserCurrentQueryResolver.kt")); - } - -} 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 70695a1d..61baead9 100644 --- a/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java +++ b/src/test/java/com/kobylynskyi/graphql/codegen/model/MappingConfigTest.java @@ -61,7 +61,6 @@ class MappingConfigTest { config.setParametrizedInputSuffix("9"); config.setTypeResolverPrefix("11"); config.setTypeResolverSuffix("12"); - config.setTypesAsInterfaces(new HashSet<>(singletonList("User"))); RelayConfig relayConfig = new RelayConfig(); relayConfig.setDirectiveArgumentName("key"); config.setRelayConfig(relayConfig); @@ -105,7 +104,6 @@ class MappingConfigTest { config.setParametrizedInputSuffix("99"); config.setTypeResolverPrefix("1111"); config.setTypeResolverSuffix("1212"); - config.setTypesAsInterfaces(new HashSet<>(singletonList("User2"))); RelayConfig relayConfig = new RelayConfig(); relayConfig.setDirectiveArgumentName("for"); config.setRelayConfig(relayConfig); @@ -221,7 +219,6 @@ class MappingConfigTest { assertEquals("11", mappingConfig.getTypeResolverPrefix()); assertEquals("12", mappingConfig.getTypeResolverSuffix()); assertEquals("key", mappingConfig.getRelayConfig().getDirectiveArgumentName()); - assertEquals(singleton("User"), mappingConfig.getTypesAsInterfaces()); } @Test @@ -265,7 +262,6 @@ class MappingConfigTest { assertEquals("11", mappingConfig.getTypeResolverPrefix()); assertEquals("12", mappingConfig.getTypeResolverSuffix()); assertEquals("key", mappingConfig.getRelayConfig().getDirectiveArgumentName()); - assertEquals(singleton("User"), mappingConfig.getTypesAsInterfaces()); } @Test @@ -314,7 +310,6 @@ class MappingConfigTest { assertEquals("1111", mappingConfig.getTypeResolverPrefix()); assertEquals("1212", mappingConfig.getTypeResolverSuffix()); assertEquals("for", mappingConfig.getRelayConfig().getDirectiveArgumentName()); - assertEquals(new HashSet<>(Arrays.asList("User", "User2")), mappingConfig.getTypesAsInterfaces()); } } diff --git a/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenTypesAsInterfacesTest.java b/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenTypesAsInterfacesTest.java deleted file mode 100644 index 5461f615..00000000 --- a/src/test/java/com/kobylynskyi/graphql/codegen/scala/GraphQLCodegenTypesAsInterfacesTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.kobylynskyi.graphql.codegen.scala; - -import com.kobylynskyi.graphql.codegen.TestUtils; -import com.kobylynskyi.graphql.codegen.model.GeneratedLanguage; -import com.kobylynskyi.graphql.codegen.model.MappingConfig; -import com.kobylynskyi.graphql.codegen.utils.Utils; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.io.File; -import java.util.Collections; -import java.util.HashSet; -import java.util.Objects; - -import static com.kobylynskyi.graphql.codegen.TestUtils.assertSameTrimmedContent; -import static com.kobylynskyi.graphql.codegen.TestUtils.getFileByName; -import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; - -class GraphQLCodegenTypesAsInterfacesTest { - - private final File outputBuildDir = new File("build/generated"); - private final File outputJavaClassesDir = new File("build/generated/com/github/graphql"); - private final MappingConfig mappingConfig = new MappingConfig(); - - @BeforeEach - void init() { - mappingConfig.setPackageName("com.github.graphql"); - mappingConfig.setFieldsWithResolvers(Collections.singleton("@customResolver")); - mappingConfig.setGeneratedLanguage(GeneratedLanguage.SCALA); - } - - @AfterEach - void cleanup() { - Utils.deleteDir(outputBuildDir); - } - - @Test - void generate_typeAsInterface() throws Exception { - mappingConfig.setTypesAsInterfaces(new HashSet<>(asList("@asInterface", "Order"))); - - new ScalaGraphQLCodegen(singletonList("src/test/resources/schemas/types-as-interfaces.graphqls"), - outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate(); - - File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); - - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/types-as-interfaces/" + - "Order.scala.txt"), getFileByName(files, "Order.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/types-as-interfaces/" + - "QueryResolver.scala.txt"), getFileByName(files, "QueryResolver.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/types-as-interfaces/" + - "User.scala.txt"), getFileByName(files, "User.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/types-as-interfaces/" + - "UserCurrentQueryResolver.scala.txt"), getFileByName(files, "UserCurrentQueryResolver.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/types-as-interfaces/" + - "UserResolver.scala.txt"), getFileByName(files, "UserResolver.scala")); - } - - @Test - void generate_typeAsInterfaceExtendsInterface() throws Exception { - mappingConfig.setTypesAsInterfaces(new HashSet<>(asList("@asInterface"))); - - new ScalaGraphQLCodegen(singletonList("src/test/resources/schemas/" + - "types-as-interfaces-extends-interface.graphqls"), - outputBuildDir, mappingConfig, TestUtils.getStaticGeneratedInfo()).generate(); - - File[] files = Objects.requireNonNull(outputJavaClassesDir.listFiles()); - - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/" + - "types-as-interfaces-extends-interface/Node.scala.txt"), getFileByName(files, "Node.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/" + - "types-as-interfaces-extends-interface/Profile.scala.txt"), - getFileByName(files, "Profile.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/" + - "types-as-interfaces-extends-interface/QueryResolver.scala.txt"), - getFileByName(files, "QueryResolver.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/" + - "types-as-interfaces-extends-interface/User.scala.txt"), getFileByName(files, "User.scala")); - assertSameTrimmedContent(new File("src/test/resources/expected-classes/scala/" + - "types-as-interfaces-extends-interface/UserCurrentQueryResolver.scala.txt"), - getFileByName(files, "UserCurrentQueryResolver.scala")); - } - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Node.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Node.kt.txt deleted file mode 100644 index dc35ca72..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Node.kt.txt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface Node { - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Profile.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Profile.kt.txt deleted file mode 100644 index 97e5b9d5..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/Profile.kt.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -data class Profile( - val firstName: String, - val lastName: String -) { - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/QueryResolver.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/QueryResolver.kt.txt deleted file mode 100644 index 907e1761..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/QueryResolver.kt.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface QueryResolver { - - @Throws(Exception::class) - fun userCurrent(): User? - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/User.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/User.kt.txt deleted file mode 100644 index c58f5bd7..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/User.kt.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface User : Node { - - val username: String - - val email: String - - val profile: Profile? - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/UserCurrentQueryResolver.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/UserCurrentQueryResolver.kt.txt deleted file mode 100644 index ce686163..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces-extends-interface/UserCurrentQueryResolver.kt.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface UserCurrentQueryResolver { - - @Throws(Exception::class) - fun userCurrent(): User? - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces/Order.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces/Order.kt.txt deleted file mode 100644 index d2578938..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces/Order.kt.txt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface Order { - - val number: String - - val price: String - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces/QueryResolver.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces/QueryResolver.kt.txt deleted file mode 100644 index 907e1761..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces/QueryResolver.kt.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface QueryResolver { - - @Throws(Exception::class) - fun userCurrent(): User? - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces/User.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces/User.kt.txt deleted file mode 100644 index f756535c..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces/User.kt.txt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface User { - - val username: String - - val email: String - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces/UserCurrentQueryResolver.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces/UserCurrentQueryResolver.kt.txt deleted file mode 100644 index ce686163..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces/UserCurrentQueryResolver.kt.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface UserCurrentQueryResolver { - - @Throws(Exception::class) - fun userCurrent(): User? - -} diff --git a/src/test/resources/expected-classes/kt/types-as-interfaces/UserResolver.kt.txt b/src/test/resources/expected-classes/kt/types-as-interfaces/UserResolver.kt.txt deleted file mode 100644 index 1c81e40e..00000000 --- a/src/test/resources/expected-classes/kt/types-as-interfaces/UserResolver.kt.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql - - -/** - * Resolver for User - */ -@javax.annotation.Generated( - value = ["com.kobylynskyi.graphql.codegen.GraphQLCodegen"], - date = "2020-12-31T23:59:59-0500" -) -interface UserResolver { - - @Throws(Exception::class) - fun orders(user: User): List - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Node.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Node.scala.txt deleted file mode 100644 index ff924075..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Node.scala.txt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait Node { - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Profile.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Profile.scala.txt deleted file mode 100644 index 9fab5411..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/Profile.scala.txt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.graphql - -import scala.collection.JavaConverters._ - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -case class Profile( - @javax.validation.constraints.NotNull - firstName: String, - @javax.validation.constraints.NotNull - lastName: String -) { - -} - diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/QueryResolver.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/QueryResolver.scala.txt deleted file mode 100644 index f6c3a7eb..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/QueryResolver.scala.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait QueryResolver { - - @throws[Exception] - def userCurrent(): User - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/User.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/User.scala.txt deleted file mode 100644 index 392a9cf7..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/User.scala.txt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait User extends Node { - - @javax.validation.constraints.NotNull - val username: String - - @javax.validation.constraints.NotNull - val email: String - - val profile: Profile - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/UserCurrentQueryResolver.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/UserCurrentQueryResolver.scala.txt deleted file mode 100644 index 5d5ad4bb..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces-extends-interface/UserCurrentQueryResolver.scala.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait UserCurrentQueryResolver { - - @throws[Exception] - def userCurrent(): User - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces/Order.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces/Order.scala.txt deleted file mode 100644 index 81938ce2..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces/Order.scala.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait Order { - - @javax.validation.constraints.NotNull - val number: String - - @javax.validation.constraints.NotNull - val price: String - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces/QueryResolver.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces/QueryResolver.scala.txt deleted file mode 100644 index f6c3a7eb..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces/QueryResolver.scala.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait QueryResolver { - - @throws[Exception] - def userCurrent(): User - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces/User.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces/User.scala.txt deleted file mode 100644 index a20e2cad..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces/User.scala.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait User { - - @javax.validation.constraints.NotNull - val username: String - - @javax.validation.constraints.NotNull - val email: String - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces/UserCurrentQueryResolver.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces/UserCurrentQueryResolver.scala.txt deleted file mode 100644 index 5d5ad4bb..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces/UserCurrentQueryResolver.scala.txt +++ /dev/null @@ -1,13 +0,0 @@ -package com.github.graphql - - -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait UserCurrentQueryResolver { - - @throws[Exception] - def userCurrent(): User - -} diff --git a/src/test/resources/expected-classes/scala/types-as-interfaces/UserResolver.scala.txt b/src/test/resources/expected-classes/scala/types-as-interfaces/UserResolver.scala.txt deleted file mode 100644 index ed31fa31..00000000 --- a/src/test/resources/expected-classes/scala/types-as-interfaces/UserResolver.scala.txt +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.graphql - - -/** - * Resolver for User - */ -@javax.annotation.Generated( - value = Array("com.kobylynskyi.graphql.codegen.GraphQLCodegen"), - date = "2020-12-31T23:59:59-0500" -) -trait UserResolver { - - @javax.validation.constraints.NotNull - @throws[Exception] - def orders(user: User): scala.Seq[Order] - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/Node.java.txt b/src/test/resources/expected-classes/types-as-interfaces-extends-interface/Node.java.txt deleted file mode 100644 index eed3f6d8..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/Node.java.txt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface Node { - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/Profile.java.txt b/src/test/resources/expected-classes/types-as-interfaces-extends-interface/Profile.java.txt deleted file mode 100644 index 8aae6800..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/Profile.java.txt +++ /dev/null @@ -1,67 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public class Profile implements java.io.Serializable { - - @javax.validation.constraints.NotNull - private String firstName; - @javax.validation.constraints.NotNull - private String lastName; - - public Profile() { - } - - public Profile(String firstName, String lastName) { - this.firstName = firstName; - this.lastName = lastName; - } - - public String getFirstName() { - return firstName; - } - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - public void setLastName(String lastName) { - this.lastName = lastName; - } - - - - public static Profile.Builder builder() { - return new Profile.Builder(); - } - - public static class Builder { - - private String firstName; - private String lastName; - - public Builder() { - } - - public Builder setFirstName(String firstName) { - this.firstName = firstName; - return this; - } - - public Builder setLastName(String lastName) { - this.lastName = lastName; - return this; - } - - - public Profile build() { - return new Profile(firstName, lastName); - } - - } -} diff --git a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/QueryResolver.java.txt b/src/test/resources/expected-classes/types-as-interfaces-extends-interface/QueryResolver.java.txt deleted file mode 100644 index 7986e7c1..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/QueryResolver.java.txt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface QueryResolver { - - User userCurrent() throws Exception; - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/User.java.txt b/src/test/resources/expected-classes/types-as-interfaces-extends-interface/User.java.txt deleted file mode 100644 index 1d2c739d..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/User.java.txt +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface User extends Node{ - - @javax.validation.constraints.NotNull - String getUsername(); - - @javax.validation.constraints.NotNull - String getEmail(); - - Profile getProfile(); - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/UserCurrentQueryResolver.java.txt b/src/test/resources/expected-classes/types-as-interfaces-extends-interface/UserCurrentQueryResolver.java.txt deleted file mode 100644 index 1474859b..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces-extends-interface/UserCurrentQueryResolver.java.txt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface UserCurrentQueryResolver { - - User userCurrent() throws Exception; - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces/Order.java.txt b/src/test/resources/expected-classes/types-as-interfaces/Order.java.txt deleted file mode 100644 index 6f510209..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces/Order.java.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface Order { - - @javax.validation.constraints.NotNull - String getNumber(); - - @javax.validation.constraints.NotNull - String getPrice(); - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces/QueryResolver.java.txt b/src/test/resources/expected-classes/types-as-interfaces/QueryResolver.java.txt deleted file mode 100644 index 7986e7c1..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces/QueryResolver.java.txt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface QueryResolver { - - User userCurrent() throws Exception; - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces/User.java.txt b/src/test/resources/expected-classes/types-as-interfaces/User.java.txt deleted file mode 100644 index a3798af5..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces/User.java.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface User { - - @javax.validation.constraints.NotNull - String getUsername(); - - @javax.validation.constraints.NotNull - String getEmail(); - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces/UserCurrentQueryResolver.java.txt b/src/test/resources/expected-classes/types-as-interfaces/UserCurrentQueryResolver.java.txt deleted file mode 100644 index 1474859b..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces/UserCurrentQueryResolver.java.txt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.graphql; - - -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface UserCurrentQueryResolver { - - User userCurrent() throws Exception; - -} diff --git a/src/test/resources/expected-classes/types-as-interfaces/UserResolver.java.txt b/src/test/resources/expected-classes/types-as-interfaces/UserResolver.java.txt deleted file mode 100644 index d5cd672b..00000000 --- a/src/test/resources/expected-classes/types-as-interfaces/UserResolver.java.txt +++ /dev/null @@ -1,16 +0,0 @@ -package com.github.graphql; - - -/** - * Resolver for User - */ -@javax.annotation.Generated( - value = "com.kobylynskyi.graphql.codegen.GraphQLCodegen", - date = "2020-12-31T23:59:59-0500" -) -public interface UserResolver { - - @javax.validation.constraints.NotNull - java.util.List orders(User user) throws Exception; - -} diff --git a/src/test/resources/schemas/types-as-interfaces-extends-interface.graphqls b/src/test/resources/schemas/types-as-interfaces-extends-interface.graphqls deleted file mode 100644 index c4906c39..00000000 --- a/src/test/resources/schemas/types-as-interfaces-extends-interface.graphqls +++ /dev/null @@ -1,26 +0,0 @@ -# A GraphQL schema provides a root type for each kind of operation. -schema { - # The query root. - query: Query -} - -type Query { - userCurrent: User -} - -type User implements Node @asInterface { - username: String! - email: String! - profile: Profile -} - -type Profile { - firstName: String! - lastName: String! -} - -interface Node { -} - -directive @customResolver on FIELD_DEFINITION -directive @asInterface on OBJECT diff --git a/src/test/resources/schemas/types-as-interfaces.graphqls b/src/test/resources/schemas/types-as-interfaces.graphqls deleted file mode 100644 index 9b71d421..00000000 --- a/src/test/resources/schemas/types-as-interfaces.graphqls +++ /dev/null @@ -1,23 +0,0 @@ -# A GraphQL schema provides a root type for each kind of operation. -schema { - # The query root. - query: Query -} - -type Query { - userCurrent: User -} - -type User @asInterface { - username: String! - email: String! - orders: [Order!]! @customResolver -} - -type Order { - number: String! - price: String! -} - -directive @customResolver on FIELD_DEFINITION -directive @asInterface on OBJECT -- GitLab