Repository: incubator-streams Updated Branches: refs/heads/master 745451d8e -> c64f8435d
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java ---------------------------------------------------------------------- diff --git a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java index c155b67..6713529 100644 --- a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java +++ b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java @@ -25,16 +25,14 @@ import org.apache.streams.util.schema.SchemaStoreImpl; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; +import org.junit.Assert; import org.junit.Test; import java.io.File; +import java.util.Arrays; import java.util.Iterator; import java.util.List; -/** - * Created by sblackmon on 5/3/16. - */ public class SchemaOrderingTest { @Test @@ -44,11 +42,11 @@ public class SchemaOrderingTest { schemaStore.create(update.toURI()); File activity = new File("target/test-classes/activitystreams-schemas/activity.json"); schemaStore.create(activity.toURI()); - assert ( schemaStore.compare( schemaStore.getByUri(update.toURI()).get(), schemaStore.getByUri(activity.toURI()).get()) == 1); + assert (schemaStore.compare( schemaStore.getByUri(update.toURI()).get(), schemaStore.getByUri(activity.toURI()).get()) == 1); Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator(); assertContainsItemsEndingWithInOrder( schemaIterator, - Lists.newArrayList( + Arrays.asList( "activity.json", "update.json" ) @@ -62,11 +60,11 @@ public class SchemaOrderingTest { schemaStore.create(alert.toURI()); File object = new File("target/test-classes/activitystreams-schemas/object.json"); schemaStore.create(object.toURI()); - assert ( schemaStore.compare( schemaStore.getByUri(object.toURI()).get(), schemaStore.getByUri(alert.toURI()).get()) == -1); + assert (schemaStore.compare( schemaStore.getByUri(object.toURI()).get(), schemaStore.getByUri(alert.toURI()).get()) == -1); Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator(); assertContainsItemsEndingWithInOrder( schemaIterator, - Lists.newArrayList( + Arrays.asList( "object.json", "alert.json" ) @@ -80,7 +78,7 @@ public class SchemaOrderingTest { schemaStore.create(alert.toURI()); File update = new File("target/test-classes/activitystreams-schemas/verbs/update.json"); schemaStore.create(update.toURI()); - assert ( schemaStore.compare( schemaStore.getByUri(alert.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == 0); + assert (schemaStore.compare( schemaStore.getByUri(alert.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == 0); } @Test @@ -94,7 +92,7 @@ public class SchemaOrderingTest { Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator(); assertContainsItemsEndingWithInOrder( schemaIterator, - Lists.newArrayList( + Arrays.asList( "object.json", "update.json" ) @@ -112,7 +110,7 @@ public class SchemaOrderingTest { Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator(); assertContainsItemsEndingWithInOrder( schemaIterator, - Lists.newArrayList( + Arrays.asList( "media_link.json", "object.json", "alert.json" @@ -127,13 +125,14 @@ public class SchemaOrderingTest { schemaStore.create(update.toURI()); File mediaLink = new File("target/test-classes/activitystreams-schemas/media_link.json"); schemaStore.create(mediaLink.toURI()); - assert ( schemaStore.getByUri(mediaLink.toURI()).isPresent()); - assert ( schemaStore.getByUri(update.toURI()).isPresent()); - assert ( schemaStore.compare( schemaStore.getByUri(mediaLink.toURI()).get(), schemaStore.getByUri(update.toURI()).get()) == -1); + Assert.assertTrue(schemaStore.getByUri(mediaLink.toURI()).isPresent()); + Assert.assertTrue(schemaStore.getByUri(update.toURI()).isPresent()); + Assert.assertTrue(schemaStore.compare( schemaStore.getByUri(mediaLink.toURI()).get(), + schemaStore.getByUri(update.toURI()).get()) == -1); Iterator<Schema> schemaIterator = schemaStore.getSchemaIterator(); assertContainsItemsEndingWithInOrder( schemaIterator, - Lists.newArrayList( + Arrays.asList( "media_link.json", "update.json" ) @@ -148,7 +147,7 @@ public class SchemaOrderingTest { public void assertContainsItemsEndingWithInOrder(Iterator<Schema> iterator, List<String> items) { for ( String item : items ) { Optional<Schema> tryFind = Iterators.tryFind( iterator, new SchemaUriEndsWithPredicate(item) ); - assert ( tryFind.isPresent() ); + Assert.assertTrue(tryFind.isPresent()); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java ---------------------------------------------------------------------- diff --git a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java index 6dad615..d5c3d47 100644 --- a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java +++ b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java @@ -26,9 +26,6 @@ import org.junit.Test; import java.io.File; -/** - * Created by sblackmon on 5/2/16. - */ public class SchemaStoreTest { @Test http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java index 9bff713..228fba2 100644 --- a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java +++ b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationGenericOrdering.java @@ -61,7 +61,7 @@ public class ObjectCombinationGenericOrdering extends Ordering<ObjectCombination * @param objectCombination ObjectCombination * @return count */ - public int wildcardCount(ObjectCombination objectCombination) { + private int wildcardCount(ObjectCombination objectCombination) { int wildcardCount = 0; if ( wildcard(objectCombination.getActor())) { wildcardCount++; @@ -83,11 +83,7 @@ public class ObjectCombinationGenericOrdering extends Ordering<ObjectCombination * @param pattern String * @return true or false */ - public boolean wildcard(String pattern) { - if ( pattern.equals("*")) { - return true; - } else { - return false; - } + private boolean wildcard(String pattern) { + return pattern.equals("*"); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java index 18b6d8b..8b395bd 100644 --- a/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java +++ b/streams-verbs/src/main/java/org/apache/streams/verbs/ObjectCombinationSpecificOrdering.java @@ -68,7 +68,7 @@ public class ObjectCombinationSpecificOrdering extends Ordering<ObjectCombinatio * @param objectCombination ObjectCombination * @return count */ - public int matchCount(ObjectCombination objectCombination) { + private int matchCount(ObjectCombination objectCombination) { int matchCount = 0; if ( match(activity.getActor(), objectCombination.getActor())) { matchCount++; @@ -92,12 +92,8 @@ public class ObjectCombinationSpecificOrdering extends Ordering<ObjectCombinatio * @return true or false */ public boolean match(ActivityObject activityObject, String pattern) { - if ( activityObject != null - && activityObject.getObjectType() != null - && activityObject.getObjectType().equals(pattern)) { - return true; - } else { - return false; - } + return activityObject != null + && activityObject.getObjectType() != null + && activityObject.getObjectType().equals(pattern); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java index b447794..051be22 100644 --- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java +++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionMatchUtil.java @@ -56,7 +56,7 @@ public class VerbDefinitionMatchUtil { if ( verbDefinition.getValue() != null && verbDefinition.getValue().equals(activity.getVerb())) { for (ObjectCombination objectCombination : verbDefinition.getObjects()) { - if (VerbDefinitionResolver.filter(activity, objectCombination) == true) { + if (VerbDefinitionResolver.filter(activity, objectCombination)) { return true; } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java index 81f0bfa..7b3017e 100644 --- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java +++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionResolver.java @@ -62,7 +62,7 @@ public class VerbDefinitionResolver { VerbDefinition verbDefinitionCopy = SerializationUtil.cloneBySerialization(verbDefinition); if ( activity.getVerb().equals(verbDefinition.getValue())) { for ( ObjectCombination criteria : verbDefinitionCopy.getObjects()) { - if ( filter(activity, criteria) == false ) { + if (!filter(activity, criteria)) { verbDefinitionCopy.getObjects().remove(criteria); } } @@ -88,14 +88,14 @@ public class VerbDefinitionResolver { for ( VerbDefinition verbDefinition : verbDefinitionSet ) { if ( activity.getVerb().equals(verbDefinition.getValue())) { for ( ObjectCombination criteria : verbDefinition.getObjects()) { - if ( filter(activity, criteria) == true ) { + if (filter(activity, criteria)) { results.add(criteria); } } } } - Collections.sort(results, new ObjectCombinationSpecificOrdering(activity)); + results.sort(new ObjectCombinationSpecificOrdering(activity)); return results; } @@ -120,19 +120,11 @@ public class VerbDefinitionResolver { } public static boolean filterType(ActivityObject activityObject, boolean required, String pattern) { - if (required == true && activityObject == null) { - return false; - } else if (required == false && activityObject == null) { - return true; - } else if (pattern.equals("*")) { - return true; - } else if (activityObject.getObjectType() == null) { - return false; - } else if (activityObject.getObjectType().equals(pattern)) { - return true; - } else { - return false; - } + return !(required && activityObject == null) && + (!required && activityObject == null || + pattern.equals("*") || + activityObject.getObjectType() != null && + activityObject.getObjectType().equals(pattern)); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java index 53113a7..e34f462 100644 --- a/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java +++ b/streams-verbs/src/main/java/org/apache/streams/verbs/VerbDefinitionTemplateUtil.java @@ -22,7 +22,7 @@ package org.apache.streams.verbs; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import com.google.common.base.Strings; +import org.apache.commons.lang3.StringUtils; import org.stringtemplate.v4.ST; /** @@ -71,11 +71,11 @@ public class VerbDefinitionTemplateUtil { public static String displayName(ActivityObject activityObject) { if ( activityObject == null ) { return ""; - } else if ( !Strings.isNullOrEmpty(activityObject.getDisplayName())) { + } else if (StringUtils.isNotBlank(activityObject.getDisplayName())) { return activityObject.getDisplayName(); - } else if ( !Strings.isNullOrEmpty(activityObject.getObjectType())) { + } else if (StringUtils.isNotBlank(activityObject.getObjectType())) { return activityObject.getObjectType(); - } else if ( !Strings.isNullOrEmpty(activityObject.toString())) { + } else if (StringUtils.isNotBlank(activityObject.toString())) { return activityObject.toString(); } else { return ""; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java index ba91b06..96039cb 100644 --- a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java +++ b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java @@ -31,7 +31,7 @@ import org.junit.Test; */ public class VerbDefinitionTemplateTest { - ObjectMapper mapper = new ObjectMapper(); + private ObjectMapper mapper = new ObjectMapper(); /** * Test application of template with no field. http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c64f8435/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java ---------------------------------------------------------------------- diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java index c481f5c..300115b 100644 --- a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java +++ b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTest.java @@ -27,7 +27,7 @@ import org.junit.Test; */ public class VerbDefinitionTest { - ObjectMapper mapper = new ObjectMapper(); + private ObjectMapper mapper = new ObjectMapper(); /** * Test read verb definition from json. @@ -59,7 +59,7 @@ public class VerbDefinitionTest { assert combination.getObject().equals("*"); assert combination.getTarget().equals("*"); assert combination.getProvider().equals("*"); - assert combination.getTargetRequired() == false; + assert !combination.getTargetRequired(); }
