SpruceHillio · wienczny · Jul 31, 2014 · Jul 31, 2014 · Jul 31, 2014 · Aug 6, 2014
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ target
 .classpath
 .project
 *.iml
-.idea
+.idea
+atlassian-ide-plugin.xml
diff --git a/pom.xml b/pom.xml
@@ -41,15 +41,48 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.7</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${version.maven-compiler}</version>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
                     <version>${version.maven-source}</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -61,24 +94,51 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.3</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>mandrill.apikey</name>
+                            <value>${mandrill.apikey}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -110,59 +170,100 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.spockframework</groupId>
-            <artifactId>spock-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+        </dependency>
     </dependencies>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.maven-compiler>3.1</version.maven-compiler>
-        <version.maven-source>2.2.1</version.maven-source>
         <version.maven-javadoc>2.9.1</version.maven-javadoc>
         <version.jackson>2.0.2</version.jackson>
+        <version.maven-source>2.3</version.maven-source>
         <version.spock>0.6-groovy-1.8</version.spock>
         <version.httpclient>4.2.1</version.httpclient>
-        <version.slf4j>1.6.4</version.slf4j>
+        <version.jersey>2.11</version.jersey>
+        <version.slf4j>1.7.7</version.slf4j>
+        <version.junit>4.11</version.junit>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${version.jackson}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.spockframework</groupId>
-                <artifactId>spock-core</artifactId>
-                <version>${version.spock}</version>
-                <scope>test</scope>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>${version.jersey}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${version.httpclient}</version>
+                <groupId>org.glassfish.jersey.media</groupId>
+                <artifactId>jersey-media-json-jackson</artifactId>
+                <version>${version.jersey}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>${version.slf4j}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${version.junit}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
+    <reporting>
+        <plugins>
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.12</version>
+                <configuration>
+                    <configLocation>checkstyle.xml</configLocation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.5.3</version>
+            </plugin>
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+        </plugins>
+    </reporting>
+
 </project>
diff --git a/src/main/java/io/sprucehill/mandrill/data/error/Error.java b/src/main/java/io/sprucehill/mandrill/data/error/Error.java
@@ -68,35 +68,31 @@ protected static abstract class Init<T extends Init<T, U>, U extends Error> {
 
         protected U object;
 
-        protected Init(U object) {
+        protected Init(final U object) {
             this.object = object;
         }
 
-        protected abstract T self();
-
-
         protected void postInit() {
         }
 
-        protected void preBuild() {
-        }
-
-        public T withStatus(String status) {
+        public T withStatus(final String status) {
             object.status = status;
             return self();
         }
 
-        public T withCode(Integer code) {
+        protected abstract T self();
+
+        public T withCode(final Integer code) {
             object.code = code;
             return self();
         }
 
-        public T withName(String name) {
+        public T withName(final String name) {
             object.name = name;
             return self();
         }
 
-        public T withMessage(String message) {
+        public T withMessage(final String message) {
             object.message = message;
             return self();
         }
@@ -105,9 +101,12 @@ public U build() {
             preBuild();
             return object;
         }
+
+        protected void preBuild() {
+        }
     }
 
-    public static class Builder extends Init<Builder,Error> {
+    public static class Builder extends Init<Builder, Error> {
 
         public Builder() {
             super(new Error());

diff --git a/src/main/java/io/sprucehill/mandrill/data/error/MessageError.java b/src/main/java/io/sprucehill/mandrill/data/error/MessageError.java
@@ -25,7 +25,7 @@
  */
 public class MessageError extends Error {
 
-    protected static abstract class Init<T extends Init<T,U>, U extends MessageError> extends Error.Init<T,U> {
+    protected static abstract class Init<T extends Init<T, U>, U extends MessageError> extends Error.Init<T, U> {
 
         private static final Set<String> names;
 
@@ -37,7 +37,7 @@ protected static abstract class Init<T extends Init<T,U>, U extends MessageError
             names = Collections.unmodifiableSet(namesTmp);
         }
 
-        protected Init(U object) {
+        protected Init(final U object) {
             super(object);
         }
 
@@ -50,7 +50,7 @@ public T withName(String name) {
         }
     }
 
-    public static class Builder extends Init<Builder,MessageError> {
+    public static class Builder extends Init<Builder, MessageError> {
 
         public Builder() {
             super(new MessageError());

diff --git a/src/main/java/io/sprucehill/mandrill/data/error/PreBuildError.java b/src/main/java/io/sprucehill/mandrill/data/error/PreBuildError.java
@@ -24,28 +24,27 @@
  */
 public class PreBuildError extends Exception {
 
-    private Map<String,String> preBuildErrors;
+    private Map<String, String> preBuildErrors;
 
-    public PreBuildError(Map<String,String> preBuildErrors) {
+    public PreBuildError(final Map<String, String> preBuildErrors) {
         super(concatPreBuildErrors(preBuildErrors));
         this.preBuildErrors = Collections.unmodifiableMap(preBuildErrors);
     }
 
-    public Map<String,String> getPreBuildErrors() {
-        return preBuildErrors;
-    }
-
-    private static String concatPreBuildErrors(Map<String,String> preBuildErrors) {
+    private static String concatPreBuildErrors(final Map<String, String> preBuildErrors) {
         StringBuilder builder = null;
-        for (Map.Entry<String,String> preBuildError : preBuildErrors.entrySet()) {
+        for (final Map.Entry<String, String> preBuildError : preBuildErrors.entrySet()) {
             if (null == builder) {
                 builder = new StringBuilder();
-            }
-            else {
+            } else {
                 builder.append(", ");
             }
             builder.append(preBuildError.getKey());
         }
         return null == builder ? "" : builder.toString();
     }
+
+    public Map<String, String> getPreBuildErrors() {
+        return preBuildErrors;
+    }
 }