OO-2893: Make the auto booking work with internalId and externalId

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")

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()) {

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);

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);

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);

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(";"));
 	}