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 17:02:59 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated:
ISIS-1742: deletes @MustSatisfy annotation + supporting facets. Updates
.adoc
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
The following commit(s) were added to refs/heads/dev/2.0.0/ISIS-1742-remove-deprecations by this push:
new 070a560 ISIS-1742: deletes @MustSatisfy annotation + supporting facets. Updates .adoc
070a560 is described below
commit 070a560780651db98c6bf4ff360a13d9ce70125f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 9 18:02:52 2017 +0100
ISIS-1742: deletes @MustSatisfy annotation + supporting facets. Updates .adoc
---
.../guides/rgant/_rgant_aaa_deprecated.adoc | 6 -
.../apache/isis/applib/annotation/MustSatisfy.java | 49 --------
...romMustSatisfyAnnotationOnTypeFacetFactory.java | 108 ------------------
.../parameter/ParameterAnnotationFacetFactory.java | 14 ---
...onFacetForMustSatisfyAnnotationOnParameter.java | 62 -----------
.../property/PropertyAnnotationFacetFactory.java | 15 +--
...ionFacetForMustSatisfyAnnotationOnProperty.java | 63 -----------
.../dflt/ProgrammingModelFacetsJava5.java | 6 -
...cificationFacetFactoryProcessParameterTest.java | 124 ---------------------
...ecificationFacetFactoryProcessPropertyTest.java | 121 --------------------
.../DomainObjectWithMustSatisfyAnnotations.java | 6 +-
...SpecificationFacetFactoryInstantiationTest.java | 33 ------
todo-deprecation-list.txt | 3 +-
13 files changed, 5 insertions(+), 605 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 681c3cf..192e221 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
@@ -23,12 +23,6 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|xref:../ugvw/ugvw.adoc#_ugvw_layout_file-based[File-based layout]?
-|`@MustSatisfy`
-|Specify arbitrary specification constraints on a property or action parameter.
-|`#mustSatisfy()` attribute for xref:../rgant/rgant.adoc#_rgant-Property_mustSatisfy[`@Property`] or xref:../rgant/rgant.adoc#_rgant-Parameter_mustSatisfy[`@Parameter`]
-|Domain
-|
-
|`@NotInServiceMenu`
|Indicates that a domain service should not be rendered in the application menu (at top of page in Wicket viewer).
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java
deleted file mode 100644
index 0494f50..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/MustSatisfy.java
+++ /dev/null
@@ -1,49 +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;
-
-import org.apache.isis.applib.spec.Specification;
-
-/**
- * @deprecated - use {@link Property#mustSatisfy()} or {@link Parameter#mustSatisfy()} instead.
- */
-@Deprecated
-@Inherited
-@Target({ ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MustSatisfy {
- /**
- * The {@link Specification}(s) to be satisfied.
- *
- * <p>
- * If more than one is provided, then all must be satisfied (in effect
- * "AND"ed together).
- *
- * @deprecated - use {@link Property#mustSatisfy()} or {@link Parameter#mustSatisfy()} instead.
- */
- @Deprecated
- Class<? extends Specification>[] value();
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
deleted file mode 100644
index 761f24b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/validating/mustsatisfyspec/MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory.java
+++ /dev/null
@@ -1,108 +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.validating.mustsatisfyspec;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.isis.applib.annotation.MustSatisfy;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-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.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 MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory extends FacetFactoryAbstract
- implements MetaModelValidatorRefiner, DeprecatedMarker {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
-
- public MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory() {
- super(FeatureType.OBJECTS_ONLY);
- }
-
- @Override
- public void process(final ProcessClassContext processClassContaxt) {
- final Facet facet = create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder(), servicesInjector);
- FacetUtil.addFacet(validator.flagIfPresent(facet));
- }
-
- private Facet create(final Class<?> clazz, final FacetHolder holder, final ServicesInjector servicesInjector) {
- return create(Annotations.getAnnotation(clazz, MustSatisfy.class), holder, servicesInjector);
- }
-
- private static Facet create(
- final MustSatisfy annotation,
- final FacetHolder holder,
- final ServicesInjector servicesInjector) {
- if (annotation == null) {
- return null;
- }
- final Class<?>[] values = annotation.value();
- final List<Specification> specifications = new ArrayList<Specification>();
- for (final Class<?> value : values) {
- final Specification specification = newSpecificationElseNull(value);
- if (specification != null) {
- specifications.add(specification);
- }
- }
- return specifications.size() > 0 ? new MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacet(specifications, holder, servicesInjector) : null;
- }
-
- private static Specification newSpecificationElseNull(final Class<?> value) {
- if (!(Specification.class.isAssignableFrom(value))) {
- return null;
- }
- try {
- return (Specification) value.newInstance();
- } catch (final InstantiationException e) {
- return null;
- } catch (final IllegalAccessException e) {
- return null;
- }
- }
-
- @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/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index e27af3d..8dbf9a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
import javax.annotation.Nullable;
-import org.apache.isis.applib.annotation.MustSatisfy;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.RegEx;
@@ -44,7 +43,6 @@ import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.Mandatory
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByNullableAnnotationOnParameter;
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByOptionalAnnotationOnParameter;
import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
-import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter;
import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetForParameterAnnotation;
import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetFromRegExAnnotationOnParameter;
@@ -55,7 +53,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
- private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
private final MetaModelValidatorForDeprecatedAnnotation regexValidator = new MetaModelValidatorForDeprecatedAnnotation(RegEx.class);
private final MetaModelValidatorForDeprecatedAnnotation optionalValidator = new MetaModelValidatorForDeprecatedAnnotation(Optional.class);
private final MetaModelValidatorForConflictingOptionality conflictingOptionalityValidator = new MetaModelValidatorForConflictingOptionality();
@@ -107,15 +104,6 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
final Annotation[] parameterAnnotations = Annotations.getParameterAnnotations(method)[paramNum];
for (final Annotation parameterAnnotation : parameterAnnotations) {
- if (parameterAnnotation instanceof MustSatisfy) {
- final MustSatisfy annotation = (MustSatisfy) parameterAnnotation;
- final Facet facet = MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.create(annotation, processParameterContext.getFacetHolder(), servicesInjector);
- FacetUtil.addFacet(mustSatisfyValidator.flagIfPresent(facet, processParameterContext));
- return;
- }
- }
-
- for (final Annotation parameterAnnotation : parameterAnnotations) {
if (parameterAnnotation instanceof Parameter) {
final Parameter parameter = (Parameter) parameterAnnotation;
FacetUtil.addFacet(
@@ -223,7 +211,6 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(mustSatisfyValidator);
metaModelValidator.add(regexValidator);
metaModelValidator.add(optionalValidator);
metaModelValidator.add(conflictingOptionalityValidator);
@@ -233,7 +220,6 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- mustSatisfyValidator.setConfiguration(configuration);
regexValidator.setConfiguration(configuration);
optionalValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.java
deleted file mode 100644
index 2755d87..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.java
+++ /dev/null
@@ -1,62 +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.param.parameter.mustsatisfy;
-
-import java.util.List;
-import com.google.common.collect.Lists;
-import org.apache.isis.applib.annotation.MustSatisfy;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacetAbstract;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter extends MustSatisfySpecificationFacetAbstract {
-
-
- public static Facet create(
- final MustSatisfy annotation,
- final FacetHolder holder,
- final ServicesInjector servicesInjector) {
- if (annotation == null) {
- return null;
- }
- final Class<?>[] values = annotation.value();
- final List<Specification> specifications = Lists.newArrayList();
- for (final Class<?> value : values) {
- final Specification specification = newSpecificationElseNull(value);
- if (specification != null) {
- specifications.add(specification);
- }
- }
- return specifications.size() > 0 ? new MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter(specifications, holder, servicesInjector) : null;
- }
-
- private MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter(
- final List<Specification> specifications,
- final FacetHolder holder, final ServicesInjector servicesInjector) {
- super(specifications, holder, servicesInjector);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 854fb60..921f1e5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Mandatory;
-import org.apache.isis.applib.annotation.MustSatisfy;
import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Property;
@@ -66,7 +65,6 @@ import org.apache.isis.core.metamodel.facets.properties.property.modify.Property
import org.apache.isis.core.metamodel.facets.properties.property.modify.PropertyDomainEventFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.modify.PropertySetterFacetForDomainEventFromDefault;
import org.apache.isis.core.metamodel.facets.properties.property.modify.PropertySetterFacetForDomainEventFromPropertyAnnotation;
-import org.apache.isis.core.metamodel.facets.properties.property.mustsatisfy.MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.mustsatisfy.MustSatisfySpecificationFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.notpersisted.NotPersistedFacetForNotPersistedAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.notpersisted.NotPersistedFacetForPropertyAnnotation;
@@ -87,7 +85,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
private final MetaModelValidatorForDeprecatedAnnotation regexValidator = new MetaModelValidatorForDeprecatedAnnotation(RegEx.class);
private final MetaModelValidatorForDeprecatedAnnotation optionalValidator = new MetaModelValidatorForDeprecatedAnnotation(Optional.class);
private final MetaModelValidatorForDeprecatedAnnotation mandatoryValidator = new MetaModelValidatorForDeprecatedAnnotation(Mandatory.class);
- private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
private final MetaModelValidatorForDeprecatedAnnotation notPersistedValidator = new MetaModelValidatorForDeprecatedAnnotation(NotPersisted.class);
private final MetaModelValidatorForConflictingOptionality conflictingOptionalityValidator = new MetaModelValidatorForConflictingOptionality();
@@ -282,15 +279,9 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
final Method method = processMethodContext.getMethod();
final FacetHolder holder = processMethodContext.getFacetHolder();
- // check for deprecated @MustSatisfy first
- final MustSatisfy annotation = Annotations.getAnnotation(method, MustSatisfy.class);
- Facet facet = mustSatisfyValidator.flagIfPresent(MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.create(annotation, holder, servicesInjector), processMethodContext);
-
- // else search for @Property(mustSatisfy=...)
+ // search for @Property(mustSatisfy=...)
final Property property = Annotations.getAnnotation(method, Property.class);
- if(facet == null) {
- facet = MustSatisfySpecificationFacetForPropertyAnnotation.create(property, holder, servicesInjector);
- }
+ Facet facet = MustSatisfySpecificationFacetForPropertyAnnotation.create(property, holder, servicesInjector);
FacetUtil.addFacet(facet);
}
@@ -396,7 +387,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
metaModelValidator.add(regexValidator);
metaModelValidator.add(optionalValidator);
metaModelValidator.add(mandatoryValidator);
- metaModelValidator.add(mustSatisfyValidator);
metaModelValidator.add(notPersistedValidator);
metaModelValidator.add(conflictingOptionalityValidator);
}
@@ -412,7 +402,6 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
regexValidator.setConfiguration(configuration);
optionalValidator.setConfiguration(configuration);
mandatoryValidator.setConfiguration(configuration);
- mustSatisfyValidator.setConfiguration(configuration);
notPersistedValidator.setConfiguration(configuration);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.java
deleted file mode 100644
index 4fd0542..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mustsatisfy/MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.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.properties.property.mustsatisfy;
-
-import java.util.List;
-import com.google.common.collect.Lists;
-import org.apache.isis.applib.annotation.MustSatisfy;
-import org.apache.isis.applib.spec.Specification;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.mustsatisfyspec.MustSatisfySpecificationFacetAbstract;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty extends MustSatisfySpecificationFacetAbstract {
-
- public static Facet create(
- final MustSatisfy annotation,
- final FacetHolder holder,
- final ServicesInjector servicesInjector) {
- if (annotation == null) {
- return null;
- }
- final Class<?>[] values = annotation.value();
- final List<Specification> specifications = Lists.newArrayList();
- for (final Class<?> value : values) {
- final Specification specification = newSpecificationElseNull(value);
- if (specification != null) {
- specifications.add(specification);
- }
- }
- return specifications.size() > 0 ? new MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty(specifications, holder, servicesInjector) : null;
- }
-
-
- private MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty(
- final List<Specification> specifications,
- final FacetHolder holder,
- final ServicesInjector servicesInjector) {
- super(specifications, holder, servicesInjector);
- }
-
-}
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 04d36c7..f46a478 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
@@ -95,7 +95,6 @@ import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjec
import org.apache.isis.core.metamodel.facets.object.regex.annotation.RegExFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaMethodsFactory;
-import org.apache.isis.core.metamodel.facets.object.validating.mustsatisfyspec.MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory;
import org.apache.isis.core.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethodFactory;
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.param.autocomplete.method.ActionParameterAutoCompleteFacetViaMethodFactory;
@@ -316,11 +315,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new MixinFacetForMixinAnnotationFactory());
-
-
- addFactory(new MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory());
-
-
// must come after RecreatableObjectFacetFactory
addFactory(new DomainObjectAnnotationFacetFactory());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/MustSatisfySpecificationFacetFactoryProcessParameterTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/MustSatisfySpecificationFacetFactoryProcessParameterTest.java
deleted file mode 100644
index 2b5c1e7..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/parameter/MustSatisfySpecificationFacetFactoryProcessParameterTest.java
+++ /dev/null
@@ -1,124 +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.param.parameter;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessParameterContext;
-import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
-import org.apache.isis.core.metamodel.facets.param.parameter.mustsatisfy.MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter;
-import org.apache.isis.core.metamodel.facets.propparam.specification.DomainObjectWithMustSatisfyAnnotations;
-import org.apache.isis.core.metamodel.facets.propparam.specification.DomainObjectWithoutMustSatisfyAnnotations;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-
-import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
-
-public class MustSatisfySpecificationFacetFactoryProcessParameterTest {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private FacetedMethodParameter mockFacetedMethodParameter;
-
- @Mock
- private ServicesInjector mockServicesInjector;
-
- @Mock
- private TranslationService mockTranslationService;
-
- private IsisConfigurationDefault stubConfiguration;
-
-
- private Class<DomainObjectWithoutMustSatisfyAnnotations> domainObjectClassWithoutAnnotation;
- private Class<DomainObjectWithMustSatisfyAnnotations> domainObjectClassWithAnnotation;
- private Method changeLastNameMethodWithout;
- private Method changeLastNameMethodWith;
-
- private ParameterAnnotationFacetFactory facetFactory;
-
- public static class Customer {}
-
- @Before
- public void setUp() throws Exception {
-
- stubConfiguration = new IsisConfigurationDefault();
-
- context.checking(new Expectations() {{
- allowing(mockServicesInjector).lookupService(TranslationService.class);
- will(returnValue(mockTranslationService));
-
- allowing(mockServicesInjector).getConfigurationServiceInternal();
- will(returnValue(stubConfiguration));
-
- allowing(mockServicesInjector).injectServicesInto(with(any(List.class)));
- }});
-
-
- domainObjectClassWithoutAnnotation = DomainObjectWithoutMustSatisfyAnnotations.class;
- domainObjectClassWithAnnotation = DomainObjectWithMustSatisfyAnnotations.class;
- changeLastNameMethodWithout = domainObjectClassWithoutAnnotation.getMethod("changeLastName", String.class);
- changeLastNameMethodWith = domainObjectClassWithAnnotation.getMethod("changeLastName", String.class);
-
- context.checking(new Expectations() {
- {
- allowing(mockFacetedMethodParameter).getIdentifier();
- will(returnValue(Identifier.actionIdentifier(Customer.class, "foo")));
- }
- });
-
- facetFactory = new ParameterAnnotationFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
- }
-
- @Test
- public void addsAMustSatisfySpecificationFacetIfAnnotated() {
-
- context.checking(new Expectations() {
- {
- oneOf(mockFacetedMethodParameter).addFacet(with(anInstanceOf(MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.class)));
- }
- });
- facetFactory.processParamsMustSatisfy(new ProcessParameterContext(Customer.class, changeLastNameMethodWith, 0, null, mockFacetedMethodParameter));
- }
-
- @Test
- public void doesNotAddsAMustSatisfySpecificationFacetIfNotAnnotated() {
-
- context.checking(new Expectations() {
- {
- never(mockFacetedMethodParameter).addFacet(with(anInstanceOf(MustSatisfySpecificationFacetForMustSatisfyAnnotationOnParameter.class)));
- }
- });
- facetFactory.processParamsMustSatisfy(new ProcessParameterContext(Customer.class, changeLastNameMethodWithout, 0, null, mockFacetedMethodParameter));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java
deleted file mode 100644
index 8ef200a..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/MustSatisfySpecificationFacetFactoryProcessPropertyTest.java
+++ /dev/null
@@ -1,121 +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.properties.property;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.properties.property.mustsatisfy.MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty;
-import org.apache.isis.core.metamodel.facets.propparam.specification.DomainObjectWithMustSatisfyAnnotations;
-import org.apache.isis.core.metamodel.facets.propparam.specification.DomainObjectWithoutMustSatisfyAnnotations;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-
-import static org.apache.isis.core.commons.matchers.IsisMatchers.anInstanceOf;
-
-public class MustSatisfySpecificationFacetFactoryProcessPropertyTest {
-
- @Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
- @Mock
- private MethodRemover mockMethodRemover;
- @Mock
- private FacetedMethod mockFacetedMethod;
-
- @Mock
- private ServicesInjector mockServicesInjector;
- @Mock
- private IsisConfigurationDefault mockConfiguration;
-
- @Mock
- private TranslationService mockTranslationService;
-
- private Class<DomainObjectWithoutMustSatisfyAnnotations> domainObjectClassWithoutAnnotation;
- private Class<DomainObjectWithMustSatisfyAnnotations> domainObjectClassWithAnnotation;
- private Method firstNameMethodWithout;
- private Method firstNameMethodWith;
- private PropertyAnnotationFacetFactory facetFactory;
-
- public static class Customer {}
-
- @Before
- public void setUp() throws Exception {
-
- context.checking(new Expectations() {{
- allowing(mockServicesInjector).lookupService(TranslationService.class);
- will(returnValue(mockTranslationService));
-
- allowing(mockServicesInjector).getConfigurationServiceInternal();
- will(returnValue(mockConfiguration));
-
- allowing(mockServicesInjector).injectServicesInto(with(any(List.class)));
-
- allowing(mockFacetedMethod).getIdentifier();
- will(returnValue(Identifier.actionIdentifier(Customer.class, "foo")));
-
- }});
-
- domainObjectClassWithoutAnnotation = DomainObjectWithoutMustSatisfyAnnotations.class;
- domainObjectClassWithAnnotation = DomainObjectWithMustSatisfyAnnotations.class;
- firstNameMethodWithout = domainObjectClassWithoutAnnotation.getMethod("getFirstName");
- firstNameMethodWith = domainObjectClassWithAnnotation.getMethod("getFirstName");
-
- facetFactory = new PropertyAnnotationFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
- }
-
- @Test
- public void addsAMustSatisfySpecificationFacetIfAnnotated() {
-
- context.checking(new Expectations() {
- {
- oneOf(mockFacetedMethod).addFacet(with(anInstanceOf(MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.class)));
- }
- });
- facetFactory.processMustSatisfy(new ProcessMethodContext(domainObjectClassWithAnnotation.getClass(), null,
- firstNameMethodWith, mockMethodRemover, mockFacetedMethod));
- }
-
- @Test
- public void doesNotAddsAMustSatisfySpecificationFacetIfNotAnnotated() {
-
- context.checking(new Expectations() {
- {
- never(mockFacetedMethod).addFacet(with(anInstanceOf(MustSatisfySpecificationFacetForMustSatisfyAnnotationOnProperty.class)));
- }
- });
- facetFactory.processMustSatisfy(new ProcessMethodContext(domainObjectClassWithAnnotation.getClass(), null,
- firstNameMethodWithout, mockMethodRemover, mockFacetedMethod));
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java
index 0c8b2d8..db3ec47 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/DomainObjectWithMustSatisfyAnnotations.java
@@ -19,13 +19,10 @@
package org.apache.isis.core.metamodel.facets.propparam.specification;
-import org.apache.isis.applib.annotation.MustSatisfy;
-
public class DomainObjectWithMustSatisfyAnnotations {
private String firstName;
- @MustSatisfy(SpecificationAlwaysSatisfied.class)
public String getFirstName() {
return firstName;
}
@@ -36,7 +33,6 @@ public class DomainObjectWithMustSatisfyAnnotations {
private String lastName;
- @MustSatisfy(SpecificationRequiresFirstLetterToBeUpperCase.class)
public String getLastName() {
return lastName;
}
@@ -45,7 +41,7 @@ public class DomainObjectWithMustSatisfyAnnotations {
this.lastName = lastName;
}
- public void changeLastName(@MustSatisfy(SpecificationRequiresFirstLetterToBeUpperCase.class) final String lastName) {
+ public void changeLastName(final String lastName) {
setLastName(lastName);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java
deleted file mode 100644
index 091c036..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/specification/MustSatisfySpecificationFacetFactoryInstantiationTest.java
+++ /dev/null
@@ -1,33 +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.propparam.specification;
-
-import org.junit.Test;
-
-import org.apache.isis.core.metamodel.facets.object.validating.mustsatisfyspec.MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory;
-
-public class MustSatisfySpecificationFacetFactoryInstantiationTest {
-
- @Test
- public void canInstantiate() {
- new MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory();
- }
-
-}
diff --git a/todo-deprecation-list.txt b/todo-deprecation-list.txt
index e8b3ef2..1c5607f 100644
--- a/todo-deprecation-list.txt
+++ b/todo-deprecation-list.txt
@@ -15,7 +15,6 @@ org.apache.isis.applib.annotation
Optional.java - entire annotation, use @Property(optionality=...) and @Parameter(optionality=...), or @javax.annotations.Nullable
- MustSatisfy.java - entire annotation, use @Property(mustSatisfy=....) or @Parameter(mustSatisfy=...) instead
RegEx.java - entire annotation, use @Property(regexPatternFlags=...) or @Parameter(regexPatternFlags=...) instead; or alternatively NEW SUPPORT for JSR-303 @Pattern annotation (http://beanvalidation.org/1.0/spec/, chapter 6).
NotContributed.java - entire annotation, use @DomainService(nature=...) or mixins instead.
@@ -366,6 +365,8 @@ org.apache.isis.applib.annotation
MemberGroups.java - entire annotation, use Xxx.layout.xml instead
+ MustSatisfy.java - entire annotation, use @Property(mustSatisfy=....) or @Parameter(mustSatisfy=...) instead
+
RenderedAsDayBefore.java - entire annotation, use @PropertyLayout(renderedAsDayBefore=...) and @ParameterLayout(renderedAsDayBefore=...)
Paged.java - entire annotation, use @DomainObjectLayout(paged=...) or @CollectionLayout(paged=...) instead.
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].