Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UBO-351 Improved logging in UBOUserByConnectionResolver #412

Merged
merged 1 commit into from
Aug 12, 2024
Merged

UBO-351 Improved logging in UBOUserByConnectionResolver #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions ubo-common/src/main/java/org/mycore/ubo/UBOUserByConnectionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@

package org.mycore.ubo;

import java.util.List;
import java.util.stream.Collectors;

import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;

import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.util.JAXBSource;
import org.apache.logging.log4j.LogManager;
Expand All @@ -35,6 +28,12 @@
import org.mycore.user2.MCRUserManager;
import org.mycore.user2.utils.MCRUserTransformer;

import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import java.util.List;
import java.util.stream.Collectors;

/**
* Resolves a User by connection id
*/
Expand All @@ -46,10 +45,18 @@ public class UBOUserByConnectionResolver implements URIResolver {
public Source resolve(String href, String base) throws TransformerException {
String connection_id = href.split(":", 2)[1];
final List<MCRUser> users = MCRUserManager.getUsers("id_connection", connection_id).collect(Collectors.toList());
if(users.size()!=1){
LOGGER.warn("There is a connection ID which has no User in DB {}", connection_id);

int size = users.size();
if (size != 1) {
if (size == 0) {
LOGGER.warn("Connection ID {} has no user in DB", connection_id);
}
if (size > 1) {
LOGGER.warn("Connection ID {} appears multiple times but for different users in DB", connection_id);
}
return new JDOMSource(new Element("null"));
}

final MCRUser user = users.get(0);

try {
Expand All @@ -58,5 +65,4 @@ public Source resolve(String href, String base) throws TransformerException {
throw new TransformerException(e);
}
}

}
Loading