This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new ec8993ab79 ISIS-3276: more removal of literal '4' in resteasy names
ec8993ab79 is described below
commit ec8993ab799954840ecada923f41b7a26162bd0a
Author: Andi Huber <[email protected]>
AuthorDate: Wed Nov 16 06:29:31 2022 +0100
ISIS-3276: more removal of literal '4' in resteasy names
---
.../org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java | 2 +-
.../org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java | 2 +-
.../jaxrsresteasy/webmodule/WebModuleJaxrsResteasy.java | 4 ++--
.../Parser_forCacheControl_Test.java | 2 +-
.../Parser_forJaxRsMediaType_Test.java | 2 +-
.../RepresentationTypeTest_getMediaType.java | 2 +-
.../RepresentationTypeTest_getName.java | 2 +-
.../RepresentationTypeTest_lookup.java | 2 +-
.../RepresentationTypeTest_parser.java | 2 +-
.../context/ResourceContext_ensureCompatibleAcceptHeader_Test.java | 2 +-
.../mappers/RestfulObjectsApplicationExceptionMapper_Test.java | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
index fb17b0c991..06015e49b0 100644
---
a/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
+++
b/regressiontests/stable-viewers-jdo/src/main/java/org/apache/causeway/testdomain/viewers/jdo/wkt/TestAppJdoWkt.java
@@ -53,7 +53,7 @@ import
org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer
// UI (Wicket Viewer)
CausewayModuleViewerWicketViewer.class,
- //CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ //CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
XrayEnable.class // for debugging only
})
diff --git
a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
index 1006226198..6479fbb58d 100644
---
a/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
+++
b/regressiontests/stable-viewers-jpa/src/main/java/org/apache/causeway/testdomain/viewers/jpa/wkt/TestAppJpaWkt.java
@@ -53,7 +53,7 @@ import
org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer
// UI (Wicket Viewer)
CausewayModuleViewerWicketViewer.class,
- //CausewayModuleViewerRestfulObjectsJaxrsResteasy4.class,
+ //CausewayModuleViewerRestfulObjectsJaxrsResteasy.class,
//XrayEnable.class // for debugging only
})
diff --git
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
index dbf85139a9..e3165625e0 100644
---
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
@@ -59,7 +59,7 @@ import lombok.val;
//CAUTION: SwaggerServiceMenu refers to this name
@Named(CausewayModuleViewerRestfulObjectsApplib.NAMESPACE +
".WebModuleJaxrsRestEasy")
@javax.annotation.Priority(PriorityPrecedence.MIDPOINT - 80)
-@Qualifier("JaxrsRestEasy4")
+@Qualifier("JaxrsRestEasy")
public final class WebModuleJaxrsResteasy extends WebModuleAbstract {
private static final String INTERACTION_FILTER_NAME =
"CausewayRestfulObjectsInteractionFilter";
@@ -83,7 +83,7 @@ public final class WebModuleJaxrsResteasy extends
WebModuleAbstract {
}
@Getter
- private final String name = "JaxrsRestEasy4";
+ private final String name = "JaxrsRestEasy";
@Override
public void prepare(final WebModuleContext ctx) {
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/Parser_forCacheControl_Test.java
similarity index 93%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/Parser_forCacheControl_Test.java
index 723b99219f..9ccd6d7c90 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/Parser_forCacheControl_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import
org.apache.causeway.viewer.restfulobjects.testing.Parser_forCacheControl_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/Parser_forJaxRsMediaType_Test.java
similarity index 93%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/Parser_forJaxRsMediaType_Test.java
index 5c2506d706..e39d6744a5 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/Parser_forJaxRsMediaType_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import
org.apache.causeway.viewer.restfulobjects.testing.Parser_forJaxRsMediaType_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_getMediaType.java
similarity index 94%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_getMediaType.java
index 4285825a41..fe74fd53a3 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_getMediaType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import
org.apache.causeway.viewer.restfulobjects.testing.RepresentationTypeTest_getMediaType_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_getName.java
similarity index 93%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_getName.java
index fa90fc284b..12f8d7c7c0 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_getName.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import
org.apache.causeway.viewer.restfulobjects.testing.RepresentationTypeTest_getName_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_lookup.java
similarity index 93%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_lookup.java
index 7f45a3eb1f..9658f97ba3 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_lookup.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import
org.apache.causeway.viewer.restfulobjects.testing.RepresentationTypeTest_lookup_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_parser.java
similarity index 94%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_parser.java
index f23887e6e0..edb7e1c6a3 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/RepresentationTypeTest_parser.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy;
import
org.apache.causeway.viewer.restfulobjects.testing.RepresentationTypeTest_parser_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
similarity index 93%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
index 1110eb2873..cc04fd50a3 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.context;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.context;
import
org.apache.causeway.viewer.restfulobjects.testing.ResourceContext_ensureCompatibleAcceptHeader_ContractTest;
diff --git
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
similarity index 93%
rename from
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
rename to
viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
index f3b1463c2e..76254bb1f7 100644
---
a/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
+++
b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4.mappers;
+package org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.mappers;
import
org.apache.causeway.viewer.restfulobjects.testing.RestfulObjectsApplicationExceptionMapper_Test_Contract;
