Skip to content

GraphQL: Merge the label-application-rules-schema into the labels-schema #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 27, 2021
Merged

GraphQL: Merge the label-application-rules-schema into the labels-schema #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fe32d1
merged label-application-rules schema into the labels schema
Dec 24, 2021
484a1e1
Remove label application rule schema from settings gradle
Dec 24, 2021
a7eab3c
Moved label application rule classes to 'rule' package
Dec 26, 2021
45bab67
Upgrade hypertrace-core-graphql
Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hypertrace-core-graphql
Open in desktop
Submodule hypertrace-core-graphql updated 1 files
+3 −3 hypertrace-core-graphql-platform/build.gradle.kts
1 change: 0 additions & 1 deletion hypertrace-graphql-impl/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ dependencies {
implementation(project(":hypertrace-graphql-entity-type"))
implementation(project(":hypertrace-graphql-spaces-schema"))
implementation(project(":hypertrace-graphql-labels-schema-impl"))
implementation(project(":hypertrace-graphql-label-application-rules-schema"))

implementation("org.slf4j:slf4j-api")
implementation("com.google.inject:guice")
Expand Down
2 changes: 0 additions & 2 deletions hypertrace-graphql-impl/src/main/java/org/hypertrace/graphql/impl/GraphQlModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.hypertrace.graphql.explorer.ExplorerSchemaModule;
import org.hypertrace.graphql.explorer.context.HypertraceExplorerContextModule;
import org.hypertrace.graphql.label.LabelSchemaModule;
import org.hypertrace.graphql.label.application.rules.LabelApplicationRuleSchemaModule;
import org.hypertrace.graphql.metric.MetricModule;
import org.hypertrace.graphql.spaces.SpacesSchemaModule;
import org.hypertrace.graphql.utils.metrics.gateway.GatewayMetricUtilsModule;
Expand Down Expand Up @@ -74,6 +73,5 @@ protected void configure() {
install(new SpacesSchemaModule());
install(new RequestTransformationModule());
install(new LabelSchemaModule());
install(new LabelApplicationRuleSchemaModule());
}
}
34 changes: 0 additions & 34 deletions hypertrace-graphql-label-application-rules-schema/build.gradle.kts
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ...va/org/hypertrace/graphql/label/application/rules/LabelApplicationRuleSchemaFragment.java
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions ...java/org/hypertrace/graphql/label/application/rules/LabelApplicationRuleSchemaModule.java
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions ...e/graphql/label/application/rules/schema/mutation/LabelApplicationRuleMutationSchema.java
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...ertrace/graphql/label/application/rules/schema/query/LabelApplicationRuleQuerySchema.java
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions hypertrace-graphql-labels-schema-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ dependencies {

annotationProcessor("org.projectlombok:lombok")
compileOnly("org.projectlombok:lombok")

implementation("org.hypertrace.core.graphql:hypertrace-core-graphql-deserialization")
}

tasks.test {
Expand Down
12 changes: 6 additions & 6 deletions ...on/rules/dao/LabelApplicationRuleDao.java → ...ql/label/dao/LabelApplicationRuleDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.hypertrace.graphql.label.application.rules.dao;
package org.hypertrace.graphql.label.dao;

import io.reactivex.rxjava3.core.Single;
import org.hypertrace.core.graphql.common.request.ContextualRequest;
import org.hypertrace.graphql.label.application.rules.request.LabelApplicationRuleCreateRequest;
import org.hypertrace.graphql.label.application.rules.request.LabelApplicationRuleDeleteRequest;
import org.hypertrace.graphql.label.application.rules.request.LabelApplicationRuleUpdateRequest;
import org.hypertrace.graphql.label.application.rules.schema.query.LabelApplicationRuleResultSet;
import org.hypertrace.graphql.label.application.rules.schema.shared.LabelApplicationRule;
import org.hypertrace.graphql.label.request.LabelApplicationRuleCreateRequest;
import org.hypertrace.graphql.label.request.LabelApplicationRuleDeleteRequest;
import org.hypertrace.graphql.label.request.LabelApplicationRuleUpdateRequest;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRule;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRuleResultSet;

public interface LabelApplicationRuleDao {
Single<LabelApplicationRule> createLabelApplicationRule(
Expand Down
2 changes: 1 addition & 1 deletion ...ation/LabelApplicationRuleIdArgument.java → ...ation/LabelApplicationRuleIdArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.hypertrace.graphql.label.application.rules.deserialization;
package org.hypertrace.graphql.label.deserialization;

import org.hypertrace.core.graphql.deserialization.PrimitiveArgument;

Expand Down
6 changes: 3 additions & 3 deletions .../fetcher/LabelApplicationRuleFetcher.java → .../fetcher/LabelApplicationRuleFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.hypertrace.graphql.label.application.rules.fetcher;
package org.hypertrace.graphql.label.fetcher;

import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import org.hypertrace.core.graphql.common.fetcher.InjectableDataFetcher;
import org.hypertrace.core.graphql.common.request.ContextualRequestBuilder;
import org.hypertrace.graphql.label.application.rules.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.application.rules.schema.query.LabelApplicationRuleResultSet;
import org.hypertrace.graphql.label.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRuleResultSet;

public class LabelApplicationRuleFetcher
extends InjectableDataFetcher<LabelApplicationRuleResultSet> {
Expand Down
8 changes: 4 additions & 4 deletions ...or/LabelApplicationRuleCreateMutator.java → ...or/LabelApplicationRuleCreateMutator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.hypertrace.graphql.label.application.rules.mutator;
package org.hypertrace.graphql.label.mutator;

import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import org.hypertrace.core.graphql.common.fetcher.InjectableDataFetcher;
import org.hypertrace.graphql.label.application.rules.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.application.rules.request.LabelApplicationRuleRequestBuilder;
import org.hypertrace.graphql.label.application.rules.schema.shared.LabelApplicationRule;
import org.hypertrace.graphql.label.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.request.LabelApplicationRuleRequestBuilder;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRule;

public class LabelApplicationRuleCreateMutator extends InjectableDataFetcher<LabelApplicationRule> {

Expand Down
6 changes: 3 additions & 3 deletions ...or/LabelApplicationRuleDeleteMutator.java → ...or/LabelApplicationRuleDeleteMutator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.hypertrace.graphql.label.application.rules.mutator;
package org.hypertrace.graphql.label.mutator;

import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import org.hypertrace.core.graphql.common.fetcher.InjectableDataFetcher;
import org.hypertrace.graphql.label.application.rules.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.application.rules.request.LabelApplicationRuleRequestBuilder;
import org.hypertrace.graphql.label.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.request.LabelApplicationRuleRequestBuilder;

public class LabelApplicationRuleDeleteMutator extends InjectableDataFetcher<Boolean> {
public LabelApplicationRuleDeleteMutator() {
Expand Down
8 changes: 4 additions & 4 deletions ...or/LabelApplicationRuleUpdateMutator.java → ...or/LabelApplicationRuleUpdateMutator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.hypertrace.graphql.label.application.rules.mutator;
package org.hypertrace.graphql.label.mutator;

import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject;
import org.hypertrace.core.graphql.common.fetcher.InjectableDataFetcher;
import org.hypertrace.graphql.label.application.rules.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.application.rules.request.LabelApplicationRuleRequestBuilder;
import org.hypertrace.graphql.label.application.rules.schema.shared.LabelApplicationRule;
import org.hypertrace.graphql.label.dao.LabelApplicationRuleDao;
import org.hypertrace.graphql.label.request.LabelApplicationRuleRequestBuilder;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRule;

public class LabelApplicationRuleUpdateMutator extends InjectableDataFetcher<LabelApplicationRule> {

Expand Down
4 changes: 2 additions & 2 deletions ...st/LabelApplicationRuleCreateRequest.java → ...st/LabelApplicationRuleCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.hypertrace.graphql.label.application.rules.request;
package org.hypertrace.graphql.label.request;

import org.hypertrace.core.graphql.common.request.ContextualRequest;
import org.hypertrace.graphql.label.application.rules.schema.shared.LabelApplicationRuleData;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRuleData;

public interface LabelApplicationRuleCreateRequest extends ContextualRequest {
LabelApplicationRuleData labelApplicationRuleData();
Expand Down
2 changes: 1 addition & 1 deletion ...st/LabelApplicationRuleDeleteRequest.java → ...st/LabelApplicationRuleDeleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.hypertrace.graphql.label.application.rules.request;
package org.hypertrace.graphql.label.request;

import org.hypertrace.core.graphql.common.request.ContextualRequest;

Expand Down
2 changes: 1 addition & 1 deletion ...t/LabelApplicationRuleRequestBuilder.java → ...t/LabelApplicationRuleRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.hypertrace.graphql.label.application.rules.request;
package org.hypertrace.graphql.label.request;

import java.util.Map;
import org.hypertrace.core.graphql.context.GraphQlRequestContext;
Expand Down
4 changes: 2 additions & 2 deletions ...st/LabelApplicationRuleUpdateRequest.java → ...st/LabelApplicationRuleUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.hypertrace.graphql.label.application.rules.request;
package org.hypertrace.graphql.label.request;

import org.hypertrace.core.graphql.common.request.ContextualRequest;
import org.hypertrace.graphql.label.application.rules.schema.shared.LabelApplicationRule;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRule;

public interface LabelApplicationRuleUpdateRequest extends ContextualRequest {
LabelApplicationRule labelApplicationRule();
Expand Down
9 changes: 9 additions & 0 deletions ...phql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/LabelSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,23 @@
import graphql.annotations.annotationTypes.GraphQLField;
import graphql.annotations.annotationTypes.GraphQLName;
import graphql.annotations.annotationTypes.GraphQLNonNull;
import org.hypertrace.graphql.label.fetcher.LabelApplicationRuleFetcher;
import org.hypertrace.graphql.label.fetcher.LabelFetcher;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRuleResultSet;

public interface LabelSchema {
String LABELS_QUERY_NAME = "labels";
String LABEL_APPLICATION_RULE_QUERY_NAME = "labelApplicationRules";

@GraphQLField
@GraphQLNonNull
@GraphQLName(LABELS_QUERY_NAME)
@GraphQLDataFetcher(LabelFetcher.class)
LabelResultSet labels();

@GraphQLField
@GraphQLNonNull
@GraphQLName(LABEL_APPLICATION_RULE_QUERY_NAME)
@GraphQLDataFetcher(LabelApplicationRuleFetcher.class)
LabelApplicationRuleResultSet labelApplicationRules();
}
32 changes: 32 additions & 0 deletions ...a-api/src/main/java/org/hypertrace/graphql/label/schema/mutation/LabelMutationSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,22 @@
import graphql.annotations.annotationTypes.GraphQLField;
import graphql.annotations.annotationTypes.GraphQLName;
import graphql.annotations.annotationTypes.GraphQLNonNull;
import org.hypertrace.graphql.label.deserialization.LabelApplicationRuleIdArgument;
import org.hypertrace.graphql.label.mutator.LabelApplicationRuleCreateMutator;
import org.hypertrace.graphql.label.mutator.LabelApplicationRuleDeleteMutator;
import org.hypertrace.graphql.label.mutator.LabelApplicationRuleUpdateMutator;
import org.hypertrace.graphql.label.mutator.LabelCreateMutator;
import org.hypertrace.graphql.label.mutator.LabelUpdateMutator;
import org.hypertrace.graphql.label.schema.Label;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRule;
import org.hypertrace.graphql.label.schema.rule.LabelApplicationRuleData;

public interface LabelMutationSchema {
String CREATE_LABEL = "createLabel";
String UPDATE_LABEL = "updateLabel";
String CREATE_LABEL_APPLICATION_RULE = "createLabelApplicationRule";
String UPDATE_LABEL_APPLICATION_RULE = "updateLabelApplicationRule";
String DELETE_LABEL_APPLICATION_RULE = "deleteLabelApplicationRule";

@GraphQLField
@GraphQLNonNull
Expand All @@ -23,4 +32,27 @@ public interface LabelMutationSchema {
@GraphQLName(UPDATE_LABEL)
@GraphQLDataFetcher(LabelUpdateMutator.class)
Label updateLabel(@GraphQLNonNull @GraphQLName(Label.ARGUMENT_NAME) UpdateLabel label);

@GraphQLField
@GraphQLNonNull
@GraphQLName(CREATE_LABEL_APPLICATION_RULE)
@GraphQLDataFetcher(LabelApplicationRuleCreateMutator.class)
LabelApplicationRule createLabelApplicationRule(
@GraphQLNonNull @GraphQLName(LabelApplicationRuleData.ARGUMENT_NAME)
LabelApplicationRuleData labelApplicationRuleData);

@GraphQLField
@GraphQLNonNull
@GraphQLName(UPDATE_LABEL_APPLICATION_RULE)
@GraphQLDataFetcher(LabelApplicationRuleUpdateMutator.class)
LabelApplicationRule updateLabelApplicationRule(
@GraphQLNonNull @GraphQLName(LabelApplicationRule.ARGUMENT_NAME)
LabelApplicationRule labelApplicationRule);

@GraphQLField
@GraphQLNonNull
@GraphQLName(DELETE_LABEL_APPLICATION_RULE)
@GraphQLDataFetcher(LabelApplicationRuleDeleteMutator.class)
Boolean deleteLabelApplicationRule(
@GraphQLNonNull @GraphQLName(LabelApplicationRuleIdArgument.ARGUMENT_NAME) String id);
}
2 changes: 1 addition & 1 deletion ...plication/rules/schema/shared/Action.java → ...ace/graphql/label/schema/rule/Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.hypertrace.graphql.label.application.rules.schema.shared;
package org.hypertrace.graphql.label.schema.rule;

import graphql.annotations.annotationTypes.GraphQLField;
import graphql.annotations.annotationTypes.GraphQLName;
Expand Down
2 changes: 1 addition & 1 deletion ...cation/rules/schema/shared/Condition.java → .../graphql/label/schema/rule/Condition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.hypertrace.graphql.label.application.rules.schema.shared;
package org.hypertrace.graphql.label.schema.rule;

import graphql.annotations.annotationTypes.GraphQLField;
import graphql.annotations.annotationTypes.GraphQLName;
Expand Down
2 changes: 1 addition & 1 deletion ...s/schema/shared/LabelApplicationRule.java → ...bel/schema/rule/LabelApplicationRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.hypertrace.graphql.label.application.rules.schema.shared;
package org.hypertrace.graphql.label.schema.rule;

import graphql.annotations.annotationTypes.GraphQLField;
import graphql.annotations.annotationTypes.GraphQLName;
Expand Down
Loading