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/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new d755f44c5c ISIS-3275: rest reg. test fixes (all green)
d755f44c5c is described below
commit d755f44c5c5f83c2e8c80f24c710a0289134f206
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 28 08:37:13 2022 +0100
ISIS-3275: rest reg. test fixes (all green)
---
regressiontests/stable-rest/pom.xml | 7 +++++++
.../apache/causeway/testdomain/rest/RestServiceStressTest.java | 3 +++
.../org/apache/causeway/testdomain/rest/RestServiceTest.java | 4 ++++
.../restfulobjects/viewer/resources/ResourceAbstract.java | 10 ----------
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/regressiontests/stable-rest/pom.xml
b/regressiontests/stable-rest/pom.xml
index 55afb57814..50e52fcf21 100644
--- a/regressiontests/stable-rest/pom.xml
+++ b/regressiontests/stable-rest/pom.xml
@@ -68,6 +68,13 @@
<artifactId>causeway-extensions-cors-impl</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.parsson</groupId>
+ <artifactId>parsson</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
index 9fe9235561..6b0d7716f8 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
@@ -37,6 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
+import org.apache.causeway.testdomain.conf.Configuration_usingSpring6;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClient;
import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
@@ -49,6 +50,7 @@ import lombok.extern.log4j.Log4j2;
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@Import({
+ Configuration_usingSpring6.class,
Configuration_usingJdo.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
@@ -59,6 +61,7 @@ class RestServiceStressTest {
@LocalServerPort int port; // just for reference (not used)
@Inject RestEndpointService restService;
+ //TODO[ISIS-3275] performance regression compared to v2: 26s vs 6s
@Test
void bookOfTheWeek_stressTest() {
diff --git
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
index 88ecbf9287..0885337473 100644
---
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
@@ -78,6 +78,10 @@ class RestServiceTest {
@Test
void bookOfTheWeek_viaRestEndpoint() {
+ //uses jakarta.json.JsonException
+
+ jakarta.json.JsonException x;
+
assertTrue(restService.getPort()>0);
val useRequestDebugLogging = false;
diff --git
a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 70c890be46..cc5cd4172d 100644
---
a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++
b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -20,7 +20,6 @@ package
org.apache.causeway.viewer.restfulobjects.viewer.resources;
import java.io.InputStream;
import java.util.Map;
-import java.util.Set;
import java.util.function.UnaryOperator;
import jakarta.servlet.http.HttpServletRequest;
@@ -40,8 +39,6 @@ import
org.apache.causeway.commons.internal.assertions._Assert;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.codec._UrlDecoderUtil;
-import org.apache.causeway.commons.internal.collections._Sets;
-import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
@@ -74,14 +71,7 @@ implements HasMetaModelContext {
@Context SecurityContext securityContext;
@Context Providers providers;
- //TODO[ISIS-3275] remove eventually
- private static final Set<Class<?>> initialized = _Sets.newHashSet();
-
protected ResourceAbstract() {
- if(!initialized.add(this.getClass())) {
- throw _Exceptions.illegalState("framework bug: %s already
instantiated, "
- + "check resteasy-spring-boot configuration",
this.getClass().getName());
- }
}
// -- FACTORIES
