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 2017/10/09 16:30:20 UTC
[isis] 09/10: ISIS-1742: moves NotContributedAs enum from applib to
metamodel (core)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7d46a078b8affa532fff6ed4f97b512f7224eab0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 9 16:53:20 2017 +0100
ISIS-1742: moves NotContributedAs enum from applib to metamodel (core)
---
.../isis/applib/annotation/NotContributedAs.java | 28 ----------------------
...tContributedFacetForActionLayoutAnnotation.java | 1 -
.../notcontributed/NotContributedFacet.java | 27 ++++++++++++++++++++-
.../NotContributedFacetAbstract.java | 1 -
...tributedFacetDerivedFromDomainServiceFacet.java | 1 -
.../NotContributedFacetDerivedFromMixinFacet.java | 1 -
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 9 ++++---
7 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributedAs.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributedAs.java
deleted file mode 100644
index 2c5eaa8..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributedAs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.apache.isis.applib.annotation;
-
-/**
- * @deprecated
- */
-@Deprecated
-public enum NotContributedAs {
- ACTION,
- ASSOCIATION,
- EITHER,
- NEITHER; /* ie contributed as both ! */
-
- /**
- * @deprecated
- */
- @Deprecated
- public static NotContributedAs notFrom(final Contributed contributed) {
- if(contributed == null) { return null; }
- switch (contributed) {
- case AS_ACTION: return NotContributedAs.ASSOCIATION;
- case AS_ASSOCIATION: return NotContributedAs.ACTION;
- case AS_NEITHER: return NotContributedAs.EITHER;
- case AS_BOTH: return null;
- }
- return null;
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
index 8cdc9e6..2309da4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
index 3819a2f..a82b085 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.actions.notcontributed;
import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -38,4 +37,30 @@ public interface NotContributedFacet extends Facet {
public boolean toActions();
public boolean toAssociations();
+
+ /**
+ * @deprecated
+ */
+ @Deprecated enum NotContributedAs {
+ ACTION,
+ ASSOCIATION,
+ EITHER,
+ NEITHER; /* ie contributed as both ! */
+
+ /**
+ * @deprecated
+ */
+ @Deprecated
+ public static NotContributedAs notFrom(final Contributed contributed) {
+ if(contributed == null) { return null; }
+ switch (contributed) {
+ case AS_ACTION: return NotContributedAs.ASSOCIATION;
+ case AS_ASSOCIATION: return NotContributedAs.ACTION;
+ case AS_NEITHER: return NotContributedAs.EITHER;
+ case AS_BOTH: return null;
+ }
+ return null;
+ }
+
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
index ee03c94..9c70d64 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.actions.notcontributed;
import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
index 66ae56b..9e864fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
index f7bf3df..1f57187 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
@@ -20,7 +20,6 @@ package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 3bf9b7a..999674c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -28,7 +28,6 @@ import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.FacetFactory;
@@ -157,7 +156,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.ACTION));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ACTION));
}
@@ -195,7 +194,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.ASSOCIATION));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ASSOCIATION));
}
@Test
@@ -231,7 +230,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.EITHER));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
}
@Test
@@ -268,7 +267,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.EITHER));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.