You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/10/12 09:35:59 UTC
[isis] 01/04: Merge remote-tracking branch 'origin/master' into v2
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ca71b7bb0bbc227ffc3c5ea1bb80c4d1477cbd5a
Merge: 714b3da 1e72339
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Oct 12 09:21:48 2018 +0100
Merge remote-tracking branch 'origin/master' into v2
# Conflicts:
# adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
# adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
# core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
# core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
.../guides/rgcfg/_rgcfg_configuring-core.adoc | 25 +++++++++++
.../_migration-notes_1.16.0-to-1.17.0.adoc | 14 +++++++
.../asciidoc/migration-notes/migration-notes.adoc | 4 +-
.../release-notes/_release-notes_1.17.0.adoc | 10 +++++
.../main/asciidoc/release-notes/release-notes.adoc | 14 ++++++-
...onParameterDefaultsAndChoicesPostProcessor.java | 49 ++++++++++++++++++++++
.../metamodel/specloader/SpecificationLoader.java | 12 +++++-
.../dflt/ProgrammingModelFacetsJava5.java | 11 ++---
8 files changed, 128 insertions(+), 11 deletions(-)
diff --cc adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
index 369e487,ff93b86..8c89c8b
--- a/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/migration-notes/migration-notes.adoc
@@@ -10,7 -10,7 +10,9 @@@ Consult these notes when migrating to n
- include::_migration-notes_1.16.0-to-2.0.0-M1.adoc[leveloffset=+1]
++
++include::_migration-notes_1.x-to-2.0.0-M1.adoc[leveloffset=+1]
+ include::_migration-notes_1.16.0-to-1.17.0.adoc[leveloffset=+1]
include::_migration-notes_1.15.0-to-1.16.0.adoc[leveloffset=+1]
include::_migration-notes_1.14.0-to-1.15.0.adoc[leveloffset=+1]
include::_migration-notes_1.13.0-to-1.14.0.adoc[leveloffset=+1]
diff --cc adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
index 5e5c67e,e916674..a766dc4
--- a/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes/release-notes.adoc
@@@ -21,18 -21,15 +21,29 @@@ This table summarises all releases of A
| Bugs
| JIRA relnotes
++
+ | xref:release-notes.adoc#_release-notes_1.17.0[1.17.0]
+ | dd-mm-yyyy
+ | TODO
+ |
+ |
+ |
+ | TODO
+
+| link:https://isis.apache.org/versions/2.0.0-M1/release-notes/release-notes.html#_release-notes_2.0.0-M1[2.0.0-M1]
+| 31-07-2018
+| First milestone release for Apache Isis 2.0.0: Java 8 support, DataNucleus 5.1, Wicket 8, meta-annotations, breadcrumbs
+| 6
+| 55
-
++ 4 tasks
++ 13 sub-tasks
+| 22
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12342392[Release notes for 2.0.0-M1]
+
+| link:https://isis.apache.org/versions/1.16.2/release-notes/release-notes.html#_release-notes_1.16.2[1.16.2]
++
++
+ | xref:release-notes.adoc#_release-notes_1.16.2[1.16.2]
| 05-03-2018
| RO viewer support, performance improvement, fix of severe bug for parented checkboxes
| 1
@@@ -332,7 -329,7 +343,8 @@@
+ include::_release-notes_1.17.0.adoc[leveloffset=+1]
+include::_release-notes_2.0.0-M1.adoc[leveloffset=+1]
include::_release-notes_1.16.2.adoc[leveloffset=+1]
include::_release-notes_1.16.1.adoc[leveloffset=+1]
include::_release-notes_1.16.0.adoc[leveloffset=+1]
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
index c6e91cb,f19ec3b..ce7cbfc
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/ActionCollectionParameterDefaultsAndChoicesPostProcessor.java
@@@ -134,15 -141,17 +139,17 @@@ ServicesInjectorAware
derivePropertyDefaultsFromType(property);
derivePropertyTypicalLengthFromType(property);
derivePropertyOrCollectionDescribedAsFromType(property);
+ derivePropertyDisabledFromViewModel(property);
derivePropertyOrCollectionImmutableFromSpec(property);
derivePropertyDisabledFromImmutable(property);
- }
+ });
// for each collection, ...
- for (final OneToManyAssociation collection : collections) {
+ collections.forEach(collection->{
derivePropertyOrCollectionDescribedAsFromType(collection);
+ deriveCollectionDisabledFromViewModel(collection);
derivePropertyOrCollectionImmutableFromSpec(collection);
deriveCollectionDisabledFromImmutable(collection);
@@@ -190,11 -199,16 +197,17 @@@
for (final ObjectActionParameter scalarParam : compatibleScalarParams) {
addCollectionParamChoicesFacetIfNoneAlready(collection, scalarParam);
}
- }
- }
+ });
+ });
+
}
+ static DisabledFacetAbstract.Semantics inferSemanticsFrom(final ViewModelFacet facet) {
+ return facet.isImplicitlyImmutable() ?
+ DisabledFacetAbstract.Semantics.DISABLED :
+ DisabledFacetAbstract.Semantics.ENABLED;
+ }
+
private FacetedMethod facetedMethodFor(final ObjectMember objectMember) {
// TODO: hacky, need to copy facet onto underlying peer, not to the action/association itself.
final ObjectMemberAbstract objectActionImpl = (ObjectMemberAbstract) objectMember;
diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index acc7097,fefa1ab..3ef0654
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@@ -86,7 -91,10 +86,10 @@@ public class SpecificationLoader implem
private final static Logger LOG = LoggerFactory.getLogger(SpecificationLoader.class);
+ // -- constructor, fields
+ public static final String INTROSPECTOR_PARALLELIZE_KEY = "isis.reflector.introspector.parallelize";
+ public static final boolean INTROSPECTOR_PARALLELIZE_DEFAULT = true;
+
- //region > constructor, fields
private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
private final ProgrammingModel programmingModel;
diff --cc core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index cbf4969,574b8c3..f33dff6
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@@ -79,17 -102,28 +79,13 @@@ import org.apache.isis.core.metamodel.f
import org.apache.isis.core.metamodel.facets.object.ignore.javalang.RemoveMethodsFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory;
import org.apache.isis.core.metamodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory;
-
- import org.apache.isis.core.metamodel.facets.object.immutable.immutableannot.CopyImmutableFacetOntoMembersFactory;
-import org.apache.isis.core.metamodel.facets.object.immutable.immutablemarkerifc.ImmutableFacetMarkerInterfaceFactory;
-import org.apache.isis.core.metamodel.facets.object.mask.annotation.MaskFacetOnTypeAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.maxlen.annotation.MaxLengthFacetOnTypeAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.membergroups.annotprop.MemberGroupLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacetForMixinAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.multiline.annotation.MultiLineFacetOnTypeAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.named.annotation.NamedFacetOnTypeAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.notpersistable.notpersistableannot.NotPersistableFacetAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.notpersistable.notpersistablemarkerifc.NotPersistableFacetMarkerInterfaceFactory;
+import org.apache.isis.core.metamodel.facets.object.navparent.annotation.NavigableParentAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.objectspecid.classname.ObjectSpecIdFacetDerivedFromClassNameFactory;
import org.apache.isis.core.metamodel.facets.object.objectvalidprops.impl.ObjectValidPropertiesFacetImplFactory;
- import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnCollectionDerivedFromViewModelFacetFactory;
- import org.apache.isis.core.metamodel.facets.object.recreatable.DisabledFacetOnPropertyDerivedFromRecreatableObjectFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.paged.annotation.PagedFacetOnTypeAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.parented.aggregated.AggregatedAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.metamodel.facets.object.plural.annotation.PluralAnnotationFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.plural.staticmethod.PluralFacetStaticMethodFactory;
import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacetFactory;
-import org.apache.isis.core.metamodel.facets.object.regex.annotation.RegExFacetOnTypeAnnotationFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.methods.TitleFacetViaMethodsFactory;
-import org.apache.isis.core.metamodel.facets.object.typicallen.annotation.TypicalLengthFacetOnTypeAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.object.validating.mustsatisfyspec.MustSatisfySpecificationFromMustSatisfyAnnotationOnTypeFacetFactory;
import org.apache.isis.core.metamodel.facets.object.validating.validateobject.method.ValidateObjectFacetMethodFactory;
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.param.autocomplete.method.ActionParameterAutoCompleteFacetViaMethodFactory;
@@@ -99,8 -133,12 +95,7 @@@ import org.apache.isis.core.metamodel.f
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.param.layout.ParameterLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.param.mandatory.dflt.MandatoryFacetOnParametersDefaultFactory;
-import org.apache.isis.core.metamodel.facets.param.multiline.annotation.MultiLineFacetOnParameterAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.param.named.annotation.NamedFacetOnParameterAnnotationFactory;
import org.apache.isis.core.metamodel.facets.param.parameter.ParameterAnnotationFacetFactory;
- import org.apache.isis.core.metamodel.facets.param.typicallen.fromtype.TypicalLengthFacetOnParameterDerivedFromTypeFacetFactory;
-import org.apache.isis.core.metamodel.facets.param.renderedasdaybefore.annotation.RenderedAsDayBeforeFacetOnParameterAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.param.typicallen.annotation.TypicalLengthFacetOnParameterAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.param.validating.maskannot.MaskFacetOnParameterAnnotationFactory;
import org.apache.isis.core.metamodel.facets.properties.accessor.PropertyAccessorFacetViaAccessorFactory;
import org.apache.isis.core.metamodel.facets.properties.autocomplete.method.PropertyAutoCompleteFacetMethodFactory;
import org.apache.isis.core.metamodel.facets.properties.bigdecimal.javaxvaldigits.BigDecimalFacetOnPropertyFromJavaxValidationDigitsAnnotationFactory;
@@@ -108,9 -146,12 +103,8 @@@ import org.apache.isis.core.metamodel.f
import org.apache.isis.core.metamodel.facets.properties.defaults.method.PropertyDefaultFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.properties.disabled.inferred.DisabledFacetOnPropertyInferredFactory;
import org.apache.isis.core.metamodel.facets.properties.mandatory.dflt.MandatoryFacetOnProperyDefaultFactory;
-import org.apache.isis.core.metamodel.facets.properties.mandatory.staticmethod.MandatoryFacetOnPropertyStaticMethodFactory;
-import org.apache.isis.core.metamodel.facets.properties.multiline.annotation.MultiLineFacetOnPropertyFactory;
import org.apache.isis.core.metamodel.facets.properties.property.PropertyAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.PropertyLayoutFacetFactory;
- import org.apache.isis.core.metamodel.facets.properties.typicallen.fromtype.TypicalLengthFacetOnPropertyDerivedFromTypeFacetFactory;
-import org.apache.isis.core.metamodel.facets.properties.renderedasdaybefore.annotation.RenderedAsDayBeforeAnnotationOnPropertyFacetFactory;
-import org.apache.isis.core.metamodel.facets.properties.typicallen.annotation.TypicalLengthOnPropertyFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.update.PropertyModifyFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.update.PropertySetAndClearFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.validating.dflt.PropertyValidateFacetDefaultFactory;