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 2018/10/04 13:35:26 UTC
[isis] branch v2 updated (2fa89ab -> 1c1ccb9)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 2fa89ab ISIS-1976: removing guava from plugins 'shiro' and 'axon'
new 64b71b2 ISIS-1976: remove runtime dependency on 'log4j'
new 1c1ccb9 ISIS-1976: fixes NPE on predicate composition
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/runtime/pom.xml | 18 ++++++----------
.../services/ServicesInstallerFromAnnotation.java | 24 ++++------------------
2 files changed, 10 insertions(+), 32 deletions(-)
[isis] 02/02: ISIS-1976: fixes NPE on predicate composition
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1c1ccb9ce823fa69b92a86e91cd1a6c20f5d14b9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 4 15:35:08 2018 +0200
ISIS-1976: fixes NPE on predicate composition
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../services/ServicesInstallerFromAnnotation.java | 24 ++++------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
index cc2f0aa..67daafc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.runtime.services;
-import static org.apache.isis.commons.internal.functions._Predicates.not;
-
import java.lang.reflect.Modifier;
import java.util.List;
import java.util.Set;
@@ -31,9 +29,6 @@ import java.util.stream.Collectors;
import javax.annotation.PreDestroy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
@@ -51,7 +46,7 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
// -- constants
- private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromAnnotation.class);
+ //private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromAnnotation.class);
public static final String NAME = "annotation";
public final static String PACKAGE_PREFIX_KEY = "isis.services.ServicesInstallerFromAnnotation.packagePrefix";
@@ -143,24 +138,13 @@ public class ServicesInstallerFromAnnotation extends ServicesInstallerAbstract {
public void shutdown() {
}
-
-
- // -- helpers
+ // -- HELPERS
private Predicate<Class<?>> instantiatable() {
- return not(nullClass()).and(not(abstractClass()));
- }
-
- private static Predicate<Class<?>> nullClass() {
- return (final Class<?> input) -> input == null;
- }
-
- private static Predicate<Class<?>> abstractClass() {
- return (final Class<?> input) -> Modifier.isAbstract(input.getModifiers());
+ return (final Class<?> input) ->
+ input != null && !Modifier.isAbstract(input.getModifiers());
}
-
-
// -- getServices (API)
private List<Object> services;
[isis] 01/02: ISIS-1976: remove runtime dependency on 'log4j'
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 64b71b277b560c7c723b7ed84403bc7daabc91af
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 4 15:34:48 2018 +0200
ISIS-1976: remove runtime dependency on 'log4j'
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
core/runtime/pom.xml | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index a9cd2bc..44f5ad0 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -111,18 +111,12 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <dependency>
- <!-- because DataNucleus uses log4j as its preferred logger -->
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <!-- required because resteasy-jaxrs declares as a test dependency whereas
- httpclient4 needs it as a compile dependency -->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- required because resteasy-jaxrs declares as a test dependency whereas -->
+<!-- httpclient4 needs it as a compile dependency -->
+<!-- <groupId>commons-logging</groupId> -->
+<!-- <artifactId>commons-logging</artifactId> -->
+<!-- </dependency> -->
</dependencies>