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 2020/01/04 14:41:14 UTC
[isis] 03/08: ISIS-2158: organize imports for 'incubator'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0cabd9a685496109607cf4379b023bbcad33cd42
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 14:11:36 2020 +0000
ISIS-2158: organize imports for 'incubator'
---
.../isis/metamodel/examples/facets/jsr303/CustomPattern.java | 8 ++++----
.../isis/metamodel/examples/facets/jsr303/CustomPatterns.java | 6 +++---
.../examples/facets/jsr303/Jsr303FacetFacetHolder.java | 7 ++++---
.../facets/jsr303/Jsr303FacetFactoryFeatureTypes.java | 7 ++++---
.../facets/jsr303/Jsr303FacetFactoryInstantiation.java | 1 +
.../facets/jsr303/Jsr303FacetFactoryProcessObject.java | 5 +++--
.../facets/jsr303/Jsr303FacetFactoryProcessProperty.java | 5 +++--
.../examples/facets/jsr303/Jsr303FacetInstantiation.java | 1 +
.../facets/jsr303/Jsr303FacetValidatingInteraction.java | 11 ++++++-----
.../isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java | 2 +-
10 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
index fd04d8e..05ed767 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
@@ -20,14 +20,14 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
import javax.validation.ConstraintValidator;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
index fc2828a..17eefcb 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
@@ -20,14 +20,14 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
@Documented
@Target( { ElementType.METHOD, FIELD })
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
index b8376b6..421c9e2 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
@@ -20,9 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +28,10 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
import org.apache.isis.metamodel.facets.FacetHolder;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
index 45dd6d5..59083a5 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
@@ -20,13 +20,14 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.collection.IsArrayContaining.hasItemInArray;
import static org.junit.Assert.assertThat;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
index c3ed4ab..731c7ff 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
@@ -21,6 +21,7 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
import org.junit.Test;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
index fa0f288..f8f846e 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
@@ -20,8 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.junit.Assert.fail;
-
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.jmock.integration.junit4.JUnit4Mockery;
@@ -31,6 +29,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import static org.junit.Assert.fail;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.MethodRemover;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
index 76fe303..821a92a 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
@@ -20,8 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.apache.isis.metamodel.commons.matchers.NofMatchers.anInstanceOf;
-
import java.lang.reflect.Method;
import org.jmock.Expectations;
@@ -33,11 +31,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.MethodRemover;
+import static org.apache.isis.metamodel.commons.matchers.NofMatchers.anInstanceOf;
+
@RunWith(JMock.class)
public class Jsr303FacetFactoryProcessProperty {
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
index e1619fd..27c1849 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
@@ -23,6 +23,7 @@ package org.apache.isis.metamodel.examples.facets.jsr303;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
import org.apache.isis.metamodel.facets.FacetHolderImpl;
diff --git a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
index cc86f66..04b61ff 100644
--- a/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
+++ b/incubator/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
@@ -20,11 +20,6 @@
package org.apache.isis.metamodel.examples.facets.jsr303;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -34,6 +29,12 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
diff --git a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
index 4e3d607..cebb542 100644
--- a/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ b/incubator/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.metrics.MetricsService;
-import lombok.val;
import lombok.extern.log4j.Log4j2;
+import lombok.val;
/**
*