You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sm...@apache.org on 2016/10/23 15:54:24 UTC
incubator-streams git commit: Streams-435: remove
incubator-streams-master-pom.xml, other lint cleanup,
this closes apache/incubator-streams#316
Repository: incubator-streams
Updated Branches:
refs/heads/master 96459caae -> 1543dc8f6
Streams-435: remove incubator-streams-master-pom.xml, other lint cleanup, this closes apache/incubator-streams#316
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/1543dc8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/1543dc8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/1543dc8f
Branch: refs/heads/master
Commit: 1543dc8f64fd8463e1d9b810e0e3b1f3ec372067
Parents: 96459ca
Author: smarthi <sm...@apache.org>
Authored: Sun Oct 23 11:54:11 2016 -0400
Committer: smarthi <sm...@apache.org>
Committed: Sun Oct 23 11:54:11 2016 -0400
----------------------------------------------------------------------
incubator-streams-master-pom.xml | 716 -------------------
.../java/SimpleHTTPPostPersistWriterTest.java | 27 +-
.../config/test/ComponentConfiguratorTest.java | 5 +-
.../serializer/util/GooglePlusActivityUtil.java | 3 +-
.../processor/TwitterProfileProcessor.java | 18 +-
.../processor/TwitterUrlApiProcessor.java | 4 +-
.../provider/TwitterStreamProcessor.java | 14 +-
.../twitter/provider/TwitterStreamProvider.java | 11 +-
8 files changed, 39 insertions(+), 759 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/incubator-streams-master-pom.xml
----------------------------------------------------------------------
diff --git a/incubator-streams-master-pom.xml b/incubator-streams-master-pom.xml
deleted file mode 100644
index 3a9dae1..0000000
--- a/incubator-streams-master-pom.xml
+++ /dev/null
@@ -1,716 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>16</version>
- </parent>
-
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-master</artifactId>
- <name>Apache Streams :: streams-master</name>
- <description>Apache Streams Master Pom</description>
- <packaging>pom</packaging>
- <version>0.4-incubating-SNAPSHOT</version>
-
- <inceptionYear>2012</inceptionYear>
-
- <url>http://streams.incubator.apache.org/${project.version}/${project.artifactId}</url>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:git:git@github.com:apache/incubator-streams-master.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-streams-master.git</developerConnection>
- <url>scm:git:git@github.com:apache/incubator-streams-master.git</url>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/STREAMS</url>
- </issueManagement>
-
- <ciManagement>
- <system>jenkins</system>
- <url>http://builds.apache.org/job/Streams%20Master/</url>
- </ciManagement>
-
- <prerequisites>
- <maven>3.3.9</maven>
- </prerequisites>
-
- <mailingLists>
- <mailingList>
- <name>Dev Mailing List</name>
- <post>dev@streams.incubator.apache.org</post>
- <subscribe>dev-subscribe@streams.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@streams.incubator.apache.org</unsubscribe>
- </mailingList>
- <mailingList>
- <name>User Mailing List</name>
- <post>user@streams.incubator.apache.org</post>
- <subscribe>user-subscribe@streams.incubator.apache.org</subscribe>
- <unsubscribe>user-unsubscribe@streams.incubator.apache.org</unsubscribe>
- </mailingList>
- </mailingLists>
-
- <repositories>
- <repository>
- <id>apache-repo</id>
- <name>Apache Repository</name>
- <url>https://repository.apache.org/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>streams.releases</id>
- <name>Streams Releases</name>
- <url>${release.repository.url}</url>
- </repository>
- <!-- Snapshots (not-releases) are published to this repository -->
- <snapshotRepository>
- <id>streams.snapshots</id>
- <name>Streams Snapshots</name>
- <url>${snapshot.repository.url}</url>
- </snapshotRepository>
- <site>
- <id>site.streams.project</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-master</url>
- </site>
- </distributionManagement>
-
- <properties>
-
- <!-- Build Properties -->
- <java.version>1.8</java.version>
- <maven.version>3.3.9</maven.version>
- <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <streams.version>0.4-incubating-SNAPSHOT</streams.version>
-
- <!-- Release Properties -->
- <snapshot.repository.url>
- https://repository.apache.org/content/repositories/snapshots
- </snapshot.repository.url>
- <release.repository.url>
- https://repository.apache.org/service/local/staging/deploy/maven2
- </release.repository.url>
-
- <!-- Plugin and Plugin Dependency Versions -->
- <build-helper.plugin.version>1.8</build-helper.plugin.version>
- <compiler.plugin.version>3.0</compiler.plugin.version>
- <clean.plugin.version>2.6</clean.plugin.version>
- <depgraph.plugin.version>1.0.2</depgraph.plugin.version>
- <docker.plugin.version>0.11.5-M1</docker.plugin.version>
- <enforcer.plugin.version>1.4.1</enforcer.plugin.version>
- <failsafe.plugin.version>2.17</failsafe.plugin.version>
- <jar.plugin.version>2.6</jar.plugin.version>
- <javadoc.plugin.version>2.10.2</javadoc.plugin.version>
- <remote-resources.plugin.version>1.4</remote-resources.plugin.version>
- <resources.plugin.version>2.7</resources.plugin.version>
- <scm.plugin.version>1.9.4</scm.plugin.version>
- <shade.plugin.version>2.3</shade.plugin.version>
- <site.plugin.version>3.4</site.plugin.version>
- <source.plugin.version>2.4</source.plugin.version>
- <surefire.plugin.version>2.17</surefire.plugin.version>
- <wagon.plugin.version>2.8</wagon.plugin.version>
- <war.plugin.version>2.5</war.plugin.version>
-
- <!-- Library Dependency Versions -->
- <jackson.version>2.3.2</jackson.version>
- <jackson-xml-databind.version>0.6.2</jackson-xml-databind.version>
- <aalto.version>0.9.9</aalto.version>
- <joda-time.version>2.2</joda-time.version>
- <rave.version>0.22</rave.version>
- <datastax.version>1.0.3</datastax.version>
- <jsonschema2pojo.version>0.4.6</jsonschema2pojo.version>
- <jaxb2.version>0.8.3</jaxb2.version>
- <jaxb2-basics.version>0.8.4</jaxb2-basics.version>
- <jaxbutil.version>1.2.6</jaxbutil.version>
- <junit.version>4.12</junit.version>
- <slf4j.version>1.7.21</slf4j.version>
- <log4j.version>1.2.16</log4j.version>
- <logback.version>1.1.1</logback.version>
- <hamcrest.version>1.3</hamcrest.version>
- <commons-io.version>2.4</commons-io.version>
- <commons-codec.version>1.10</commons-codec.version>
- <commons-validator.version>1.4.0</commons-validator.version>
- <commons-lang3.version>3.1</commons-lang3.version>
- <typesafe.config.version>1.2.0</typesafe.config.version>
- <reflections.version>0.9.9</reflections.version>
- <orgjson.version>20140107</orgjson.version>
- <guava.version>19.0</guava.version>
- <scala.version>2.11.0</scala.version>
- <clojure.version>1.4.0</clojure.version>
- <zookeeper.version>3.4.5</zookeeper.version>
- <netty.version>3.8.0.Final</netty.version>
- <json-path.version>0.9.1</json-path.version>
- <build-helper.version>1.8</build-helper.version>
- <facebook4j.version>2.1.0</facebook4j.version>
- <mockito.version>1.9.5</mockito.version>
- <powermock.version>1.5.6</powermock.version>
- <httpcomponents.core.version>4.3.3</httpcomponents.core.version>
- <httpcomponents.client.version>4.3.5</httpcomponents.client.version>
-
- <!-- osgi configuration -->
- <org.osgi.service.http.port>8080</org.osgi.service.http.port>
- <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
-
- </properties>
-
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${clean.plugin.version}</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/site/resources</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>${remote-resources.plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <!-- Will generate META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE -->
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- <!-- Will generate META-INF/DISCLAIMER -->
- <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${resources.plugin.version}</version>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- <executions>
- <execution>
- <id>copy-resources</id>
- <!-- validate is first to run-->
- <!-- copy these files to src/site/resources -->
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/src/site/resources</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/jsonschema</directory>
- </resource>
- <resource>
- <directory>src/main/xmlschema</directory>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <version>${jsonschema2pojo.version}</version>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <sourcePaths>
- <sourcePath>src/main/jsonschema</sourcePath>
- </sourcePaths>
- <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>${jaxb2.version}</version>
- <configuration>
- <schemaDirectory>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>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${enforcer.plugin.version}</version>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <message>Java 8 or higher is required to compile this module</message>
- <version>[${java.version},)</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <message>Maven 3.3.9 or higher is required to compile this module</message>
- <version>[${maven.version},)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-banned-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
- <exclude>org.slf4j:slf4j-jcl</exclude>
- <exclude>org.slf4j:slf4j-jdk14</exclude>
- <exclude>org.log4j:log4j</exclude>
- <exclude>commons-logging:commons-logging</exclude>
- </excludes>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- <execution>
- <id>enforce-no-snapshots</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireReleaseDeps>
- <message>No Snapshots Allowed!</message>
- <!-- Don't fail for modules within this project's groupId or sub-groupIds -->
- <excludes>
- <exclude>org.apache.streams:*</exclude>
- <exclude>org.apache.streams.*:*</exclude>
- </excludes>
- <!-- Don't fail for parents being snapshots as the only parent modules are within this project -->
- <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
- </requireReleaseDeps>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.plugin.version}</version>
- <executions>
- <execution>
- <id>integration-tests</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${jar.plugin.version}</version>
- <configuration>
- <skipIfEmpty>true</skipIfEmpty>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${site.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-scm</artifactId>
- <version>${wagon.plugin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-api</artifactId>
- <version>${scm.plugin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svn-commons</artifactId>
- <version>${scm.plugin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-svnexe</artifactId>
- <version>${scm.plugin.version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <!-- Apache POM doesn't define default war-plugin version, so do it here -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>${war.plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.github.ferstl</groupId>
- <artifactId>depgraph-maven-plugin</artifactId>
- <version>1.0.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <!-- add apache-incubator-disclaimer-resource-bundle to be removed again when graduating from Incubator -->
- <resourceBundles combine.children="append">
- <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- <properties>
- <projectName>${notice.file.project.name}</projectName>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <!-- copy legal files added/appended by maven-remote-resources-plugin
- from /WEB-INF/classes/META-INF/ to root /META-INF folder as expected
- for war artifacts,
- -->
- <webResources>
- <resource>
- <directory>${project.build.directory}/classes</directory>
- <includes>
- <include>META-INF/LICENSE</include>
- <include>META-INF/NOTICE</include>
- <include>META-INF/DEPENDENCIES</include>
- <include>META-INF/DISCLAIMER</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </webResources>
- <!-- exclude legal files added/appended by maven-remote-resources-plugin
- under /WEB-INF/classes/META-INF/ as for war artifacts these should (see above)
- be provided under /META-INF/ instead.
- -->
- <packagingExcludes>
- WEB-INF/classes/META-INF/LICENSE,
- WEB-INF/classes/META-INF/LICENSE.txt,
- WEB-INF/classes/META-INF/NOTICE,
- WEB-INF/classes/META-INF/NOTICE.txt,
- WEB-INF/classes/META-INF/DISCLAIMER,
- WEB-INF/classes/META-INF/DEPENDENCIES
- </packagingExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.plugin.version}</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- <aggregate>true</aggregate>
- <failOnError>false</failOnError>
- <minmemory>128m</minmemory>
- <maxmemory>1g</maxmemory>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <properties>
- <skipTests>false</skipTests>
- <maven.test.skip>false</maven.test.skip>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${source.plugin.version}</version>
- <configuration>
- <skipSource>true</skipSource>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <skip>false</skip>
- </configuration>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.apache.resources</groupId>
- <artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>1.0.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>source-release</descriptorRef>
- </descriptorRefs>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>apache-release</releaseProfiles>
- <preparationGoals>clean install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>.travis.yml</exclude>
- <exclude>.git</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.git/**</exclude>
- <exclude>.idea/**</exclude>
- <exclude>**/DEPENDENCIES</exclude>
- <exclude>**/LICENSE</exclude>
- <exclude>**/MANIFEST.MF</exclude>
- <exclude>**/NOTICE</exclude>
- <exclude>**/README.*</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/overlays/**</exclude>
- <exclude>**/src/test/resources/**/*.csv</exclude>
- <exclude>**/src/test/resources/**/*.tsv</exclude>
- <exclude>**/src/test/resources/**/*.txt</exclude>
- <exclude>**/src/site/resources/**</exclude>
- <exclude>**/.gitignore</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ini</exclude>
- <exclude>**/*.jar</exclude>
- <exclude>dependency-reduced-pom.xml</exclude>
- <exclude>rat.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- <skipExec>true</skipExec>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.ferstl</groupId>
- <artifactId>depgraph-maven-plugin</artifactId>
- <version>${depgraph.plugin.version}</version>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <configuration>
- <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <reportSets>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>javadoc-no-fork</report>
- <report>test-javadoc-no-fork</report>
- <report>aggregate</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>html</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>${site.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>com.github.ferstl</groupId>
- <artifactId>depgraph-maven-plugin</artifactId>
- <version>${depgraph.plugin.version}</version>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java b/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
index 48d52fa..55e338d 100644
--- a/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
+++ b/streams-components/streams-http/src/test/java/SimpleHTTPPostPersistWriterTest.java
@@ -41,7 +41,7 @@ import static org.mockito.Matchers.any;
/**
* Test for
- * @see {@link org.apache.streams.components.http.persist.SimpleHTTPPostPersistWriter}
+ * @see org.apache.streams.components.http.persist.SimpleHTTPPostPersistWriter
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({HttpClients.class, CloseableHttpResponse.class, CloseableHttpResponse.class})
@@ -65,11 +65,6 @@ public class SimpleHTTPPostPersistWriterTest {
private static final String PROTOCOL = "http";
/**
- * HttpClients mock.
- */
- private HttpClients httpClients;
-
- /**
* CloseableHttpClient mock.
*/
private CloseableHttpClient client;
@@ -89,15 +84,12 @@ public class SimpleHTTPPostPersistWriterTest {
*/
private ByteArrayInputStream input;
- /**
- * Instance under tests.
- */
- private SimpleHTTPPostPersistWriter writer;
-
@Before
public void setUp() throws Exception
{
- this.httpClients = PowerMockito.mock(HttpClients.class);
+ /*
+ HttpClients mock.
+ */
this.client = PowerMockito.mock(CloseableHttpClient.class);
PowerMockito.mockStatic(HttpClients.class);
@@ -119,16 +111,19 @@ public class SimpleHTTPPostPersistWriterTest {
HttpPersistWriterConfiguration configuration = new HttpPersistWriterConfiguration();
configuration.setProtocol(PROTOCOL);
configuration.setHostname(HOSTNAME);
- configuration.setPort(new Long(PORT));
+ configuration.setPort((long) PORT);
configuration.setResourcePath("/");
- this.writer = new SimpleHTTPPostPersistWriter(configuration);
+ /*
+ Instance under tests.
+ */
+ SimpleHTTPPostPersistWriter writer = new SimpleHTTPPostPersistWriter(configuration);
- this.writer.prepare(null);
+ writer.prepare(null);
StreamsDatum testDatum = new StreamsDatum(mapper.readValue("{\"message\":\"ping\"}", ObjectNode.class));
- this.writer.write(testDatum);
+ writer.write(testDatum);
Mockito.verify(this.client).execute(any(HttpUriRequest.class));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java b/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
index 4acad9d..eddfb53 100644
--- a/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
+++ b/streams-config/src/test/java/org/apache/streams/config/test/ComponentConfiguratorTest.java
@@ -22,20 +22,19 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigRenderOptions;
-import junit.framework.Assert;
import org.apache.streams.config.ComponentConfiguration;
import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.config.StreamsConfigurator;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
/**
* Test for
-* @see {@link org.apache.streams.config.ComponentConfigurator}
+* @see org.apache.streams.config.ComponentConfigurator
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest(StreamsConfigurator.class)
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/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 5da7037..86f019e 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
@@ -19,7 +19,6 @@
package com.google.gplus.serializer.util;
-import com.google.api.client.util.Maps;
import com.google.api.services.plus.model.Comment;
import com.google.api.services.plus.model.Person;
import com.google.common.base.Joiner;
@@ -126,7 +125,7 @@ public class GooglePlusActivityUtil {
obj.setContent(comment.getObject().getContent());
obj.setObjectType(comment.getObject().getObjectType());
- Map<String, Object> extensions = Maps.newHashMap();
+ Map<String, Object> extensions = new HashMap<>();
extensions.put("googlePlus", comment);
obj.setAdditionalProperty("extensions", extensions);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterProfileProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterProfileProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterProfileProcessor.java
index 8b72627..d49a54f 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterProfileProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterProfileProcessor.java
@@ -19,18 +19,18 @@
package org.apache.streams.twitter.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
+import org.apache.streams.jackson.StreamsJacksonMapper;
+import org.apache.streams.twitter.converter.TwitterDateTimeFormat;
import org.apache.streams.twitter.pojo.Retweet;
import org.apache.streams.twitter.pojo.Tweet;
import org.apache.streams.twitter.pojo.User;
import org.apache.streams.twitter.provider.TwitterEventClassifier;
-import org.apache.streams.twitter.converter.StreamsTwitterMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
import java.util.Random;
@@ -41,12 +41,12 @@ public class TwitterProfileProcessor implements StreamsProcessor, Runnable {
private final static Logger LOGGER = LoggerFactory.getLogger(TwitterProfileProcessor.class);
- private ObjectMapper mapper = new StreamsTwitterMapper();
+ private ObjectMapper mapper = StreamsJacksonMapper.getInstance(TwitterDateTimeFormat.TWITTER_FORMAT);
private Queue<StreamsDatum> inQueue;
private Queue<StreamsDatum> outQueue;
- public final static String TERMINATE = new String("TERMINATE");
+ private final static String TERMINATE = "TERMINATE";
@Override
public void run() {
@@ -86,7 +86,7 @@ public class TwitterProfileProcessor implements StreamsProcessor, Runnable {
@Override
public List<StreamsDatum> process(StreamsDatum entry) {
- List<StreamsDatum> result = Lists.newArrayList();
+ List<StreamsDatum> result = new ArrayList<>();
String item;
try {
// first check for valid json
@@ -94,7 +94,7 @@ public class TwitterProfileProcessor implements StreamsProcessor, Runnable {
if( entry.getDocument() instanceof String) {
item = (String) entry.getDocument();
} else {
- item = mapper.writeValueAsString((ObjectNode)entry.getDocument());
+ item = mapper.writeValueAsString(entry.getDocument());
}
Class inClass = TwitterEventClassifier.detectClass(item);
@@ -117,14 +117,14 @@ public class TwitterProfileProcessor implements StreamsProcessor, Runnable {
user = mapper.readValue(item, User.class);
result.add(createStreamsDatum(user));
} else {
- return Lists.newArrayList();
+ return new ArrayList<>();
}
return result;
} catch (Exception e) {
e.printStackTrace();
LOGGER.warn("Error processing " + entry.toString());
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterUrlApiProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterUrlApiProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterUrlApiProcessor.java
index 61229a2..30db471 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterUrlApiProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/processor/TwitterUrlApiProcessor.java
@@ -20,13 +20,13 @@ package org.apache.streams.twitter.processor;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.apache.streams.components.http.HttpProcessorConfiguration;
import org.apache.streams.components.http.processor.SimpleHTTPGetProcessor;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.core.StreamsProcessor;
import org.apache.streams.pojo.json.Activity;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,7 +71,7 @@ public class TwitterUrlApiProcessor extends SimpleHTTPGetProcessor implements St
@Override
protected Map<String, String> prepareParams(StreamsDatum entry) {
- Map<String, String> params = Maps.newHashMap();
+ Map<String, String> params = new HashMap<>();
params.put("url", mapper.convertValue(entry.getDocument(), Activity.class).getLinks().get(0));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
index a64e597..96df67b 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProcessor.java
@@ -21,17 +21,19 @@ package org.apache.streams.twitter.provider;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
import com.twitter.hbc.core.processor.StringDelimitedProcessor;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
/**
*
*/
@@ -91,7 +93,7 @@ public class TwitterStreamProcessor extends StringDelimitedProcessor {
StreamsDatum rawDatum = new StreamsDatum(document);
return Lists.newArrayList(rawDatum);
}
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/1543dc8f/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
index b426966..3856935 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterStreamProvider.java
@@ -65,6 +65,7 @@ import java.io.FileOutputStream;
import java.io.PrintStream;
import java.io.Serializable;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Queue;
@@ -105,7 +106,7 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
TwitterStreamConfiguration config = new ComponentConfigurator<>(TwitterStreamConfiguration.class).detectConfiguration(typesafe, "twitter");
TwitterStreamProvider provider = new TwitterStreamProvider(config);
- ObjectMapper mapper = new StreamsJacksonMapper(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT));
+ ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT));
PrintStream outStream = null;
try {
@@ -286,9 +287,9 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
return;
}
- LOGGER.debug("host={}\tendpoint={}\taut={}", new Object[] {hosebirdHosts,endpoint,auth});
+ LOGGER.debug("host={}\tendpoint={}\taut={}", hosebirdHosts, endpoint, auth);
- providerQueue = new LinkedBlockingQueue<Future<List<StreamsDatum>>>(MAX_BATCH);
+ providerQueue = new LinkedBlockingQueue<>(MAX_BATCH);
client = new ClientBuilder()
.name("apache/streams/streams-contrib/streams-provider-twitter")
@@ -342,10 +343,10 @@ public class TwitterStreamProvider implements StreamsProvider, Serializable, Dat
LOGGER.warn("Interrupted while waiting for future. Initiate shutdown.");
this.cleanUp();
Thread.currentThread().interrupt();
- return Lists.newArrayList();
+ return new ArrayList<>();
} catch (ExecutionException e) {
LOGGER.warn("Error getting tweet from future");
- return Lists.newArrayList();
+ return new ArrayList<>();
}
}
}