This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 946836ccba ISIS-3164: fixes Inspect Metamodel view
add db21865fa0 ISIS-3204: adds TypeOfAnyCardinality
add 5c6f764a20 ISIS-3204: MM: replace TypeOf simple type with the new one
(any cardinality)
add 7a1162a3f6 ISIS-3204: fully implement, yet some test failing
add c825aa500b ISIS-3204: metamodel test fixes
add 646d4eaccf ISIS-3204: remaining test fixes - all green
add d4837dc593 ISIS-3204: purge CollectionSemanticsFacet
add a16dd1ca0c ISIS-3204: purge SingleTypeValueFacet
add 97008035d3 ISIS-3204: purge ElementSpecificationProvider
add 6a77460abc ISIS-3204: move isSupportedForActionParameter flag directly
to TypeOfAnyCardinality
add fd58fb4467 ISIS-3204: [Metamodel] support for type pre-loading
add 010bea5f5d ISIS-3204: [Metamodel] adds proper member introspection
guard
add b99e3df739 ISIS-3204: [Metamodel] eager inspection fixes
add 5c4ae72fa4 ISIS-3204: [Metamodel] schema update: common ancestor for
facet and facet-holder
add b4687ee9c9 ISIS-3204: Inspect Metamodel View - new title renderer
add d87ab1079d ISIS-3204: [Metamodel] reporting, duplicate attribute fix
add bf1e072f5f ISIS-3204: first attempt on fixing generic type inspection
add b9294e580c ISIS-3204: honor programming model constants when
cataloging one-to-many assoc.
add 23e88e4cae ISIS-3204: prepare for merge
new e1b254d483 Merge pull request #1086 from apache/3204-bounded.generics
The 1 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:
.../metamodel/Object_downloadMetamodelXml.java | 12 +-
.../isis/applib/services/metamodel/BeanSort.java | 3 +-
.../isis/applib/services/metamodel/Config.java | 128 ++--
.../services/metamodel/MetaModelServiceMenu.java | 58 +-
.../metamodel/MetaModelService_Config_Test.java | 21 +-
.../apache/isis/schema/metamodel/metamodel-2.0.xsd | 695 ++++++++++----------
.../org/apache/isis/commons/collections/Can.java | 43 +-
.../commons/collections/ImmutableCollection.java | 94 +++
.../isis/commons/collections/ImmutableEnumSet.java | 9 +
.../commons/internal/collections/_Collections.java | 30 +-
.../isis/commons/internal/reflection/_Reflect.java | 40 ++
.../beans/IsisBeanTypeClassifierDefault.java | 6 +-
.../progmodel/ProgrammingModelConstants.java | 103 +++
.../core/metamodel/IsisModuleCoreMetamodel.java | 62 ++
.../metamodel/_testing/_ServiceInjectorLegacy.java | 34 +-
.../isis/core/metamodel/commons/MethodUtil.java | 13 +-
.../core/metamodel/commons/ParameterAdapter.java | 57 +-
.../isis/core/metamodel/facets/FacetedMethod.java | 41 +-
.../metamodel/facets/FacetedMethodParameter.java | 11 +-
...rCollectionIdentifyingFacetFactoryAbstract.java | 5 +-
.../facets/SingleIntValueFacetAbstract.java | 9 +-
.../isis/core/metamodel/facets/TypedHolder.java | 12 +-
.../core/metamodel/facets/TypedHolderAbstract.java | 22 +-
...lementSpecificationProviderFromTypeOfFacet.java | 37 --
.../facets/actcoll/typeof/TypeOfFacet.java | 82 +--
.../facets/actcoll/typeof/TypeOfFacetAbstract.java | 57 +-
...tFromArray.java => TypeOfFacetFromFeature.java} | 5 +-
...tFromGenerics.java => TypeOfFacetFromType.java} | 7 +-
.../action/ActionAnnotationFacetFactory.java | 22 +-
...nChoicesForCollectionParameterFacetFactory.java | 30 +-
.../typeof/TypeOfFacetForActionAnnotation.java | 15 +-
.../CollectionAccessorFacetViaAccessorFactory.java | 15 +-
.../CollectionAnnotationFacetFactory.java | 33 +-
.../typeof/TypeOfFacetForCollectionAnnotation.java | 11 +-
.../javautilcollection/CollectionFacetFactory.java | 19 +-
.../collparam/semantics/CollectionSemantics.java | 136 ----
.../semantics/CollectionSemanticsFacet.java | 28 -
.../semantics/CollectionSemanticsFacetDefault.java | 46 --
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 12 +-
.../typicallen/TypicalLengthFacetAbstract.java | 11 +-
.../method/PropertyChoicesFacetViaMethod.java | 2 +-
.../metamodel/inspect/Object_inspectMetamodel.java | 18 +-
.../core/metamodel/inspect/model/ActionNode.java | 13 +-
.../metamodel/inspect/model/CollectionNode.java | 13 +-
.../metamodel/inspect/model/FacetAttrNode.java | 6 +
.../metamodel/inspect/model/FacetGroupNode.java | 10 +-
.../core/metamodel/inspect/model/FacetNode.java | 30 +-
.../isis/core/metamodel/inspect/model/MMNode.java | 46 +-
.../metamodel/inspect/model/MMNodeFactory.java | 1 -
.../core/metamodel/inspect/model/MemberNode.java | 6 +
.../metamodel/inspect/model/ParameterNode.java | 13 +-
.../core/metamodel/inspect/model/PropertyNode.java | 13 +-
.../core/metamodel/inspect/model/TypeNode.java | 16 +-
.../core/metamodel/object/MmAssertionUtil.java | 5 +-
.../ClassSubstitutorForCollections.java | 33 +-
.../services/metamodel/MetaModelExporter.java | 81 ++-
.../core/metamodel/services/metamodel/Util.java | 35 -
.../core/metamodel/services/metamodel/_Util.java | 141 ++++
.../spec/ElementSpecificationProvider.java | 44 --
.../core/metamodel/spec/TypeOfAnyCardinality.java | 185 ++++++
.../metamodel/spec/feature/OneToManyFeature.java | 13 +-
.../specloader/SpecificationLoaderDefault.java | 17 +-
.../specloader/specimpl/FacetedMethodsBuilder.java | 11 +-
.../specloader/specimpl/ObjectActionDefault.java | 4 +-
.../specimpl/OneToManyActionParameterDefault.java | 18 +-
.../specimpl/OneToManyAssociationDefault.java | 19 +-
.../specimpl/OneToManyAssociationMixedIn.java | 4 +-
.../specimpl/OneToOneAssociationDefault.java | 2 +-
.../specimpl/dflt/ObjectSpecificationDefault.java | 16 +-
.../apache/isis/core/metamodel/util/Facets.java | 10 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 7 +-
.../metamodel/facets/AbstractFacetFactoryTest.java | 7 +-
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 17 +-
.../CollectionAnnotationFacetFactoryTest.java | 17 +-
...ollectionAnnotationFacetFactoryTest_typeOf.java | 28 +-
.../facets/object/mixin/MixinIntendedAs.java | 2 -
.../metamodel/spec/TypeOfAnyCardinalityTest.java | 182 ++++++
.../specloader/SpecificationLoaderTest_array.java | 64 --
.../SpecificationLoaderTest_collection.java | 66 --
.../SpecificationLoaderTest_nonScalar.java | 126 ++++
.../viewer/graphql/viewer/source/TypeMapper.java | 2 +-
.../testing/AbstractFacetFactoryTest.java | 6 +-
.../domainmodel/AnnotationSyntesizerTest.java | 11 +-
.../DomainModelTest_usingGoodDomain.java | 54 +-
.../MetaModelRegressionTest.verify.approved.xml | 707 ++++++++++++++-------
.../integtest/Layout_Counter_IntegTest.java | 10 +-
.../integtest/Layout_SimpleObject_IntegTest.java | 16 +-
.../testdomain/model/good/ProperElementTypeVm.java | 36 +-
...rence.java => ProperElementTypeVmAbstract.java} | 39 +-
.../domainobjects/CollectionSemantics.java | 4 +-
.../ObjectCollectionReprRenderer.java | 2 +-
.../service/swagger/internal/Generation.java | 2 +-
.../rendering/service/swagger/internal/_Util.java | 2 +-
.../viewer/resources/_EndpointLogging.java | 2 +-
.../viewer/wicket/ui/IsisModuleViewerWicketUi.java | 1 +
.../components/tree/IsisToWicketTreeAdapter.java | 14 +-
96 files changed, 2606 insertions(+), 1717 deletions(-)
create mode 100644
commons/src/main/java/org/apache/isis/commons/collections/ImmutableCollection.java
delete mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/ElementSpecificationProviderFromTypeOfFacet.java
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/{TypeOfFacetFromArray.java
=> TypeOfFacetFromFeature.java} (84%)
rename
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actcoll/typeof/{TypeOfFacetFromGenerics.java
=> TypeOfFacetFromType.java} (77%)
delete mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collparam/semantics/CollectionSemantics.java
delete mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collparam/semantics/CollectionSemanticsFacet.java
delete mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collparam/semantics/CollectionSemanticsFacetDefault.java
delete mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/Util.java
create mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/_Util.java
delete mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ElementSpecificationProvider.java
create mode 100644
core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/TypeOfAnyCardinality.java
create mode 100644
core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/TypeOfAnyCardinalityTest.java
delete mode 100644
core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_array.java
delete mode 100644
core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_collection.java
create mode 100644
core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTest_nonScalar.java
copy
regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/{ProperChoicesWhenActionHasParamSupportingMethodTypeOfReference.java
=> ProperElementTypeVmAbstract.java} (54%)
