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
commit f88f9738ada502ac6ab3e314efdd988686def1a2 Merge: 36c84d4ed7 d07fd78eaa Author: Andi Huber <[email protected]> AuthorDate: Mon Nov 14 15:55:00 2022 +0100 ISIS-3275: renaming resteasy4 (remove version literal) .../relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 4 +++- .../web/src/main/java/demoapp/web/DemoAppManifestCommon.java | 4 ++-- .../restclient/integtests/OutboxRestClient_IntegTest.java | 4 ++-- .../org/apache/causeway/testdomain/rest/CorsFilterTest.java | 4 ++-- .../rest/RestServiceSimpifiedRepresentationTest.java | 4 ++-- .../apache/causeway/testdomain/rest/JsonValueEncoderTest.java | 4 ++-- .../apache/causeway/testdomain/rest/RestServiceStressTest.java | 4 ++-- .../org/apache/causeway/testdomain/rest/RestServiceTest.java | 4 ++-- .../CausewayModuleViewerRestfulObjectsJaxrsResteasy.java} | 10 +++++----- .../conneg/RestfulObjectsJaxbWriterForXml.java | 2 +- .../webmodule/WebModuleJaxrsResteasy.java} | 6 +++--- 11 files changed, 26 insertions(+), 24 deletions(-) diff --cc regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java index 2f7a7af478,659c74c507..fdf2a8b53a --- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java +++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/CorsFilterTest.java @@@ -41,9 -44,8 +41,9 @@@ import org.apache.causeway.testdomain.r import org.apache.causeway.testdomain.rospec.RoSpecSampler; import org.apache.causeway.testdomain.util.rest.RestEndpointService; import org.apache.causeway.viewer.restfulobjects.client.log.ClientConversationFilter; --import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4; ++import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; +import jakarta.inject.Inject; import lombok.val; @SpringBootTest( @@@ -60,7 -62,7 +60,7 @@@ @Import({ Configuration_headless.class, Configuration_usingRoSpec.class, -- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class, ++ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class, CausewayModuleExtCors.class }) @TestMethodOrder(OrderAnnotation.class) // run tests in sequence, to ease debugging diff --cc regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java index e37f0c381a,d1190d8c27..dd002e0cb1 --- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java +++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/rest/RestServiceSimpifiedRepresentationTest.java @@@ -57,7 -61,7 +57,7 @@@ import org.apache.causeway.tooling.mode import org.apache.causeway.tooling.model4adoc.AsciiDocWriter; import org.apache.causeway.viewer.restfulobjects.client.ActionParameterListBuilder; import org.apache.causeway.viewer.restfulobjects.client.log.ClientConversationFilter; --import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4; ++import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy; import static org.apache.causeway.testdomain.util.CollectionAssertions.assertComponentWiseEquals; import static org.apache.causeway.testdomain.util.CollectionAssertions.assertComponentWiseNumberEquals; @@@ -85,7 -87,7 +85,7 @@@ import lombok.val @Import({ Configuration_headless.class, Configuration_usingRoSpec.class, -- CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class, ++ CausewayModuleViewerRestfulObjectsJaxrsResteasy.class, }) @TestMethodOrder(OrderAnnotation.class) // run tests in sequence for reporting class RestServiceSimpifiedRepresentationTest { diff --cc viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.java index 40284f19d8,6b3c325e49..6f0a4eb3ab --- a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.java +++ b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/CausewayModuleViewerRestfulObjectsJaxrsResteasy.java @@@ -21,8 -21,8 +21,8 @@@ package org.apache.causeway.viewer.rest import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; - import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.conneg.RestfulObjectsJaxbWriterForXml; - import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.webmodule.WebModuleJaxrsResteasy4; + import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.conneg.RestfulObjectsJaxbWriterForXml; -import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.webmodule.WebModuleJaxrsResteasy4; ++import org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.webmodule.WebModuleJaxrsResteasy; import org.apache.causeway.viewer.restfulobjects.viewer.CausewayModuleViewerRestfulObjectsViewer; /** @@@ -34,7 -34,7 +34,7 @@@ CausewayModuleViewerRestfulObjectsViewer.class, // @Service's -- WebModuleJaxrsResteasy4.class, ++ WebModuleJaxrsResteasy.class, // @Component's RestfulObjectsJaxbWriterForXml.class, diff --cc viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java index 0163f50566,8b44642061..45a1a5e8e8 --- a/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java +++ b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java @@@ -16,8 -16,14 +16,8 @@@ * specific language governing permissions and limitations * under the License. */ - package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.webmodule; + package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.webmodule; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; - import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.springframework.beans.factory.annotation.Qualifier; @@@ -56,9 -57,9 +56,9 @@@ import lombok.val */ @Service @Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE + ".WebModuleJaxrsRestEasy4") // CAUTION: SwaggerServiceMenu refers to this name [email protected](PriorityPrecedence.MIDPOINT - 80) [email protected](PriorityPrecedence.MIDPOINT - 80) @Qualifier("JaxrsRestEasy4") --public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract { ++public final class WebModuleJaxrsResteasy extends WebModuleAbstract { private static final String INTERACTION_FILTER_NAME = "CausewayRestfulObjectsInteractionFilter"; @@@ -69,7 -70,7 +69,7 @@@ private final String urlPattern; @Inject -- public WebModuleJaxrsResteasy4( ++ public WebModuleJaxrsResteasy( final CausewayConfiguration causewayConfiguration, final RestEasyConfiguration restEasyConfiguration, final ServiceInjector serviceInjector) {
