Skip to content

Commit

Permalink
[#559] remove usage of Condition class in ditto java client;
Browse files Browse the repository at this point in the history 
Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
  • Loading branch information
Stefan Maute committed Aug 23, 2021
1 parent 413231a commit 3c8ae03
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 20 deletions.
3 changes: 1 addition & 2 deletions java/src/main/java/org/eclipse/ditto/client/options/Options.java
View file
Expand Up @@ -15,7 +15,6 @@
import java.util.Arrays;

import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.client.management.CommonManagement;
import org.eclipse.ditto.json.JsonFieldSelector;
import org.eclipse.ditto.policies.model.PolicyId;
Expand Down Expand Up @@ -147,7 +146,7 @@ public static Option<ThingId> copyPolicyFromThing(final ThingId thingToCopyPolic
* @return the new option.
* @since 2.1.0
*/
public static Option<Condition> condition(final Condition condition) {
public static Option<String> condition(final String condition) {
return DefaultOption.newInstance(OptionName.Modify.CONDITION, condition);
}
}
Expand Down
7 changes: 3 additions & 4 deletions java/src/main/java/org/eclipse/ditto/client/options/internal/ConditionOptionVisitor.java
View file
Expand Up @@ -14,7 +14,6 @@

import javax.annotation.concurrent.ThreadSafe;

import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.client.options.Option;
import org.eclipse.ditto.client.options.OptionName;

Expand All @@ -26,7 +25,7 @@
* @since 2.1.0
*/
@ThreadSafe
final class ConditionOptionVisitor extends AbstractOptionVisitor<Condition> {
final class ConditionOptionVisitor extends AbstractOptionVisitor<String> {

/**
* Constructor.
Expand All @@ -36,8 +35,8 @@ final class ConditionOptionVisitor extends AbstractOptionVisitor<Condition> {
}

@Override
protected Condition getValueFromOption(final Option<?> option) {
return option.getValueAs(Condition.class);
protected String getValueFromOption(final Option<?> option) {
return option.getValueAs(String.class);
}

}
6 changes: 3 additions & 3 deletions java/src/main/java/org/eclipse/ditto/client/options/internal/OptionsEvaluator.java
View file
Expand Up @@ -17,7 +17,6 @@
import javax.annotation.concurrent.Immutable;

import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.client.options.Option;
import org.eclipse.ditto.json.JsonFieldSelector;
import org.eclipse.ditto.policies.model.PolicyId;
Expand Down Expand Up @@ -161,10 +160,11 @@ public Optional<ThingId> copyPolicyFromThingId() {

/**
* Returns whether a request should be applied to the thing or not.
* @return an Optional holding the {@link Condition} to apply to the request.
*
* @return an Optional holding the {@link String} to apply to the request.
* @since 2.1.0
*/
public Optional<Condition> condition() {
public Optional<String> condition() {
return getValue(new ConditionOptionVisitor());
}

Expand Down
3 changes: 1 addition & 2 deletions java/src/test/java/org/eclipse/ditto/client/DittoClientAttributesTest.java
View file
Expand Up @@ -22,7 +22,6 @@

import org.assertj.core.api.Assertions;
import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.base.model.signals.Signal;
import org.eclipse.ditto.client.internal.AbstractDittoClientThingsTest;
import org.eclipse.ditto.client.options.Options;
Expand Down Expand Up @@ -58,7 +57,7 @@
*/
public final class DittoClientAttributesTest extends AbstractDittoClientThingsTest {

private static final Condition CONDITION = Condition.of("ne(attributes/test)");
private static final String CONDITION = "ne(attributes/test)";
private static final JsonPointer ATTRIBUTE_KEY_NEW = JsonFactory.newPointer("new");
private static final JsonPointer ATTRIBUTE_KEY_REALLY_NEW = JsonFactory.newPointer("reallyNew");
private static final JsonPointer ATTRIBUTE_KEY_OLD = JsonFactory.newPointer("old");
Expand Down
3 changes: 1 addition & 2 deletions java/src/test/java/org/eclipse/ditto/client/DittoClientFeaturesTest.java
View file
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.ditto.base.model.common.HttpStatus;
import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.base.model.signals.Signal;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
Expand Down Expand Up @@ -73,7 +72,7 @@
public final class DittoClientFeaturesTest extends AbstractDittoClientThingsTest {

private static final String FEATURE_ID = "someFeature";
private static final Condition CONDITION = Condition.of("ne(attributes/test)");
private static final String CONDITION = "ne(attributes/test)";
private static final Feature FEATURE = ThingsModelFactory.newFeatureBuilder()
.properties(ThingsModelFactory.newFeaturePropertiesBuilder()
.set("propertyPointer", "propertyValue")
Expand Down
9 changes: 4 additions & 5 deletions java/src/test/java/org/eclipse/ditto/client/DittoClientPoliciesTest.java
View file
Expand Up @@ -27,7 +27,6 @@
import java.util.function.Function;

import org.assertj.core.api.Assertions;
import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.client.internal.AbstractDittoClientTest;
import org.eclipse.ditto.client.options.Options;
import org.eclipse.ditto.json.JsonFactory;
Expand Down Expand Up @@ -211,22 +210,22 @@ public void testUpdatePolicyWithMissingId() {

@Test(expected = IllegalArgumentException.class)
public void testCreatePolicyWithForbiddenOption() {
client.policies().create(POLICY, Options.Modify.condition(Condition.of("ne(attributes/test)")));
client.policies().create(POLICY, Options.Modify.condition("ne(attributes/test)"));
}

@Test(expected = IllegalArgumentException.class)
public void testPutPolicyWithForbiddenOption() {
client.policies().put(POLICY, Options.Modify.condition(Condition.of("ne(attributes/test)")));
client.policies().put(POLICY, Options.Modify.condition("ne(attributes/test)"));
}

@Test(expected = IllegalArgumentException.class)
public void testUpdatePolicyWithForbiddenOption() {
client.policies().update(POLICY, Options.Modify.condition(Condition.of("ne(attributes/test)")));
client.policies().update(POLICY, Options.Modify.condition("ne(attributes/test)"));
}

@Test(expected = IllegalArgumentException.class)
public void testDeletePolicyWithForbiddenOption() {
client.policies().delete(POLICY_ID, Options.Modify.condition(Condition.of("ne(attributes/test)")));
client.policies().delete(POLICY_ID, Options.Modify.condition("ne(attributes/test)"));
}

}
3 changes: 1 addition & 2 deletions java/src/test/java/org/eclipse/ditto/client/DittoClientThingTest.java
View file
Expand Up @@ -34,7 +34,6 @@
import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
import org.eclipse.ditto.base.model.headers.DittoHeaderDefinition;
import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.base.model.headers.condition.Condition;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgement;
import org.eclipse.ditto.base.model.signals.acks.Acknowledgements;
import org.eclipse.ditto.client.internal.AbstractDittoClientThingsTest;
Expand Down Expand Up @@ -78,7 +77,7 @@
public final class DittoClientThingTest extends AbstractDittoClientThingsTest {

private static final String FEATURE_ID = "someFeature";
private static final Condition CONDITION = Condition.of("ne(attributes/test)");
private static final String CONDITION = "ne(attributes/test)";
private static final JsonPointer ATTRIBUTE_KEY_NEW = JsonFactory.newPointer("new");
private static final String ATTRIBUTE_VALUE = "value";
private static final Feature FEATURE = ThingsModelFactory.newFeatureBuilder()
Expand Down

0 comments on commit 3c8ae03

Please sign in to comment.