diff --git a/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategy.java b/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategy.java index ae22c9f5bf..5290c1c8cc 100644 --- a/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategy.java +++ b/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategy.java @@ -105,7 +105,7 @@ protected Result> doApply(final Context context, SubjectsModifiedPartially.of(policyId, activatedSubjects, nextRevision, getEventTimestamp(), dittoHeaders); final ActivatePolicyTokenIntegrationResponse rawResponse = - ActivatePolicyTokenIntegrationResponse.of(policyId, command.getSubjectId(), dittoHeaders); + ActivatePolicyTokenIntegrationResponse.of(policyId, dittoHeaders); // do not append ETag - activated subjects do not support ETags. return ResultFactory.newMutationResult(command, event, rawResponse); } else { diff --git a/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategy.java b/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategy.java index 16bb5744b7..a1fd234153 100644 --- a/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategy.java +++ b/services/policies/persistence/src/main/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategy.java @@ -98,7 +98,7 @@ protected Result> doApply(final Context context, SubjectsDeletedPartially.of(policyId, deactivatedSubjectsIds, nextRevision, getEventTimestamp(), dittoHeaders); final DeactivatePolicyTokenIntegrationResponse rawResponse = - DeactivatePolicyTokenIntegrationResponse.of(policyId, command.getSubjectId(), dittoHeaders); + DeactivatePolicyTokenIntegrationResponse.of(policyId, dittoHeaders); return ResultFactory.newMutationResult(command, event, rawResponse); } diff --git a/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategyTest.java b/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategyTest.java index 87a24962c7..6b77141506 100644 --- a/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategyTest.java +++ b/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/ActivatePolicyTokenIntegrationStrategyTest.java @@ -82,7 +82,7 @@ public void activateTokenIntegration() { ActivatePolicyTokenIntegrationResponse.class, response -> assertThat(response) .isEqualTo( - ActivatePolicyTokenIntegrationResponse.of(context.getState(), subjectId, dittoHeaders))); + ActivatePolicyTokenIntegrationResponse.of(context.getState(), dittoHeaders))); } @Test diff --git a/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategyTest.java b/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategyTest.java index 27c8a3cab8..63cb7ae93e 100644 --- a/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategyTest.java +++ b/services/policies/persistence/src/test/java/org/eclipse/ditto/services/policies/persistence/actors/strategies/commands/DeactivatePolicyTokenIntegrationStrategyTest.java @@ -91,7 +91,7 @@ public void deactivateTokenIntegration() { DeactivatePolicyTokenIntegrationResponse.class, response -> assertThat(response) .isEqualTo( - DeactivatePolicyTokenIntegrationResponse.of(context.getState(), subjectId, dittoHeaders))); + DeactivatePolicyTokenIntegrationResponse.of(context.getState(), dittoHeaders))); } @Test @@ -108,7 +108,7 @@ public void deactivateNonexistentSubject() { DeactivatePolicyTokenIntegrationResponse.class, response -> assertThat(response) .isEqualTo( - DeactivatePolicyTokenIntegrationResponse.of(context.getState(), subjectId, dittoHeaders))); + DeactivatePolicyTokenIntegrationResponse.of(context.getState(), dittoHeaders))); } @Test diff --git a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponse.java b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponse.java index b42462609f..735b6c09eb 100755 --- a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponse.java +++ b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponse.java @@ -20,19 +20,15 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonField; -import org.eclipse.ditto.json.JsonFieldDefinition; import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonObjectBuilder; import org.eclipse.ditto.json.JsonPointer; import org.eclipse.ditto.model.base.common.HttpStatusCode; import org.eclipse.ditto.model.base.headers.DittoHeaders; -import org.eclipse.ditto.model.base.json.FieldType; import org.eclipse.ditto.model.base.json.JsonParsableCommandResponse; import org.eclipse.ditto.model.base.json.JsonSchemaVersion; import org.eclipse.ditto.model.policies.PolicyId; -import org.eclipse.ditto.model.policies.SubjectId; import org.eclipse.ditto.signals.commands.base.AbstractCommandResponse; import org.eclipse.ditto.signals.commands.policies.PolicyCommandResponse; @@ -57,33 +53,23 @@ public final class ActivatePolicyTokenIntegrationResponse */ public static final HttpStatusCode STATUS = HttpStatusCode.OK; - static final JsonFieldDefinition JSON_SUBJECT_ID = - JsonFactory.newStringFieldDefinition("subjectId", FieldType.REGULAR, JsonSchemaVersion.V_2); - private final PolicyId policyId; - private final SubjectId subjectId; - - private ActivatePolicyTokenIntegrationResponse(final PolicyId policyId, final SubjectId subjectId, - final DittoHeaders dittoHeaders) { + private ActivatePolicyTokenIntegrationResponse(final PolicyId policyId, final DittoHeaders dittoHeaders) { super(TYPE, STATUS, dittoHeaders); this.policyId = checkNotNull(policyId, "policyId"); - this.subjectId = checkNotNull(subjectId, "subjectId"); } /** * Creates a response to an {@code ActivatePolicyTokenIntegration} command. * * @param policyId the policy ID. - * @param subjectId the added subject ID. * @param dittoHeaders the headers of the preceding command. * @return the response. * @throws NullPointerException if any argument is {@code null}. */ - public static ActivatePolicyTokenIntegrationResponse of(final PolicyId policyId, - final SubjectId subjectId, - final DittoHeaders dittoHeaders) { - return new ActivatePolicyTokenIntegrationResponse(policyId, subjectId, dittoHeaders); + public static ActivatePolicyTokenIntegrationResponse of(final PolicyId policyId, final DittoHeaders dittoHeaders) { + return new ActivatePolicyTokenIntegrationResponse(policyId, dittoHeaders); } /** @@ -101,8 +87,7 @@ public static ActivatePolicyTokenIntegrationResponse fromJson(final JsonObject j final DittoHeaders dittoHeaders) { final PolicyId policyId = PolicyId.of(jsonObject.getValueOrThrow(PolicyCommandResponse.JsonFields.JSON_POLICY_ID)); - final SubjectId subjectId = SubjectId.newInstance(jsonObject.getValueOrThrow(JSON_SUBJECT_ID)); - return new ActivatePolicyTokenIntegrationResponse(policyId, subjectId, dittoHeaders); + return new ActivatePolicyTokenIntegrationResponse(policyId, dittoHeaders); } @Override @@ -121,12 +106,11 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js final Predicate predicate = schemaVersion.and(thePredicate); jsonObjectBuilder.set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, policyId.toString(), predicate); - jsonObjectBuilder.set(JSON_SUBJECT_ID, subjectId.toString(), predicate); } @Override public ActivatePolicyTokenIntegrationResponse setDittoHeaders(final DittoHeaders dittoHeaders) { - return new ActivatePolicyTokenIntegrationResponse(policyId, subjectId, dittoHeaders); + return new ActivatePolicyTokenIntegrationResponse(policyId, dittoHeaders); } @Override @@ -144,13 +128,12 @@ public boolean equals(@Nullable final Object o) { } final ActivatePolicyTokenIntegrationResponse that = (ActivatePolicyTokenIntegrationResponse) o; return Objects.equals(policyId, that.policyId) && - Objects.equals(subjectId, that.subjectId) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), policyId, subjectId); + return Objects.hash(super.hashCode(), policyId); } @Override @@ -158,7 +141,6 @@ public String toString() { return getClass().getSimpleName() + " [" + super.toString() + ", policyId=" + policyId + - ", subjectId=" + subjectId + "]"; } diff --git a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivateTokenIntegrationResponse.java b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivateTokenIntegrationResponse.java index edb6d27e90..8fa3fd2e82 100755 --- a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivateTokenIntegrationResponse.java +++ b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/ActivateTokenIntegrationResponse.java @@ -64,7 +64,6 @@ public final class ActivateTokenIntegrationResponse static final JsonFieldDefinition JSON_SUBJECT_ID = JsonFactory.newStringFieldDefinition("subjectId", FieldType.REGULAR, JsonSchemaVersion.V_2); - // TODO: determine the content of the response. private final PolicyId policyId; private final Label label; private final SubjectId subjectId; diff --git a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponse.java b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponse.java index 553f9e3f20..45c89b7422 100755 --- a/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponse.java +++ b/signals/commands/policies/src/main/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponse.java @@ -20,19 +20,15 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.eclipse.ditto.json.JsonFactory; import org.eclipse.ditto.json.JsonField; -import org.eclipse.ditto.json.JsonFieldDefinition; import org.eclipse.ditto.json.JsonObject; import org.eclipse.ditto.json.JsonObjectBuilder; import org.eclipse.ditto.json.JsonPointer; import org.eclipse.ditto.model.base.common.HttpStatusCode; import org.eclipse.ditto.model.base.headers.DittoHeaders; -import org.eclipse.ditto.model.base.json.FieldType; import org.eclipse.ditto.model.base.json.JsonParsableCommandResponse; import org.eclipse.ditto.model.base.json.JsonSchemaVersion; import org.eclipse.ditto.model.policies.PolicyId; -import org.eclipse.ditto.model.policies.SubjectId; import org.eclipse.ditto.signals.commands.base.AbstractCommandResponse; import org.eclipse.ditto.signals.commands.policies.PolicyCommandResponse; @@ -57,33 +53,26 @@ public final class DeactivatePolicyTokenIntegrationResponse */ public static final HttpStatusCode STATUS = HttpStatusCode.OK; - static final JsonFieldDefinition JSON_SUBJECT_ID = - JsonFactory.newStringFieldDefinition("subjectId", FieldType.REGULAR, JsonSchemaVersion.V_2); - private final PolicyId policyId; - private final SubjectId subjectId; - private DeactivatePolicyTokenIntegrationResponse(final PolicyId policyId, final SubjectId subjectId, + private DeactivatePolicyTokenIntegrationResponse(final PolicyId policyId, final DittoHeaders dittoHeaders) { super(TYPE, STATUS, dittoHeaders); this.policyId = checkNotNull(policyId, "policyId"); - this.subjectId = checkNotNull(subjectId, "subjectId"); } /** * Creates a response to an {@code DeactivatePolicyTokenIntegration} command. * * @param policyId the policy ID. - * @param subjectId the added subject ID. * @param dittoHeaders the headers of the preceding command. * @return the response. * @throws NullPointerException if any argument is {@code null}. */ public static DeactivatePolicyTokenIntegrationResponse of(final PolicyId policyId, - final SubjectId subjectId, final DittoHeaders dittoHeaders) { - return new DeactivatePolicyTokenIntegrationResponse(policyId, subjectId, dittoHeaders); + return new DeactivatePolicyTokenIntegrationResponse(policyId, dittoHeaders); } /** @@ -101,8 +90,7 @@ public static DeactivatePolicyTokenIntegrationResponse fromJson(final JsonObject final DittoHeaders dittoHeaders) { final PolicyId policyId = PolicyId.of(jsonObject.getValueOrThrow(PolicyCommandResponse.JsonFields.JSON_POLICY_ID)); - final SubjectId subjectId = SubjectId.newInstance(jsonObject.getValueOrThrow(JSON_SUBJECT_ID)); - return new DeactivatePolicyTokenIntegrationResponse(policyId, subjectId, dittoHeaders); + return new DeactivatePolicyTokenIntegrationResponse(policyId, dittoHeaders); } @Override @@ -121,12 +109,11 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js final Predicate predicate = schemaVersion.and(thePredicate); jsonObjectBuilder.set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, policyId.toString(), predicate); - jsonObjectBuilder.set(JSON_SUBJECT_ID, subjectId.toString(), predicate); } @Override public DeactivatePolicyTokenIntegrationResponse setDittoHeaders(final DittoHeaders dittoHeaders) { - return new DeactivatePolicyTokenIntegrationResponse(policyId, subjectId, dittoHeaders); + return new DeactivatePolicyTokenIntegrationResponse(policyId, dittoHeaders); } @Override @@ -144,13 +131,12 @@ public boolean equals(@Nullable final Object o) { } final DeactivatePolicyTokenIntegrationResponse that = (DeactivatePolicyTokenIntegrationResponse) o; return Objects.equals(policyId, that.policyId) && - Objects.equals(subjectId, that.subjectId) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), policyId, subjectId); + return Objects.hash(super.hashCode(), policyId); } @Override @@ -158,7 +144,6 @@ public String toString() { return getClass().getSimpleName() + " [" + super.toString() + ", policyId=" + policyId + - ", subjectId=" + subjectId + "]"; } diff --git a/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponseTest.java b/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponseTest.java index 126cd80655..103a365b5c 100755 --- a/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponseTest.java +++ b/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/ActivatePolicyTokenIntegrationResponseTest.java @@ -37,7 +37,6 @@ public final class ActivatePolicyTokenIntegrationResponseTest { .set(PolicyCommandResponse.JsonFields.TYPE, ActivatePolicyTokenIntegrationResponse.TYPE) .set(PolicyCommandResponse.JsonFields.STATUS, ActivatePolicyTokenIntegrationResponse.STATUS.toInt()) .set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, TestConstants.Policy.POLICY_ID.toString()) - .set(ActivatePolicyTokenIntegrationResponse.JSON_SUBJECT_ID, TestConstants.Policy.SUBJECT_ID.toString()) .build(); @Test @@ -56,19 +55,13 @@ public void testHashCodeAndEquals() { @Test(expected = NullPointerException.class) public void tryToCreateInstanceWithNullPolicyId() { - ActivatePolicyTokenIntegrationResponse.of(null, TestConstants.Policy.SUBJECT_ID, TestConstants.EMPTY_DITTO_HEADERS); - } - - - @Test(expected = NullPointerException.class) - public void tryToCreateInstanceWithNullSubject() { - ActivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, null, TestConstants.EMPTY_DITTO_HEADERS); + ActivatePolicyTokenIntegrationResponse.of(null, TestConstants.EMPTY_DITTO_HEADERS); } @Test public void toJsonReturnsExpected() { final ActivatePolicyTokenIntegrationResponse underTest = - ActivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, TestConstants.Policy.SUBJECT_ID, + ActivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, TestConstants.EMPTY_DITTO_HEADERS); final JsonObject actualJson = underTest.toJson(FieldType.regularOrSpecial()); @@ -81,7 +74,7 @@ public void createInstanceFromValidJson() { ActivatePolicyTokenIntegrationResponse.fromJson(KNOWN_JSON, TestConstants.EMPTY_DITTO_HEADERS); final ActivatePolicyTokenIntegrationResponse expectedCommand = - ActivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, TestConstants.Policy.SUBJECT_ID, + ActivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, TestConstants.EMPTY_DITTO_HEADERS); assertThat(underTest).isEqualTo(expectedCommand); } diff --git a/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponseTest.java b/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponseTest.java index a6b841c935..0f4b8034cd 100755 --- a/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponseTest.java +++ b/signals/commands/policies/src/test/java/org/eclipse/ditto/signals/commands/policies/actions/DeactivatePolicyTokenIntegrationResponseTest.java @@ -37,7 +37,6 @@ public final class DeactivatePolicyTokenIntegrationResponseTest { .set(PolicyCommandResponse.JsonFields.TYPE, DeactivatePolicyTokenIntegrationResponse.TYPE) .set(PolicyCommandResponse.JsonFields.STATUS, DeactivatePolicyTokenIntegrationResponse.STATUS.toInt()) .set(PolicyCommandResponse.JsonFields.JSON_POLICY_ID, TestConstants.Policy.POLICY_ID.toString()) - .set(DeactivatePolicyTokenIntegrationResponse.JSON_SUBJECT_ID, TestConstants.Policy.SUBJECT_ID.toString()) .build(); @Test @@ -56,20 +55,14 @@ public void testHashCodeAndEquals() { @Test(expected = NullPointerException.class) public void tryToCreateInstanceWithNullPolicyId() { - DeactivatePolicyTokenIntegrationResponse.of(null, TestConstants.Policy.SUBJECT_ID, TestConstants.EMPTY_DITTO_HEADERS); - } - - - @Test(expected = NullPointerException.class) - public void tryToCreateInstanceWithNullSubject() { - DeactivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, null, TestConstants.EMPTY_DITTO_HEADERS); + DeactivatePolicyTokenIntegrationResponse.of(null, TestConstants.EMPTY_DITTO_HEADERS); } @Test public void toJsonReturnsExpected() { final DeactivatePolicyTokenIntegrationResponse underTest = DeactivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, - TestConstants.Policy.SUBJECT_ID, TestConstants.EMPTY_DITTO_HEADERS); + TestConstants.EMPTY_DITTO_HEADERS); final JsonObject actualJson = underTest.toJson(FieldType.regularOrSpecial()); assertThat(actualJson).isEqualTo(KNOWN_JSON); @@ -82,7 +75,7 @@ public void createInstanceFromValidJson() { final DeactivatePolicyTokenIntegrationResponse expectedCommand = DeactivatePolicyTokenIntegrationResponse.of(TestConstants.Policy.POLICY_ID, - TestConstants.Policy.SUBJECT_ID, TestConstants.EMPTY_DITTO_HEADERS); + TestConstants.EMPTY_DITTO_HEADERS); assertThat(underTest).isEqualTo(expectedCommand); }