Constructor for ODSEntityFactory is provided Optional<User>
Signed-off-by: Matthias Koller <m.koller@peak-solution.de>
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java b/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java
index 013c077..c03206a 100644
--- a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java
+++ b/src/main/java/org/eclipse/mdm/api/odsadapter/ODSContext.java
@@ -97,7 +97,7 @@
@Override
public Optional<EntityFactory> getEntityFactory() {
try {
- return Optional.of(new ODSEntityFactory(modelManager, entityManager.loadLoggedOnUser().get()));
+ return Optional.of(new ODSEntityFactory(modelManager, entityManager.loadLoggedOnUser()));
} catch (DataAccessException e) {
throw new IllegalStateException("Unable to load instance of the logged in user.");
}
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java b/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java
index c66516f..ec2a38e 100644
--- a/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java
+++ b/src/main/java/org/eclipse/mdm/api/odsadapter/query/ODSEntityFactory.java
@@ -76,7 +76,7 @@
// ======================================================================
private final ODSModelManager modelManager;
- private final User loggedInUser;
+ private final Optional<User> loggedInUser;
// ======================================================================
// Constructors
@@ -90,7 +90,7 @@
* @param loggedInUser
* The logged in {@link User}.
*/
- public ODSEntityFactory(ODSModelManager modelManager, User loggedInUser) {
+ public ODSEntityFactory(ODSModelManager modelManager, Optional<User> loggedInUser) {
this.modelManager = modelManager;
this.loggedInUser = loggedInUser;
}
@@ -153,7 +153,7 @@
*/
@Override
protected Optional<User> getLoggedInUser() {
- return Optional.of(loggedInUser);
+ return loggedInUser;
}
/**
