From e2363eca5358c7a25a35d62a3e800d6b00e7296a Mon Sep 17 00:00:00 2001
From: uhensler <none@none>
Date: Wed, 20 Sep 2017 11:55:07 +0200
Subject: [PATCH] OO-2893: Make the auto booking work with internalId and
externalId
---
.../provider/auto/manager/AdvanceOrderDAO.java | 3 +--
.../provider/auto/manager/AutoAccessManagerImpl.java | 4 ++--
.../provider/auto/manager/ExternalIdHandler.java | 4 ++--
.../provider/auto/manager/ExternalRefHandler.java | 4 ++--
.../provider/auto/manager/InternalIdHandler.java | 6 +++---
.../provider/auto/manager/SemicolonSplitter.java | 4 ++--
6 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java
index fc96f40c6f9..d8549833abd 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AdvanceOrderDAO.java
@@ -21,7 +21,6 @@ package org.olat.resource.accesscontrol.provider.auto.manager;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -94,7 +93,7 @@ class AdvanceOrderDAO {
}
Collection<AdvanceOrder> loadPendingAdvanceOrders(Map<IdentifierKey, String> identifiers) {
- if (identifiers == null || identifiers.isEmpty()) return Collections.<AdvanceOrder>emptyList();
+ if (identifiers == null || identifiers.isEmpty()) return new ArrayList<>();
StringBuilder sb = new StringBuilder();
sb.append("select advanceOrder from advanceOrder advanceOrder")
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java
index 7d2d7808300..a96e49e9c38 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/AutoAccessManagerImpl.java
@@ -19,8 +19,8 @@
*/
package org.olat.resource.accesscontrol.provider.auto.manager;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
@@ -106,7 +106,7 @@ public class AutoAccessManagerImpl implements AutoAccessManager {
@Override
public Collection<AdvanceOrder> loadPendingAdvanceOrders(RepositoryEntry entry) {
- if (entry == null) return Collections.<AdvanceOrder>emptyList();
+ if (entry == null) return new ArrayList<>();
Map<IdentifierKey, String> searchValues = new EnumMap<>(IdentifierKey.class);
for (IdentifierKey key: IdentifierKey.values()) {
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java
index ef65dbec6f9..2165d2b6910 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalIdHandler.java
@@ -19,7 +19,7 @@
*/
package org.olat.resource.accesscontrol.provider.auto.manager;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
import org.olat.repository.RepositoryEntry;
@@ -47,7 +47,7 @@ class ExternalIdHandler implements IdentifierKeyHandler {
@Override
public List<RepositoryEntry> find(String value) {
- List<RepositoryEntry> entries = Collections.emptyList();;
+ List<RepositoryEntry> entries = new ArrayList<>();
try {
entries = repositoryService.loadRepositoryEntriesByExternalId(value);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java
index 0bfa99a19d5..77d09bbba24 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/ExternalRefHandler.java
@@ -19,7 +19,7 @@
*/
package org.olat.resource.accesscontrol.provider.auto.manager;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
import org.olat.repository.RepositoryEntry;
@@ -47,7 +47,7 @@ class ExternalRefHandler implements IdentifierKeyHandler {
@Override
public List<RepositoryEntry> find(String value) {
- List<RepositoryEntry> entries = Collections.<RepositoryEntry>emptyList();;
+ List<RepositoryEntry> entries = new ArrayList<>();
try {
entries = repositoryService.loadRepositoryEntriesByExternalRef(value);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java
index 516eb85f532..9a0482ff67f 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/InternalIdHandler.java
@@ -19,7 +19,7 @@
*/
package org.olat.resource.accesscontrol.provider.auto.manager;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.List;
import org.olat.repository.RepositoryEntry;
@@ -41,12 +41,12 @@ class InternalIdHandler implements IdentifierKeyHandler {
@Override
public IdentifierKey getIdentifierKey() {
- return IdentifierKey.externalId;
+ return IdentifierKey.internalId;
}
@Override
public List<RepositoryEntry> find(String value) {
- List<RepositoryEntry> entries = Collections.<RepositoryEntry>emptyList();
+ List<RepositoryEntry> entries = new ArrayList<>();
try {
Long repositoryEntryKey = Long.parseLong(value);
diff --git a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java
index 15aa6fad3a9..67e7e2f2405 100644
--- a/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java
+++ b/src/main/java/org/olat/resource/accesscontrol/provider/auto/manager/SemicolonSplitter.java
@@ -19,9 +19,9 @@
*/
package org.olat.resource.accesscontrol.provider.auto.manager;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import org.springframework.stereotype.Component;
@@ -44,7 +44,7 @@ public class SemicolonSplitter implements IdentifierValueSplitter {
@Override
public Collection<String> split(String rawValue) {
- if (rawValue == null) return Collections.<String>emptyList();
+ if (rawValue == null) return new ArrayList<>();
return Arrays.asList(rawValue.split(";"));
}
--
GitLab