http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java index 7aa632e..5b23e16 100644 --- a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java +++ b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java @@ -26,7 +26,6 @@ import org.apache.streams.core.StreamsDatum; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,9 +62,8 @@ public class AccountTypeProcessor extends SimpleHTTPGetProcessor { @Override protected Map<String, String> prepareParams(StreamsDatum entry) { Activity activity = mapper.convertValue(entry.getDocument(), Activity.class); - Actor actor = activity.getActor(); - ActivityObject actorObject = mapper.convertValue(actor, ActivityObject.class); - String username = (String) ExtensionUtil.getInstance().getExtension(actorObject, "screenName"); + ActivityObject actor = mapper.convertValue(activity.getActor(), ActivityObject.class); + String username = (String) ExtensionUtil.getInstance().getExtension(actor, "screenName"); Map<String, String> params = new HashMap<>(); params.put("id", actor.getId()); params.put("name", actor.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java index 4f6af35..1ee55a9 100644 --- a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java +++ b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java @@ -26,7 +26,6 @@ import org.apache.streams.core.StreamsDatum; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,9 +62,8 @@ public class DemographicsProcessor extends SimpleHTTPGetProcessor { @Override protected Map<String, String> prepareParams(StreamsDatum entry) { Activity activity = mapper.convertValue(entry.getDocument(), Activity.class); - Actor actor = activity.getActor(); - ActivityObject actorObject = mapper.convertValue(actor, ActivityObject.class); - String username = (String) ExtensionUtil.getInstance().getExtension(actorObject, "screenName"); + ActivityObject actor = mapper.convertValue(activity.getActor(), ActivityObject.class); + String username = (String) ExtensionUtil.getInstance().getExtension(actor, "screenName"); Map<String, String> params = new HashMap<>(); params.put("id", actor.getId()); params.put("name", actor.getDisplayName()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-urls/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-urls/pom.xml b/streams-contrib/streams-processor-urls/pom.xml index c6a1408..eda32a8 100644 --- a/streams-contrib/streams-processor-urls/pom.xml +++ b/streams-contrib/streams-processor-urls/pom.xml @@ -53,10 +53,6 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -106,57 +102,42 @@ </testResources> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.urls</targetPackage> + </configuration> <executions> <execution> - <id>add-source</id> - <phase>generate-sources</phase> <goals> - <goal>add-source</goal> + <goal>generate-sources</goal> </goals> - <configuration> - <sources> - <source>target/generated-sources/jsonschema2pojo/**/*.java</source> - </sources> - </configuration> </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> <execution> - <id>add-source-jaxb2</id> + <id>add-source</id> <phase>generate-sources</phase> <goals> <goal>add-source</goal> </goals> <configuration> <sources> - <source>target/generated-sources/jaxb2</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> </executions> </plugin> - <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/urls/LinkDetails.json</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>org.apache.streams.urls</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-facebook/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/pom.xml b/streams-contrib/streams-provider-facebook/pom.xml index 02729a7..7db5fde 100644 --- a/streams-contrib/streams-provider-facebook/pom.xml +++ b/streams-contrib/streams-provider-facebook/pom.xml @@ -119,6 +119,25 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.facebook.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -130,7 +149,7 @@ </goals> <configuration> <sources> - <source>target/generated-sources/jsonschema2pojo</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> @@ -141,54 +160,6 @@ <artifactId>maven-resources-plugin</artifactId> </plugin> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/FacebookConfiguration.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/FacebookUserInformationConfiguration.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/FacebookUserstreamConfiguration.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/graph/Post.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/Page.json</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>com.facebook</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.8.3</version> - <configuration> - <schemaDirectory>../streams-provider-gnip/gnip-powertrack/src/main/xmlschema/</schemaDirectory> - <generateDirectory>target/generated-sources/jaxb2</generateDirectory> - <verbose>true</verbose> - <debug>true</debug> - <encoding>${project.build.sourceEncoding}</encoding> - <forceRegenerate>true</forceRegenerate> - <removeOldOutput>false</removeOldOutput> - <generatePackage>org.apache.streams.pojo.xml</generatePackage> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <version>1.2.1</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java index 0cc9d69..e8f2fff 100644 --- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java +++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java @@ -36,7 +36,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Image; import org.apache.streams.pojo.json.Provider; import org.slf4j.Logger; @@ -130,12 +129,12 @@ public class FacebookActivityUtil { } /** - * Builds the activity {@link org.apache.streams.pojo.json.Actor} object from the Page + * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the Page * @param page the object to use as the source * @return a valid Actor populated from the Page */ - public static Actor buildActor(Page page) { - Actor actor = new Actor(); + public static ActivityObject buildActor(Page page) { + ActivityObject actor = new ActivityObject(); actor.setId(formatId( Optional.fromNullable( page.getId()) @@ -164,12 +163,12 @@ public class FacebookActivityUtil { } /** - * Builds an {@link org.apache.streams.pojo.json.Actor} object from the {@link Post} + * Builds an {@link org.apache.streams.pojo.json.ActivityObject} object from the {@link Post} * @param post - * @return {@link org.apache.streams.pojo.json.Actor} + * @return {@link org.apache.streams.pojo.json.ActivityObject} */ - public static Actor buildActor(Post post) { - Actor actor = new Actor(); + public static ActivityObject buildActor(Post post) { + ActivityObject actor = new ActivityObject(); try { actor.setId(formatId( @@ -193,7 +192,7 @@ public class FacebookActivityUtil { * @param actor * @param page */ - public static void buildExtensions(Actor actor, Page page) { + public static void buildExtensions(ActivityObject actor, Page page) { Map<String, Object> extensions = new HashMap<>(); Location location = page.getLocation(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java index 3375931..f829b08 100644 --- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java +++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java @@ -22,7 +22,7 @@ import org.apache.streams.data.ActivitySerializer; import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.facebook.Post; import org.apache.streams.pojo.json.Activity; -import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.ActivityObject; import org.apache.streams.pojo.json.Provider; import java.util.List; @@ -61,8 +61,8 @@ public class FacebookStreamsPostSerializer implements ActivitySerializer<Post> { return null; } - public Actor createActor(Post post) { - Actor actor = new Actor(); + public ActivityObject createActor(Post post) { + ActivityObject actor = new ActivityObject(); actor.setDisplayName(post.getFrom().getName()); actor.setId(ID_PREFIX+post.getFrom().getId()); return actor; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gmail/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gmail/pom.xml b/streams-contrib/streams-provider-google/google-gmail/pom.xml index 77807b6..f8370c7 100644 --- a/streams-contrib/streams-provider-google/google-gmail/pom.xml +++ b/streams-contrib/streams-provider-google/google-gmail/pom.xml @@ -54,10 +54,6 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -128,6 +124,25 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.google.gmail.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -139,35 +154,13 @@ </goals> <configuration> <sources> - <source>target/generated-sources/jsonschema2pojo</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/com/google/gmail</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>org.apache.streams.google.gmail.pojo</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java index 7b624ba..e2b5501 100644 --- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java +++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java @@ -38,7 +38,6 @@ import org.apache.streams.data.ActivitySerializer; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Generator; import org.apache.streams.pojo.json.Icon; import org.apache.streams.pojo.json.Provider; @@ -94,7 +93,7 @@ public class GMailMessageActivitySerializer implements ActivitySerializer<GmailM provider.setId("http://gmail.com";); provider.setDisplayName("GMail"); activity.setProvider(provider); - Actor actor = new Actor(); + ActivityObject actor = new ActivityObject(); actor.setId(gmailMessage.getFrom().getEmail()); actor.setDisplayName(gmailMessage.getFrom().getName()); activity.setActor(actor); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/pom.xml b/streams-contrib/streams-provider-google/google-gplus/pom.xml index cfdba45..f91bc5f 100644 --- a/streams-contrib/streams-provider-google/google-gplus/pom.xml +++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml @@ -59,10 +59,6 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -175,6 +171,25 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.google.gplus.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -186,35 +201,13 @@ </goals> <configuration> <sources> - <source>target/generated-sources/jsonschema2pojo</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/com/google/gplus/GPlusConfiguration.json</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>org.apache.streams.google.gplus.pojo</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <version>1.2.1</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java index 86f019e..cdc7e8f 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java @@ -28,7 +28,6 @@ import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Image; import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; @@ -216,13 +215,13 @@ public class GooglePlusActivityUtil { /** * Given a {@link com.google.api.services.plus.model.Activity.Actor} object, return a fully fleshed - * out {@link org.apache.streams.pojo.json.Actor} object + * out {@link org.apache.streams.pojo.json.ActivityObject} actor * * @param gPlusActor - * @return {@link Actor} + * @return {@link ActivityObject} */ - private static Actor buildActor(com.google.api.services.plus.model.Activity.Actor gPlusActor) { - Actor actor = new Actor(); + private static ActivityObject buildActor(com.google.api.services.plus.model.Activity.Actor gPlusActor) { + ActivityObject actor = new ActivityObject(); actor.setDisplayName(gPlusActor.getDisplayName()); actor.setId(formatId(String.valueOf(gPlusActor.getId()))); @@ -245,8 +244,8 @@ public class GooglePlusActivityUtil { * @param person * @return Actor constructed with relevant Person details */ - private static Actor buildActor(Person person) { - Actor actor = new Actor(); + private static ActivityObject buildActor(Person person) { + ActivityObject actor = new ActivityObject(); actor.setUrl(person.getUrl()); actor.setDisplayName(person.getDisplayName()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java index 056babe..0b101e9 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java @@ -27,7 +27,7 @@ import com.google.gplus.serializer.util.GooglePlusActivityUtil; import org.apache.commons.lang.StringUtils; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; -import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.ActivityObject; import org.apache.streams.pojo.json.Provider; import org.junit.Before; import org.junit.Ignore; @@ -87,7 +87,7 @@ public class GooglePlusPersonSerDeIT { assertEquals(provider.getId(), "id:providers:googleplus"); assertEquals(provider.getDisplayName(), "GooglePlus"); - Actor actor = activity.getActor(); + ActivityObject actor = activity.getActor(); assertNotNull(actor.getImage()); assert(actor.getId().contains("id:googleplus:")); assertNotNull(actor.getUrl()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java index 1c67802..8ffec0b 100644 --- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java +++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java @@ -28,7 +28,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; -import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.ActivityObject; import org.apache.streams.pojo.json.Provider; import org.junit.Before; import org.junit.Test; @@ -86,7 +86,7 @@ public class GooglePlusActivitySerDeIT { assertEquals(provider.getId(), "id:providers:googleplus"); assertEquals(provider.getDisplayName(), "GooglePlus"); - Actor actor = activity.getActor(); + ActivityObject actor = activity.getActor(); assertNotNull(actor.getImage()); assert(actor.getId().contains("id:googleplus:")); assertNotNull(actor.getUrl()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-instagram/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/pom.xml b/streams-contrib/streams-provider-instagram/pom.xml index 4ef4469..a8b5989 100644 --- a/streams-contrib/streams-provider-instagram/pom.xml +++ b/streams-contrib/streams-provider-instagram/pom.xml @@ -52,10 +52,6 @@ <artifactId>jackson-datatype-joda</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -133,6 +129,25 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.instagram.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -144,36 +159,13 @@ </goals> <configuration> <sources> - <source>target/generated-sources/jsonschema2pojo</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/com/instagram/InstagramConfiguration.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/com/instagram/InstagramUserInformationConfiguration.json</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>org.apache.streams.instagram.pojo</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <version>1.2.1</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java index bf3f233..1c82da4 100644 --- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java +++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java @@ -27,7 +27,6 @@ import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Image; import org.apache.streams.pojo.json.Provider; import org.jinstagram.entity.comments.CommentData; @@ -98,8 +97,8 @@ public class InstagramActivityUtil { * @param item * @return Actor object */ - public static Actor buildActor(UserInfoData item) { - Actor actor = new Actor(); + public static ActivityObject buildActor(UserInfoData item) { + ActivityObject actor = new ActivityObject(); try { Image image = new Image(); @@ -134,8 +133,8 @@ public class InstagramActivityUtil { * @param item the item * @return a valid Actor */ - public static Actor buildActor(MediaFeedData item) { - Actor actor = new Actor(); + public static ActivityObject buildActor(MediaFeedData item) { + ActivityObject actor = new ActivityObject(); try { Image image = new Image(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-moreover/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-moreover/pom.xml b/streams-contrib/streams-provider-moreover/pom.xml index 4ae9993..548f534 100644 --- a/streams-contrib/streams-provider-moreover/pom.xml +++ b/streams-contrib/streams-provider-moreover/pom.xml @@ -56,10 +56,6 @@ <artifactId>jackson-datatype-json-org</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -107,54 +103,20 @@ </testResources> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source-jsonschema2pojo</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/generated-sources/jsonschema2pojo</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-source-jaxb2</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/generated-sources/jaxb2</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/com/moreover/Moreover.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/com/moreover/MoreoverConfiguration.json</sourcePath> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> <targetPackage>com.moreover</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> </configuration> <executions> <execution> <goals> - <goal>generate</goal> + <goal>generate-sources</goal> </goals> </execution> </executions> @@ -188,6 +150,26 @@ </executions> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/generated-sources/pojo</source> + <source>target/generated-sources/jaxb2</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <version>1.2.1</version> @@ -214,10 +196,10 @@ <skipTests>${skipITs}</skipTests> </configuration> </plugin> -<plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> -</plugin> + </plugin> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java index 3940a7c..8a91281 100644 --- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java +++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java @@ -27,7 +27,6 @@ import org.apache.streams.data.util.ActivityUtil; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; @@ -119,8 +118,8 @@ public class MoreoverUtils { return provider; } - public static Actor convert(Author author, String platformName) { - Actor actor = new Actor(); + public static ActivityObject convert(Author author, String platformName) { + ActivityObject actor = new ActivityObject(); AuthorPublishingPlatform platform = author.getPublishingPlatform(); String userId = platform.getUserId(); if (userId != null) actor.setId(ActivityUtil.getPersonId(getProviderID(platformName), userId)); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-rss/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-rss/pom.xml b/streams-contrib/streams-provider-rss/pom.xml index 299f9ff..de774c4 100644 --- a/streams-contrib/streams-provider-rss/pom.xml +++ b/streams-contrib/streams-provider-rss/pom.xml @@ -48,10 +48,6 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -139,6 +135,25 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.rss.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -150,35 +165,13 @@ </goals> <configuration> <sources> - <source>target/generated-sources/jsonschema2pojo</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/RssStreamConfiguration.json</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>org.apache.streams.rss.pojo</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <version>1.2.1</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java index 8b483a1..e323f27 100644 --- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java +++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java @@ -28,7 +28,6 @@ import org.apache.streams.data.util.RFC3339Utils; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Author; import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; @@ -83,7 +82,7 @@ public class SyndEntryActivitySerializer implements ActivitySerializer<ObjectNod Activity activity = new Activity(); Provider provider = buildProvider(entry); - Actor actor = buildActor(entry); + ActivityObject actor = buildActor(entry); ActivityObject activityObject = buildActivityObject(entry); activityObject.setUrl(provider.getUrl()); @@ -124,9 +123,9 @@ public class SyndEntryActivitySerializer implements ActivitySerializer<ObjectNod * @param entry * @return */ - private Actor buildActor(ObjectNode entry) { + private ActivityObject buildActor(ObjectNode entry) { + ActivityObject actor = new ActivityObject(); Author author = new Author(); - Actor actor = new Actor(); if (entry.get("author") != null) { author.setId(entry.get("author").textValue()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java index 5e7ed53..b1d5f9d 100644 --- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java +++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Lists; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; -import org.apache.streams.pojo.json.Actor; +import org.apache.streams.pojo.json.ActivityObject; import org.apache.streams.pojo.json.Author; import org.apache.streams.pojo.json.Provider; import org.apache.streams.rss.serializer.SyndEntryActivitySerializer; @@ -89,7 +89,7 @@ public class SyndEntryActivitySerializerIT { assertEquals(new DateTime(expected, DateTimeZone.UTC), published); } - public void testActor(String expected, Actor actor) { + public void testActor(String expected, ActivityObject actor) { assertEquals("id:rss:null" + ":" + expected, actor.getId()); assertEquals(expected, actor.getDisplayName()); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-sysomos/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-sysomos/pom.xml b/streams-contrib/streams-provider-sysomos/pom.xml index 724ee19..b00793c 100644 --- a/streams-contrib/streams-provider-sysomos/pom.xml +++ b/streams-contrib/streams-provider-sysomos/pom.xml @@ -48,10 +48,6 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-core</artifactId> </dependency> @@ -103,59 +99,24 @@ </testResources> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/generated-sources/jsonschema2pojo/**/*.java</source> - </sources> - </configuration> - </execution> - <execution> - <id>add-source-jaxb2</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>target/generated-sources/jaxb2</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/com/sysomos/Sysomos.json</sourcePath> - <sourcePath>${project.basedir}/src/main/jsonschema/com/sysomos/SysomosConfiguration.json</sourcePath> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> <targetPackage>com.sysomos</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> </configuration> <executions> <execution> <goals> - <goal>generate</goal> + <goal>generate-sources</goal> </goals> </execution> </executions> </plugin> - <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> @@ -168,6 +129,13 @@ <forceRegenerate>true</forceRegenerate> <removeOldOutput>false</removeOldOutput> <generatePackage>com.sysomos.xml</generatePackage> + <plugins> + <plugin> + <groupId>org.jvnet.jaxb2_commons</groupId> + <artifactId>jaxb2-basics</artifactId> + <version>${jaxb2-basics.version}</version> + </plugin> + </plugins> </configuration> <executions> <execution> @@ -178,6 +146,25 @@ </executions> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/generated-sources/pojo</source> + <source>target/generated-sources/jaxb2</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java index 66beaed..5d2a399 100644 --- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java +++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java @@ -24,7 +24,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; @@ -53,7 +52,7 @@ public class SysomosBeatActivityConverter { converted.setTitle(beat.getTitle()); converted.setPublished(new DateTime(beat.getTime())); converted.setUrl(beat.getLink()); - converted.setActor(new Actor()); + converted.setActor(new ActivityObject()); Map<String, BeatApi.BeatResponse.Beat.Tag> mappedTags = mapTags(beat); Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(converted); extensions.put("keywords", beat.getContent()); @@ -71,7 +70,7 @@ public class SysomosBeatActivityConverter { protected void setChannelSpecificValues(BeatApi.BeatResponse.Beat beat, Activity converted, Map<String, BeatApi.BeatResponse.Beat.Tag> mappedTags) { String mediaType = beat.getMediaType(); String lowerMediaType = mediaType.toLowerCase(); - Actor actor = converted.getActor(); + ActivityObject actor = converted.getActor(); ActivityObject object = converted.getObject(); if ("TWITTER".equals(mediaType)) { actor.setId(getPersonId(lowerMediaType, beat.getHost())); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/pom.xml b/streams-contrib/streams-provider-twitter/pom.xml index e16cee2..f97a984 100644 --- a/streams-contrib/streams-provider-twitter/pom.xml +++ b/streams-contrib/streams-provider-twitter/pom.xml @@ -53,10 +53,6 @@ <artifactId>jackson-datatype-joda</artifactId> </dependency> <dependency> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-core</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -139,6 +135,25 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> + <configuration> + <sourcePaths> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> + </sourcePaths> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> + <targetPackage>org.apache.streams.twitter.pojo</targetPackage> + </configuration> + <executions> + <execution> + <goals> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -150,35 +165,13 @@ </goals> <configuration> <sources> - <source>target/generated-sources/jsonschema2pojo</source> + <source>target/generated-sources/pojo</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> - <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> - <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> - </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> - <targetPackage>org.apache.streams.twitter.pojo</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>com.googlecode.maven-download-plugin</groupId> <artifactId>download-maven-plugin</artifactId> <version>1.2.1</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java index b3647fa..bb31fd6 100644 --- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java +++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java @@ -25,7 +25,6 @@ import org.apache.streams.data.ActivityConverter; import org.apache.streams.exceptions.ActivityConversionException; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.twitter.pojo.UserstreamEvent; import java.util.List; @@ -97,8 +96,8 @@ public class TwitterJsonUserstreameventActivityConverter implements ActivityConv return activity; } - public Actor buildActor(UserstreamEvent event) { - Actor actor = new Actor(); + public ActivityObject buildActor(UserstreamEvent event) { + ActivityObject actor = new ActivityObject(); //actor.setId(formatId(delete.getDelete().getStatus().getUserIdStr())); return actor; } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java index 08873c9..4015514 100644 --- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java +++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java @@ -30,7 +30,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Image; import org.apache.streams.pojo.json.Provider; import org.apache.streams.twitter.Url; @@ -127,8 +126,8 @@ public class TwitterActivityUtil { * @param delete the delete event * @return a valid Actor */ - public static Actor buildActor(Delete delete) { - Actor actor = new Actor(); + public static ActivityObject buildActor(Delete delete) { + ActivityObject actor = new ActivityObject(); actor.setId(formatId(delete.getDelete().getStatus().getUserIdStr())); actor.setObjectType("page"); return actor; @@ -184,24 +183,24 @@ public class TwitterActivityUtil { } /** - * Builds the activity {@link org.apache.streams.pojo.json.Actor} object from the tweet + * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the tweet * @param tweet the object to use as the source * @return a valid Actor populated from the Tweet */ - public static Actor buildActor(Tweet tweet) { - Actor actor = new Actor(); + public static ActivityObject buildActor(Tweet tweet) { + ActivityObject actor = new ActivityObject(); User user = tweet.getUser(); return buildActor(user); } /** - * Builds the activity {@link org.apache.streams.pojo.json.Actor} object from the User + * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the User * @param user the object to use as the source * @return a valid Actor populated from the Tweet */ - public static Actor buildActor(User user) { - Actor actor = new Actor(); + public static ActivityObject buildActor(User user) { + ActivityObject actor = new ActivityObject(); actor.setId(formatId( Optional.fromNullable( user.getIdStr()) http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java index a455754..c110670 100644 --- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java +++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java @@ -20,17 +20,23 @@ package org.apache.streams.twitter.test.utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; +import org.apache.streams.converter.ActivityObjectConverterProcessorConfiguration; import org.apache.streams.converter.ActivityObjectConverterUtil; +import org.apache.streams.data.DocumentClassifier; import org.apache.streams.data.util.ActivityUtil; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.ActivityObject; import org.apache.streams.twitter.converter.TwitterDateTimeFormat; +import org.apache.streams.twitter.converter.TwitterDocumentClassifier; +import org.apache.streams.twitter.converter.TwitterJsonUserActivityObjectConverter; import org.apache.streams.twitter.pojo.User; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; + /** * Tests {org.apache.streams.twitter.converter.*} */ @@ -40,7 +46,12 @@ public class TwitterActivityObjectsConvertersTest { private ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT)); - private ActivityObjectConverterUtil activityObjectConverterUtil = ActivityObjectConverterUtil.getInstance(); + private ActivityObjectConverterProcessorConfiguration activityObjectConverterProcessorConfiguration = + new ActivityObjectConverterProcessorConfiguration() + .withClassifiers(Lists.newArrayList(new TwitterDocumentClassifier())) + .withConverters(Lists.newArrayList(new TwitterJsonUserActivityObjectConverter())); + + private ActivityObjectConverterUtil activityObjectConverterUtil = ActivityObjectConverterUtil.getInstance(activityObjectConverterProcessorConfiguration); private String userJson = "{\"id\":1663018644,\"id_str\":\"1663018644\",\"name\":\"M.R. Clark\",\"screen_name\":\"cantennisfan\",\"location\":\"\",\"url\":null,\"description\":null,\"protected\":false,\"verified\":false,\"followers_count\":0,\"friends_count\":5,\"listed_count\":0,\"favourites_count\":2,\"statuses_count\":72,\"created_at\":\"Sun Aug 11 17:23:47 +0000 2013\",\"utc_offset\":-18000,\"time_zone\":\"Eastern Time (US & Canada)\",\"geo_enabled\":false,\"lang\":\"en\",\"contributors_enabled\":false,\"is_translator\":false,\"profile_background_color\":\"C0DEED\",\"profile_background_image_url\":\"http://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_image_url_https\":\"https://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_tile\":false,\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"profile_im age_url\":\"http://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"profile_image_url_https\":\"https://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"default_profile\":true,\"default_profile_image\":true,\"following\":null,\"follow_request_sent\":null,\"notifications\":null,\"status\":{\"created_at\":\"Thu Jan 01 14:11:48 +0000 2015\",\"id\":550655634706669568,\"id_str\":\"550655634706669568\",\"text\":\"CBC Media Centre - CBC - Air Farce New Year's Eve 2014/2015: http://t.co/lMlL9VbC5e\",\"source\":\";<a href=\\\"https://dev.twitter.com/docs/tfw\\\"; rel=\\\"nofollow\\\">Twitter for Websites</a>\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweet_count\":0,\"favorite_count\":0,\"entities\":{\"hashtags\":[],\"trends\": [],\"urls\":[{\"url\":\"http://t.co/lMlL9VbC5e\",\"expanded_url\":\"http://www.cbc.ca/mediacentre/air-farce-new-years-eve-20142015.html#.VKVVarDhVxR.twitter\",\"display_url\":\"cbc.ca/mediacentre/aiâ¦\",\"indices\":[61,83]}],\"user_mentions\":[],\"symbols\":[]},\"favorited\":false,\"retweeted\":false,\"possibly_sensitive\":false,\"filter_level\":\"medium\",\"lang\":\"en\",\"timestamp_ms\":\"1420121508658\"}}\n";; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-youtube/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-youtube/pom.xml b/streams-contrib/streams-provider-youtube/pom.xml index 92ab036..2e8db41 100644 --- a/streams-contrib/streams-provider-youtube/pom.xml +++ b/streams-contrib/streams-provider-youtube/pom.xml @@ -139,33 +139,48 @@ </testResources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> <sourcePaths> - <sourcePath>${project.basedir}/src/main/jsonschema/com/youtube/YoutubeConfiguration.json</sourcePath> + <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> <targetPackage>org.apache.streams.youtube.pojo</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> </configuration> <executions> <execution> <goals> - <goal>generate</goal> + <goal>generate-sources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> </goals> + <configuration> + <sources> + <source>target/generated-sources/pojo</source> + </sources> + </configuration> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <configuration> <skipTests>${skipITs}</skipTests> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java index 482ec04..ab2f55c 100644 --- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java +++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java @@ -31,7 +31,6 @@ import org.apache.streams.exceptions.ActivitySerializerException; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Image; import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; @@ -95,8 +94,8 @@ public class YoutubeActivityUtil { } } - public static Actor createActorForChannel(Channel channel) { - Actor actor = new Actor(); + public static ActivityObject createActorForChannel(Channel channel) { + ActivityObject actor = new ActivityObject(); actor.setId("id:youtube:"+channel.getId()); actor.setSummary(channel.getSnippet().getDescription()); actor.setDisplayName(channel.getSnippet().getTitle()); @@ -156,13 +155,13 @@ public class YoutubeActivityUtil { } /** - * Build an {@link org.apache.streams.pojo.json.Actor} object given the video object + * Build an {@link org.apache.streams.pojo.json.ActivityObject} actor given the video object * @param video * @param id * @return Actor object */ - private static Actor buildActor(Video video, String id) { - Actor actor = new Actor(); + private static ActivityObject buildActor(Video video, String id) { + ActivityObject actor = new ActivityObject(); actor.setId("id:youtube:" + id); actor.setDisplayName(video.getSnippet().getChannelTitle()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java index 9b93e59..c162f41 100644 --- a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java +++ b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java @@ -25,7 +25,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.ActivityObject; -import org.apache.streams.pojo.json.Actor; import org.apache.streams.pojo.json.Provider; import org.joda.time.DateTime; import org.junit.Before; @@ -76,7 +75,7 @@ public class YoutubeVideoSerDeTest { assertEquals(provider.getId(), "id:providers:youtube"); assertEquals(provider.getDisplayName(), "YouTube"); - Actor actor = activity.getActor(); + ActivityObject actor = activity.getActor(); assert (actor.getId().contains("id:youtube:")); assertNotNull(actor.getDisplayName()); assertNotNull(actor.getSummary()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/streams-monitoring/pom.xml b/streams-monitoring/pom.xml index 1955c11..9cd97bd 100644 --- a/streams-monitoring/pom.xml +++ b/streams-monitoring/pom.xml @@ -93,36 +93,56 @@ </testResources> <plugins> <plugin> - <groupId>org.jsonschema2pojo</groupId> - <artifactId>jsonschema2pojo-maven-plugin</artifactId> + <groupId>org.apache.streams.plugins</groupId> + <artifactId>streams-plugin-pojo</artifactId> + <version>${project.version}</version> <configuration> - <addCompileSourceRoot>true</addCompileSourceRoot> - <generateBuilders>true</generateBuilders> <sourcePaths> <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath> </sourcePaths> - <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory> + <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory> <targetPackage>org.apache.streams.pojo.json</targetPackage> - <useLongIntegers>true</useLongIntegers> - <useJodaDates>true</useJodaDates> </configuration> <executions> <execution> <goals> - <goal>generate</goal> + <goal>generate-sources</goal> </goals> </execution> </executions> </plugin> <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/MemoryUsageObjects.json</exclude> - </excludes> - </configuration> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>target/generated-sources/pojo</source> + </sources> + </configuration> + </execution> + </executions> </plugin> </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/MemoryUsageObjects.json</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> + </project> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java ---------------------------------------------------------------------- diff --git a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java b/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java index fc0d6ea..1c68239 100644 --- a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java +++ b/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java @@ -20,7 +20,7 @@ package org.apache.streams.jackson; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.streams.pojo.json.MemoryUsageBroadcast; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/pom.xml b/streams-plugins/pom.xml index 75825e0..166636a 100644 --- a/streams-plugins/pom.xml +++ b/streams-plugins/pom.xml @@ -27,6 +27,7 @@ <relativePath>../pom.xml</relativePath> </parent> + <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugins</artifactId> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-cassandra/pom.xml b/streams-plugins/streams-plugin-cassandra/pom.xml index f13df92..9d94ec5 100644 --- a/streams-plugins/streams-plugin-cassandra/pom.xml +++ b/streams-plugins/streams-plugin-cassandra/pom.xml @@ -26,7 +26,7 @@ <packaging>maven-plugin</packaging> <parent> - <groupId>org.apache.streams</groupId> + <groupId>org.apache.streams.plugins</groupId> <artifactId>streams-plugins</artifactId> <version>0.5-incubating-SNAPSHOT</version> <relativePath>..</relativePath> @@ -167,9 +167,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>joda-time</groupId>
![http://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_image_url_https\":\"https://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_tile\":false,\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"profile_im](https://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_image_url_https\":\"https://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_tile\":false,\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"profile_im){kind=link}
![http://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"profile_image_url_https\":\"https://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"default_profile\":true,\"default_profile_image\":true,\"following\":null,\"follow_request_sent\":null,\"notifications\":null,\"status\":{\"created_at\":\"Thu](https://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"profile_image_url_https\":\"https://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"default_profile\":true,\"default_profile_image\":true,\"following\":null,\"follow_request_sent\":null,\"notifications\":null,\"status\":{\"created_at\":\"Thu){kind=link}