This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3676 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 3df0a1604dcf06c5f201698d24d7726ee87d926e Author: danhaywood <[email protected]> AuthorDate: Mon Feb 12 16:09:01 2024 +0000 CAUSEWAY-3676: wip, moves TopLevel to model --- viewers/graphql/model/src/main/java/module-info.java | 1 + .../causeway/viewer/graphql/model}/toplevel/GqlvTopLevelMutation.java | 2 +- .../causeway/viewer/graphql/model}/toplevel/GqlvTopLevelQuery.java | 2 +- .../viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java | 2 ++ viewers/graphql/viewer/src/main/java/module-info.java | 1 - .../viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java | 4 ++-- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/viewers/graphql/model/src/main/java/module-info.java b/viewers/graphql/model/src/main/java/module-info.java index 0941b42afc..8588e7499a 100644 --- a/viewers/graphql/model/src/main/java/module-info.java +++ b/viewers/graphql/model/src/main/java/module-info.java @@ -1,6 +1,7 @@ module org.apache.causeway.incubator.viewer.graphql.model { exports org.apache.causeway.viewer.graphql.model; exports org.apache.causeway.viewer.graphql.model.types; + exports org.apache.causeway.viewer.graphql.model.toplevel; exports org.apache.causeway.viewer.graphql.model.registry; exports org.apache.causeway.viewer.graphql.model.domain; exports org.apache.causeway.viewer.graphql.model.exceptions; diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelMutation.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java similarity index 98% rename from viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelMutation.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java index 219111640a..bb0f12c079 100644 --- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelMutation.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelMutation.java @@ -1,4 +1,4 @@ -package org.apache.causeway.viewer.graphql.viewer.toplevel; +package org.apache.causeway.viewer.graphql.model.toplevel; import java.util.ArrayList; import java.util.List; diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java similarity index 98% rename from viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java rename to viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java index bc1e97bcfe..207c6aad06 100644 --- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/toplevel/GqlvTopLevelQuery.java +++ b/viewers/graphql/model/src/main/java/org/apache/causeway/viewer/graphql/model/toplevel/GqlvTopLevelQuery.java @@ -1,4 +1,4 @@ -package org.apache.causeway.viewer.graphql.viewer.toplevel; +package org.apache.causeway.viewer.graphql.model.toplevel; import java.util.ArrayList; import java.util.List; diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java index ab001059ca..a9f7f27763 100644 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/scenario/Calculator_IntegTest.java @@ -23,6 +23,7 @@ import org.apache.causeway.viewer.graphql.viewer.test.e2e.Abstract_IntegTest; import org.approvaltests.Approvals; import org.approvaltests.reporters.DiffReporter; import org.approvaltests.reporters.UseReporter; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -38,6 +39,7 @@ public class Calculator_IntegTest extends Abstract_IntegTest { @Test + @Disabled @UseReporter(DiffReporter.class) void concat() throws Exception { diff --git a/viewers/graphql/viewer/src/main/java/module-info.java b/viewers/graphql/viewer/src/main/java/module-info.java index 72afbea3c4..d1d8a7bb90 100644 --- a/viewers/graphql/viewer/src/main/java/module-info.java +++ b/viewers/graphql/viewer/src/main/java/module-info.java @@ -1,6 +1,5 @@ module org.apache.causeway.incubator.viewer.graphql.viewer { exports org.apache.causeway.viewer.graphql.viewer; - exports org.apache.causeway.viewer.graphql.viewer.toplevel; exports org.apache.causeway.viewer.graphql.viewer.integration; requires com.fasterxml.jackson.core; diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java index c2827adf8a..ecff161c44 100644 --- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java +++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/GraphQlSourceForCauseway.java @@ -21,7 +21,7 @@ package org.apache.causeway.viewer.graphql.viewer.integration; import javax.annotation.PostConstruct; import javax.inject.Inject; -import org.apache.causeway.viewer.graphql.viewer.toplevel.GqlvTopLevelMutation; +import org.apache.causeway.viewer.graphql.model.toplevel.GqlvTopLevelMutation; import org.springframework.graphql.execution.GraphQlSource; import org.springframework.stereotype.Service; @@ -36,7 +36,7 @@ import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; import org.apache.causeway.viewer.graphql.model.types.TypeMapper; import org.apache.causeway.viewer.graphql.model.context.Context; import org.apache.causeway.viewer.graphql.model.registry.GraphQLTypeRegistry; -import org.apache.causeway.viewer.graphql.viewer.toplevel.GqlvTopLevelQuery; +import org.apache.causeway.viewer.graphql.model.toplevel.GqlvTopLevelQuery; import lombok.RequiredArgsConstructor; import lombok.val;
