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/03 13:49:39 UTC
[isis] 02/03: ISIS-1742: deletes @ActionOrder annotation and
corresponding facet and facet factory
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 98e3edb748ac395d4a3127aac5b05ef592bc3690
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 14:35:43 2017 +0100
ISIS-1742: deletes @ActionOrder annotation and corresponding facet and facet factory
---
.../apache/isis/applib/annotation/ActionOrder.java | 42 -------------
.../facets/members/order/MemberOrderFacet.java | 5 +-
.../object/actionorder/ActionOrderFacet.java | 41 ------------
.../actionorder/ActionOrderFacetAbstract.java | 36 -----------
.../annotation/ActionOrderFacetAnnotation.java | 35 -----------
.../ActionOrderFacetAnnotationFactory.java | 72 ----------------------
.../facets/object/fieldorder/FieldOrderFacet.java | 1 -
.../dflt/ProgrammingModelFacetsJava5.java | 3 -
.../ActionOrderFacetAnnotationFactoryTest.java | 63 -------------------
9 files changed, 1 insertion(+), 297 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
deleted file mode 100644
index ad9ee37..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
+++ /dev/null
@@ -1,42 +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;
-
-/**
- * @deprecated - use {@link MemberOrder} or <code>Xxx.layout.json</code> instead.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ActionOrder {
-
- /**
- * @deprecated - use {@link MemberOrder} or <code>Xxx.layout.json</code> instead.
- */
- @Deprecated
- String value();
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java
index bdb5652..b81811f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/order/MemberOrderFacet.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.members.order;
import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
-import org.apache.isis.core.metamodel.facets.object.actionorder.ActionOrderFacet;
import org.apache.isis.core.metamodel.facets.object.fieldorder.FieldOrderFacet;
/**
@@ -29,9 +28,7 @@ import org.apache.isis.core.metamodel.facets.object.fieldorder.FieldOrderFacet;
*
* <p>
* In the standard Apache Isis Programming Model, corresponds to annotating each
- * of the member methods with the <tt>@MemberOrder</tt>. An alternative appraoch
- * is to use the {@link ActionOrderFacet actionOrder} or {@link FieldOrderFacet
- * field order}.
+ * of the member methods with the <tt>@MemberOrder</tt>.
*
* @see MemberOrderFacet
* @see FieldOrderFacet
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacet.java
deleted file mode 100644
index 6a1dbf0..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacet.java
+++ /dev/null
@@ -1,41 +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.object.actionorder;
-
-import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.object.fieldorder.FieldOrderFacet;
-
-/**
- * (One of the) mechanism(s) for determining the order in which the actions of
- * the object should be rendered.
- *
- * <p>
- * In the standard Apache Isis Programming Model, typically corresponds to the
- * <tt>actionOrder</tt> method which returns a comma-separated list of action
- * names. An alternative (and preferred, because it is refactoring-safe)
- * mechanism is to annotate each of the methods using <tt>@MemberOrder</tt>.
- *
- * @see MemberOrderFacet
- * @see FieldOrderFacet
- */
-public interface ActionOrderFacet extends SingleStringValueFacet {
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacetAbstract.java
deleted file mode 100644
index 74f5d2d..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacetAbstract.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.object.actionorder;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.SingleStringValueFacetAbstract;
-
-public abstract class ActionOrderFacetAbstract extends SingleStringValueFacetAbstract implements ActionOrderFacet {
-
- public static Class<? extends Facet> type() {
- return ActionOrderFacet.class;
- }
-
- public ActionOrderFacetAbstract(final String value, final FacetHolder holder) {
- super(type(), holder, value);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotation.java
deleted file mode 100644
index 992e6a7..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotation.java
+++ /dev/null
@@ -1,35 +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.object.actionorder.annotation;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.actionorder.ActionOrderFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class ActionOrderFacetAnnotation extends ActionOrderFacetAbstract {
-
- public ActionOrderFacetAnnotation(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java
deleted file mode 100644
index 1acd1c5..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.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.object.actionorder.annotation;
-
-import org.apache.isis.applib.annotation.ActionOrder;
-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.object.actionorder.ActionOrderFacet;
-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 ActionOrderFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, DeprecatedMarker {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(ActionOrder.class);
-
- public ActionOrderFacetAnnotationFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(final ProcessClassContext processClassContext) {
- final ActionOrder annotation = Annotations.getAnnotation(processClassContext.getCls(), ActionOrder.class);
- final ActionOrderFacet facet = create(annotation, processClassContext.getFacetHolder());
- FacetUtil.addFacet(validator.flagIfPresent(facet));
- }
-
- private ActionOrderFacet create(final ActionOrder annotation, final FacetHolder facetHolder) {
- return annotation == null ? null : new ActionOrderFacetAnnotation(annotation.value(), facetHolder);
- }
-
- @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/object/fieldorder/FieldOrderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacet.java
index 3db035b..0ad2508 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacet.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.object.fieldorder;
import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.object.actionorder.ActionOrderFacet;
/**
* (One of the) mechanism(s) for determining the order in which the properties
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 5e750eb..2035420 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
@@ -64,7 +64,6 @@ import org.apache.isis.core.metamodel.facets.members.named.staticmethod.NamedFac
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
import org.apache.isis.core.metamodel.facets.members.render.annotprop.RenderFacetOrResolveFactory;
import org.apache.isis.core.metamodel.facets.object.ViewModelSemanticCheckingFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.actionorder.annotation.ActionOrderFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.audit.markerifc.AuditableFacetMarkerInterfaceFactory;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.bookmarkable.BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory;
import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacetFactory;
@@ -311,8 +310,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new MemberOrderFacetFactory());
- addFactory(new ActionOrderFacetAnnotationFactory());
-
addFactory(new FieldOrderFacetAnnotationFactory());
addFactory(new MemberGroupLayoutFacetFactory());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacetAnnotationFactoryTest.java
deleted file mode 100644
index 77530eb..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacetAnnotationFactoryTest.java
+++ /dev/null
@@ -1,63 +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.ordering.actionorder;
-
-import org.apache.isis.applib.annotation.ActionOrder;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.object.actionorder.ActionOrderFacet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.object.actionorder.annotation.ActionOrderFacetAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.actionorder.annotation.ActionOrderFacetAnnotation;
-
-public class ActionOrderFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private ActionOrderFacetAnnotationFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new ActionOrderFacetAnnotationFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testActionOrderAnnotationPickedUpOnClass() {
- @ActionOrder("foo,bar")
- class Customer {
- }
-
- facetFactory.process(new ProcessClassContext(Customer.class, null, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(ActionOrderFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof ActionOrderFacetAnnotation);
- final ActionOrderFacetAnnotation actionOrderFacetAnnotation = (ActionOrderFacetAnnotation) facet;
- assertEquals("foo,bar", actionOrderFacetAnnotation.value());
-
- assertNoMethodsRemoved();
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.