You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/07/20 07:27:36 UTC
[causeway] branch master updated (6cd175c1c9 -> b872114486)
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/causeway.git
from 6cd175c1c9 Merge pull request #1789 from apache/dependabot/maven/master/shiro.version-1.12.0
new 70d3959024 CAUSEWAY-3533: Remove code marked as deprecated for removal since RC2
new b872114486 CAUSEWAY-3533: adds mignotes (RC3)
The 2 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:
.../applib/pages/index/annotation/Action.adoc | 28 --------
.../applib/pages/index/annotation/Collection.adoc | 26 --------
.../pages/index/annotation/DomainObjectLayout.adoc | 26 --------
.../applib/pages/index/annotation/Property.adoc | 26 --------
.../modules/commons/pages/index/io/YamlUtils.adoc | 32 +++++-----
.../ROOT/pages/2023/2.0.0-RC3/mignotes.adoc} | 16 +++--
.../ROOT/pages/2023/2.0.0-RC3/relnotes.adoc} | 5 +-
.../relnotes/modules/ROOT/pages/about.adoc | 11 +++-
.../apache/causeway/applib/annotation/Action.java | 13 ----
.../causeway/applib/annotation/Collection.java | 10 ---
.../applib/annotation/DomainObjectLayout.java | 11 ----
.../applib/annotation/LogicalTypeName.java | 51 ---------------
.../causeway/applib/annotation/Property.java | 10 ---
core/adoc/modules/_overview/pages/about.adoc | 27 +++++++-
.../action/ActionAnnotationFacetFactory.java | 13 ----
.../hidden/HiddenFacetForActionAnnotation.java | 55 ----------------
.../CollectionAnnotationFacetFactory.java | 13 ----
.../hidden/HiddenFacetForCollectionAnnotation.java | 54 ----------------
.../property/PropertyAnnotationFacetFactory.java | 12 ----
.../hidden/HiddenFacetForPropertyAnnotation.java | 55 ----------------
.../ActionAnnotationFacetFactoryTest_Hidden.java | 74 ----------------------
.../CollectionAnnotationFacetFactoryTest.java | 49 --------------
.../PropertyAnnotationFacetFactoryTest.java | 42 ------------
23 files changed, 65 insertions(+), 594 deletions(-)
copy antora/components/{refguide-index/modules/applib/pages/index/mixins/system/hooks/HasInteractionId_see-also.adoc => relnotes/modules/ROOT/pages/2023/2.0.0-RC3/mignotes.adoc} (66%)
copy antora/components/{userguide/modules/ROOT/partials/ui-layout-and-hints/progmodel.adoc => relnotes/modules/ROOT/pages/2023/2.0.0-RC3/relnotes.adoc} (92%)
delete mode 100644 api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java
delete mode 100644 core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
delete mode 100644 core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
delete mode 100644 core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
[causeway] 01/02: CAUSEWAY-3533: Remove code marked as deprecated for removal since RC2
Posted by ah...@apache.org.
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/causeway.git
commit 70d39590241a6435b4cfa089e1bdb456940635c3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jul 20 09:15:59 2023 +0200
CAUSEWAY-3533: Remove code marked as deprecated for removal since RC2
---
.../apache/causeway/applib/annotation/Action.java | 13 ----
.../causeway/applib/annotation/Collection.java | 10 ---
.../applib/annotation/DomainObjectLayout.java | 11 ----
.../applib/annotation/LogicalTypeName.java | 51 ---------------
.../causeway/applib/annotation/Property.java | 10 ---
.../action/ActionAnnotationFacetFactory.java | 13 ----
.../hidden/HiddenFacetForActionAnnotation.java | 55 ----------------
.../CollectionAnnotationFacetFactory.java | 13 ----
.../hidden/HiddenFacetForCollectionAnnotation.java | 54 ----------------
.../property/PropertyAnnotationFacetFactory.java | 12 ----
.../hidden/HiddenFacetForPropertyAnnotation.java | 55 ----------------
.../ActionAnnotationFacetFactoryTest_Hidden.java | 74 ----------------------
.../CollectionAnnotationFacetFactoryTest.java | 49 --------------
.../PropertyAnnotationFacetFactoryTest.java | 42 ------------
14 files changed, 462 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java
index 6add510f77..a8b85b61e5 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Action.java
@@ -148,19 +148,6 @@ public @interface Action {
Publishing executionPublishing()
default Publishing.NOT_SPECIFIED;
- /**
- * Indicates where (in the UI) the action is not visible to the user.
- * <p>
- * For {@link DomainService domain service} actions, the action's visibility is dependent upon its
- * {@link DomainService#nature() nature}.
- *
- * @see ActionLayout#hidden()
- * @deprecated use {@link ActionLayout#hidden()} instead
- */
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
- Where hidden()
- default Where.NOT_SPECIFIED;
-
/**
* Whether the action is restricted to prototyping, or whether it is
* available also in production mode.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java
index 2e5591d8ea..5f8837dcb6 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Collection.java
@@ -81,16 +81,6 @@ public @interface Collection {
Class<? extends CollectionDomainEvent<?,?>> domainEvent()
default CollectionDomainEvent.Default.class;
- /**
- * Indicates when the collection is not visible to the user.
- *
- * @see CollectionLayout#hidden()
- * @deprecated use CollectionLayout#hidden() instead
- */
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
- Where hidden()
- default Where.NOT_SPECIFIED;
-
/**
* The type-of the elements held within the collection.
*
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java
index 42fc022ca5..d96afbf5fa 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/DomainObjectLayout.java
@@ -131,17 +131,6 @@ public @interface DomainObjectLayout {
int paged()
default -1;
- /**
- * The plural name of the class.
- * @deprecated CAUSEWAY-3321: for standalone tables (action result),
- * parented tables (collections) or plural action parameters,
- * the framework should (and will) use the name of the originating action,
- * collection or action parameter instead.
- */
- @Deprecated(forRemoval = true)
- String plural()
- default "";
-
/**
* Whether a standalone collection, when represented in a table form, should additionally be
* "decorated" with client-side (javascript) enhancements, for example to enable paging and filtering.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java
deleted file mode 100644
index 64e56aee3f..0000000000
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LogicalTypeName.java
+++ /dev/null
@@ -1,51 +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.causeway.applib.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Named;
-
-/**
- * Introduced to allow for abstract types to be mapped to a logical-type-name,
- * for the security model to apply permission checks against.
- * @deprecated use {@link Named} instead
- * @see Named
- */
-@Inherited
-@Target({
- ElementType.TYPE,
- ElementType.ANNOTATION_TYPE
-})
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated(forRemoval = true, since = "2.0.0-M8")
-public @interface LogicalTypeName {
-
- /**
- * If unspecified, the fully-qualified class name is used instead.
- * @see DomainObject#logicalTypeName()
- */
- String value()
- default "";
-
-}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java
index d74c650f33..29406ea4f9 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Property.java
@@ -183,16 +183,6 @@ public @interface Property {
String fileAccept()
default "";
- /**
- * Indicates where the property is not visible to the user.
- *
- * @see PropertyLayout#hidden()
- * @deprecated use {@link PropertyLayout#hidden()} instead
- */
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
- Where hidden()
- default Where.NOT_SPECIFIED;
-
/**
* The maximum entry length of a field.
*
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index 4b2946d2d3..0002bf91ea 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -31,7 +31,6 @@ import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.causeway.core.metamodel.facets.actions.action.choicesfrom.ChoicesFromFacetForActionAnnotation;
import org.apache.causeway.core.metamodel.facets.actions.action.explicit.ActionExplicitFacetForActionAnnotation;
-import org.apache.causeway.core.metamodel.facets.actions.action.hidden.HiddenFacetForActionAnnotation;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacet;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForAction;
import org.apache.causeway.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForMixedInPropertyOrCollection;
@@ -61,11 +60,9 @@ extends FacetFactoryAbstract {
processExplicit(processMethodContext, actionIfAny);
processDomainEvent(processMethodContext, actionIfAny);
- processHidden(processMethodContext, actionIfAny);
processRestrictTo(processMethodContext, actionIfAny);
processSemantics(processMethodContext, actionIfAny);
-
// must come after processing semantics
processCommandPublishing(processMethodContext, actionIfAny);
@@ -145,16 +142,6 @@ extends FacetFactoryAbstract {
}
}
- @SuppressWarnings({ "removal" })
- void processHidden(final ProcessMethodContext processMethodContext, final Optional<Action> actionIfAny) {
- val facetedMethod = processMethodContext.getFacetHolder();
-
- // search for @Action(hidden=...)
- addFacetIfPresent(
- HiddenFacetForActionAnnotation
- .create(actionIfAny, facetedMethod));
- }
-
void processRestrictTo(final ProcessMethodContext processMethodContext, final Optional<Action> actionIfAny) {
val facetedMethod = processMethodContext.getFacetHolder();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
deleted file mode 100644
index e5b1ec5b37..0000000000
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/hidden/HiddenFacetForActionAnnotation.java
+++ /dev/null
@@ -1,55 +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.causeway.core.metamodel.facets.actions.action.hidden;
-
-import java.util.Optional;
-
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
-
-@Deprecated(forRemoval = true, since = "2.0.0-RC2")
-public class HiddenFacetForActionAnnotation
-extends HiddenFacetAbstract {
-
- public static Optional<HiddenFacetForActionAnnotation> create(
- final Optional<Action> actionsIfAny,
- final FacetHolder holder) {
-
- return actionsIfAny
- .map(Action::hidden)
- .filter(where -> where != null && where != Where.NOT_SPECIFIED)
- .map(where -> new HiddenFacetForActionAnnotation(where, holder));
- }
-
- private HiddenFacetForActionAnnotation(final Where where, final FacetHolder holder) {
- super(where, holder);
- }
-
- @Override
- public String hiddenReason(final ManagedObject targetAdapter, final Where whereContext) {
- if(!where().includes(whereContext)) {
- return null;
- }
- return "Hidden on " + where().getFriendlyName();
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 6f5de16277..bc50dc96f7 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -32,7 +32,6 @@ import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.causeway.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
import org.apache.causeway.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
-import org.apache.causeway.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import org.apache.causeway.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacet;
import org.apache.causeway.core.metamodel.facets.collections.collection.typeof.TypeOfFacetForCollectionAnnotation;
import org.apache.causeway.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacet;
@@ -60,7 +59,6 @@ extends FacetFactoryAbstract {
}
processDomainEvent(processMethodContext, collectionIfAny);
- processHidden(processMethodContext, collectionIfAny);
processTypeOf(processMethodContext, collectionIfAny);
}
@@ -102,17 +100,6 @@ extends FacetFactoryAbstract {
.create(collectionIfAny, cls, holder));
}
- @SuppressWarnings("removal")
- void processHidden(final ProcessMethodContext processMethodContext, final Optional<Collection> collectionIfAny) {
- val holder = processMethodContext.getFacetHolder();
-
- // check for @Collection(hidden=...)
- addFacetIfPresent(
- HiddenFacetForCollectionAnnotation
- .create(collectionIfAny, holder));
- }
-
-
void processTypeOf(final ProcessMethodContext processMethodContext, final Optional<Collection> collectionIfAny) {
val cls = processMethodContext.getCls();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
deleted file mode 100644
index 0b00c5c046..0000000000
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/hidden/HiddenFacetForCollectionAnnotation.java
+++ /dev/null
@@ -1,54 +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.causeway.core.metamodel.facets.collections.collection.hidden;
-
-import java.util.Optional;
-
-import org.apache.causeway.applib.annotation.Collection;
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
-
-@Deprecated(forRemoval = true, since = "2.0.0-RC2")
-public class HiddenFacetForCollectionAnnotation extends HiddenFacetAbstract {
-
- public static Optional<HiddenFacetForCollectionAnnotation> create(
- final Optional<Collection> collectionIfAny,
- final FacetHolder holder) {
-
- return collectionIfAny
- .map(Collection::hidden)
- .filter(where -> where != null && where != Where.NOT_SPECIFIED)
- .map(where -> new HiddenFacetForCollectionAnnotation(where, holder));
- }
-
- private HiddenFacetForCollectionAnnotation(final Where where, final FacetHolder holder) {
- super(where, holder);
- }
-
- @Override
- public String hiddenReason(final ManagedObject targetAdapter, final Where whereContext) {
- if(!where().includes(whereContext)) {
- return null;
- }
- return "Hidden on " + where().getFriendlyName();
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index f17e4bbbe6..e33c6c360d 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -39,7 +39,6 @@ import org.apache.causeway.core.metamodel.facets.properties.projection.Projectin
import org.apache.causeway.core.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.fileaccept.FileAcceptFacetForPropertyAnnotation;
-import org.apache.causeway.core.metamodel.facets.properties.property.hidden.HiddenFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.mandatory.MandatoryFacetInvertedByNullableAnnotationOnProperty;
import org.apache.causeway.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForPropertyAnnotation;
@@ -76,7 +75,6 @@ extends FacetFactoryAbstract {
}
processDomainEvent(processMethodContext, propertyIfAny);
- processHidden(processMethodContext, propertyIfAny);
processEditing(processMethodContext, propertyIfAny);
processCommandPublishing(processMethodContext, propertyIfAny);
processProjecting(processMethodContext, propertyIfAny);
@@ -163,16 +161,6 @@ extends FacetFactoryAbstract {
}
- @SuppressWarnings("removal")
- void processHidden(final ProcessMethodContext processMethodContext, final Optional<Property> propertyIfAny) {
- val facetHolder = processMethodContext.getFacetHolder();
-
- // search for @Property(hidden=...)
- addFacetIfPresent(
- HiddenFacetForPropertyAnnotation
- .create(propertyIfAny, facetHolder));
- }
-
void processEditing(final ProcessMethodContext processMethodContext, final Optional<Property> propertyIfAny) {
val facetHolder = processMethodContext.getFacetHolder();
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
deleted file mode 100644
index fb6b9f5cdb..0000000000
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/property/hidden/HiddenFacetForPropertyAnnotation.java
+++ /dev/null
@@ -1,55 +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.causeway.core.metamodel.facets.properties.property.hidden;
-
-import java.util.Optional;
-
-import org.apache.causeway.applib.annotation.Property;
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
-import org.apache.causeway.core.metamodel.facets.members.hidden.HiddenFacetAbstract;
-import org.apache.causeway.core.metamodel.object.ManagedObject;
-
-@Deprecated(forRemoval = true, since = "2.0.0-RC2")
-public class HiddenFacetForPropertyAnnotation
-extends HiddenFacetAbstract {
-
- public static Optional<HiddenFacetForPropertyAnnotation> create(
- final Optional<Property> propertyIfAny,
- final FacetHolder holder) {
-
- return propertyIfAny
- .map(Property::hidden)
- .filter(where -> where != null && where != Where.NOT_SPECIFIED)
- .map(where -> new HiddenFacetForPropertyAnnotation(where, holder));
- }
-
- private HiddenFacetForPropertyAnnotation(final Where where, final FacetHolder holder) {
- super(where, holder);
- }
-
- @Override
- public String hiddenReason(final ManagedObject targetAdapter, final Where whereContext) {
- if(!where().includes(whereContext)) {
- return null;
- }
- return "Hidden on " + where().getFriendlyName();
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
deleted file mode 100644
index b730dd0ba6..0000000000
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_Hidden.java
+++ /dev/null
@@ -1,74 +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.causeway.core.metamodel.facets.actions.action;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.apache.causeway.applib.annotation.Action;
-import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
-
-import lombok.val;
-
-class ActionAnnotationFacetFactoryTest_Hidden
-extends ActionAnnotationFacetFactoryTest {
-
- private void processHidden(
- final ActionAnnotationFacetFactory facetFactory, final ProcessMethodContext processMethodContext) {
-
- val actionIfAny = processMethodContext.synthesizeOnMethod(Action.class);
- facetFactory.processHidden(processMethodContext, actionIfAny);
- }
-
- @Test
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
- void withAnnotation() {
-
- class Customer {
- @Action(hidden = Where.REFERENCES_PARENT)
- public void someAction() {
- }
- }
-
- // given
- actionScenario(Customer.class, "someAction", (processMethodContext, facetHolder, facetedMethod)->{
-
- // when
- processHidden(facetFactory, processMethodContext);
-
- // then
- val hiddenFacet = facetedMethod.getFacet(HiddenFacet.class);
- assertNotNull(hiddenFacet);
- assertThat(hiddenFacet.where(), is(Where.REFERENCES_PARENT));
-
- val hiddenFacetImpl = facetedMethod.getFacet(HiddenFacet.class);
- assertNotNull(hiddenFacetImpl);
- assertTrue(hiddenFacet == hiddenFacetImpl);
-
- });
-
- }
-
-}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
index e11aaa2705..643a1d2ceb 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest.java
@@ -28,7 +28,6 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.mockito.Mockito;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -38,12 +37,10 @@ import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.MemberSupport;
import org.apache.causeway.applib.annotation.Nature;
-import org.apache.causeway.applib.annotation.Where;
import org.apache.causeway.applib.events.domain.CollectionDomainEvent;
import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.CollectionSemantics;
import org.apache.causeway.core.metamodel.commons.matchers.CausewayMatchers;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facets.DomainEventFacetAbstract.EventTypeOrigin;
@@ -52,8 +49,6 @@ import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.causeway.core.metamodel.facets.actcoll.typeof.TypeOfFacetFromFeature;
-import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
-import org.apache.causeway.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
import org.apache.causeway.core.metamodel.facets.collections.collection.modify.CollectionDomainEventFacet;
import org.apache.causeway.core.metamodel.facets.collections.collection.typeof.TypeOfFacetForCollectionAnnotation;
import org.apache.causeway.core.metamodel.facets.propcoll.accessor.PropertyOrCollectionAccessorFacetAbstract;
@@ -66,7 +61,6 @@ import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.val;
-@SuppressWarnings("removal")
class CollectionAnnotationFacetFactoryTest
extends FacetFactoryTestAbstract {
@@ -78,12 +72,6 @@ extends FacetFactoryTestAbstract {
facetFactory.processDomainEvent(processMethodContext, collectionIfAny);
}
- private static void processHidden(
- final CollectionAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
- val collectionIfAny = facetFactory.collectionIfAny(processMethodContext);
- facetFactory.processHidden(processMethodContext, collectionIfAny);
- }
-
private static void processTypeOf(
final CollectionAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
val collectionIfAny = facetFactory.collectionIfAny(processMethodContext);
@@ -398,43 +386,6 @@ extends FacetFactoryTestAbstract {
}
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
- static class Hidden extends CollectionAnnotationFacetFactoryTest {
-
- @Test
- void withAnnotation() {
-
- class Order {
- }
- @SuppressWarnings("unused")
- class Customer {
- @Collection(hidden = Where.REFERENCES_PARENT)
- public List<Order> getOrders() { return null; }
- public void setOrders(final List<Order> orders) {}
- }
-
- // given
- collectionScenario(Customer.class, "orders", (processMethodContext, facetHolder, facetedMethod)->{
-
- // when
- processHidden(facetFactory, processMethodContext);
-
- // then
- final HiddenFacet hiddenFacet = facetedMethod.getFacet(HiddenFacet.class);
- assertNotNull(hiddenFacet);
- assertTrue(hiddenFacet instanceof HiddenFacetForCollectionAnnotation);
- final HiddenFacetForCollectionAnnotation hiddenFacetImpl = (HiddenFacetForCollectionAnnotation) hiddenFacet;
- assertThat(hiddenFacetImpl.where(), is(Where.REFERENCES_PARENT));
-
- final Facet hiddenFacetForColl = facetedMethod.getFacet(HiddenFacet.class);
- assertNotNull(hiddenFacetForColl);
- assertTrue(hiddenFacet == hiddenFacetForColl);
-
- });
- }
-
- }
-
static class TypeOf extends CollectionAnnotationFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index ced5ee1a1a..adfa2c4a1e 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -48,14 +48,12 @@ import org.apache.causeway.applib.spec.Specification;
import org.apache.causeway.core.metamodel.commons.matchers.CausewayMatchers;
import org.apache.causeway.core.metamodel.consent.Consent.VetoReason;
import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy;
-import org.apache.causeway.core.metamodel.facetapi.Facet;
import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
import org.apache.causeway.core.metamodel.facetapi.FacetUtil;
import org.apache.causeway.core.metamodel.facets.DomainEventFacetAbstract.EventTypeOrigin;
import org.apache.causeway.core.metamodel.facets.FacetFactory;
import org.apache.causeway.core.metamodel.facets.FacetFactoryTestAbstract;
import org.apache.causeway.core.metamodel.facets.FacetedMethod;
-import org.apache.causeway.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.causeway.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.causeway.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
@@ -65,7 +63,6 @@ import org.apache.causeway.core.metamodel.facets.propcoll.accessor.PropertyOrCol
import org.apache.causeway.core.metamodel.facets.propcoll.memserexcl.SnapshotExcludeFacet;
import org.apache.causeway.core.metamodel.facets.properties.property.disabled.DisabledFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.entitychangepublishing.EntityPropertyChangePublishingPolicyFacet;
-import org.apache.causeway.core.metamodel.facets.properties.property.hidden.HiddenFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForPropertyAnnotation;
import org.apache.causeway.core.metamodel.facets.properties.property.modify.PropertyDomainEventFacet;
@@ -87,7 +84,6 @@ import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.val;
-@SuppressWarnings("removal")
class PropertyAnnotationFacetFactoryTest extends FacetFactoryTestAbstract {
PropertyAnnotationFacetFactory facetFactory;
@@ -98,12 +94,6 @@ class PropertyAnnotationFacetFactoryTest extends FacetFactoryTestAbstract {
facetFactory.processDomainEvent(processMethodContext, propertyIfAny);
}
- private static void processHidden(
- final PropertyAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
- val propertyIfAny = facetFactory.propertyIfAny(processMethodContext);
- facetFactory.processHidden(processMethodContext, propertyIfAny);
- }
-
private static void processOptional(
final PropertyAnnotationFacetFactory facetFactory, final FacetFactory.ProcessMethodContext processMethodContext) {
val propertyIfAny = facetFactory.propertyIfAny(processMethodContext);
@@ -485,38 +475,6 @@ class PropertyAnnotationFacetFactoryTest extends FacetFactoryTestAbstract {
}
- @TestInstance(Lifecycle.PER_CLASS) @Deprecated(forRemoval = true, since = "2.0.0-RC2")
- static class Hidden extends PropertyAnnotationFacetFactoryTest {
-
- @Test
- void withAnnotation() {
-
- @SuppressWarnings("unused")
- class Customer {
- @Property(hidden = Where.REFERENCES_PARENT)
- @Getter @Setter private String name;
- }
-
- // given
- propertyScenario(Customer.class, "name", (processMethodContext, facetHolder, facetedMethod)->{
- // when
- processHidden(facetFactory, processMethodContext);
-
- // then
- final HiddenFacet hiddenFacet = facetedMethod.getFacet(HiddenFacet.class);
- assertNotNull(hiddenFacet);
- assertTrue(hiddenFacet instanceof HiddenFacetForPropertyAnnotation);
- final HiddenFacetForPropertyAnnotation hiddenFacetImpl = (HiddenFacetForPropertyAnnotation) hiddenFacet;
- assertThat(hiddenFacetImpl.where(), is(Where.REFERENCES_PARENT));
-
- final Facet hiddenFacetForProp = facetedMethod.getFacet(HiddenFacet.class);
- assertNotNull(hiddenFacetForProp);
- assertTrue(hiddenFacet == hiddenFacetForProp);
- });
- }
-
- }
-
@TestInstance(Lifecycle.PER_CLASS)
static class Editing extends PropertyAnnotationFacetFactoryTest {
[causeway] 02/02: CAUSEWAY-3533: adds mignotes (RC3)
Posted by ah...@apache.org.
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/causeway.git
commit b8721144861af1ef5950ecc7f40858c491336d7c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jul 20 09:27:31 2023 +0200
CAUSEWAY-3533: adds mignotes (RC3)
---
.../applib/pages/index/annotation/Action.adoc | 28 -------------------
.../applib/pages/index/annotation/Collection.adoc | 26 ------------------
.../pages/index/annotation/DomainObjectLayout.adoc | 26 ------------------
.../applib/pages/index/annotation/Property.adoc | 26 ------------------
.../modules/commons/pages/index/io/YamlUtils.adoc | 32 +++++++++++-----------
.../ROOT/pages/2023/2.0.0-RC3/mignotes.adoc | 18 ++++++++++++
.../ROOT/pages/2023/2.0.0-RC3/relnotes.adoc | 7 +++++
.../relnotes/modules/ROOT/pages/about.adoc | 11 +++++++-
core/adoc/modules/_overview/pages/about.adoc | 27 +++++++++++++++++-
9 files changed, 77 insertions(+), 124 deletions(-)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc
index 63d85d21a2..d365729b78 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc
@@ -14,8 +14,6 @@ Groups together all domain-specific metadata for an invokable action on a domain
Publishing commandPublishing() default Publishing.NOT_SPECIFIED; // <.>
Class<? extends ActionDomainEvent<?>> domainEvent() default ActionDomainEvent.Default.class; // <.>
Publishing executionPublishing() default Publishing.NOT_SPECIFIED; // <.>
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
-Where hidden() default Where.NOT_SPECIFIED; // <.>
RestrictTo restrictTo() default RestrictTo.NOT_SPECIFIED; // <.>
SemanticsOf semantics() default SemanticsOf.NOT_SPECIFIED; // <.>
Class<?> typeOf() default // represents unspecified
@@ -49,18 +47,6 @@ Indicates that an invocation of the action should be posted to the _org.apache.c
--
Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (triggered by action invocations), should be published to xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
--
-<.> xref:#hidden[hidden]
-+
---
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use _ActionLayout#hidden()_ instead
-====
-
-Indicates where (in the UI) the action is not visible to the user.
---
<.> xref:#restrictTo[restrictTo]
+
--
@@ -132,20 +118,6 @@ This subclass must provide a no-arg constructor; the fields are set reflectively
Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (triggered by action invocations), should be published to xref:refguide:applib:index/services/publishing/spi/ExecutionSubscriber.adoc[ExecutionSubscriber] s.
-[#hidden]
-=== hidden
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use _ActionLayout#hidden()_ instead
-====
-
-Indicates where (in the UI) the action is not visible to the user.
-
-For xref:refguide:applib:index/annotation/DomainService.adoc[DomainService] actions, the action's visibility is dependent upon its _DomainService#nature() nature_ .
-
[#restrictTo]
=== restrictTo
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc
index 903885feda..bdfa1e5993 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Collection.adoc
@@ -10,8 +10,6 @@ Domain semantics for domain object collection.
----
@interface Collection {
Class<? extends CollectionDomainEvent<?, ?>> domainEvent() default CollectionDomainEvent.Default.class; // <.>
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
-Where hidden() default Where.NOT_SPECIFIED; // <.>
Class<?> typeOf() default // represents unspecified
void.class; // <.>
}
@@ -22,18 +20,6 @@ void.class; // <.>
--
Indicates that changes to the collection that should be posted to the _org.apache.causeway.applib.services.eventbus.EventBusService event bus_ using a custom (subclass of) xref:refguide:applib:index/events/domain/CollectionDomainEvent.adoc[CollectionDomainEvent] .
--
-<.> xref:#hidden[hidden]
-+
---
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use CollectionLayout#hidden() instead
-====
-
-Indicates when the collection is not visible to the user.
---
<.> xref:#typeOf[typeOf]
+
--
@@ -63,18 +49,6 @@ public class Order {
This subclass must provide a no-arg constructor; the fields are set reflectively.
-[#hidden]
-=== hidden
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use CollectionLayout#hidden() instead
-====
-
-Indicates when the collection is not visible to the user.
-
[#typeOf]
=== typeOf
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
index f617793cd4..5a302fc7a2 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObjectLayout.adoc
@@ -16,8 +16,6 @@ Layout hints for domain objects.
String describedAs() default ""; // <.>
String named() default ""; // <.>
int paged() default -1; // <.>
- @Deprecated(forRemoval = true)
-String plural() default ""; // <.>
Class<? extends TableDecorator> tableDecorator() default TableDecorator.Default.class; // <.>
Class<? extends CssClassUiEvent<?>> cssClassUiEvent() default CssClassUiEvent.Default.class; // <.>
Class<? extends IconUiEvent<?>> iconUiEvent() default IconUiEvent.Default.class; // <.>
@@ -61,18 +59,6 @@ Name of this class (overriding the name derived from its name in code).
--
The page size for instances of this class when rendered within a table.
--
-<.> xref:#plural[plural]
-+
---
-[WARNING]
-====
-[red]#_deprecated:_#
-
-CAUSEWAY-3321: for standalone tables (action result), parented tables (collections) or plural action parameters, the framework should (and will) use the name of the originating action, collection or action parameter instead.
-====
-
-The plural name of the class.
---
<.> xref:#tableDecorator[tableDecorator]
+
--
@@ -144,18 +130,6 @@ If annotated on a collection, then the page size refers to parented collections
If annotated on a type, then the page size refers to standalone collections (eg as returned from a repository query).
-[#plural]
-=== plural
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-CAUSEWAY-3321: for standalone tables (action result), parented tables (collections) or plural action parameters, the framework should (and will) use the name of the originating action, collection or action parameter instead.
-====
-
-The plural name of the class.
-
[#tableDecorator]
=== tableDecorator
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc
index 974946f8a5..80bfdb5c27 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Property.adoc
@@ -17,8 +17,6 @@ Collects together all the domain semantics for the property of a domain object.
Publishing entityChangePublishing() default Publishing.NOT_SPECIFIED; // <.>
Publishing executionPublishing() default Publishing.NOT_SPECIFIED; // <.>
String fileAccept() default ""; // <.>
- @Deprecated(forRemoval = true, since = "2.0.0-RC2")
-Where hidden() default Where.NOT_SPECIFIED; // <.>
int maxLength() default -1; // <.>
Snapshot snapshot() default Snapshot.NOT_SPECIFIED; // <.>
Class<? extends Specification>[] mustSatisfy() default {}; // <.>
@@ -70,18 +68,6 @@ Whether xref:refguide:applib:index/services/iactn/Execution.adoc[Execution] s (t
--
For uploading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ).
--
-<.> xref:#hidden[hidden]
-+
---
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use _PropertyLayout#hidden()_ instead
-====
-
-Indicates where the property is not visible to the user.
---
<.> xref:#maxLength[maxLength]
+
--
@@ -191,18 +177,6 @@ The value should be of the form "file_extension|audio/*|video/*|image/*|media_ty
Note that this does not prevent the user from uploading some other file type; rather it merely defaults the file type in the file open dialog.
-[#hidden]
-=== hidden
-
-[WARNING]
-====
-[red]#_deprecated:_#
-
-use _PropertyLayout#hidden()_ instead
-====
-
-Indicates where the property is not visible to the user.
-
[#maxLength]
=== maxLength
diff --git a/antora/components/refguide-index/modules/commons/pages/index/io/YamlUtils.adoc b/antora/components/refguide-index/modules/commons/pages/index/io/YamlUtils.adoc
index 14128867d8..f5c49fc8e7 100644
--- a/antora/components/refguide-index/modules/commons/pages/index/io/YamlUtils.adoc
+++ b/antora/components/refguide-index/modules/commons/pages/index/io/YamlUtils.adoc
@@ -9,30 +9,30 @@ Utilities to convert from and to YAML format.
.YamlUtils.java
----
class YamlUtils {
- Try<T> tryRead(Class<T> mappedType, String stringUtf8) // <.>
- Try<T> tryRead(Class<T> mappedType, DataSource source) // <.>
- void write(Object pojo, DataSink sink, YamlUtils.YamlCustomizer... customizers) // <.>
- String toStringUtf8(Object pojo, YamlUtils.YamlCustomizer... customizers) // <.>
+ Try<T> tryRead(Class<T> mappedType, String stringUtf8, YamlUtils.YamlLoadCustomizer... customizers) // <.>
+ Try<T> tryRead(Class<T> mappedType, DataSource source, YamlUtils.YamlLoadCustomizer... customizers) // <.>
+ void write(Object pojo, DataSink sink, YamlUtils.YamlDumpCustomizer... customizers) // <.>
+ String toStringUtf8(Object pojo, YamlUtils.YamlDumpCustomizer... customizers) // <.>
DumperOptions allowReadOnlyProperties(DumperOptions opts) // <.>
}
----
-<.> xref:#tryRead_Class_String[tryRead(Class, String)]
+<.> xref:#tryRead_Class_String_YamlUtils_YamlLoadCustomizer[tryRead(Class, String, YamlUtils_YamlLoadCustomizer)]
+
--
Tries to deserialize YAML content from given UTF8 encoded _String_ into an instance of given _mappedType_ .
--
-<.> xref:#tryRead_Class_DataSource[tryRead(Class, DataSource)]
+<.> xref:#tryRead_Class_DataSource_YamlUtils_YamlLoadCustomizer[tryRead(Class, DataSource, YamlUtils_YamlLoadCustomizer)]
+
--
Tries to deserialize YAML content from given xref:refguide:commons:index/io/DataSource.adoc[DataSource] into an instance of given _requiredType_ .
--
-<.> xref:#write_Object_DataSink_YamlUtils_YamlCustomizer[write(Object, DataSink, YamlUtils_YamlCustomizer)]
+<.> xref:#write_Object_DataSink_YamlUtils_YamlDumpCustomizer[write(Object, DataSink, YamlUtils_YamlDumpCustomizer)]
+
--
Writes given _pojo_ to given xref:refguide:commons:index/io/DataSink.adoc[DataSink] .
--
-<.> xref:#toStringUtf8_Object_YamlUtils_YamlCustomizer[toStringUtf8(Object, YamlUtils_YamlCustomizer)]
+<.> xref:#toStringUtf8_Object_YamlUtils_YamlDumpCustomizer[toStringUtf8(Object, YamlUtils_YamlDumpCustomizer)]
+
--
Converts given _pojo_ to an UTF8 encoded _String_ .
@@ -45,23 +45,23 @@ Include read-only JavaBean properties (the ones without setters) in the YAML doc
== Members
-[#tryRead_Class_String]
-=== tryRead(Class, String)
+[#tryRead_Class_String_YamlUtils_YamlLoadCustomizer]
+=== tryRead(Class, String, YamlUtils_YamlLoadCustomizer)
Tries to deserialize YAML content from given UTF8 encoded _String_ into an instance of given _mappedType_ .
-[#tryRead_Class_DataSource]
-=== tryRead(Class, DataSource)
+[#tryRead_Class_DataSource_YamlUtils_YamlLoadCustomizer]
+=== tryRead(Class, DataSource, YamlUtils_YamlLoadCustomizer)
Tries to deserialize YAML content from given xref:refguide:commons:index/io/DataSource.adoc[DataSource] into an instance of given _requiredType_ .
-[#write_Object_DataSink_YamlUtils_YamlCustomizer]
-=== write(Object, DataSink, YamlUtils_YamlCustomizer)
+[#write_Object_DataSink_YamlUtils_YamlDumpCustomizer]
+=== write(Object, DataSink, YamlUtils_YamlDumpCustomizer)
Writes given _pojo_ to given xref:refguide:commons:index/io/DataSink.adoc[DataSink] .
-[#toStringUtf8_Object_YamlUtils_YamlCustomizer]
-=== toStringUtf8(Object, YamlUtils_YamlCustomizer)
+[#toStringUtf8_Object_YamlUtils_YamlDumpCustomizer]
+=== toStringUtf8(Object, YamlUtils_YamlDumpCustomizer)
Converts given _pojo_ to an UTF8 encoded _String_ .
diff --git a/antora/components/relnotes/modules/ROOT/pages/2023/2.0.0-RC3/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2023/2.0.0-RC3/mignotes.adoc
new file mode 100644
index 0000000000..2fb3b27d39
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2023/2.0.0-RC3/mignotes.adoc
@@ -0,0 +1,18 @@
+= Migrating from RC2 to RC3
+
+:Notice: 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 ag [...]
+:page-partial:
+
+This page will be added to as development progresses.
+
+== Programming Model
+
+=== Removed
+
+As previously marked deprecated for removal:
+
+* `Action#hidden` ... use `ActionLayout#hidden` instead
+* `Collection#hidden` ... use `CollectionLayout#hidden` instead
+* `Property#hidden` ... use `PropertyLayout#hidden` instead
+* `@LogicalTypeName(..)` ... use `@Named(..)` instead
+
diff --git a/antora/components/relnotes/modules/ROOT/pages/2023/2.0.0-RC3/relnotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2023/2.0.0-RC3/relnotes.adoc
new file mode 100644
index 0000000000..e9600fc7d3
--- /dev/null
+++ b/antora/components/relnotes/modules/ROOT/pages/2023/2.0.0-RC3/relnotes.adoc
@@ -0,0 +1,7 @@
+[[r2.0.0-RC3]]
+= 2.0.0-RC3
+
+:Notice: 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 ag [...]
+:page-partial:
+
+Not available yet. To be announced.
\ No newline at end of file
diff --git a/antora/components/relnotes/modules/ROOT/pages/about.adoc b/antora/components/relnotes/modules/ROOT/pages/about.adoc
index 3042a16dc1..139e92306c 100644
--- a/antora/components/relnotes/modules/ROOT/pages/about.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/about.adoc
@@ -6,7 +6,6 @@
This table summarises all releases of Apache Causeway v2.0 to date.
-
[cols="2,2,4a,>1,>1,>1,3a"]
|===
| Version
@@ -17,6 +16,16 @@ This table summarises all releases of Apache Causeway v2.0 to date.
| Bugs
| Detail
+| 2.0.0-RC3
+| _tba_
+| Third release candidate for Apache Causeway 2.0.0.
+| _tba_
+| _tba_
+| _tba_
+|
+* xref:relnotes:ROOT:2023/2.0.0-RC3/relnotes.adoc[Release Notes]
+* xref:relnotes:ROOT:2023/2.0.0-RC3/mignotes.adoc[Migration Notes]
+
| 2.0.0-RC2
| 13-Jul-2023
| Second release candidate for Apache Causeway 2.0.0.
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 7f57db8fd7..1870ca152d 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -6914,7 +6914,16 @@ Artifact: causeway-viewer-graphql-viewer
Type: jar
Directory: /incubator/viewers/graphql/viewer
----
-|.Dependencies
+|.Components
+****
+o.a.i.viewer.graphql.viewer.source.ExecutionStrategyResolvingWithinInteraction +
+o.a.i.viewer.graphql.viewer.source.GraphQlServiceForCauseway +
+o.a.i.viewer.graphql.viewer.source.GraphQlSourceForCauseway +
+o.a.i.viewer.graphql.viewer.source.ObjectTypeFactory +
+o.a.i.viewer.graphql.viewer.source.QueryFieldFactory +
+****
+
+.Dependencies
****
org.apache.causeway.core:causeway-core-webapp:jar:<managed> +
org.apache.causeway.incubator.viewer:causeway-viewer-graphql-model:jar:<managed> +
@@ -7000,6 +7009,12 @@ Directory: /incubator/extensions/core/commandreplay/primary
----
|A module for obtaining commands from a primary
+.Components
+****
+o.a.i.extensions.commandreplay.primary.config.PrimaryConfig +
+o.a.i.extensions.commandreplay.primary.spiimpl.CaptureResultOfCommand +
+****
+
.Dependencies
****
org.apache.causeway.core:causeway-core-config:jar:<managed> +
@@ -7025,6 +7040,16 @@ Directory: /incubator/extensions/core/commandreplay/secondary
|A module providing a Quartz Job to run on a secondary system,
for obtaining commands from a primary and saving them so that they are replayed.
+.Components
+****
+o.a.i.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserException +
+o.a.i.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserResult +
+o.a.i.extensions.commandreplay.secondary.analysis.CommandReplayAnalysisService +
+o.a.i.extensions.commandreplay.secondary.config.SecondaryConfig +
+o.a.i.extensions.commandreplay.secondary.fetch.CommandFetcher +
+o.a.i.extensions.commandreplay.secondary.job.ReplicateAndReplayJob +
+****
+
.Dependencies
****
org.apache.causeway.core:causeway-core-config:jar:<managed> +