You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/01/17 17:13:18 UTC
[04/17] isis git commit: ISIS-1296: using toolchain plugin to enforce
Java7; don't call JDK8 APIs
ISIS-1296: using toolchain plugin to enforce Java7; don't call JDK8 APIs
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9d232328
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9d232328
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9d232328
Branch: refs/heads/master
Commit: 9d2323286b734d8732c2c38411d073675a8ef13a
Parents: 0f92613
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jan 10 13:35:03 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jan 10 13:35:03 2016 +0000
----------------------------------------------------------------------
.../isis/core/metamodel/facets/Annotations.java | 2 +-
.../container/DomainObjectContainerDefault.java | 2 +-
core/pom.xml | 21 ++++++++++++++++++++
.../unittestsupport/soap/SoapEndpointSpec.java | 3 +--
4 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9d232328/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
index 707213c..1e08d5d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
@@ -185,7 +185,7 @@ public final class Annotations {
for (Method method : cls.getDeclaredMethods()) {
if(MethodScope.OBJECT.matchesScopeOf(method) &&
- method.getParameterCount() == 0) {
+ method.getParameterTypes().length == 0) {
final Annotation annotation = method.getAnnotation(annotationClass);
if(annotation != null) {
evaluators.add(new MethodEvaluator(method, annotation));
http://git-wip-us.apache.org/repos/asf/isis/blob/9d232328/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index 7944bbf..1371109 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -195,7 +195,7 @@ public class DomainObjectContainerDefault
}
final Constructor<?>[] constructors = mixinClass.getConstructors();
for (Constructor<?> constructor : constructors) {
- if(constructor.getParameterCount() == 1 &&
+ if(constructor.getParameterTypes().length == 1 &&
constructor.getParameterTypes()[0].isAssignableFrom(mixedIn.getClass())) {
final Object mixin;
try {
http://git-wip-us.apache.org/repos/asf/isis/blob/9d232328/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e28435f..624fc0b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -948,6 +948,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.7</version>
+ <vendor>oracle</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/isis/blob/9d232328/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
----------------------------------------------------------------------
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
index e3511e6..e83439a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
@@ -16,11 +16,10 @@
*/
package org.apache.isis.core.unittestsupport.soap;
-import java.util.function.Supplier;
-
import javax.annotation.Nullable;
import com.google.common.base.Function;
+import com.google.common.base.Supplier;
public class SoapEndpointSpec {