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
commit e1b254d4834793174c973f42a6560476a89e4f3c Merge: 946836ccba 23e88e4cae Author: Andi Huber <[email protected]> AuthorDate: Wed Sep 7 19:55:19 2022 +0200 Merge pull request #1086 from apache/3204-bounded.generics ISIS-3204: Metamodel Support for Bounded Generics .../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 +- ...ypeVm.java => ProperElementTypeVmAbstract.java} | 36 +- .../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(+), 1714 deletions(-)
