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 c26b3e029a ISIS-3275: cleaning up some annotations
c26b3e029a is described below
commit c26b3e029a32ba70f7c023495ddcf3b809dc6fd9
Author: Andi Huber <[email protected]>
AuthorDate: Sun Nov 13 16:57:10 2022 +0100
ISIS-3275: cleaning up some annotations
---
.../dom/domain/tests/DomainIntrospectionTestJdo.java | 2 +-
.../dom/domain/tests/DomainIntrospectionTestJpa.java | 2 +-
.../java/demoapp/web/linebreaker/LineBreaker.java | 6 +++---
.../web/notifications/NotificationsResource.java | 20 ++++++++++----------
.../security/PrototypeActionsVisibilityAdvisor.java | 4 ++--
.../ui/custom/WhereInTheWorldPanelFactory.java | 2 +-
.../causeway/testdomain/ldap/LdapServerService.java | 4 ++--
.../testdomain/conf/Configuration_headless.java | 2 +-
.../testdomain/jdo/JdoInventoryResource.java | 2 +-
.../testdomain/jpa/JpaInventoryResource.java | 2 +-
.../testdomain/model/actnsemantics/BlobDemoMenu.java | 2 +-
.../subscriber/CommandSubscriberForTesting.java | 2 +-
.../EntityChangesSubscriberForTesting.java | 2 +-
.../EntityPropertyChangeSubscriberForTesting.java | 2 +-
.../subscriber/ExecutionSubscriberForTesting.java | 2 +-
.../causeway/testdomain/rospec/RoSpecSampler.java | 2 +-
.../testdomain/util/kv/KVStoreForTesting.java | 4 ++--
17 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
index 6c5bebb39a..e4aee41f69 100644
---
a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
+++
b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.tests;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
diff --git
a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
index 762254f7a3..e79616a95e 100644
---
a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
+++
b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
@@ -20,7 +20,7 @@ package demoapp.dom.domain.tests;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
diff --git
a/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
b/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
index c8b0fafa8a..2543643caa 100644
--- a/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
+++ b/examples/demo/web/src/main/java/demoapp/web/linebreaker/LineBreaker.java
@@ -18,8 +18,8 @@
*/
package demoapp.web.linebreaker;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.causeway.applib.annotation.Action;
import org.apache.causeway.applib.annotation.DomainService;
@@ -41,7 +41,7 @@ import lombok.extern.log4j.Log4j2;
@DomainService(
nature = NatureOfService.REST
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = { @Inject })
@Log4j2
public class LineBreaker {
diff --git
a/examples/demo/web/src/main/java/demoapp/web/notifications/NotificationsResource.java
b/examples/demo/web/src/main/java/demoapp/web/notifications/NotificationsResource.java
index 9f5cd96c27..96a34f2daa 100644
---
a/examples/demo/web/src/main/java/demoapp/web/notifications/NotificationsResource.java
+++
b/examples/demo/web/src/main/java/demoapp/web/notifications/NotificationsResource.java
@@ -18,14 +18,14 @@
*/
package demoapp.web.notifications;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
@Path("/notifications")
public class NotificationsResource {
@@ -39,7 +39,7 @@ public class NotificationsResource {
@GET
@Path("/get/{id}")
@Produces(MediaType.APPLICATION_JSON)
- public Response getNotification(@PathParam("id") int id) {
+ public Response getNotification(@PathParam("id") final int id) {
return Response.ok()
.entity(new Notification(id, "john", "test notification"))
.build();
@@ -49,7 +49,7 @@ public class NotificationsResource {
@Path("/post/")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response postNotification(Notification notification) {
+ public Response postNotification(final Notification notification) {
return Response.status(201).entity(notification).build();
}
}
diff --git
a/examples/demo/web/src/main/java/demoapp/web/security/PrototypeActionsVisibilityAdvisor.java
b/examples/demo/web/src/main/java/demoapp/web/security/PrototypeActionsVisibilityAdvisor.java
index 4b0386f112..e9e49ccd4d 100644
---
a/examples/demo/web/src/main/java/demoapp/web/security/PrototypeActionsVisibilityAdvisor.java
+++
b/examples/demo/web/src/main/java/demoapp/web/security/PrototypeActionsVisibilityAdvisor.java
@@ -18,7 +18,7 @@
*/
package demoapp.web.security;
-import javax.inject.Named;
+import jakarta.inject.Named;
import org.springframework.context.event.EventListener;
@@ -43,7 +43,7 @@ import
org.apache.causeway.core.metamodel.inspect.Object_inspectMetamodel;
@DomainServiceLayout(
menuBar = DomainServiceLayout.MenuBar.TERTIARY
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
public class PrototypeActionsVisibilityAdvisor {
@EventListener(Object_downloadMetamodelXml.ActionDomainEvent.class)
diff --git
a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
index f256103b54..646b769d28 100644
---
a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
+++
b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
//tag::class[]
@org.springframework.stereotype.Component
[email protected](PriorityPrecedence.EARLY)
// <.>
[email protected](PriorityPrecedence.EARLY)
// <.>
public class WhereInTheWorldPanelFactory extends
EntityComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
diff --git
a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
index b96bfdcbe2..69578fcdf3 100644
---
a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
+++
b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/ldap/LdapServerService.java
@@ -20,8 +20,8 @@ package org.apache.causeway.testdomain.ldap;
import java.util.concurrent.CountDownLatch;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import org.junit.runners.model.InitializationError;
import org.springframework.stereotype.Service;
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
index 043adcdd01..fd463f2fb1 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/conf/Configuration_headless.java
@@ -58,7 +58,7 @@ import lombok.RequiredArgsConstructor;
public class Configuration_headless {
@Service
- @javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
+ @jakarta.annotation.Priority(PriorityPrecedence.MIDPOINT)
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public static class HeadlessCommandSupport
implements TransactionBoundaryAware {
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
index 9cccba8554..c0928778f7 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java
@@ -50,7 +50,7 @@ import lombok.val;
nature = NatureOfService.REST,
aliased = "testdomain.jdo.InventoryResourceAlias" // <-- as tested
with RestEndpointService
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = { @Inject })
public class JdoInventoryResource {
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
index 7cf8978f1b..3fab411047 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java
@@ -45,7 +45,7 @@ import lombok.val;
@Named("testdomain.jpa.InventoryResource")
@DomainService(nature = NatureOfService.REST)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
@RequiredArgsConstructor(onConstructor_ = { @Inject })
public class JpaInventoryResource {
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemoMenu.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemoMenu.java
index 94fb6d60d2..311968a83d 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemoMenu.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/model/actnsemantics/BlobDemoMenu.java
@@ -36,7 +36,7 @@ import lombok.val;
@DomainObjectLayout(
named="Blob Demo Menu"
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
public class BlobDemoMenu {
@Inject private FactoryService factoryService;
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
index abcfd5722a..9e3832c656 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/CommandSubscriberForTesting.java
@@ -21,7 +21,7 @@ package org.apache.causeway.testdomain.publishing.subscriber;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
index dc9afc9cad..c8d6d9794c 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityChangesSubscriberForTesting.java
@@ -21,7 +21,7 @@ package org.apache.causeway.testdomain.publishing.subscriber;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
index a52794a316..684fb098d2 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/EntityPropertyChangeSubscriberForTesting.java
@@ -21,7 +21,7 @@ package org.apache.causeway.testdomain.publishing.subscriber;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
index 894309219d..5314594ceb 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/publishing/subscriber/ExecutionSubscriberForTesting.java
@@ -21,7 +21,7 @@ package org.apache.causeway.testdomain.publishing.subscriber;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import jakarta.inject.Inject;
import org.springframework.stereotype.Service;
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
index c85f030554..39de5cc5b6 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java
@@ -34,7 +34,7 @@ import
org.apache.causeway.commons.internal.collections._Lists;
@DomainService(
nature = NatureOfService.REST
)
[email protected](PriorityPrecedence.EARLY)
[email protected](PriorityPrecedence.EARLY)
public class RoSpecSampler {
// -- VOID
diff --git
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
index e4b4b69dbc..3dd3b7706a 100644
---
a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
+++
b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/kv/KVStoreForTesting.java
@@ -22,8 +22,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CountDownLatch;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import jakarta.inject.Singleton;
import org.springframework.stereotype.Service;
