From aae50fbb200713fee6ea7686ccb4306c00a12fcc Mon Sep 17 00:00:00 2001 From: saxenakshitiz Date: Mon, 20 Dec 2021 18:51:44 +0530 Subject: [PATCH 1/2] Refactor code to split labels into api and impl --- .../build.gradle.kts | 3 +-- hypertrace-graphql-impl/build.gradle.kts | 2 +- .../build.gradle.kts | 20 +++++++++++++++++++ .../graphql/label/dao/LabelDao.java | 0 .../graphql/label/fetcher/LabelFetcher.java | 0 .../graphql/label/joiner/LabelJoiner.java | 0 .../label/joiner/LabelJoinerBuilder.java | 0 .../label/mutator/LabelCreateMutator.java | 0 .../label/mutator/LabelUpdateMutator.java | 0 .../label/request/LabelCreateRequest.java | 0 .../label/request/LabelRequestBuilder.java | 0 .../label/request/LabelUpdateRequest.java | 0 .../graphql/label/schema/Label.java | 0 .../graphql/label/schema/LabelData.java | 0 .../graphql/label/schema/LabelResultSet.java | 0 .../graphql/label/schema/LabelSchema.java | 0 .../label/schema/mutation/CreateLabel.java | 0 .../schema/mutation/LabelMutationSchema.java | 0 .../build.gradle.kts | 1 + .../graphql/label/LabelSchemaFragment.java | 0 .../graphql/label/LabelSchemaModule.java | 0 .../label/dao/LabelConfigServiceDao.java | 0 .../graphql/label/dao/LabelDaoModule.java | 0 .../label/dao/LabelRequestConverter.java | 0 .../label/dao/LabelResponseConverter.java | 0 .../CreateLabelDeserializationConfig.java | 0 .../LabelDeserializationConfig.java | 0 .../LabelDeserializationModule.java | 0 .../joiner/DefaultLabelJoinerBuilder.java | 0 .../label/joiner/LabelJoinerModule.java | 0 .../request/LabelRequestBuilderImpl.java | 0 .../label/request/LabelRequestModule.java | 0 settings.gradle.kts | 3 ++- 33 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 hypertrace-graphql-labels-schema-api/build.gradle.kts rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/dao/LabelDao.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoiner.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerBuilder.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/request/LabelCreateRequest.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilder.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/request/LabelUpdateRequest.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/schema/Label.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/schema/LabelData.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/schema/LabelResultSet.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-api}/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/build.gradle.kts (95%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/LabelSchemaFragment.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/LabelSchemaModule.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/dao/LabelConfigServiceDao.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/dao/LabelDaoModule.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationModule.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/joiner/DefaultLabelJoinerBuilder.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerModule.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilderImpl.java (100%) rename {hypertrace-graphql-labels-schema => hypertrace-graphql-labels-schema-impl}/src/main/java/org/hypertrace/graphql/label/request/LabelRequestModule.java (100%) diff --git a/hypertrace-graphql-entity-schema/build.gradle.kts b/hypertrace-graphql-entity-schema/build.gradle.kts index 4dca82d4..2e7451d8 100644 --- a/hypertrace-graphql-entity-schema/build.gradle.kts +++ b/hypertrace-graphql-entity-schema/build.gradle.kts @@ -11,6 +11,7 @@ dependencies { api("io.github.graphql-java:graphql-java-annotations") api(project(":hypertrace-graphql-metric-schema")) api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema") + api(project(":hypertrace-graphql-labels-schema-api")) annotationProcessor("org.projectlombok:lombok") compileOnly("org.projectlombok:lombok") @@ -29,8 +30,6 @@ dependencies { implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization") implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-rx-utils") - implementation(project(":hypertrace-graphql-labels-schema")) - testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-junit-jupiter") diff --git a/hypertrace-graphql-impl/build.gradle.kts b/hypertrace-graphql-impl/build.gradle.kts index af462d87..9e2a78b9 100644 --- a/hypertrace-graphql-impl/build.gradle.kts +++ b/hypertrace-graphql-impl/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { implementation(project(":hypertrace-graphql-explorer-context")) implementation(project(":hypertrace-graphql-entity-type")) implementation(project(":hypertrace-graphql-spaces-schema")) - implementation(project(":hypertrace-graphql-labels-schema")) + implementation(project(":hypertrace-graphql-labels-schema-impl")) implementation(project(":hypertrace-graphql-label-application-rules-schema")) implementation("org.slf4j:slf4j-api") diff --git a/hypertrace-graphql-labels-schema-api/build.gradle.kts b/hypertrace-graphql-labels-schema-api/build.gradle.kts new file mode 100644 index 00000000..260d842f --- /dev/null +++ b/hypertrace-graphql-labels-schema-api/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + `java-library` + jacoco + id("org.hypertrace.jacoco-report-plugin") +} + +dependencies { + api("com.google.inject:guice") + api("com.graphql-java:graphql-java") + api("org.hypertrace.core.graphql:hypertrace-core-graphql-spi") + api("io.github.graphql-java:graphql-java-annotations") + api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema") + + annotationProcessor("org.projectlombok:lombok") + compileOnly("org.projectlombok:lombok") +} + +tasks.test { + useJUnitPlatform() +} diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelDao.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/dao/LabelDao.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelDao.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/dao/LabelDao.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoiner.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoiner.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoiner.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoiner.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerBuilder.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerBuilder.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerBuilder.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerBuilder.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelCreateRequest.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelCreateRequest.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelCreateRequest.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelCreateRequest.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilder.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilder.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilder.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilder.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelUpdateRequest.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelUpdateRequest.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelUpdateRequest.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/request/LabelUpdateRequest.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/Label.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/Label.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/Label.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/Label.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/LabelData.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelData.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/LabelData.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelData.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/LabelResultSet.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelResultSet.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/LabelResultSet.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelResultSet.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java rename to hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java diff --git a/hypertrace-graphql-labels-schema/build.gradle.kts b/hypertrace-graphql-labels-schema-impl/build.gradle.kts similarity index 95% rename from hypertrace-graphql-labels-schema/build.gradle.kts rename to hypertrace-graphql-labels-schema-impl/build.gradle.kts index feebf6a0..641f70ec 100644 --- a/hypertrace-graphql-labels-schema/build.gradle.kts +++ b/hypertrace-graphql-labels-schema-impl/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { api("org.hypertrace.core.graphql:hypertrace-core-graphql-spi") api("io.github.graphql-java:graphql-java-annotations") api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema") + api(project(":hypertrace-graphql-labels-schema-api")) annotationProcessor("org.projectlombok:lombok") compileOnly("org.projectlombok:lombok") diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/LabelSchemaFragment.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/LabelSchemaFragment.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/LabelSchemaFragment.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/LabelSchemaFragment.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/LabelSchemaModule.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/LabelSchemaModule.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/LabelSchemaModule.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/LabelSchemaModule.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelConfigServiceDao.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelConfigServiceDao.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelConfigServiceDao.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelConfigServiceDao.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelDaoModule.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelDaoModule.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelDaoModule.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelDaoModule.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/CreateLabelDeserializationConfig.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationConfig.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationModule.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationModule.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationModule.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelDeserializationModule.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/DefaultLabelJoinerBuilder.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/DefaultLabelJoinerBuilder.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/DefaultLabelJoinerBuilder.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/DefaultLabelJoinerBuilder.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerModule.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerModule.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerModule.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/joiner/LabelJoinerModule.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilderImpl.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilderImpl.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilderImpl.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/request/LabelRequestBuilderImpl.java diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelRequestModule.java b/hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/request/LabelRequestModule.java similarity index 100% rename from hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/request/LabelRequestModule.java rename to hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/request/LabelRequestModule.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 5b845ba3..96b30404 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,5 +25,6 @@ include(":hypertrace-graphql-entity-type") include(":hypertrace-graphql-service-config") include(":hypertrace-graphql-platform") include(":hypertrace-graphql-spaces-schema") -include(":hypertrace-graphql-labels-schema") +include(":hypertrace-graphql-labels-schema-api") +include(":hypertrace-graphql-labels-schema-impl") include(":hypertrace-graphql-label-application-rules-schema") \ No newline at end of file From 3fd8250e98c1117bb9141f527dcfbee91e11c130 Mon Sep 17 00:00:00 2001 From: saxenakshitiz Date: Mon, 20 Dec 2021 19:12:02 +0530 Subject: [PATCH 2/2] Address review comments --- hypertrace-graphql-entity-schema/build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hypertrace-graphql-entity-schema/build.gradle.kts b/hypertrace-graphql-entity-schema/build.gradle.kts index 2e7451d8..bfd0683b 100644 --- a/hypertrace-graphql-entity-schema/build.gradle.kts +++ b/hypertrace-graphql-entity-schema/build.gradle.kts @@ -11,7 +11,6 @@ dependencies { api("io.github.graphql-java:graphql-java-annotations") api(project(":hypertrace-graphql-metric-schema")) api("org.hypertrace.core.graphql:hypertrace-core-graphql-common-schema") - api(project(":hypertrace-graphql-labels-schema-api")) annotationProcessor("org.projectlombok:lombok") compileOnly("org.projectlombok:lombok") @@ -30,6 +29,8 @@ dependencies { implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization") implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-rx-utils") + implementation(project(":hypertrace-graphql-labels-schema-api")) + testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-junit-jupiter")