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 2019/10/07 12:07:29 UTC
[isis] branch v2 updated: ISIS-2158: cleaning up
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/v2 by this push:
new 2c3d254 ISIS-2158: cleaning up
2c3d254 is described below
commit 2c3d2543046439dc2572a349b30a80bb70beeac4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 7 14:07:21 2019 +0200
ISIS-2158: cleaning up
Task-Url: https://issues.apache.org/jira/browse/ISIS-2158
---
.../facets/object/mixin/MixinIntendedAs.java | 7 +----
.../MethodPrefixBasedFacetFactoryAbstract.java | 1 -
.../annotation/SortedByFacetAnnotationFactory.java | 1 -
.../dflt/MetaModelValidatorDefault.java | 35 ----------------------
.../specloader/ProgrammingModelServiceDefault.java | 21 -------------
.../metamodel/specloader/ReflectorConstants.java | 10 -------
.../specloader/SpecificationLoaderDefault.java | 4 +--
.../validator/MetaModelValidatorComposite.java | 2 +-
.../SpecificationLoaderTestAbstract.java | 15 ++--------
9 files changed, 6 insertions(+), 90 deletions(-)
diff --git a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
index e2968de..ed2c39f 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
@@ -31,12 +31,10 @@ import org.apache.isis.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.FacetedMethodParameter;
import org.apache.isis.metamodel.facets.MethodRemoverConstants;
-import org.apache.isis.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
import org.apache.isis.metamodel.specloader.SpecificationLoaderDefault;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import lombok.val;
@@ -46,8 +44,6 @@ abstract class MixinIntendedAs {
protected void setUp() throws Exception {
- val mmValidator = MetaModelValidatorComposite.asComposite(new MetaModelValidatorDefault());
-
programmingModel = new ProgrammingModelFacetsJava8();
// PRODUCTION
@@ -56,8 +52,7 @@ abstract class MixinIntendedAs {
.specificationLoader(SpecificationLoaderDefault.getInstance(
new IsisConfiguration(),
new IsisSystemEnvironment(),
- programmingModel,
- mmValidator))
+ programmingModel))
// .serviceInjector(mockServiceInjector)
// .serviceRegistry(mockServiceRegistry)
.build());
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 597a335..7f33bc3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
public abstract class MethodPrefixBasedFacetFactoryAbstract
extends FacetFactoryAbstract
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
index 9937247..4d279d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/collections/sortedby/annotation/SortedByFacetAnnotationFactory.java
@@ -31,7 +31,6 @@ import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.java
deleted file mode 100644
index 808f83b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/metamodelvalidator/dflt/MetaModelValidatorDefault.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.metamodel.metamodelvalidator.dflt;
-
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorAbstract;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
-
-public class MetaModelValidatorDefault extends MetaModelValidatorAbstract {
-
- /**
- * Does nothing.
- * @param validationFailures
- */
- @Override
- public void validateInto(ValidationFailures validationFailures) {
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
index 2396ebf..a926cb5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ProgrammingModelServiceDefault.java
@@ -24,14 +24,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.config.IsisConfiguration;
-import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilter;
import org.apache.isis.metamodel.progmodel.ProgrammingModelService;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
import lombok.val;
@@ -52,8 +49,6 @@ public class ProgrammingModelServiceDefault implements ProgrammingModelService {
// -- HELPER
- @Inject private IsisConfigurationLegacy configurationLegacy;
- @Inject private IsisConfiguration configuration;
@Inject private ServiceRegistry serviceRegistry;
@Inject private ProgrammingModelInitFilter programmingModelInitFilter;
@@ -63,8 +58,6 @@ public class ProgrammingModelServiceDefault implements ProgrammingModelService {
private _Lazy<ValidationFailures> validationResult =
_Lazy.threadSafe(this::validate);
- private MetaModelValidatorComposite metaModelValidator;
-
private ProgrammingModel createProgrammingModel() {
log.debug("About to create the ProgrammingModel.");
@@ -99,20 +92,6 @@ public class ProgrammingModelServiceDefault implements ProgrammingModelService {
return programmingModel;
}
-// private MetaModelValidatorComposite createMetaModelValidator() {
-//
-// val metaModelValidatorClassName =
-// configurationLegacy.getString(
-// ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME,
-// ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT);
-//
-// log.debug("About to create the MetaModelValidator {}.", metaModelValidatorClassName);
-//
-// val mmValidator = InstanceUtil.createInstance(metaModelValidatorClassName, MetaModelValidator.class);
-// val mmValidatorComposite = MetaModelValidatorComposite.asComposite(mmValidator);
-// return mmValidatorComposite;
-// }
-
private ValidationFailures validate() {
val failures = new ValidationFailures();
programmingModel.get().streamValidators()
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
index 1013ce3..133e5eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/ReflectorConstants.java
@@ -22,10 +22,8 @@ package org.apache.isis.metamodel.specloader;
import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.config.IsisConfigurationLegacy;
import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
public final class ReflectorConstants {
@@ -40,14 +38,6 @@ public final class ReflectorConstants {
public static final String PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT = ProgrammingModelFacetsJava8.class.getName();
/**
- * Key used to lookup implementation of {@link MetaModelValidator} in
- * {@link IsisConfigurationLegacy}.
- */
- public static final String META_MODEL_VALIDATOR_CLASS_NAME = ConfigurationConstants.ROOT + "reflector.validator";
- public static final String META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT = MetaModelValidatorDefault.class.getName();
-
-
- /**
* Key used to lookup comma-separated list of {@link FacetFactory}s to
* include.
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index c9b79ad..886211c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -47,7 +47,6 @@ import org.apache.isis.metamodel.specloader.specimpl.FacetedMethodsBuilderContex
import org.apache.isis.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.metamodel.specloader.specimpl.standalonelist.ObjectSpecificationOnStandaloneList;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.schema.utils.CommonDtoUtils;
import static org.apache.isis.commons.internal.base._With.requires;
@@ -95,8 +94,7 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
public static SpecificationLoaderDefault getInstance (
IsisConfiguration configuration,
IsisSystemEnvironment isisSystemEnvironment,
- ProgrammingModel programmingModel,
- MetaModelValidator metaModelValidator) {
+ ProgrammingModel programmingModel) {
val instance = new SpecificationLoaderDefault();
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java
index ddd4198..e81b208 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorComposite.java
@@ -26,7 +26,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import lombok.val;
@Deprecated
-public final class MetaModelValidatorComposite extends MetaModelValidatorAbstract {
+final class MetaModelValidatorComposite extends MetaModelValidatorAbstract {
private final List<MetaModelValidator> validators = _Lists.newArrayList();
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 2429e39..c6cb32f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -38,14 +38,12 @@ import org.apache.isis.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.metamodel.progmodels.dflt.ProgrammingModelFacetsJava8;
import org.apache.isis.metamodel.services.persistsession.ObjectAdapterService;
import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.security.authentication.AuthenticationSessionProvider;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -91,9 +89,6 @@ abstract class SpecificationLoaderTestAbstract {
return mock;
}
- MetaModelValidatorComposite getMetaModelValidatorComposite() {
- return MetaModelValidatorComposite.asComposite(new MetaModelValidatorDefault());
- }
ProgrammingModel getProgrammingModel() {
return new ProgrammingModelFacetsJava8();
@@ -102,14 +97,12 @@ abstract class SpecificationLoaderTestAbstract {
//@Produces
SpecificationLoader getSpecificationLoader(
IsisConfiguration configuration,
- ProgrammingModel programmingModel,
- MetaModelValidatorComposite mmValidator) {
+ ProgrammingModel programmingModel) {
return SpecificationLoaderDefault.getInstance(
configuration,
new IsisSystemEnvironment(),
- programmingModel,
- mmValidator);
+ programmingModel);
}
}
@@ -134,7 +127,6 @@ abstract class SpecificationLoaderTestAbstract {
val producers = new Producers();
- val mmValidator = producers.getMetaModelValidatorComposite();
val programmingModel = producers.getProgrammingModel();
MetaModelContext.preset(MetaModelContext.builder()
@@ -142,8 +134,7 @@ abstract class SpecificationLoaderTestAbstract {
.specificationLoader(specificationLoader = producers
.getSpecificationLoader(
isisConfiguration,
- programmingModel,
- mmValidator
+ programmingModel
)
)
.translationService(producers.mockTranslationService())