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:19 UTC
[isis] 08/10: ISIS-1742: deletes @NotContributed annotation,
facets and .adocs.
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 ef89e2d7ed34e5a7e524bd819bc152cea442b036
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 9 16:51:51 2017 +0100
ISIS-1742: deletes @NotContributed annotation, facets and .adocs.
Retains NotContributed.As enum, moved out to NotContributedAs enum.
Also introduces Contributed value to NotContributedFacet
---
.../guides/rgant/_rgant_aaa_deprecated.adoc | 9 --
.../isis/applib/annotation/NotContributed.java | 85 -----------------
.../isis/applib/annotation/NotContributedAs.java | 28 ++++++
...tContributedFacetForActionLayoutAnnotation.java | 13 ++-
.../notcontributed/NotContributedFacet.java | 6 +-
.../NotContributedFacetAbstract.java | 31 ++++--
.../annotation/NotContributedFacetAnnotation.java | 36 -------
.../NotContributedFacetAnnotationFactory.java | 72 --------------
...tributedFacetDerivedFromDomainServiceFacet.java | 5 +-
.../NotContributedFacetDerivedFromMixinFacet.java | 5 +-
.../dflt/ProgrammingModelFacetsJava5.java | 3 -
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 10 +-
.../NotContributedFacetAnnotationFactoryTest.java | 104 ---------------------
todo-deprecation-list.txt | 4 +-
14 files changed, 75 insertions(+), 336 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
index d7544a5..681c3cf 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant_aaa_deprecated.adoc
@@ -30,15 +30,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|
-|`@NotContributed`
-|Indicates that a domain service action is not rendered as an action on the (entity) types of its parameters.
-For 1-arg query-only actions, controls whether the domain service action is rendered as a property or collection on the entity type of its parameter.
-|Use xref:../rgant/rgant.adoc#_rgant-DomainService_nature[`@DomainService#nature()`] to specify whether any of the actions in a domain service should appear in the menu bars (applies at type level, not action level).
-For individual actions, use xref:../rgant/rgant.adoc#_rgant-ActionLayout_contributedAs[`@ActionLayout#` +
-`contributedAs()`] to specify whether any individual action should be contributed only as an action or as an association (property or collection).
-|UI
-|
-
|`@NotInServiceMenu`
|Indicates that a domain service should not be rendered in the application menu (at top of page in Wicket viewer).
|xref:../rgant/rgant.adoc#_rgant-DomainService_nature[`@DomainService#nature()`] to signify that none of the actions in a domain service should appear in the menu bars
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
deleted file mode 100644
index 0ea2741..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates the a (repository) action should not be contributed, either as
- * an object action, or as an association (property/collection), or as either.
- * <p/>
- * <p/>
- * It may still be appear in the repository menu (unless it has been annotated
- * as {@link NotInServiceMenu}).
- * <p/>
- * <p/>
- * If annotated with {@link Hidden}, then also implies that the
- * menu should not be contributed.
- * <p/>
- * <p/>
- * Has no meaning for actions on regular entities.
- *
- * @deprecated - to not contribute at all, move action to a service whose {@link org.apache.isis.applib.annotation.DomainService#nature() nature} is {@link org.apache.isis.applib.annotation.NatureOfService#VIEW_MENU_ONLY} or {@link org.apache.isis.applib.annotation.NatureOfService#DOMAIN}; to contribute only as an action or as an association, ensure action is in a service whose nature is {@link org.apache.isis.applib.annotation.NatureOfService#VIEW} or {@link org.apache.isis.applib.annot [...]
- */
-@Deprecated
-@Inherited
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NotContributed {
-
- /**
- * @deprecated
- */
- @Deprecated
- public enum As {
- ACTION,
- ASSOCIATION,
- EITHER,
- NEITHER; /* ie contributed as both ! */
-
- /**
- * @deprecated
- */
- @Deprecated
- public static As from(final Contributed contributed) {
- if(contributed == null) { return null; }
- switch (contributed) {
- case AS_ACTION: return As.ASSOCIATION;
- case AS_ASSOCIATION: return As.ACTION;
- case AS_NEITHER: return As.EITHER;
- case AS_BOTH: return null;
- }
- return null;
- }
-
- }
-
- /**
- * @deprecated
- * @return
- */
- @Deprecated
- As value() default As.EITHER;
-
-}
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
new file mode 100644
index 0000000..2c5eaa8
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributedAs.java
@@ -0,0 +1,28 @@
+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 7273c48..8cdc9e6 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,7 @@ 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.NotContributed;
+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;
@@ -35,15 +35,18 @@ public class NotContributedFacetForActionLayoutAnnotation extends NotContributed
return null;
}
final Contributed contributed = actionLayout.contributed();
- final NotContributed.As as = NotContributed.As.from(contributed);
+ final NotContributedAs as = NotContributedAs.notFrom(contributed);
if(as == null) {
return null;
}
- return new NotContributedFacetForActionLayoutAnnotation(as, holder);
+ return new NotContributedFacetForActionLayoutAnnotation(as, contributed, holder);
}
- private NotContributedFacetForActionLayoutAnnotation(final NotContributed.As as, final FacetHolder holder) {
- super(as, holder);
+ private NotContributedFacetForActionLayoutAnnotation(
+ final NotContributedAs as,
+ final Contributed contributed,
+ final FacetHolder holder) {
+ super(as, contributed, holder);
}
}
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 7d80dca..3819a2f 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
@@ -19,7 +19,8 @@
package org.apache.isis.core.metamodel.facets.actions.notcontributed;
-import org.apache.isis.applib.annotation.NotContributed.As;
+import org.apache.isis.applib.annotation.Contributed;
+import org.apache.isis.applib.annotation.NotContributedAs;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -32,7 +33,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
*/
public interface NotContributedFacet extends Facet {
- public As value();
+ public NotContributedAs value();
+ public Contributed inverseValue();
public boolean toActions();
public boolean toAssociations();
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 c98815e..ee03c94 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
@@ -19,41 +19,56 @@
package org.apache.isis.core.metamodel.facets.actions.notcontributed;
-import org.apache.isis.applib.annotation.NotContributed.As;
+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;
public abstract class NotContributedFacetAbstract extends FacetAbstract implements NotContributedFacet {
- private final As as;
+ private final NotContributedAs as;
+ private final Contributed contributed;
public static Class<? extends Facet> type() {
return NotContributedFacet.class;
}
- public NotContributedFacetAbstract(final As as, final FacetHolder holder) {
- this(as, holder, Derivation.NOT_DERIVED);
+ public NotContributedFacetAbstract(
+ final NotContributedAs as,
+ final Contributed contributed,
+ final FacetHolder holder) {
+ this(as, contributed, holder, Derivation.NOT_DERIVED);
}
- public NotContributedFacetAbstract(final As as, final FacetHolder holder, final Derivation derivation) {
+ public NotContributedFacetAbstract(
+ final NotContributedAs as,
+ final Contributed contributed,
+ final FacetHolder holder,
+ final Derivation derivation) {
super(type(), holder, derivation);
this.as = as;
+ this.contributed = contributed;
}
@Override
- public As value() {
+ public NotContributedAs value() {
return as;
}
@Override
+ public Contributed inverseValue() {
+ return contributed;
+ }
+
+ @Override
public boolean toActions() {
- return value() == As.EITHER || value() == As.ACTION;
+ return value() == NotContributedAs.EITHER || value() == NotContributedAs.ACTION;
}
@Override
public boolean toAssociations() {
- return value() == As.EITHER || value() == As.ASSOCIATION;
+ return value() == NotContributedAs.EITHER || value() == NotContributedAs.ASSOCIATION;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
deleted file mode 100644
index a9cb337..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation;
-
-import org.apache.isis.applib.annotation.NotContributed.As;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NotContributedFacetAnnotation extends NotContributedFacetAbstract {
-
- public NotContributedFacetAnnotation(As as, final FacetHolder holder) {
- super(as, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
deleted file mode 100644
index 407fcb8..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactory.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation;
-
-import org.apache.isis.applib.annotation.NotContributed;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.metamodel.progmodel.DeprecatedMarker;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class NotContributedFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, DeprecatedMarker {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(NotContributed.class);
-
- public NotContributedFacetAnnotationFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final NotContributed annotation = Annotations.getAnnotation(processMethodContext.getMethod(), NotContributed.class);
- final NotContributedFacet facet = create(annotation, processMethodContext.getFacetHolder());
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private NotContributedFacet create(final NotContributed annotation, final FacetHolder holder) {
- return annotation == null ? null : new NotContributedFacetAnnotation(annotation.value(), holder);
- }
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-
-}
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 3dd7ec4..66ae56b 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
@@ -19,8 +19,9 @@
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.NotContributed;
+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;
@@ -30,7 +31,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacet extends NotContrib
private final NatureOfService natureOfService;
public NotContributedFacetDerivedFromDomainServiceFacet(final NatureOfService natureOfService, final FacetHolder holder) {
- super(NotContributed.As.EITHER, holder, Derivation.DERIVED);
+ super(NotContributedAs.EITHER, Contributed.AS_NEITHER , holder, Derivation.DERIVED);
this.natureOfService = natureOfService;
}
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 8e8fea3..f7bf3df 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
@@ -19,7 +19,8 @@
package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.NotContributed;
+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;
@@ -31,7 +32,7 @@ public class NotContributedFacetDerivedFromMixinFacet extends NotContributedFace
public NotContributedFacetDerivedFromMixinFacet(
final FacetHolder holder) {
- super(NotContributed.As.NEITHER, holder, Derivation.DERIVED);
+ super(NotContributedAs.NEITHER, Contributed.AS_NEITHER, holder, Derivation.DERIVED);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index c88e412..04d36c7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -23,7 +23,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.ActionChoicesForColl
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation.NotContributedFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromDomainServiceFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.annotation.NotInServiceMenuFacetAnnotationFactory;
@@ -292,8 +291,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new EncodableFacetAnnotationElseConfigurationFactory());
- addFactory(new NotContributedFacetAnnotationFactory());
-
addFactory(new NotInServiceMenuFacetAnnotationFactory());
addFactory(new NotInServiceMenuFacetViaMethodFactory());
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 c314caa..3bf9b7a 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,7 @@ 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.NotContributed;
+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 +157,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(NotContributed.As.ACTION));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.ACTION));
}
@@ -195,7 +195,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(NotContributed.As.ASSOCIATION));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.ASSOCIATION));
}
@Test
@@ -231,7 +231,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(NotContributed.As.EITHER));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.EITHER));
}
@Test
@@ -268,7 +268,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(NotContributed.As.EITHER));
+ assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedAs.EITHER));
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactoryTest.java
deleted file mode 100644
index 289c8bc..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/annotation/NotContributedFacetAnnotationFactoryTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation;
-
-import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.NotContributed;
-import org.apache.isis.applib.annotation.NotContributed.As;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-public class NotContributedFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private NotContributedFacetAnnotationFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new NotContributedFacetAnnotationFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testAnnotationPickedUp() {
- class CustomerRepository {
- @NotContributed
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
-
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, actionMethod, methodRemover, facetedMethod));
-
- final NotContributedFacet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NotContributedFacetAbstract);
- assertThat(facet.value(), is(As.EITHER));
-
- assertNoMethodsRemoved();
- }
-
- public void testAnnotationPickedUpWithAsAssociation() {
- class CustomerRepository {
- @NotContributed(As.ASSOCIATION)
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
-
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, actionMethod, methodRemover, facetedMethod));
-
- final NotContributedFacet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NotContributedFacetAbstract);
- assertThat(facet.value(), is(As.ASSOCIATION));
-
- assertNoMethodsRemoved();
- }
-
- public void testAnnotationPickedUpWithAsAction() {
- class CustomerRepository {
- @NotContributed(As.ACTION)
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
-
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, actionMethod, methodRemover, facetedMethod));
-
- final NotContributedFacet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NotContributedFacetAbstract);
- assertThat(facet.value(), is(As.ACTION));
-
- assertNoMethodsRemoved();
- }
-
-}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index f3b4994..e8b3ef2 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -11,9 +11,6 @@ org.apache.isis.applib
org.apache.isis.applib.annotation
-
-
-
Mandatory.java - entire annotation, use @Property(optionality=...) and @Parameter(optionality=...), or @javax.annotations.Nullable
Optional.java - entire annotation, use @Property(optionality=...) and @Parameter(optionality=...), or @javax.annotations.Nullable
@@ -42,6 +39,7 @@ org.apache.isis.applib.events - entire package. These event classes supported o
redundant as @Xxx(domainEvent=...) on member achieves much the same effect using event bus
org.apache.isis.applib.filter - entire package of Filter classes; use guava Predicate instead.
+
org.apache.isis.applib.fixturescripts
FixtureScript.java - various methods to simplify API
add(...) - use addResult(...) instead
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.