[#926] fix deserialization of PolicyActionFailedException; fix status…

… code when executing an action on a nonexistent policy entry. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Jan 2, 2021 · edc5200 · edc5200
1 parent e517083
commit edc5200
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.../policies/src/main/java/org/eclipse/ditto/model/policies/PolicyActionFailedException.java b/.../policies/src/main/java/org/eclipse/ditto/model/policies/PolicyActionFailedException.java
@@ -20,6 +20,7 @@
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonParseException;
 import org.eclipse.ditto.model.base.common.HttpStatusCode;
 import org.eclipse.ditto.model.base.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.model.base.exceptions.DittoRuntimeExceptionBuilder;
@@ -121,7 +122,9 @@ public static Builder newBuilderForDeactivateTokenIntegration() {
      * format.
      */
     public static PolicyActionFailedException fromJson(final JsonObject jsonObject, final DittoHeaders dittoHeaders) {
-        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder());
+        final HttpStatusCode status = HttpStatusCode.forInt(jsonObject.getValueOrThrow(JsonFields.STATUS))
+                .orElseThrow(() -> new JsonParseException("Unsupported status"));
+        return DittoRuntimeException.fromJson(jsonObject, dittoHeaders, new Builder().status(status));
     }
 
     @Override

diff --git a/...tto/services/policies/persistence/actors/strategies/commands/ActivateSubjectStrategy.java b/...tto/services/policies/persistence/actors/strategies/commands/ActivateSubjectStrategy.java
@@ -24,7 +24,6 @@
 import org.eclipse.ditto.model.base.headers.entitytag.EntityTag;
 import org.eclipse.ditto.model.policies.Label;
 import org.eclipse.ditto.model.policies.Policy;
-import org.eclipse.ditto.model.policies.PolicyActionFailedException;
 import org.eclipse.ditto.model.policies.PolicyEntry;
 import org.eclipse.ditto.model.policies.PolicyId;
 import org.eclipse.ditto.model.policies.Subject;
@@ -34,6 +33,7 @@
 import org.eclipse.ditto.services.policies.common.config.PolicyConfig;
 import org.eclipse.ditto.services.utils.persistentactors.results.Result;
 import org.eclipse.ditto.services.utils.persistentactors.results.ResultFactory;
+import org.eclipse.ditto.signals.commands.policies.exceptions.PolicyEntryNotAccessibleException;
 import org.eclipse.ditto.signals.commands.policies.modify.ActivateSubject;
 import org.eclipse.ditto.signals.commands.policies.modify.ActivateSubjectResponse;
 import org.eclipse.ditto.signals.events.policies.PolicyEvent;
@@ -92,9 +92,10 @@ protected Result<PolicyEvent<?>> doApply(final Context<PolicyId> context,
                         command);
             }
         } else {
-            // Command is constructed incorrectly. This is a bug.
+            // Policy is configured incorrectly
             return ResultFactory.newErrorResult(
-                    PolicyActionFailedException.newBuilderForActivateTokenIntegration().build(), command);
+                    PolicyEntryNotAccessibleException.newBuilder(policyId, label).dittoHeaders(dittoHeaders).build(),
+                    command);
         }
     }
 

diff --git a/...o/services/policies/persistence/actors/strategies/commands/DeactivateSubjectStrategy.java b/...o/services/policies/persistence/actors/strategies/commands/DeactivateSubjectStrategy.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.services.policies.common.config.PolicyConfig;
 import org.eclipse.ditto.services.utils.persistentactors.results.Result;
 import org.eclipse.ditto.services.utils.persistentactors.results.ResultFactory;
+import org.eclipse.ditto.signals.commands.policies.exceptions.PolicyEntryNotAccessibleException;
 import org.eclipse.ditto.signals.commands.policies.modify.DeactivateSubject;
 import org.eclipse.ditto.signals.commands.policies.modify.DeactivateSubjectResponse;
 import org.eclipse.ditto.signals.events.policies.PolicyEvent;
@@ -88,9 +89,10 @@ protected Result<PolicyEvent<?>> doApply(final Context<PolicyId> context,
                 return ResultFactory.newMutationResult(adjustedCommand, event, rawResponse);
             }
         } else {
-            // Command is constructed incorrectly. This is a bug.
+            // Policy is configured incorrectly
             return ResultFactory.newErrorResult(
-                    PolicyActionFailedException.newBuilderForDeactivateTokenIntegration().build(), command);
+                    PolicyEntryNotAccessibleException.newBuilder(policyId, label).dittoHeaders(dittoHeaders).build(),
+                    command);
         }
     }