This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new a496defefe ISIS-3049: purge PropertyChoicesFacetFromChoicesFacetFactory
a496defefe is described below
commit a496defefe9842f5178ba0694ec4babb1540f531
Author: Andi Huber <[email protected]>
AuthorDate: Mon Jul 11 18:17:46 2022 +0200
ISIS-3049: purge PropertyChoicesFacetFromChoicesFacetFactory
---
...ropertyChoicesFacetFromChoicesFacetFactory.java | 52 ----------------------
.../param/ChoicesAndDefaultsPostProcessor.java | 2 -
.../DomainModelTest_usingGoodDomain.java | 3 --
3 files changed, 57 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacetFactory.java
deleted file mode 100644
index 657663e21a..0000000000
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetFromChoicesFacetFactory.java
+++ /dev/null
@@ -1,52 +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.choices.enums;
-
-import javax.inject.Inject;
-
-import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
-
-import lombok.val;
-
-public class PropertyChoicesFacetFromChoicesFacetFactory
-extends FacetFactoryAbstract {
-
- @Inject
- public PropertyChoicesFacetFromChoicesFacetFactory(final MetaModelContext
mmc) {
- super(mmc, FeatureType.PROPERTIES_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
-
- final Class<?> returnType =
processMethodContext.getMethod().getReturnType();
-
- val choicesFacetIfAny =
getSpecificationLoader().loadSpecification(returnType)
- .lookupNonFallbackFacet(ChoicesFacet.class);
-
- FacetUtil.addFacetIfPresent(
- PropertyChoicesFacetFromChoicesFacet
- .create(choicesFacetIfAny,
processMethodContext.getFacetHolder()));
- }
-
-}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
index 2780fef2b6..de866a0999 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ChoicesAndDefaultsPostProcessor.java
@@ -104,8 +104,6 @@ extends ObjectSpecificationPostProcessorAbstract {
}
if(!hasMemberLevelChoices(prop)) {
- //TODO not used: PropertyChoicesFacetFromChoicesFacetFactory
-
val choicesFacetIfAny = prop.getElementType()
.lookupNonFallbackFacet(ChoicesFacet.class);
diff --git
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 624fb13760..908f2bbb34 100644
---
a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++
b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -434,8 +433,6 @@ class DomainModelTest_usingGoodDomain {
assertHasProperty(i2Spec, "f");
}
- //FIXME[ISIS-3049]
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
@Test
void actionParamChoices_shouldBeAllowed_toBeDerivedFromChoicesFrom() {
