You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/05/19 05:35:43 UTC
(causeway) branch v3 updated (6e1291c0f6 -> 5ef741c8d9)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 6e1291c0f6 Merge remote-tracking branch 'origin/master' into v3
add 209229019f CAUSEWAY-3741 - Enables hyphen in namespace
add fcdeddcaa2 Merge branch 'master' of https://github.com/apache/causeway
add e7dada6fd4 Test for hyphenated object name being converted to camelCase for graphql
add 7e0ab963e3 Merge pull request #2410 from bkalbfus/master
add 870a716c6e CAUSEWAY-3741: minor: adds some java-doc
new 7d7cd2d3b7 Merge remote-tracking branch 'origin/master' into v3
new 5ef741c8d9 fixes merge
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../viewer/graphql/model/domain/TypeNames.java | 61 +-
.../viewer/graphql/model/domain/TypeNamesTest.java | 18 +-
...{Calculator.java => CalculatorNameVariant.java} | 4 +-
...torNameVariant_IntegTest.each.hyphenated._.gql} | 2 +-
...ariant_IntegTest.each.hyphenated.approved.json} | 2 +-
...t.java => CalculatorNameVariant_IntegTest.java} | 2 +-
viewers/graphql/test/src/test/resources/schema.gql | 1278 ++++++++++++++++++++
7 files changed, 1337 insertions(+), 30 deletions(-)
copy commons/src/test/java/org/apache/causeway/commons/internal/primitives/_IntsTest.java => viewers/graphql/model/src/test/java/org/apache/causeway/viewer/graphql/model/domain/TypeNamesTest.java (60%)
copy viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/{Calculator.java => CalculatorNameVariant.java} (98%)
copy viewers/graphql/{test2/src/test/java/org/apache/causeway/viewer/graphql/viewer/test2/e2e/calc/Calculator_IntegTest.each.add_doubles._.gql => test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/calc/CalculatorNameVariant_IntegTest.each.hyphenated._.gql} (72%)
copy viewers/graphql/{test2/src/test/java/org/apache/causeway/viewer/graphql/viewer/test2/e2e/calc/Calculator_IntegTest.each.add_doubles.approved.json => test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/calc/CalculatorNameVariant_IntegTest.each.hyphenated.approved.json} (76%)
copy viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/e2e/calc/{Calculator_IntegTest.java => CalculatorNameVariant_IntegTest.java} (95%)
(causeway) 01/02: Merge remote-tracking branch 'origin/master' into v3
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 7d7cd2d3b7bab35774d3ed781d942cb5418b6407
Merge: 6e1291c0f6 870a716c6e
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun May 19 07:34:26 2024 +0200
Merge remote-tracking branch 'origin/master' into v3
.../viewer/graphql/model/domain/TypeNames.java | 61 +-
.../viewer/graphql/model/domain/TypeNamesTest.java | 38 +
.../test/domain/calc/CalculatorNameVariant.java | 195 +++
...atorNameVariant_IntegTest.each.hyphenated._.gql | 11 +
...Variant_IntegTest.each.hyphenated.approved.json | 13 +
.../e2e/calc/CalculatorNameVariant_IntegTest.java | 41 +
viewers/graphql/test/src/test/resources/schema.gql | 1278 ++++++++++++++++++++
7 files changed, 1620 insertions(+), 17 deletions(-)
(causeway) 02/02: fixes merge
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 5ef741c8d96f1c1d0376b3a9c3d84c33f1ea892a
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun May 19 07:35:38 2024 +0200
fixes merge
---
.../graphql/viewer/test/domain/calc/CalculatorNameVariant.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/CalculatorNameVariant.java b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/CalculatorNameVariant.java
index e339867871..06aba231a1 100644
--- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/CalculatorNameVariant.java
+++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/calc/CalculatorNameVariant.java
@@ -29,9 +29,9 @@ import java.time.ZonedDateTime;
import java.util.Locale;
import java.util.UUID;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainService;