MID-6244 rest provider not handling ObjectType object properly

Evolveum · Apr 28, 2020 · 07813a6 · 07813a6
1 parent 5a15119
commit 07813a6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointAbstractProvider.java b/infra/common/src/main/java/com/evolveum/midpoint/common/rest/MidpointAbstractProvider.java
@@ -29,6 +29,8 @@
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.util.exception.SystemException;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -84,7 +86,10 @@ public void writeTo(T object, Class<?> type, Type genericType,
                 .options(SerializationOptions.createSerializeReferenceNames());
 
         try {
-            if (object instanceof PrismObject) {
+            if (object instanceof ObjectType) {
+                ObjectType ot = (ObjectType) object;
+                serializedForm = serializer.serialize(ot.asPrismObject());
+            } else if (object instanceof PrismObject) {
                 serializedForm = serializer.serialize((PrismObject<?>) object);
             } else if (object instanceof OperationResult) {
                 Function<LocalizableMessage, String> resolveKeys = msg -> localizationService.translate(msg, Locale.US);