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 2023/02/24 14:26:51 UTC
[causeway] branch spring6 updated (873e548570 -> 9fdf123340)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 873e548570 Merge pull request #1450 from apache/dependabot/maven/spring6/org.springframework.boot-spring-boot-maven-plugin-3.0.3
add d7d66dec09 CAUSEWAY-3222: adds titles to social-links
add 19c59ab9b2 Bump maven-assembly-plugin from 3.4.2 to 3.5.0
add 6c1eea5b43 Merge pull request #1444 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-assembly-plugin-3.5.0
add 464c7192f3 causeway logo asf candidates
add 482e51140d CAUSEWAY-3330: adds composite value RO test case
add b979444638 CAUSEWAY-3330: provide the proper utility for transport of {@link ValueDecomposition} over REST
add e634fad9fc CAUSEWAY-3330: render comp. val. RO with type="ValueDecomposition[base64/zlib]"
add 6070a1b747 Merge pull request #1452 from apache/3330-RO.composite.values
add b8bb2e55e4 Bump spring-boot.version from 2.7.8 to 2.7.9
add 9e57d5b085 Merge pull request #1445 from apache/dependabot/maven/master/spring-boot.version-2.7.9
add 279965fafa Bump spring-boot-starter-parent from 2.7.8 to 2.7.9
add efcb4af6cb Merge pull request #1446 from apache/dependabot/maven/master/org.springframework.boot-spring-boot-starter-parent-2.7.9
add 06a9b0a0c4 Bump spring-boot-maven-plugin from 2.7.8 to 2.7.9
add 3e67d843da Merge pull request #1447 from apache/dependabot/maven/master/org.springframework.boot-spring-boot-maven-plugin-2.7.9
new 9fdf123340 Merge remote-tracking branch 'origin/master' into spring6
The 1 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:
antora/supplemental-ui/img/home/causeway-logo.pptx | Bin 47361 -> 65120 bytes
antora/supplemental-ui/index.html | 10 +--
.../applib/value/semantics/ValueDecomposition.java | 12 ++-
.../applib/value/CalendarEventSemantics.java | 2 +-
.../causeway/testdomain/rest/RestServiceTest.java | 98 ++++++++-------------
.../testdomain/jdo/JdoInventoryResource.java | 8 +-
.../testdomain/util/rest/RestEndpointService.java | 19 ++++
.../applib/dtos/ScalarValueDtoV2.java | 67 +++++++++++---
.../client/src/main/java/module-info.java | 1 +
.../client/ActionParameterListBuilder.java | 10 +++
.../restfulobjects/client/ResponseDigest.java | 9 ++
.../restfulobjects/client/ResponseDigester.java | 34 ++-----
.../restfulobjects/client/RestfulClient.java | 11 +++
...ntentNegotiationServiceOrgApacheCausewayV2.java | 45 ++++++----
.../JsonValueEncoderServiceDefault.java | 12 +++
.../viewer/resources/JsonParserHelper.java | 4 +-
16 files changed, 219 insertions(+), 123 deletions(-)
[causeway] 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 9fdf1233402bf298b3bdb6d9a17d3c121dbc212e
Merge: 873e548570 3e67d843da
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Feb 24 15:26:45 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
antora/supplemental-ui/img/home/causeway-logo.pptx | Bin 47361 -> 65120 bytes
antora/supplemental-ui/index.html | 10 +--
.../applib/value/semantics/ValueDecomposition.java | 12 ++-
.../applib/value/CalendarEventSemantics.java | 2 +-
.../causeway/testdomain/rest/RestServiceTest.java | 98 ++++++++-------------
.../testdomain/jdo/JdoInventoryResource.java | 8 +-
.../testdomain/util/rest/RestEndpointService.java | 19 ++++
.../applib/dtos/ScalarValueDtoV2.java | 67 +++++++++++---
.../client/src/main/java/module-info.java | 1 +
.../client/ActionParameterListBuilder.java | 10 +++
.../restfulobjects/client/ResponseDigest.java | 9 ++
.../restfulobjects/client/ResponseDigester.java | 34 ++-----
.../restfulobjects/client/RestfulClient.java | 11 +++
...ntentNegotiationServiceOrgApacheCausewayV2.java | 45 ++++++----
.../JsonValueEncoderServiceDefault.java | 12 +++
.../viewer/resources/JsonParserHelper.java | 4 +-
16 files changed, 219 insertions(+), 123 deletions(-)
diff --cc regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
index 37175d973b,190d456ebc..709698f706
--- a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
+++ b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceTest.java
@@@ -18,10 -18,11 +18,11 @@@
*/
package org.apache.causeway.testdomain.rest;
-import javax.inject.Inject;
-import javax.xml.bind.JAXBException;
+import jakarta.inject.Inject;
+import jakarta.xml.bind.JAXBException;
import org.junit.jupiter.api.Assertions;
+ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
diff --cc viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java
index 663068cb57,c31a840247..9a1c101ea7
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ActionParameterListBuilder.java
@@@ -22,8 -22,10 +22,10 @@@ import java.util.LinkedHashMap
import java.util.Map;
import java.util.stream.Collectors;
-import javax.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Entity;
+ import org.apache.causeway.applib.value.semantics.ValueDecomposition;
+
import lombok.Getter;
/**
diff --cc viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigester.java
index 0482c7c54d,355f01655a..5f533edfc1
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigester.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/ResponseDigester.java
@@@ -23,11 -22,10 +22,10 @@@ import java.util.ArrayList
import java.util.List;
import java.util.Optional;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
- import com.fasterxml.jackson.core.JsonParseException;
- import com.fasterxml.jackson.databind.JsonMappingException;
+ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.lang.Nullable;
diff --cc viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java
index 34b126465a,7e7c608f8a..e892d08eb1
--- a/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java
+++ b/viewers/restfulobjects/client/src/main/java/org/apache/causeway/viewer/restfulobjects/client/RestfulClient.java
@@@ -21,16 -21,17 +21,18 @@@ package org.apache.causeway.viewer.rest
import java.net.URI;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
import java.util.function.UnaryOperator;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
+ import org.apache.causeway.applib.value.semantics.ValueDecomposition;
+ import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
import org.apache.causeway.commons.internal.base._Strings;
diff --cc viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java
index 5e70a1ac25,21f50c35d3..b2d6fd1656
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheCausewayV2.java
@@@ -20,11 -20,12 +20,12 @@@ package org.apache.causeway.viewer.rest
import java.util.EnumSet;
import java.util.List;
+ import java.util.Optional;
import java.util.stream.Stream;
-import javax.inject.Named;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Named;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.databind.node.POJONode;
@@@ -59,9 -64,11 +64,11 @@@ import lombok.val
*/
@Service
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".ContentNegotiationServiceOrgApacheCausewayV2")
-@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 200)
+@jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT - 200)
@Qualifier("OrgApacheCausewayV2")
- public class ContentNegotiationServiceOrgApacheCausewayV2 extends ContentNegotiationServiceAbstract {
+ @RequiredArgsConstructor(onConstructor_ = {@Autowired})
+ public class ContentNegotiationServiceOrgApacheCausewayV2
+ extends ContentNegotiationServiceAbstract {
/**
* Unlike RO v1.0, use a single content-type of <code>application/json;profile="urn:org.apache.causeway/v2"</code>.