You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/09/05 06:37:02 UTC
[1/2] syncope git commit: [SYNCOPE-1362] Troublesome Optional
Repository: syncope
Updated Branches:
refs/heads/2_1_X 215f9d397 -> 3a97b618e
refs/heads/master 15843b583 -> d5e73caee
[SYNCOPE-1362] Troublesome Optional
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3a97b618
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3a97b618
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3a97b618
Branch: refs/heads/2_1_X
Commit: 3a97b618e24173c6cfd4d97341b2d000553f0939
Parents: 215f9d3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Sep 5 08:36:41 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Sep 5 08:36:41 2018 +0200
----------------------------------------------------------------------
.../console/commons/SortableAnyProviderComparator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a97b618/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
index 9a5d86a..318963d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
@@ -83,20 +83,20 @@ public class SortableAnyProviderComparator<T extends AnyTO> extends SortableData
final AttrTO attr;
if (schemaType == null) {
- attr = this.anyTO.getPlainAttr(schema).get();
+ attr = this.anyTO.getPlainAttr(schema).orElse(null);
} else {
switch (schemaType) {
case PLAIN:
default:
- attr = this.anyTO.getPlainAttr(schema).get();
+ attr = this.anyTO.getPlainAttr(schema).orElse(null);
break;
case DERIVED:
- attr = this.anyTO.getDerAttr(schema).get();
+ attr = this.anyTO.getDerAttr(schema).orElse(null);
break;
case VIRTUAL:
- attr = this.anyTO.getVirAttr(schema).get();
+ attr = this.anyTO.getVirAttr(schema).orElse(null);
break;
}
}
[2/2] syncope git commit: [SYNCOPE-1362] Troublesome Optional
Posted by il...@apache.org.
[SYNCOPE-1362] Troublesome Optional
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d5e73cae
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d5e73cae
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d5e73cae
Branch: refs/heads/master
Commit: d5e73caeebdf5c772ebfd5da958b380c1ec6fd5c
Parents: 15843b5
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Sep 5 08:36:41 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Sep 5 08:36:55 2018 +0200
----------------------------------------------------------------------
.../console/commons/SortableAnyProviderComparator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d5e73cae/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
index 9a5d86a..318963d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java
@@ -83,20 +83,20 @@ public class SortableAnyProviderComparator<T extends AnyTO> extends SortableData
final AttrTO attr;
if (schemaType == null) {
- attr = this.anyTO.getPlainAttr(schema).get();
+ attr = this.anyTO.getPlainAttr(schema).orElse(null);
} else {
switch (schemaType) {
case PLAIN:
default:
- attr = this.anyTO.getPlainAttr(schema).get();
+ attr = this.anyTO.getPlainAttr(schema).orElse(null);
break;
case DERIVED:
- attr = this.anyTO.getDerAttr(schema).get();
+ attr = this.anyTO.getDerAttr(schema).orElse(null);
break;
case VIRTUAL:
- attr = this.anyTO.getVirAttr(schema).get();
+ attr = this.anyTO.getVirAttr(schema).orElse(null);
break;
}
}