From 32f356569d63921509aa9049d7724fe79f6db87c Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Sun, 8 Aug 2021 12:33:34 +0700 Subject: [PATCH] Task: Upgraded the dgs graphql to submodules and parent modules for extends projects --- .gitignore | 26 +++++- build.gradle.kts | 83 ++++++++----------- dgs-graphql/.gitignore | 37 +++++++++ dgs-graphql/build.gradle.kts | 44 ++++++++++ .../graphql/demo/GraphqlDemoApplication.kt | 0 .../graphql/demo/config/GraphQLConfig.kt | 0 .../graphql/demo/config/ManagementConfig.kt | 0 .../cubetiqs/graphql/demo/config/WebConfig.kt | 0 .../graphql/demo/config/WebSecurityConfig.kt | 23 +++++ .../graphql/demo/context/GMutation.kt | 0 .../cubetiqs/graphql/demo/context/GQuery.kt | 0 .../graphql/demo/context/GSubscription.kt | 0 .../graphql/demo/domain/AbstractEntity.kt | 0 .../graphql/demo/domain/AbstractInput.kt | 0 .../graphql/demo/domain/account/Account.kt | 0 .../demo/domain/account/AccountCurrency.kt | 0 .../domain/account/AccountEntityListener.kt | 0 .../demo/domain/account/AccountInput.kt | 0 .../demo/domain/account/AccountMapper.kt | 0 .../demo/domain/account/AccountType.kt | 0 .../cubetiqs/graphql/demo/domain/user/User.kt | 0 .../demo/domain/user/UserEntityListener.kt | 0 .../graphql/demo/domain/user/UserInput.kt | 0 .../graphql/demo/domain/user/UserMapper.kt | 0 .../demo/repository/AccountRepository.kt | 0 .../graphql/demo/repository/UserRepository.kt | 0 .../mutation/AccountMutationResolver.kt | 1 - .../resolver/mutation/UserMutationResolver.kt | 0 .../resolver/query/AccountQueryResolver.kt | 0 .../demo/resolver/query/HelloQueryResolver.kt | 5 +- .../demo/resolver/query/UserQueryResolver.kt | 0 .../subscription/HelloSubscriptionResolver.kt | 0 .../src}/main/resources/application.yml | 0 .../main/resources/schema/account.graphql | 0 .../main/resources/schema/expense.graphql | 0 .../main/resources/schema/schema.graphqls | 0 .../src}/main/resources/schema/user.graphql | 0 .../demo/GraphqlDemoApplicationTests.kt | 0 settings.gradle.kts | 9 +- 39 files changed, 170 insertions(+), 58 deletions(-) create mode 100644 dgs-graphql/.gitignore create mode 100644 dgs-graphql/build.gradle.kts rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplication.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/config/GraphQLConfig.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/config/ManagementConfig.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/config/WebConfig.kt (100%) create mode 100644 dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/context/GMutation.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/context/GQuery.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/context/GSubscription.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractEntity.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractInput.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/account/Account.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountCurrency.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountEntityListener.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountInput.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountMapper.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountType.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/user/User.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserEntityListener.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserInput.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserMapper.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/repository/AccountRepository.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/repository/UserRepository.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt (97%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt (70%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt (100%) rename {src => dgs-graphql/src}/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt (100%) rename {src => dgs-graphql/src}/main/resources/application.yml (100%) rename {src => dgs-graphql/src}/main/resources/schema/account.graphql (100%) rename {src => dgs-graphql/src}/main/resources/schema/expense.graphql (100%) rename {src => dgs-graphql/src}/main/resources/schema/schema.graphqls (100%) rename {src => dgs-graphql/src}/main/resources/schema/user.graphql (100%) rename {src => dgs-graphql/src}/test/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplicationTests.kt (100%) diff --git a/.gitignore b/.gitignore index c2065bc..1ef1a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -HELP.md +../HELP.md .gradle build/ !gradle/wrapper/gradle-wrapper.jar @@ -35,3 +35,27 @@ out/ ### VS Code ### .vscode/ + +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 2e72b82..9dfedfe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,58 +1,45 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.5.3" - id("io.spring.dependency-management") version "1.0.11.RELEASE" - kotlin("jvm") version "1.5.21" - kotlin("plugin.spring") version "1.5.21" - kotlin("plugin.jpa") version "1.5.21" - id("com.netflix.dgs.codegen") version "5.0.5" + id("org.springframework.boot") version "2.5.3" apply false + id("io.spring.dependency-management") version "1.0.11.RELEASE" apply false + kotlin("jvm") version "1.5.21" apply false + kotlin("plugin.spring") version "1.5.21" apply false + kotlin("plugin.jpa") version "1.5.21" apply false + id("com.netflix.dgs.codegen") version "5.0.5" apply false } -group = "com.cubetiqs" -version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_11 +allprojects { + repositories { + maven { url = uri("https://m.ctdn.net") } + } -repositories { - maven { url = uri("https://m.ctdn.net") } + group = "com.cubetiqs" + version = "0.0.1-SNAPSHOT" + + val javaVersion = "11" + + tasks.withType { + sourceCompatibility = javaVersion + targetCompatibility = javaVersion + } + + tasks.withType { + kotlinOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + jvmTarget = javaVersion + } + } } -extra["dgsVersion"] = "4.5.0" +subprojects { + apply { + plugin("io.spring.dependency-management") + } -dependencies { - implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:${property("dgsVersion")}") - runtimeOnly("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:${property("dgsVersion")}") - - implementation("org.springframework.boot:spring-boot-starter-actuator") - implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("io.projectreactor.kotlin:reactor-kotlin-extensions") - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") - - developmentOnly("org.springframework.boot:spring-boot-devtools") - runtimeOnly("org.postgresql:postgresql") - - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.projectreactor:reactor-test") -} - -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "11" - } -} - -tasks.withType { - useJUnitPlatform() -} - -tasks.withType { - packageName = "com.cubetiqs.graphql.demo.dgmodel" - schemaPaths = mutableListOf("${projectDir}/src/main/resources/schema") - generateClient = true + the().apply { + imports { + mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES) + } + } } \ No newline at end of file diff --git a/dgs-graphql/.gitignore b/dgs-graphql/.gitignore new file mode 100644 index 0000000..59b4ead --- /dev/null +++ b/dgs-graphql/.gitignore @@ -0,0 +1,37 @@ +../HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/dgs-graphql/build.gradle.kts b/dgs-graphql/build.gradle.kts new file mode 100644 index 0000000..b59fc90 --- /dev/null +++ b/dgs-graphql/build.gradle.kts @@ -0,0 +1,44 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id("org.springframework.boot") + id("io.spring.dependency-management") + kotlin("jvm") + kotlin("plugin.spring") + kotlin("plugin.jpa") + id("com.netflix.dgs.codegen") +} + +extra["dgsVersion"] = "4.5.0" + +dependencies { + implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:${property("dgsVersion")}") + runtimeOnly("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:${property("dgsVersion")}") + + implementation("org.springframework.boot:spring-boot-starter-security") + implementation("org.springframework.boot:spring-boot-starter-actuator") + implementation("org.springframework.boot:spring-boot-starter-data-jpa") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("io.projectreactor.kotlin:reactor-kotlin-extensions") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") + + developmentOnly("org.springframework.boot:spring-boot-devtools") + runtimeOnly("org.postgresql:postgresql") + + testImplementation("org.springframework.boot:spring-boot-starter-test") + testImplementation("io.projectreactor:reactor-test") +} + +tasks.withType { + useJUnitPlatform() +} + +tasks.withType { + packageName = "com.cubetiqs.graphql.demo.dgmodel" + schemaPaths = mutableListOf("${projectDir}/src/main/resources/schema") + generateClient = true +} \ No newline at end of file diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplication.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplication.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplication.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplication.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/config/GraphQLConfig.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/GraphQLConfig.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/config/GraphQLConfig.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/GraphQLConfig.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/config/ManagementConfig.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/ManagementConfig.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/config/ManagementConfig.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/ManagementConfig.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebConfig.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebConfig.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/config/WebConfig.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebConfig.kt diff --git a/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt new file mode 100644 index 0000000..fd14544 --- /dev/null +++ b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt @@ -0,0 +1,23 @@ +package com.cubetiqs.graphql.demo.config + +import org.springframework.context.annotation.Configuration +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter +import org.springframework.security.config.http.SessionCreationPolicy + +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +class WebSecurityConfig : WebSecurityConfigurerAdapter() { + override fun configure(http: HttpSecurity) { + http.csrf().disable() + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS) + .and() + .authorizeRequests() + .anyRequest() + .permitAll() + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/context/GMutation.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/context/GMutation.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/context/GMutation.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/context/GMutation.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/context/GQuery.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/context/GQuery.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/context/GQuery.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/context/GQuery.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/context/GSubscription.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/context/GSubscription.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/context/GSubscription.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/context/GSubscription.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractEntity.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractEntity.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractEntity.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractEntity.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractInput.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractInput.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractInput.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractInput.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/Account.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/Account.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/Account.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/Account.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountCurrency.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountCurrency.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountCurrency.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountCurrency.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountEntityListener.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountEntityListener.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountEntityListener.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountEntityListener.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountInput.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountInput.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountInput.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountInput.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountMapper.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountMapper.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountMapper.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountMapper.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountType.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountType.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountType.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountType.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/User.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/User.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/User.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/User.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserEntityListener.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserEntityListener.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserEntityListener.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserEntityListener.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserInput.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserInput.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserInput.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserInput.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserMapper.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserMapper.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserMapper.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserMapper.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/repository/AccountRepository.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/repository/AccountRepository.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/repository/AccountRepository.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/repository/AccountRepository.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/repository/UserRepository.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/repository/UserRepository.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/repository/UserRepository.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/repository/UserRepository.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt similarity index 97% rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt index ae38ebf..0ca9e79 100644 --- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt +++ b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt @@ -7,7 +7,6 @@ import com.cubetiqs.graphql.demo.domain.account.AccountInput import com.cubetiqs.graphql.demo.domain.account.AccountMapper import com.cubetiqs.graphql.demo.repository.AccountRepository import com.cubetiqs.graphql.demo.repository.UserRepository -import com.netflix.graphql.dgs.DgsData import com.netflix.graphql.dgs.DgsMutation import org.springframework.beans.factory.annotation.Autowired import org.springframework.transaction.annotation.Propagation diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt similarity index 70% rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt index 9dcef6d..fa4208e 100644 --- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt +++ b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/HelloQueryResolver.kt @@ -1,7 +1,9 @@ package com.cubetiqs.graphql.demo.resolver.query import com.cubetiqs.graphql.demo.context.GQuery +import com.cubetiqs.graphql.demo.dgmodel.DgsConstants import com.netflix.graphql.dgs.DgsQuery +import org.springframework.security.access.prepost.PreAuthorize import reactor.core.publisher.Mono import java.util.concurrent.CompletableFuture @@ -12,7 +14,8 @@ class HelloQueryResolver { return Mono.just("Hello Query...!").toFuture() } - @DgsQuery(field = "helloByName") + @PreAuthorize("hasAnyRole('ADMIN')") + @DgsQuery(field = DgsConstants.QUERY.HelloByName) fun helloByName(name: String): CompletableFuture { return Mono.just("Hello $name...!").toFuture() } diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt similarity index 100% rename from src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt rename to dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/subscription/HelloSubscriptionResolver.kt diff --git a/src/main/resources/application.yml b/dgs-graphql/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to dgs-graphql/src/main/resources/application.yml diff --git a/src/main/resources/schema/account.graphql b/dgs-graphql/src/main/resources/schema/account.graphql similarity index 100% rename from src/main/resources/schema/account.graphql rename to dgs-graphql/src/main/resources/schema/account.graphql diff --git a/src/main/resources/schema/expense.graphql b/dgs-graphql/src/main/resources/schema/expense.graphql similarity index 100% rename from src/main/resources/schema/expense.graphql rename to dgs-graphql/src/main/resources/schema/expense.graphql diff --git a/src/main/resources/schema/schema.graphqls b/dgs-graphql/src/main/resources/schema/schema.graphqls similarity index 100% rename from src/main/resources/schema/schema.graphqls rename to dgs-graphql/src/main/resources/schema/schema.graphqls diff --git a/src/main/resources/schema/user.graphql b/dgs-graphql/src/main/resources/schema/user.graphql similarity index 100% rename from src/main/resources/schema/user.graphql rename to dgs-graphql/src/main/resources/schema/user.graphql diff --git a/src/test/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplicationTests.kt b/dgs-graphql/src/test/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplicationTests.kt similarity index 100% rename from src/test/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplicationTests.kt rename to dgs-graphql/src/test/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplicationTests.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 1bf5fae..dc19c94 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,3 @@ -pluginManagement { - repositories { - maven { url = uri("https://repo.spring.io/milestone") } - maven { url = uri("https://repo.spring.io/snapshot") } - gradlePluginPortal() - } -} rootProject.name = "graphql-demo" + +include("dgs-graphql") \ No newline at end of file