ObjectRetriever: removed duplicate validateObjectType() call

It is called in updateLoadedObject() called just before removed line.
Evolveum · Nov 8, 2021 · 5a5fdb0 · 5a5fdb0
1 parent 7d71684
commit 5a5fdb0
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
@@ -60,9 +60,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
-/**
- * @author lazyman, mederly
- */
 @Component
 public class ObjectRetriever {
 
@@ -195,7 +192,6 @@ public <T extends ObjectType> PrismObject<T> getObjectInternal(Session session,
 
         LOGGER.trace("Transforming data to JAXB type.");
         PrismObject<T> prismObject = updateLoadedObject(fullObject, type, oid, options, null, session);
-        validateObjectType(prismObject, type);
 
         // this was implemented to allow report parsing errors as warnings to upper layers;
         // however, it causes problems when serialization problems are encountered: in such cases, we put
@@ -246,7 +242,7 @@ public <F extends FocusType> PrismObject<F> searchShadowOwnerAttempt(String shad
 
             session.getTransaction().commit();
 
-        } catch (SchemaException | RuntimeException ex) {
+        } catch (SchemaException | RuntimeException | ObjectNotFoundException ex) {
             baseHelper.handleGeneralException(ex, session, result);
         } finally {
             baseHelper.cleanupSessionAndResult(session, result);
@@ -491,7 +487,7 @@ private <C extends Containerable> void processAssignmentsQuery(List<C> list, RQu
      */
     private <T extends ObjectType> PrismObject<T> updateLoadedObject(GetObjectResult result,
             Class<T> type, String oid, Collection<SelectorOptions<GetOperationOptions>> options,
-            Holder<PrismObject<T>> partialValueHolder, Session session) throws SchemaException {
+            Holder<PrismObject<T>> partialValueHolder, Session session) throws SchemaException, ObjectNotFoundException {
 
         GetOperationOptions rootOptions = SelectorOptions.findRootOptions(options);
         boolean raw = GetOperationOptions.isRaw(rootOptions);
@@ -768,11 +764,11 @@ private MutableItemDefinition<?> createDynamicDefinition(RExtItem extItem, ItemN
     }
 
     private <T extends ObjectType> void validateObjectType(PrismObject<T> prismObject, Class<T> type)
-            throws SchemaException {
+            throws ObjectNotFoundException {
         if (prismObject == null || !type.isAssignableFrom(prismObject.getCompileTimeClass())) {
-            throw new SchemaException("Expected to find '" + type.getSimpleName() + "' but found '"
+            throw new ObjectNotFoundException("Expected to find '" + type.getSimpleName() + "' but found '"
                     + prismObject.getCompileTimeClass().getSimpleName() + "' (" + prismObject.toDebugName()
-                    + "). Bad OID in a reference?");
+                    + "). Bad OID in a reference?", prismObject.getOid());
         }
         if (InternalsConfig.consistencyChecks) {
             prismObject.checkConsistence();
@@ -849,7 +845,7 @@ public <T extends ObjectType> void searchObjectsIterativeAttempt(Class<T> type,
             }
 
             session.getTransaction().commit();
-        } catch (SchemaException | QueryException | RuntimeException ex) {
+        } catch (SchemaException | QueryException | RuntimeException | ObjectNotFoundException ex) {
             baseHelper.handleGeneralException(ex, session, result);
         } finally {
             baseHelper.cleanupSessionAndResult(session, result);