You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/05/09 17:39:33 UTC
[isis] 02/04: ISIS-2112: remove @Any qualifiers at injection points
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1358116ff094459f62f948325a4985323a0168d7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 9 19:12:30 2019 +0200
ISIS-2112: remove @Any qualifiers at injection points
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
.../core/metamodel/services/grid/GridLoaderServiceDefault.java | 4 +---
.../isis/core/metamodel/services/grid/GridServiceDefault.java | 4 +---
.../rendering/service/RepresentationServiceContentNegotiator.java | 5 ++---
.../service/conneg/ContentNegotiationServiceXRoDomainType.java | 4 +---
.../apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java | 7 ++++---
5 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index 7e779fd..b82bf1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -24,8 +24,6 @@ import java.util.Map;
import java.util.Objects;
import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.xml.bind.JAXBContext;
@@ -276,6 +274,6 @@ public class GridLoaderServiceDefault implements GridLoaderService {
@Inject MessageService messageService;
@Inject JaxbService jaxbService;
- @Inject @Any Instance<GridSystemService<?>> gridSystemServices;
+ @Inject List<GridSystemService<?>> gridSystemServices;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index 121f5d2..7032ea9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -19,8 +19,6 @@ package org.apache.isis.core.metamodel.services.grid;
import java.util.List;
import java.util.stream.Collectors;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -204,7 +202,7 @@ public class GridServiceDefault implements GridService {
////////////////////////////////////////////////////////
@Inject GridLoaderService gridLoaderService;
- @Inject @Any private Instance<GridSystemService<?>> gridSystemServices;
+ @Inject private List<GridSystemService<?>> gridSystemServices;
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index 5f06e87..8d5e390 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -16,11 +16,10 @@
*/
package org.apache.isis.viewer.restfulobjects.rendering.service;
+import java.util.List;
import java.util.function.Function;
import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.core.Response;
@@ -174,5 +173,5 @@ public class RepresentationServiceContentNegotiator implements RepresentationSer
return responseBuilder.build();
}
- @Inject @Any Instance<ContentNegotiationService> contentNegotiationServices;
+ @Inject List<ContentNegotiationService> contentNegotiationServices;
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 20e9a26..60c2eef 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -20,8 +20,6 @@ package org.apache.isis.viewer.restfulobjects.rendering.service.conneg;
import java.util.List;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -157,6 +155,6 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
return domainObject;
}
- @Inject @Any Instance<ContentMappingService> contentMappingServices;
+ @Inject List<ContentMappingService> contentMappingServices;
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 505c020..a3f04be 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
-import javax.enterprise.inject.Instance;
+import java.util.List;
+
import javax.inject.Inject;
import org.apache.wicket.Component;
@@ -50,8 +51,8 @@ public class IsisSignInPanel extends SignInPanel {
@Inject transient IsisSessionFactory isisSessionFactory;
@Inject transient ServiceInjector servicesInjector;
@Inject transient private PageClassRegistry pageClassRegistry;
- @Inject transient Instance<UserRegistrationService> anyUserRegistrationService;
- @Inject transient Instance<EmailNotificationService> anyEmailNotificationService;
+ @Inject transient List<UserRegistrationService> anyUserRegistrationService;
+ @Inject transient List<EmailNotificationService> anyEmailNotificationService;
private final boolean signUpLink;
private final boolean passwordResetLink;