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 2022/01/09 12:26:49 UTC
[isis] branch master updated: ISIS-2856: more deprecations handled (RO, subdomains)
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
The following commit(s) were added to refs/heads/master by this push:
new 067c2db ISIS-2856: more deprecations handled (RO, subdomains)
067c2db is described below
commit 067c2dba8541d0cfafa16a46cb3165b66486a0e1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 9 13:26:42 2022 +0100
ISIS-2856: more deprecations handled (RO, subdomains)
---
.../subdomains/base/applib/utils/TitleBuilder.java | 11 ++------
.../rendering/domainobjects/MemberType.java | 33 ++++------------------
2 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java
index bae7e25..9a88fa6 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/utils/TitleBuilder.java
@@ -39,7 +39,7 @@ public class TitleBuilder {
private final StringBuilder nameString;
private final StringBuilder referenceString;
- private static String titleFor(Object object) {
+ private static String titleFor(final Object object) {
if (object == null) {
return null;
} else if (object instanceof String) {
@@ -97,7 +97,7 @@ public class TitleBuilder {
.toString().trim();
}
- private StringBuilder delimited(StringBuilder stringBuilder){
+ private StringBuilder delimited(final StringBuilder stringBuilder){
return stringBuilder.length()>0 ? stringBuilder.insert(0,DELIMITER.charAt(0)).append(DELIMITER.charAt(1)) : stringBuilder;
}
@@ -109,11 +109,4 @@ public class TitleBuilder {
return this;
}
- /**
- * @deprecated - this method does nothing...
- */
- @Deprecated
- public TitleBuilder withTupleElement(Object object) {
- return this;
- }
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
index 4a2ba50..436cdbf 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/MemberType.java
@@ -28,7 +28,6 @@ import org.apache.isis.core.metamodel.facets.actions.validate.ActionValidationFa
import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyClearFacet;
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.facets.properties.validating.PropertyValidateFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
@@ -38,6 +37,8 @@ import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
+import lombok.Getter;
+
public enum MemberType {
PROPERTY("properties/", RepresentationType.OBJECT_PROPERTY,
@@ -59,11 +60,10 @@ public enum MemberType {
"invokeIdempotent", MutatorSpec.of(Rel.INVOKE, ActionValidationFacet.class, ActionInvocationFacet.class, RestfulHttpMethod.PUT, BodyArgs.MANY, "invoke"),
"invoke", MutatorSpec.of(Rel.INVOKE, ActionValidationFacet.class, ActionInvocationFacet.class, RestfulHttpMethod.POST, BodyArgs.MANY, "invoke")));
- private final String urlPart;
- private final String name;
- private final RepresentationType representationType;
-
- private final Map<String, MutatorSpec> mutators;
+ @Getter private final String urlPart;
+ @Getter private final String name;
+ @Getter private final RepresentationType representationType;
+ @Getter private final Map<String, MutatorSpec> mutators;
private MemberType(final String urlPart, final RepresentationType representationType, final Map<String, MutatorSpec> mutators) {
this.urlPart = urlPart;
@@ -72,19 +72,6 @@ public enum MemberType {
name = Enums.enumToCamelCase(this);
}
- public String getUrlPart() {
- return urlPart;
- }
-
- public Map<String, MutatorSpec> getMutators() {
- return mutators;
- }
-
- @Deprecated //inline
- public final ObjectSpecification specFor(final ObjectMember objectMember) {
- return objectMember.getElementType();
- }
-
public boolean isProperty() {
return this == MemberType.PROPERTY;
}
@@ -110,14 +97,6 @@ public enum MemberType {
return objectMember.isAction() ? ACTION : objectMember.isOneToOneAssociation() ? PROPERTY : COLLECTION;
}
- public RepresentationType getRepresentationType() {
- return representationType;
- }
-
- public String getName() {
- return name;
- }
-
public static MemberType determineFrom(final ObjectFeature objectFeature) {
if (objectFeature instanceof ObjectAction) {
return MemberType.ACTION;