[SPARQL - DELETE] amélioration de l’exception levée par le service de…

…lete de SPARQL quand on passe une uri qui n'existe pas
OpenSILEX · Jan 5, 2024 · e50cd3c · e50cd3c
1 parent 3abe250
commit e50cd3c
Show file tree

Hide file tree

Showing 42 changed files with 145 additions and 145 deletions.
diff --git a/opensilex-brapi/src/main/java/org/opensilex/brapi/api/GermplasmAPI.java b/opensilex-brapi/src/main/java/org/opensilex/brapi/api/GermplasmAPI.java
@@ -15,7 +15,7 @@
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.server.response.ErrorResponse;

diff --git a/opensilex-brapi/src/main/java/org/opensilex/brapi/api/StudiesAPI.java b/opensilex-brapi/src/main/java/org/opensilex/brapi/api/StudiesAPI.java
@@ -33,7 +33,7 @@
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ApiProtected;
 import org.opensilex.security.authentication.ForbiddenURIAccessException;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.sparql.ontology.dal.OntologyDAO;

diff --git a/opensilex-brapi/src/main/java/org/opensilex/brapi/api/VariablesAPI.java b/opensilex-brapi/src/main/java/org/opensilex/brapi/api/VariablesAPI.java
@@ -18,7 +18,7 @@
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.sparql.service.SPARQLService;
 import org.opensilex.utils.ListWithPagination;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/annotation/api/AnnotationAPI.java b/opensilex-core/src/main/java/org/opensilex/core/annotation/api/AnnotationAPI.java
@@ -15,7 +15,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.server.response.ErrorResponse;
 import org.opensilex.server.response.ObjectUriResponse;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/area/api/AreaAPI.java b/opensilex-core/src/main/java/org/opensilex/core/area/api/AreaAPI.java
@@ -34,6 +34,7 @@
 import org.opensilex.security.authentication.ApiProtected;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
+import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.server.response.*;
 import org.opensilex.server.rest.validation.ValidURI;
 import org.opensilex.server.rest.validation.date.ValidOffsetDateTime;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/data/api/DataAPI.java b/opensilex-core/src/main/java/org/opensilex/core/data/api/DataAPI.java
@@ -59,7 +59,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.server.exceptions.NotFoundException;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/data/api/DataFilesAPI.java b/opensilex-core/src/main/java/org/opensilex/core/data/api/DataFilesAPI.java
@@ -31,7 +31,6 @@
 import org.opensilex.security.account.dal.AccountDAO;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.user.api.UserGetDTO;
-import org.opensilex.server.response.ObjectUriResponse;
 import org.opensilex.sparql.SPARQLModule;
 import org.opensilex.sparql.model.SPARQLTreeListModel;
 import org.opensilex.sparql.ontology.dal.ClassModel;
@@ -44,21 +43,16 @@
 import org.opensilex.nosql.exceptions.NoSQLInvalidUriListException;
 import org.opensilex.nosql.exceptions.NoSQLTooLargeSetException;
 import org.opensilex.nosql.mongodb.MongoDBService;
-import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.server.exceptions.NotFoundException;
 import org.opensilex.server.response.ErrorResponse;
 import org.opensilex.server.response.PaginatedListResponse;
 import org.opensilex.server.response.SingleObjectResponse;
 import org.opensilex.server.rest.serialization.ObjectMapperContextResolver;
-import org.opensilex.sparql.SPARQLModule;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;
-import org.opensilex.sparql.model.SPARQLTreeListModel;
-import org.opensilex.sparql.ontology.dal.ClassModel;
-import org.opensilex.sparql.ontology.dal.OntologyDAO;
 import org.opensilex.sparql.ontology.store.OntologyStore;
 import org.opensilex.sparql.response.CreatedUriResponse;
 import org.opensilex.sparql.service.SPARQLService;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/device/api/DeviceAPI.java b/opensilex-core/src/main/java/org/opensilex/core/device/api/DeviceAPI.java
@@ -51,6 +51,7 @@
 import org.opensilex.sparql.csv.DefaultCsvImporter;
 import org.opensilex.sparql.csv.validation.CachedCsvImporter;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.sparql.exceptions.SPARQLAlreadyExistingUriException;
 import org.opensilex.sparql.response.CreatedUriResponse;
 import org.opensilex.sparql.response.NamedResourceDTO;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/document/dal/DocumentDAO.java b/opensilex-core/src/main/java/org/opensilex/core/document/dal/DocumentDAO.java
@@ -27,7 +27,7 @@
 import org.opensilex.fs.service.FileStorageService;
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;
 import org.opensilex.sparql.exceptions.SPARQLException;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/event/api/EventAPI.java b/opensilex-core/src/main/java/org/opensilex/core/event/api/EventAPI.java
@@ -31,10 +31,11 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.exceptions.InvalidValueException;
+import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.server.response.ErrorResponse;
 import org.opensilex.server.response.ObjectUriResponse;
 import org.opensilex.server.response.PaginatedListResponse;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/event/api/csv/AbstractEventCsvImporter.java b/opensilex-core/src/main/java/org/opensilex/core/event/api/csv/AbstractEventCsvImporter.java
@@ -12,7 +12,7 @@
 import org.opensilex.sparql.csv.CSVValidationModel;
 import org.opensilex.sparql.model.SPARQLResourceModel;
 import org.opensilex.sparql.ontology.dal.OntologyDAO;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.sparql.deserializer.URIDeserializer;
 import org.opensilex.sparql.exceptions.SPARQLInvalidClassDefinitionException;
 import org.opensilex.sparql.exceptions.SPARQLMapperNotFoundException;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/experiment/api/ExperimentAPI.java b/opensilex-core/src/main/java/org/opensilex/core/experiment/api/ExperimentAPI.java
@@ -56,7 +56,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/experiment/dal/ExperimentDAO.java b/opensilex-core/src/main/java/org/opensilex/core/experiment/dal/ExperimentDAO.java
@@ -30,7 +30,7 @@
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ForbiddenURIAccessException;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.SecurityOntology;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;
 import org.opensilex.sparql.deserializer.URIDeserializer;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/experiment/factor/api/FactorAPI.java b/opensilex-core/src/main/java/org/opensilex/core/experiment/factor/api/FactorAPI.java
@@ -26,6 +26,7 @@
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;
 import org.opensilex.sparql.SPARQLModule;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.sparql.exceptions.SPARQLAlreadyExistingUriException;
 import org.opensilex.sparql.exceptions.SPARQLInvalidURIException;
 import org.opensilex.sparql.model.SPARQLTreeListModel;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/germplasm/api/GermplasmAPI.java b/opensilex-core/src/main/java/org/opensilex/core/germplasm/api/GermplasmAPI.java
@@ -32,7 +32,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/germplasmGroup/api/GermplasmGroupApi.java b/opensilex-core/src/main/java/org/opensilex/core/germplasmGroup/api/GermplasmGroupApi.java
@@ -12,9 +12,6 @@
 import org.opensilex.core.germplasm.api.GermplasmSearchFilter;
 import org.opensilex.core.germplasm.dal.GermplasmDAO;
 import org.opensilex.core.germplasm.dal.GermplasmModel;
-import org.opensilex.core.germplasmGroup.api.GermplasmGroupCreationDTO;
-import org.opensilex.core.germplasmGroup.api.GermplasmGroupGetDTO;
-import org.opensilex.core.germplasmGroup.api.GermplasmGroupUpdateDTO;
 import org.opensilex.core.germplasmGroup.dal.GermplasmGroupDAO;
 import org.opensilex.core.germplasmGroup.dal.GermplasmGroupModel;
 import org.opensilex.nosql.mongodb.MongoDBService;
@@ -23,7 +20,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/metrics/api/MetricAPI.java b/opensilex-core/src/main/java/org/opensilex/core/metrics/api/MetricAPI.java
@@ -21,7 +21,7 @@
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.server.exceptions.NotFoundException;
 import org.opensilex.server.response.ErrorResponse;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/ontology/api/OntologyAPI.java b/opensilex-core/src/main/java/org/opensilex/core/ontology/api/OntologyAPI.java
@@ -15,6 +15,7 @@
 import org.opensilex.security.authentication.ApiProtected;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
+import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.server.exceptions.ConflictException;
 import org.opensilex.server.exceptions.NotFoundException;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/organisation/dal/OrganizationDAO.java b/opensilex-core/src/main/java/org/opensilex/core/organisation/dal/OrganizationDAO.java
@@ -19,7 +19,7 @@
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ForbiddenURIAccessException;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;
 import org.opensilex.sparql.mapping.SPARQLListFetcher;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/organisation/dal/facility/FacilityDAO.java b/opensilex-core/src/main/java/org/opensilex/core/organisation/dal/facility/FacilityDAO.java
@@ -30,11 +30,10 @@
 import org.opensilex.core.organisation.dal.site.SiteModel;
 import org.opensilex.core.organisation.dal.site.SiteSearchFilter;
 import org.opensilex.core.organisation.exception.SiteFacilityInvalidAddressException;
-import org.opensilex.core.variablesGroup.dal.VariablesGroupDAO;
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ForbiddenURIAccessException;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;
 import org.opensilex.sparql.model.SPARQLResourceModel;
 import org.opensilex.sparql.service.SPARQLQueryHelper;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/organisation/dal/site/SiteDAO.java b/opensilex-core/src/main/java/org/opensilex/core/organisation/dal/site/SiteDAO.java
@@ -24,7 +24,7 @@
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.security.authentication.ForbiddenURIAccessException;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.server.exceptions.BadRequestException;
 import org.opensilex.server.exceptions.NotFoundException;
 import org.opensilex.sparql.deserializer.SPARQLDeserializers;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/position/api/PositionAPI.java b/opensilex-core/src/main/java/org/opensilex/core/position/api/PositionAPI.java
@@ -4,9 +4,7 @@
 import com.mongodb.MongoQueryException;
 import com.mongodb.client.FindIterable;
 import io.swagger.annotations.*;
-import io.swagger.util.Json;
 import org.geojson.GeoJsonObject;
-import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.opensilex.core.event.dal.EventModel;
 import org.opensilex.core.event.dal.EventSearchFilter;
 import org.opensilex.core.event.dal.move.MoveEventDAO;
@@ -18,13 +16,12 @@
 import org.opensilex.nosql.mongodb.MongoDBService;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.account.dal.AccountModel;
 import org.opensilex.server.response.ErrorResponse;
 import org.opensilex.server.response.PaginatedListResponse;
 import org.opensilex.server.response.SingleObjectResponse;
-import org.opensilex.server.rest.serialization.ObjectMapperContextResolver;
 import org.opensilex.server.rest.validation.ValidURI;
 import org.opensilex.server.rest.validation.date.ValidOffsetDateTime;
 import org.opensilex.sparql.service.SPARQLService;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/provenance/api/ProvenanceAPI.java b/opensilex-core/src/main/java/org/opensilex/core/provenance/api/ProvenanceAPI.java
@@ -23,7 +23,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.person.dal.PersonModel;
 import org.opensilex.security.user.api.UserGetDTO;

diff --git a/...silex-core/src/main/java/org/opensilex/core/scientificObject/api/ScientificObjectAPI.java b/...silex-core/src/main/java/org/opensilex/core/scientificObject/api/ScientificObjectAPI.java
@@ -5,8 +5,6 @@
 //******************************************************************************
 package org.opensilex.core.scientificObject.api;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mongodb.MongoWriteException;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.model.geojson.Geometry;
@@ -22,7 +20,6 @@
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.opensilex.core.csv.api.CSVValidationDTO;
 import org.opensilex.core.data.api.CriteriaDTO;
-import org.opensilex.core.data.api.SingleCriteriaDTO;
 import org.opensilex.core.data.dal.DataDAO;
 import org.opensilex.core.event.dal.move.MoveEventDAO;
 import org.opensilex.core.event.dal.move.MoveModel;
@@ -46,9 +43,11 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
+import org.opensilex.server.exceptions.BadRequestException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.server.exceptions.displayable.DisplayableBadRequestException;
 import org.opensilex.server.response.*;
 import org.opensilex.server.rest.validation.Date;
@@ -640,7 +639,7 @@ public Response updateScientificObject(
             }
             throw mongoException;
         }catch (DuplicateNameException e){
-            throw new IllegalArgumentException(e.getMessage());
+            throw new BadRequestException(e.getMessage());
         }
         catch (Exception ex) {
             sparql.rollbackTransaction();

diff --git a/opensilex-core/src/main/java/org/opensilex/core/variable/api/VariableAPI.java b/opensilex-core/src/main/java/org/opensilex/core/variable/api/VariableAPI.java
@@ -37,7 +37,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;
@@ -65,7 +65,6 @@
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
 import java.time.LocalDate;
-import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;

diff --git a/...-core/src/main/java/org/opensilex/core/variable/api/characteristic/CharacteristicAPI.java b/...-core/src/main/java/org/opensilex/core/variable/api/characteristic/CharacteristicAPI.java
@@ -17,7 +17,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/variable/api/entity/EntityAPI.java b/opensilex-core/src/main/java/org/opensilex/core/variable/api/entity/EntityAPI.java
@@ -17,7 +17,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/...ore/src/main/java/org/opensilex/core/variable/api/entityOfInterest/InterestEntityAPI.java b/...ore/src/main/java/org/opensilex/core/variable/api/entityOfInterest/InterestEntityAPI.java
@@ -17,7 +17,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/variable/api/method/MethodAPI.java b/opensilex-core/src/main/java/org/opensilex/core/variable/api/method/MethodAPI.java
@@ -17,7 +17,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;

diff --git a/opensilex-core/src/main/java/org/opensilex/core/variable/api/unit/UnitAPI.java b/opensilex-core/src/main/java/org/opensilex/core/variable/api/unit/UnitAPI.java
@@ -17,7 +17,7 @@
 import org.opensilex.security.authentication.ApiCredential;
 import org.opensilex.security.authentication.ApiCredentialGroup;
 import org.opensilex.security.authentication.ApiProtected;
-import org.opensilex.security.authentication.NotFoundURIException;
+import org.opensilex.server.exceptions.NotFoundURIException;
 import org.opensilex.security.authentication.injection.CurrentUser;
 import org.opensilex.security.user.api.UserGetDTO;
 import org.opensilex.server.response.*;