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 2021/03/03 18:39:08 UTC
[isis] 03/09: ISIS-2553: remove redundant natural comp.
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 547202f962fa42a845ff2ddf6a6d5bd8feda4ac8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 3 15:14:46 2021 +0100
ISIS-2553: remove redundant natural comp.
---
.../services/appfeat/ApplicationFeatureId.java | 46 ++++++----------------
.../permission/ApplicationPermissionValueSet.java | 2 +-
2 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
index 4d728b1..faccc3e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
@@ -132,20 +132,6 @@ implements
return new ApplicationFeatureId(ApplicationFeatureType.MEMBER, fullyQualifiedName);
}
- /**
- * Round-trip with {@link #asString()}
- */
- public static ApplicationFeatureId parse(final String asString) {
- return new ApplicationFeatureId(asString);
- }
-
- /**
- * Round-trip with {@link #asEncodedString()}
- */
- public static ApplicationFeatureId parseEncoded(final String encodedString) {
- return new ApplicationFeatureId(_Strings.base64UrlDecode(encodedString));
- }
-
// -- CONSTRUCTOR
private ApplicationFeatureId(final String asString) {
@@ -252,7 +238,7 @@ implements
return newClass(classFqn);
}
- // -- ENCODING
+ // -- ENCODING / DECODING
@Programmatic
public String asString() {
@@ -263,26 +249,20 @@ implements
public String asEncodedString() {
return _Strings.base64UrlEncode(asString());
}
-
- // //////////////////////////////////////
-
- // -- Comparators
- public static final class Comparators {
- private Comparators(){}
- public static Comparator<ApplicationFeatureId> natural() {
- return new ApplicationFeatureIdComparator();
- }
-
- static class ApplicationFeatureIdComparator implements Comparator<ApplicationFeatureId>, Serializable {
- private static final long serialVersionUID = 1L;
-
- @Override
- public int compare(final ApplicationFeatureId o1, final ApplicationFeatureId o2) {
- return o1.compareTo(o2);
- }
- }
+
+ /**
+ * Round-trip with {@link #asString()}
+ */
+ public static ApplicationFeatureId parse(final String asString) {
+ return new ApplicationFeatureId(asString);
}
+ /**
+ * Round-trip with {@link #asEncodedString()}
+ */
+ public static ApplicationFeatureId parseEncoded(final String encodedString) {
+ return new ApplicationFeatureId(_Strings.base64UrlDecode(encodedString));
+ }
// //////////////////////////////////////
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java
index fadcaa1..6ffa62f 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermissionValueSet.java
@@ -88,7 +88,7 @@ public class ApplicationPermissionValueSet implements Serializable {
*/
private final _Multimaps.SetMultimap<ApplicationFeatureId, ApplicationPermissionValue> permissionsByFeature =
_Multimaps.newSortedSetMultimap(
- Collections.reverseOrder(ApplicationFeatureId.Comparators.natural()),
+ Collections.reverseOrder(),
null // natural element order
);