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/10 07:39:20 UTC
[isis] branch master updated (b298721 -> e28427d)
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 b298721 ISIS-2856: restore critical implementation note
new 0722d6f ISIS-2856: cucumber support: remove deprecated converters
new e28427d ISIS-2856: more deprecation removals
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:
.../invocation/ActionDomainEventFacetAbstract.java | 23 +-
.../shirorealmldap/realm/impl/IsisLdapRealm.java | 69 ++---
.../isis/testing/specsupport/applib/specs/V.java | 345 ---------------------
3 files changed, 34 insertions(+), 403 deletions(-)
delete mode 100644 testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java
[isis] 01/02: ISIS-2856: cucumber support: remove deprecated converters
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/isis.git
commit 0722d6fb092ee55dd33ea942823b62af0d816d3a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 10 08:38:40 2022 +0100
ISIS-2856: cucumber support: remove deprecated converters
---
.../isis/testing/specsupport/applib/specs/V.java | 345 ---------------------
1 file changed, 345 deletions(-)
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java
deleted file mode 100644
index e3038dd..0000000
--- a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java
+++ /dev/null
@@ -1,345 +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.isis.testing.specsupport.applib.specs;
-
-import org.joda.time.format.DateTimeFormat;
-
-/**
- * A set of converters for built-in value types; for use in Cucumber step definitions.
- *
- * @since 2.0 {@index}
- */
-public class V {
-
- private V() {
- }
-
- /**
- * @deprecated this is just a dummy, it seems the former cucumber.api.Transformer was removed;
- * what's the replacement?
- *
- * @param <T>
- */
- @Deprecated
- public static abstract class Transformer<T> {
- public abstract T transform(java.lang.String value);
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Byte}, but also recognizing the
- * keyword 'null'.
- */
- public static class Byte extends Transformer<java.lang.Byte> {
-
- @Override
- public java.lang.Byte transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : java.lang.Byte.parseByte(value);
- }
-
- public static java.lang.Byte as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Byte().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Short}, but also recognizing the
- * keyword 'null'.
- */
- public static class Short extends Transformer<java.lang.Short> {
-
- @Override
- public java.lang.Short transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : java.lang.Short.parseShort(value);
- }
-
- public static java.lang.Short as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Short().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Integer}, but also recognizing the
- * keyword 'null'.
- */
- public static class Integer extends Transformer<java.lang.Integer> {
-
- @Override
- public java.lang.Integer transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : java.lang.Integer.parseInt(value);
- }
-
- public static java.lang.Integer as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Integer().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Long}, but also recognizing the
- * keyword 'null'.
- */
- public static class Long extends Transformer<java.lang.Long> {
-
- @Override
- public java.lang.Long transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : java.lang.Long.parseLong(value);
- }
-
- public static java.lang.Long as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Long().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Float}, but also recognizing the
- * keyword 'null'.
- */
- public static class Float extends Transformer<java.lang.Float> {
-
- @Override
- public java.lang.Float transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : java.lang.Float.parseFloat(value);
- }
-
- public static java.lang.Float as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Float().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Double}, but also recognizing the
- * keyword 'null'.
- */
- public static class Double extends Transformer<java.lang.Double> {
-
- @Override
- public java.lang.Double transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : java.lang.Double.parseDouble(value);
- }
-
- public static java.lang.Double as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Double().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.math.BigInteger}, but also recognizing the
- * keyword 'null'.
- */
- public static class BigInteger extends Transformer<java.math.BigInteger> {
-
- @Override
- public java.math.BigInteger transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : new java.math.BigInteger(value);
- }
-
- public static java.math.BigInteger as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new BigInteger().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.math.BigDecimal}, but also recognizing the
- * keyword 'null'.
- */
- public static class BigDecimal extends Transformer<java.math.BigDecimal> {
-
- @Override
- public java.math.BigDecimal transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : new java.math.BigDecimal(value);
- }
-
- public static java.math.BigDecimal as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new BigDecimal().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.Character}, but also recognizing the
- * keyword 'null'.
- */
- public static class Character extends Transformer<java.lang.Character> {
-
- @Override
- public java.lang.Character transform(final java.lang.String value) {
- return value == null || "null".equals(value) || value.length() <1
- ? null
- : value.charAt(0);
- }
-
- public static java.lang.Character as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new Character().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link java.lang.String}, but also recognizing the
- * keyword 'null'.
- */
- public static class String extends Transformer<java.lang.String> {
-
- @Override
- public java.lang.String transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : value;
- }
-
- public static java.lang.String as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new String().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link org.joda.time.LocalDate}, but also recognizing the
- * keyword 'null'.
- */
- public static class LyyyyMMdd extends Transformer<org.joda.time.LocalDate> {
-
- @Override
- public org.joda.time.LocalDate transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : DateTimeFormat.forPattern("yyyy-MM-dd").parseLocalDate(value);
- }
-
- public static org.joda.time.LocalDate as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new LyyyyMMdd().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link org.joda.time.DateTime}, but also recognizing the
- * keyword 'null'.
- */
- public static class yyyyMMddHHmmss extends Transformer<org.joda.time.DateTime> {
-
- @Override
- public org.joda.time.DateTime transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss").parseDateTime(value);
- }
-
- public static org.joda.time.DateTime as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new yyyyMMddHHmmss().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link org.joda.time.DateTime}, but also recognizing the
- * keyword 'null'.
- */
- public static class yyyyMMddHHmm extends Transformer<org.joda.time.DateTime> {
-
- @Override
- public org.joda.time.DateTime transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : DateTimeFormat.forPattern("yyyy-MM-dd HH:mm").parseDateTime(value);
- }
-
- public static org.joda.time.DateTime as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new yyyyMMddHHmmss().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link org.joda.time.LocalDateTime}, but also recognizing the
- * keyword 'null'.
- */
- public static class LyyyyMMddHHmm extends Transformer<org.joda.time.LocalDateTime> {
-
- @Override
- public org.joda.time.LocalDateTime transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : DateTimeFormat.forPattern("yyyy-MM-dd HH:mm").parseLocalDateTime(value);
- }
-
- public static org.joda.time.DateTime as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new yyyyMMddHHmmss().transform((java.lang.String) value)
- : null;
- }
- }
-
- /**
- * Converts {@link java.lang.String}s to {@link org.joda.time.LocalDateTime}, but also recognizing the
- * keyword 'null'.
- */
- public static class LyyyyMMddHHmmss extends Transformer<org.joda.time.LocalDateTime> {
-
- @Override
- public org.joda.time.LocalDateTime transform(final java.lang.String value) {
- return value == null || "null".equals(value)
- ? null
- : DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss").parseLocalDateTime(value);
- }
-
- public static org.joda.time.DateTime as(final Object value) {
- return value != null && value instanceof java.lang.String
- ? new yyyyMMddHHmmss().transform((java.lang.String) value)
- : null;
- }
- }
-
-
-}
[isis] 02/02: ISIS-2856: more deprecation removals
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/isis.git
commit e28427d499ffdab89dc8b0914829c62d1c5cf385
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 10 08:39:08 2022 +0100
ISIS-2856: more deprecation removals
---
.../invocation/ActionDomainEventFacetAbstract.java | 23 ++++----
.../shirorealmldap/realm/impl/IsisLdapRealm.java | 69 ++++++++--------------
2 files changed, 34 insertions(+), 58 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
index a8d2213..93983c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionDomainEventFacetAbstract.java
@@ -34,7 +34,6 @@ import org.apache.isis.core.metamodel.interactions.InteractionContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import lombok.Getter;
@@ -77,7 +76,11 @@ implements ActionDomainEventFacet {
AbstractDomainEvent.Phase.HIDE,
getEventType(),
actionFrom(ic), getFacetHolder(),
- ic.getHead(), argumentAdaptersFrom(ic),
+ ic.getHead(),
+ // corresponds to programming model 'hidePlaceOrder()',
+ // which does no longer consider args
+ Can.empty(),
+ // result pojo n/a
null);
if (event != null && event.isHidden()) {
return "Hidden by subscriber";
@@ -86,14 +89,18 @@ implements ActionDomainEventFacet {
}
@Override
- public String disables(UsabilityContext ic) {
+ public String disables(final UsabilityContext ic) {
final ActionDomainEvent<?> event =
domainEventHelper.postEventForAction(
AbstractDomainEvent.Phase.DISABLE,
getEventType(),
actionFrom(ic), getFacetHolder(),
- ic.getHead(), argumentAdaptersFrom(ic),
+ ic.getHead(),
+ // corresponds to programming model 'disablePlaceOrder()',
+ // which does no longer consider args
+ Can.empty(),
+ // result pojo n/a
null);
if (event != null && event.isDisabled()) {
final TranslatableString reasonTranslatable = event.getDisabledReasonTranslatable();
@@ -101,7 +108,6 @@ implements ActionDomainEventFacet {
return reasonTranslatable.translate(translationService, translationContext);
}
return event.getDisabledReason();
-
}
return null;
}
@@ -141,11 +147,4 @@ implements ActionDomainEventFacet {
return ((ActionInteractionContext) ic).getObjectAction();
}
- @Deprecated
- private static Can<ManagedObject> argumentAdaptersFrom(
- final InteractionContext ic) {
-
- return Can.empty();
- }
-
}
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
index 9adda95..daafa5d 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
@@ -45,7 +45,6 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.security.shiro.permrolemapper.PermissionToRoleMapper;
import org.apache.isis.security.shiro.permrolemapper.PermissionToRoleMapperFromIni;
-import org.apache.isis.security.shiro.permrolemapper.PermissionToRoleMapperFromString;
import static org.apache.isis.commons.internal.base._NullSafe.stream;
@@ -223,7 +222,7 @@ public class IsisLdapRealm extends DefaultLdapRealm {
}
private Set<String>
- getPermissionForRole(String username, LdapContext ldapContext)
+ getPermissionForRole(final String username, final LdapContext ldapContext)
throws NamingException {
final Set<String> permissions = _Sets.newLinkedHashSet();
@@ -251,15 +250,15 @@ public class IsisLdapRealm extends DefaultLdapRealm {
return roleNames;
}
- protected boolean memberOf(SearchResult group, Set<String> groups) throws NamingException {
+ protected boolean memberOf(final SearchResult group, final Set<String> groups) throws NamingException {
Attribute attribute = group.getAttributes().get(cnAttribute);
String groupName = attribute.get().toString();
return groups.contains(groupName);
}
private Collection<String> getPermissionForUser(
- String username,
- LdapContext ldapContextFactory) throws NamingException {
+ final String username,
+ final LdapContext ldapContextFactory) throws NamingException {
try {
return permUser(username, ldapContextFactory);
@@ -268,7 +267,7 @@ public class IsisLdapRealm extends DefaultLdapRealm {
}
}
- private Collection<String> permUser(String username, LdapContext systemLdapCtx)
+ private Collection<String> permUser(final String username, final LdapContext systemLdapCtx)
throws NamingException {
final Set<String> permissions = _Sets.newLinkedHashSet();
final NamingEnumeration<SearchResult> searchResultEnum = systemLdapCtx.search(
@@ -281,8 +280,8 @@ public class IsisLdapRealm extends DefaultLdapRealm {
}
private void addPermIfFound(
- SearchResult group, Set<String> permissions,
- Set<String> extractedAttributeP, Set<String> permissionByAttributeP)
+ final SearchResult group, final Set<String> permissions,
+ final Set<String> extractedAttributeP, final Set<String> permissionByAttributeP)
throws NamingException {
final NamingEnumeration<? extends Attribute> attributeEnum = group.getAttributes().getAll();
Map<String, Set<String>> keyValues = _Maps.newHashMap();
@@ -356,11 +355,11 @@ public class IsisLdapRealm extends DefaultLdapRealm {
}
}
- private String roleNameFor(String groupName) {
+ private String roleNameFor(final String groupName) {
return !rolesByGroup.isEmpty() ? rolesByGroup.get(groupName) : groupName;
}
- private Set<String> permsFor(Set<String> roleNames) {
+ private Set<String> permsFor(final Set<String> roleNames) {
Set<String> perms = _Sets.newLinkedHashSet(); // preserve order
for (String role : roleNames) {
Set<String> permsForRole = getPermissionsByRole().get(role);
@@ -371,19 +370,19 @@ public class IsisLdapRealm extends DefaultLdapRealm {
return perms;
}
- public void setSearchBase(String searchBase) {
+ public void setSearchBase(final String searchBase) {
this.searchBase = searchBase;
}
- public void setGroupObjectClass(String groupObjectClassAttribute) {
+ public void setGroupObjectClass(final String groupObjectClassAttribute) {
this.groupObjectClass = groupObjectClassAttribute;
}
- public void setUniqueMemberAttribute(String uniqueMemberAttribute) {
+ public void setUniqueMemberAttribute(final String uniqueMemberAttribute) {
this.uniqueMemberAttribute = uniqueMemberAttribute;
}
- public void setUniqueMemberAttributeValueTemplate(String template) {
+ public void setUniqueMemberAttributeValueTemplate(final String template) {
if (!StringUtils.hasText(template)) {
String msg = "User DN template cannot be null or empty.";
throw new IllegalArgumentException(msg);
@@ -401,13 +400,12 @@ public class IsisLdapRealm extends DefaultLdapRealm {
this.uniqueMemberAttributeValueSuffix = suffix;
}
- public void setRolesByGroup(Map<String, String> rolesByGroup) {
+ public void setRolesByGroup(final Map<String, String> rolesByGroup) {
this.rolesByGroup.putAll(rolesByGroup);
}
/**
- * Retrieves permissions by role set using either
- * {@link #setPermissionsByRole(String)} or {@link #setResourcePath(String)}.
+ * Retrieves permissions by role set using {@link #setResourcePath(String)}.
*/
private Map<String, Set<String>> getPermissionsByRole() {
if (permissionToRoleMapper == null) {
@@ -438,7 +436,7 @@ public class IsisLdapRealm extends DefaultLdapRealm {
*
* @see #setResourcePath(String)
*/
- public void setResourcePath(String resourcePath) {
+ public void setResourcePath(final String resourcePath) {
if (permissionToRoleMapper != null) {
throw new IllegalStateException("Permissions already set, " + permissionToRoleMapper.getClass().getName());
}
@@ -446,56 +444,35 @@ public class IsisLdapRealm extends DefaultLdapRealm {
this.permissionToRoleMapper = new PermissionToRoleMapperFromIni(ini);
}
- /**
- * Specify permissions for each role using a formatted string.
- * <p/>
- * <pre>
- * ldapRealm.permissionsByRole=\
- * user_role = *:ToDoItemsJdo:*:*,\
- * *:ToDoItem:*:*; \
- * self-install_role = *:ToDoItemsFixturesService:install:* ; \
- * admin_role = *
- * </pre>
- *
- * @see #setResourcePath(String)
- */
- @Deprecated
- public void setPermissionsByRole(String permissionsByRoleStr) {
- if (permissionToRoleMapper != null) {
- throw new IllegalStateException("Permissions already set, " + permissionToRoleMapper.getClass().getName());
- }
- this.permissionToRoleMapper = new PermissionToRoleMapperFromString(permissionsByRoleStr);
- }
-
- public void setPermissionByUserAttribute(String permissionByUserAttr) {
+ public void setPermissionByUserAttribute(final String permissionByUserAttr) {
String[] list = permissionByUserAttr.split(",");
stream(list).forEach(this.permissionByUserAttribute::add);
}
- public void setPermissionByGroupAttribute(String permissionByGroupAttribute) {
+ public void setPermissionByGroupAttribute(final String permissionByGroupAttribute) {
String[] list = permissionByGroupAttribute.split(",");
stream(list).forEach(this.permissionByGroupAttribute::add);
}
- public void setUserExtractedAttribute(String userExtractedAttribute) {
+ public void setUserExtractedAttribute(final String userExtractedAttribute) {
String[] list = userExtractedAttribute.split(",");
stream(list).forEach(this.userExtractedAttribute::add);
}
- public void setGroupExtractedAttribute(String groupExtractedAttribute) {
+ public void setGroupExtractedAttribute(final String groupExtractedAttribute) {
String[] list = groupExtractedAttribute.split(",");
stream(list).forEach(this.groupExtractedAttribute::add);
}
- public void setSearchUserBase(String searchUserBase) {
+ public void setSearchUserBase(final String searchUserBase) {
this.searchUserBase = searchUserBase;
}
- public void setUserObjectClass(String userObjectClass) {
+ public void setUserObjectClass(final String userObjectClass) {
this.userObjectClass = userObjectClass;
}
- public void setCnAttribute(String cnAttribute) {
+ public void setCnAttribute(final String cnAttribute) {
this.cnAttribute = cnAttribute;
}