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:37 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated
(bc3df4c -> 94f4c00)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.
from bc3df4c ISIS-1742: deletes @ActionSemantics annotation, replaced ActionSemantics.Of enum with SemanticsOf enum
new b8ac761 ISIS-1742: deletes @QueryOnly and @Idempotent annotations
new 98e3edb ISIS-1742: deletes @ActionOrder annotation and corresponding facet and facet factory
new 94f4c00 ISIS-1742: deletes @FieldOrder and corresponding facet and facet factory. Also:
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../guides/rgant/_rgant_aaa_deprecated.adoc | 70 ---------------------
.../ugbtb/_ugbtb_programming-model_finetuning.adoc | 6 +-
.../apache/isis/applib/annotation/ActionOrder.java | 42 -------------
.../apache/isis/applib/annotation/FieldOrder.java | 37 -----------
.../apache/isis/applib/annotation/Idempotent.java | 36 -----------
.../apache/isis/applib/annotation/QueryOnly.java | 36 -----------
.../action/ActionAnnotationFacetFactory.java | 31 ++--------
...tionSemanticsFacetFromIdempotentAnnotation.java | 45 --------------
...ctionSemanticsFacetFromQueryOnlyAnnotation.java | 44 -------------
.../facets/members/order/MemberOrderFacet.java | 7 +--
.../object/actionorder/ActionOrderFacet.java | 41 ------------
.../actionorder/ActionOrderFacetAbstract.java | 36 -----------
.../annotation/ActionOrderFacetAnnotation.java | 35 -----------
.../ActionOrderFacetAnnotationFactory.java | 72 ----------------------
.../facets/object/fieldorder/FieldOrderFacet.java | 41 ------------
.../object/fieldorder/FieldOrderFacetAbstract.java | 36 -----------
.../annotation/FieldOrderFacetAnnotation.java | 35 -----------
.../FieldOrderFacetAnnotationFactory.java | 71 ---------------------
.../dflt/ProgrammingModelFacetsJava5.java | 5 --
.../action/ActionAnnotationFacetFactoryTest.java | 6 --
.../IdempotentFacetAnnotationFactoryTest.java | 64 -------------------
.../QueryOnlyFacetAnnotationFactoryTest.java | 65 -------------------
.../ActionOrderFacetAnnotationFactoryTest.java | 63 -------------------
.../FieldOrderFacetAnnotationFactoryTest.java | 63 -------------------
24 files changed, 9 insertions(+), 978 deletions(-)
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/ActionOrder.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Idempotent.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/QueryOnly.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromIdempotentAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromQueryOnlyAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacet.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/ActionOrderFacetAbstract.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/actionorder/annotation/ActionOrderFacetAnnotationFactory.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacet.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacetAbstract.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/IdempotentFacetAnnotationFactoryTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/QueryOnlyFacetAnnotationFactoryTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/actionorder/ActionOrderFacetAnnotationFactoryTest.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/fieldorder/FieldOrderFacetAnnotationFactoryTest.java
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 01/03: ISIS-1742: deletes @QueryOnly and @Idempotent
annotations
Posted by da...@apache.org.
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 b8ac761e45c6985b8b9ea39f60a370c0ff7687f6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 14:31:27 2017 +0100
ISIS-1742: deletes @QueryOnly and @Idempotent annotations
---
.../apache/isis/applib/annotation/Idempotent.java | 36 ------------
.../apache/isis/applib/annotation/QueryOnly.java | 36 ------------
.../action/ActionAnnotationFacetFactory.java | 31 ++---------
...tionSemanticsFacetFromIdempotentAnnotation.java | 45 ---------------
...ctionSemanticsFacetFromQueryOnlyAnnotation.java | 44 ---------------
.../action/ActionAnnotationFacetFactoryTest.java | 6 --
.../IdempotentFacetAnnotationFactoryTest.java | 64 ---------------------
.../QueryOnlyFacetAnnotationFactoryTest.java | 65 ----------------------
8 files changed, 4 insertions(+), 323 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Idempotent.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Idempotent.java
deleted file mode 100644
index 1902463..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Idempotent.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.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 Action#semantics()} instead.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Idempotent {
-}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/QueryOnly.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/QueryOnly.java
deleted file mode 100644
index 4fbae07..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/QueryOnly.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.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 Action#semantics()} instead.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface QueryOnly {
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 64282df..d5ea3d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -26,9 +26,7 @@ import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.Command;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.annotation.Idempotent;
import org.apache.isis.applib.annotation.Prototype;
-import org.apache.isis.applib.annotation.QueryOnly;
import org.apache.isis.applib.annotation.TypeOf;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
@@ -60,8 +58,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeF
import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFallbackToNonIdempotent;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFromIdempotentAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFromQueryOnlyAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetOnActionForTypeOfAnnotation;
import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacet;
@@ -83,8 +79,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
private final MetaModelValidatorForDeprecatedAnnotation bulkValidator = new MetaModelValidatorForDeprecatedAnnotation(Bulk.class);
private final MetaModelValidatorForDeprecatedAnnotation commandValidator = new MetaModelValidatorForDeprecatedAnnotation(Command.class);
- private final MetaModelValidatorForDeprecatedAnnotation queryOnlyValidator = new MetaModelValidatorForDeprecatedAnnotation(QueryOnly.class);
- private final MetaModelValidatorForDeprecatedAnnotation idempotentValidator = new MetaModelValidatorForDeprecatedAnnotation(Idempotent.class);
private final MetaModelValidatorForDeprecatedAnnotation typeOfValidator = new MetaModelValidatorForDeprecatedAnnotation(TypeOf.class);
private final MetaModelValidatorForDeprecatedAnnotation hiddenValidator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
private final MetaModelValidatorForDeprecatedAnnotation disabledValidator = new MetaModelValidatorForDeprecatedAnnotation(Disabled.class);
@@ -241,23 +235,10 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
- ActionSemanticsFacet facet;
-
- // check for the deprecated @QueryOnly...
- final QueryOnly queryOnly = Annotations.getAnnotation(processMethodContext.getMethod(), QueryOnly.class);
- facet = queryOnlyValidator.flagIfPresent(ActionSemanticsFacetFromQueryOnlyAnnotation.create(queryOnly, holder), processMethodContext);
-
- // else check for the deprecated @Idempotent...
- if(facet == null) {
- final Idempotent idempotent = Annotations.getAnnotation(processMethodContext.getMethod(), Idempotent.class);
- facet = idempotentValidator.flagIfPresent(ActionSemanticsFacetFromIdempotentAnnotation.create(idempotent, holder), processMethodContext);
- }
-
- // else check for @Action(semantics=...)
- if(facet == null) {
- final Action action = Annotations.getAnnotation(method, Action.class);
- facet = ActionSemanticsFacetForActionAnnotation.create(action, holder);
- }
+ // check for @Action(semantics=...)
+ final Action action = Annotations.getAnnotation(method, Action.class);
+ ActionSemanticsFacet facet =
+ ActionSemanticsFacetForActionAnnotation.create(action, holder);
// else fallback
if(facet == null) {
@@ -394,8 +375,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
metaModelValidator.add(bulkValidator);
metaModelValidator.add(commandValidator);
- metaModelValidator.add(queryOnlyValidator);
- metaModelValidator.add(idempotentValidator);
metaModelValidator.add(typeOfValidator);
metaModelValidator.add(hiddenValidator);
metaModelValidator.add(disabledValidator);
@@ -412,8 +391,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
bulkValidator.setConfiguration(configuration);
commandValidator.setConfiguration(configuration);
- queryOnlyValidator.setConfiguration(configuration);
- idempotentValidator.setConfiguration(configuration);
typeOfValidator.setConfiguration(configuration);
hiddenValidator.setConfiguration(configuration);
disabledValidator.setConfiguration(configuration);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromIdempotentAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromIdempotentAnnotation.java
deleted file mode 100644
index 329bf02..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromIdempotentAnnotation.java
+++ /dev/null
@@ -1,45 +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.action.semantics;
-
-import org.apache.isis.applib.annotation.Idempotent;
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
-import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class ActionSemanticsFacetFromIdempotentAnnotation extends ActionSemanticsFacetAbstract {
-
- private ActionSemanticsFacetFromIdempotentAnnotation(final FacetHolder holder) {
- super(SemanticsOf.IDEMPOTENT, holder);
- }
-
- public static ActionSemanticsFacet create(final Idempotent idempotent, final FacetHolder holder) {
- if (idempotent == null) {
- return null;
- }
- return new ActionSemanticsFacetFromIdempotentAnnotation(holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromQueryOnlyAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromQueryOnlyAnnotation.java
deleted file mode 100644
index ecf9722..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/semantics/ActionSemanticsFacetFromQueryOnlyAnnotation.java
+++ /dev/null
@@ -1,44 +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.action.semantics;
-
-import org.apache.isis.applib.annotation.QueryOnly;
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
-import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class ActionSemanticsFacetFromQueryOnlyAnnotation extends ActionSemanticsFacetAbstract {
-
- private ActionSemanticsFacetFromQueryOnlyAnnotation(final FacetHolder holder) {
- super(SemanticsOf.SAFE, holder);
- }
-
- public static ActionSemanticsFacet create(final QueryOnly queryOnly, final FacetHolder holder) {
- if (queryOnly == null) {
- return null;
- }
- return new ActionSemanticsFacetFromQueryOnlyAnnotation(holder);
- }
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 0edd382..8de356a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -34,9 +34,7 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.CommandExecuteIn;
import org.apache.isis.applib.annotation.CommandPersistence;
import org.apache.isis.applib.annotation.CommandReification;
-import org.apache.isis.applib.annotation.Idempotent;
import org.apache.isis.applib.annotation.InvokeOn;
-import org.apache.isis.applib.annotation.QueryOnly;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.HasTransactionId;
@@ -426,7 +424,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
public void whenDeprecatedQueryOnly() {
class Customer {
- @QueryOnly
public void someAction() {
}
}
@@ -449,7 +446,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
public void whenDeprecatedIdempotent() {
class Customer {
- @Idempotent
public void someAction() {
}
}
@@ -586,7 +582,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
public void whenDeprecatedQueryOnlyAndDeprecatedActionSemantics() {
class Customer {
- @QueryOnly
public void someAction() {
}
}
@@ -609,7 +604,6 @@ public class ActionAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4
public void whenDeprecatedIdempotentAndDeprecatedActionSemantics() {
class Customer {
- @Idempotent
public void someAction() {
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/IdempotentFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/IdempotentFacetAnnotationFactoryTest.java
deleted file mode 100644
index 01a6ef3..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/IdempotentFacetAnnotationFactoryTest.java
+++ /dev/null
@@ -1,64 +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.action;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.annotation.Idempotent;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
-import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFromIdempotentAnnotation;
-
-public class IdempotentFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private ActionAnnotationFacetFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new ActionAnnotationFacetFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testQueryOnlyAnnotationPickedUp() {
- class Customer {
- @Idempotent
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processSemantics(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof ActionSemanticsFacetFromIdempotentAnnotation);
-
- assertNoMethodsRemoved();
- }
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/QueryOnlyFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/QueryOnlyFacetAnnotationFactoryTest.java
deleted file mode 100644
index 41f7cee..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/QueryOnlyFacetAnnotationFactoryTest.java
+++ /dev/null
@@ -1,65 +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.action;
-
-import java.lang.reflect.Method;
-import org.apache.isis.applib.annotation.QueryOnly;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-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.action.semantics.ActionSemanticsFacetFromQueryOnlyAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
-
-public class QueryOnlyFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private ActionAnnotationFacetFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new ActionAnnotationFacetFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testQueryOnlyAnnotationPickedUp() {
- class Customer {
- @QueryOnly
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.processSemantics(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(ActionSemanticsFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof ActionSemanticsFacetFromQueryOnlyAnnotation);
-
- assertNoMethodsRemoved();
- }
-
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 03/03: ISIS-1742: deletes @FieldOrder and corresponding
facet and facet factory. Also:
Posted by da...@apache.org.
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 94f4c00942dba94f328d3547f66498b82fb91124
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 14:49:27 2017 +0100
ISIS-1742: deletes @FieldOrder and corresponding facet and facet factory. Also:
Also
- removes some deprecated annotations from .adoc
---
.../guides/rgant/_rgant_aaa_deprecated.adoc | 70 ---------------------
.../ugbtb/_ugbtb_programming-model_finetuning.adoc | 6 +-
.../apache/isis/applib/annotation/FieldOrder.java | 37 -----------
.../facets/members/order/MemberOrderFacet.java | 2 -
.../facets/object/fieldorder/FieldOrderFacet.java | 40 ------------
.../object/fieldorder/FieldOrderFacetAbstract.java | 36 -----------
.../annotation/FieldOrderFacetAnnotation.java | 35 -----------
.../FieldOrderFacetAnnotationFactory.java | 71 ----------------------
.../dflt/ProgrammingModelFacetsJava5.java | 2 -
.../FieldOrderFacetAnnotationFactoryTest.java | 63 -------------------
10 files changed, 4 insertions(+), 358 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 26a452f..3a05ef0 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
@@ -22,24 +22,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|Layer
|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
-|`@ActionOrder`
-|Order of buttons and menu items representing actions.
-|xref:../rgant/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]
-|UI
-|Yes
-
-|`@ActionInteraction`
-|Enable subscribers on the Event Bus Service to either veto, validate or take further steps before/after an action has been invoked.
-|xref:../rgant/rgant.adoc#_rgant-Action_domainEvent[`@Action#domainEvent()`]
-|Domain
-|
-
-|`@ActionSemantics`
-|Query-only, idempotent or non-idempotent.
-|xref:../rgant/rgant.adoc#_rgant-Action_semantics[`@Action#semantics()`]
-|Domain
-|
-
|`@Audited`
|Audit changes to an object.
|xref:../rgant/rgant.adoc#_rgant-DomainObject_auditing[`@DomainObject#` +
@@ -73,12 +55,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|UI, Domain
|
-|`@CollectionInteraction`
-|Enable subscribers on the Event Bus Service to either veto, validate or take further steps before/after a collection has been added to or removed from.
-|xref:../rgant/rgant.adoc#_rgant-Collection_domainEvent[`@Collection#domainEvent()`]
-|Domain
-|
-
|`@Command`
|Action invocation should be reified as a command object, optionally persistable for profiling and enhanced auditing, and background/async support.
|xref:../rgant/rgant.adoc#_rgant-Action_command[`@Action#command()`]
@@ -121,12 +97,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|UI
|
-|`@FieldOrder`
-|Order of properties and collections.
-|xref:../rgant/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`]
-|UI
-|Yes
-
|`@Hidden`
|Object member is not visible, or on domain service (to indicate that none of its actions are visible).
|For domain object members, use `#hidden()` attribute of xref:../rgant/rgant.adoc#_rgant-Action_hidden[`Action`], xref:../rgant/rgant.adoc#_rgant-Property_hidden[`Property`] or xref:../rgant/rgant.adoc#_rgant-Collection_hidden[`Collection`]. +
@@ -135,12 +105,6 @@ For domain service, use xref:../rgant/rgant.adoc#_rgant-DomainService_nature[`@D
|UI, Domain
|Yes
-|`@Idempotent`
-|Whether an action is idempotent (can be invoked multiple times with same post-condition).
-|xref:../rgant/rgant.adoc#_rgant-Action_semantics[`@Action#semantics`]
-|Domain
-|
-
|`@Ignore`
|Exclude this method from the metamodel.
|xref:../rgant/rgant.adoc#_rgant-Programmatic[`@Programmatic`]. +
@@ -246,40 +210,6 @@ Also part of the toString representation of bookmarks, if using the Bookmark Ser
|UI
|
-|`@PostsAction` +
-`InvokedEvent`
-|Post a domain event to the Event Bus Service indicating that an action has been invoked.
-|xref:../rgant/rgant.adoc#_rgant-Action_domainEvent[`@Action#domainEvent()`]
-|Domain
-|
-
-|`@PostsCollection` +
-`AddedToEvent`
-|Post a domain event to the Event Bus Service indicating that an element has been added to a collection.
-|xref:../rgant/rgant.adoc#_rgant-Collection_domainEvent[`@Collection#domainEvent()`]
-|Domain
-|
-
-|`@PostsCollection` +
-`RemovedFromEvent`
-|Post a domain event to the Event Bus Service indicating that an element has been removed from a collection.
-|xref:../rgant/rgant.adoc#_rgant-Collection_domainEvent[`@Collection#domainEvent()`]
-|Domain
-|
-
-|`@PostsProperty` +
-`ChangedEvent`
-|Post a domain event to the Event Bus Service indicating that the value of a property has changed.
-|xref:../rgant/rgant.adoc#_rgant-Property_domainEvent[`@Property#domainEvent()`]
-|Domain
-|
-
-|`@PropertyInteraction`
-|Enable subscribers on the Event Bus Service to either veto, validate or take further steps before/after a property has been modified or cleared.
-|xref:../rgant/rgant.adoc#_rgant-Property_domainEvent[`@Property#domainEvent()`]
-|Domain
-|
-
|`@Prototype`
|Indicates that an action should only be visible in 'prototype' mode.
|xref:../rgant/rgant.adoc#_rgant-Action_restrictTo[`@Action#restrictTo()`]
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
index a3e4c27..5e74b40 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
@@ -40,11 +40,13 @@ Let's see how this is done.
=== Including or excluding facets
-Suppose that you wanted to completely remove support for the (already deprecated) `@ActionOrder` annotation. This would be done using:
+Suppose that you wanted to completely remove support for some existing facet, eg to support the "persisting()" and "persisted()" callback methods.
+This would be done using:
[source,ini]
----
-isis.reflector.facets.exclude=org.apache.isis.core.metamodel.facets.object.actionorder.annotation.ActionOrderFacetAnnotationFactory
+isis.reflector.facets.exclude=\
+ org.apache.isis.core.metamodel.facets.object.callbacks.PersistCallbackFacetFactory
----
Or, suppose you wanted to use add some custom facet factory of your own, use:
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
deleted file mode 100644
index 463d992..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/FieldOrder.java
+++ /dev/null
@@ -1,37 +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.
- */
-@Inherited
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface FieldOrder {
- 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 b81811f..f794cbd 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.fieldorder.FieldOrderFacet;
/**
* The preferred mechanism for determining the order in which the members of the
@@ -31,7 +30,6 @@ import org.apache.isis.core.metamodel.facets.object.fieldorder.FieldOrderFacet;
* of the member methods with the <tt>@MemberOrder</tt>.
*
* @see MemberOrderFacet
- * @see FieldOrderFacet
*/
public interface MemberOrderFacet extends MultipleValueFacet {
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
deleted file mode 100644
index 0ad2508..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacet.java
+++ /dev/null
@@ -1,40 +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.fieldorder;
-
-import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-
-/**
- * (One of the) mechanism(s) for determining the order in which the properties
- * and collections of the object should be rendered.
- *
- * <p>
- * In the standard Apache Isis Programming Model, typically corresponds to the
- * <tt>fieldOrder</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 ActionOrderFacet
- */
-public interface FieldOrderFacet extends SingleStringValueFacet {
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacetAbstract.java
deleted file mode 100644
index c1ee886..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/FieldOrderFacetAbstract.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.fieldorder;
-
-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 FieldOrderFacetAbstract extends SingleStringValueFacetAbstract implements FieldOrderFacet {
-
- public static Class<? extends Facet> type() {
- return FieldOrderFacet.class;
- }
-
- public FieldOrderFacetAbstract(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/fieldorder/annotation/FieldOrderFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotation.java
deleted file mode 100644
index 98dd7f1..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotation.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.fieldorder.annotation;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.fieldorder.FieldOrderFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class FieldOrderFacetAnnotation extends FieldOrderFacetAbstract {
-
- public FieldOrderFacetAnnotation(final String value, final FacetHolder holder) {
- super(value, holder);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
deleted file mode 100644
index 0f6fc5c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/fieldorder/annotation/FieldOrderFacetAnnotationFactory.java
+++ /dev/null
@@ -1,71 +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.fieldorder.annotation;
-
-import org.apache.isis.applib.annotation.FieldOrder;
-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.fieldorder.FieldOrderFacet;
-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 FieldOrderFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, DeprecatedMarker {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(FieldOrder.class);
-
- public FieldOrderFacetAnnotationFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(final ProcessClassContext processClassContaxt) {
- final FieldOrder annotation = Annotations.getAnnotation(processClassContaxt.getCls(), FieldOrder.class);
- final FieldOrderFacet facet = create(annotation, processClassContaxt.getFacetHolder());
- FacetUtil.addFacet(validator.flagIfPresent(facet));
- }
-
- private FieldOrderFacet create(final FieldOrder annotation, final FacetHolder holder) {
- return annotation == null ? null : new FieldOrderFacetAnnotation(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/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 2035420..13b6645 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
@@ -85,7 +85,6 @@ import org.apache.isis.core.metamodel.facets.object.domainservice.annotation.Dom
import org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.object.encodeable.annotcfg.EncodableFacetAnnotationElseConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.facets.annotation.FacetsFacetAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.fieldorder.annotation.FieldOrderFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacetFactory;
import org.apache.isis.core.metamodel.facets.object.hidden.annotation.HiddenFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.hidden.method.HiddenObjectFacetViaMethodFactory;
@@ -310,7 +309,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new MemberOrderFacetFactory());
- addFactory(new FieldOrderFacetAnnotationFactory());
addFactory(new MemberGroupLayoutFacetFactory());
addFactory(new AggregatedAnnotationFactory());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/fieldorder/FieldOrderFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/fieldorder/FieldOrderFacetAnnotationFactoryTest.java
deleted file mode 100644
index f01d169..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/fieldorder/FieldOrderFacetAnnotationFactoryTest.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.fieldorder;
-
-import org.apache.isis.applib.annotation.FieldOrder;
-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.fieldorder.FieldOrderFacet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.object.fieldorder.annotation.FieldOrderFacetAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.fieldorder.annotation.FieldOrderFacetAnnotation;
-
-public class FieldOrderFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private FieldOrderFacetAnnotationFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new FieldOrderFacetAnnotationFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testFieldOrderAnnotationPickedUpOnClass() {
- @FieldOrder("foo,bar")
- class Customer {
- }
-
- facetFactory.process(new ProcessClassContext(Customer.class, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(FieldOrderFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof FieldOrderFacetAnnotation);
- final FieldOrderFacetAnnotation fieldOrderFacetAnnotation = (FieldOrderFacetAnnotation) facet;
- assertEquals("foo,bar", fieldOrderFacetAnnotation.value());
-
- assertNoMethodsRemoved();
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/03: ISIS-1742: deletes @ActionOrder annotation and
corresponding facet and facet factory
Posted by da...@apache.org.
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>.