You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/19 08:42:37 UTC
[isis] branch master updated: ISIS-2618: housekeeping: remove
MethodRemoverConstants
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 1be2fdb ISIS-2618: housekeeping: remove MethodRemoverConstants
1be2fdb is described below
commit 1be2fdb09977fc36445a66f7e7c4b737af77892f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Apr 19 10:42:24 2021 +0200
ISIS-2618: housekeeping: remove MethodRemoverConstants
---
.../core/metamodel/facetapi/MethodRemover.java | 12 +++++++
.../DomainObjectAnnotationFacetFactory.java | 9 +++--
.../recreatable/RecreatableObjectFacetFactory.java | 7 ++--
.../metamodel/methods/MethodRemoverConstants.java | 41 ----------------------
.../specloader/facetprocessor/FacetProcessor.java | 3 +-
.../facets/object/mixin/MixinIntendedAs.java | 5 ++-
6 files changed, 26 insertions(+), 51 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java
index 6566be4..d466756 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MethodRemover.java
@@ -63,6 +63,18 @@ public interface MethodRemover {
void removeMethod(Method method);
+ // -- NOOP IMPLEMENTATION
+
+ public static final MethodRemover NOOP = new MethodRemover() {
+
+ @Override
+ public void removeMethod(final Method method) {
+ }
+
+ @Override
+ public void removeMethods(Predicate<Method> filter, Consumer<Method> onRemoval) {
+ }
+ };
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index ef31ae4..76dfe0f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -83,9 +83,12 @@ import static org.apache.isis.commons.internal.base._NullSafe.stream;
import lombok.val;
-
-public class DomainObjectAnnotationFacetFactory extends FacetFactoryAbstract
-implements MetaModelRefiner, PostConstructMethodCache, ObjectSpecIdFacetFactory {
+public class DomainObjectAnnotationFacetFactory
+extends FacetFactoryAbstract
+implements
+ MetaModelRefiner,
+ PostConstructMethodCache,
+ ObjectSpecIdFacetFactory {
private final MetaModelValidatorForMixinTypes mixinTypeValidator =
new MetaModelValidatorForMixinTypes("@DomainObject#nature=MIXIN");
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 6b662f0..4488a40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -43,8 +43,11 @@ import org.apache.isis.core.metamodel.specloader.validator.ValidationFailure;
import lombok.val;
-public class RecreatableObjectFacetFactory extends FacetFactoryAbstract
-implements MetaModelRefiner, PostConstructMethodCache {
+public class RecreatableObjectFacetFactory
+extends FacetFactoryAbstract
+implements
+ MetaModelRefiner,
+ PostConstructMethodCache {
public RecreatableObjectFacetFactory() {
super(FeatureType.OBJECTS_ONLY);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodRemoverConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodRemoverConstants.java
deleted file mode 100644
index f5f7842..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/methods/MethodRemoverConstants.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.methods;
-
-import java.lang.reflect.Method;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-
-import org.apache.isis.core.metamodel.facetapi.MethodRemover;
-
-public class MethodRemoverConstants {
-
- public static final MethodRemover NOOP = new MethodRemover() {
-
- @Override
- public void removeMethod(final Method method) {
- }
-
- @Override
- public void removeMethods(Predicate<Method> filter, Consumer<Method> onRemoval) {
- }
-
- };
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
index 61598d7..ab133f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/facetprocessor/FacetProcessor.java
@@ -48,7 +48,6 @@ import org.apache.isis.core.metamodel.facets.ObjectSpecIdFacetFactory.ProcessObj
import org.apache.isis.core.metamodel.facets.PropertyOrCollectionIdentifyingFacetFactory;
import org.apache.isis.core.metamodel.methods.MethodFilteringFacetFactory;
import org.apache.isis.core.metamodel.methods.MethodPrefixBasedFacetFactory;
-import org.apache.isis.core.metamodel.methods.MethodRemoverConstants;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -448,7 +447,7 @@ public class FacetProcessor {
// -- HELPER
private static MethodRemover removerElseNoopRemover(MethodRemover methodRemover) {
- return methodRemover != null ? methodRemover : MethodRemoverConstants.NOOP;
+ return methodRemover != null ? methodRemover : MethodRemover.NOOP;
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
index def39ed..a7d6132 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -38,7 +38,6 @@ import org.apache.isis.core.metamodel.facetapi.MethodRemover;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
-import org.apache.isis.core.metamodel.methods.MethodRemoverConstants;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
@@ -97,7 +96,7 @@ abstract class MixinIntendedAs {
val processClassContext =
new FacetFactory.ProcessClassContext(
type,
- MethodRemoverConstants.NOOP,
+ MethodRemover.NOOP,
facetHolder);
programmingModel.streamFactories()
@@ -124,7 +123,7 @@ abstract class MixinIntendedAs {
owningType,
actionMethod,
paramIndex,
- MethodRemoverConstants.NOOP,
+ MethodRemover.NOOP,
facetedMethodParameter);
programmingModel.streamFactories()