Merge pull request #75 from ArcBees/codestyle

Update checkstyle and remove build tools
ArcBees · Jan 12, 2017 · 9154db5 · 9154db5
2 parents e3ad06c + 907ecbc
commit 9154db5
Show file tree

Hide file tree

Showing 61 changed files with 316 additions and 550 deletions.
diff --git a/jukito-build-tools/pom.xml b/jukito-build-tools/pom.xml
diff --git a/jukito-build-tools/src/main/resources/org/jukito/checkstyle.xml b/jukito-build-tools/src/main/resources/org/jukito/checkstyle.xml
diff --git a/jukito-build-tools/src/main/resources/org/jukito/suppressions.xml b/jukito-build-tools/src/main/resources/org/jukito/suppressions.xml
diff --git a/jukito-samples/pom.xml b/jukito-samples/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -11,12 +12,16 @@
     <artifactId>jukito-samples</artifactId>
     <name>Jukito Samples</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
-        <dependency>
-            <groupId>org.jukito</groupId>
-            <artifactId>jukito-build-tools</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

diff --git a/jukito-samples/src/main/java/org/jukito/samples/modules/PetrolLineModule.java b/jukito-samples/src/main/java/org/jukito/samples/modules/PetrolLineModule.java
@@ -16,11 +16,11 @@
 
 package org.jukito.samples.modules;
 
-import com.google.inject.AbstractModule;
-
 import org.jukito.samples.Engine;
 import org.jukito.samples.PetrolEngine;
 
+import com.google.inject.AbstractModule;
+
 public class PetrolLineModule extends AbstractModule {
     @Override
     protected void configure() {

diff --git a/jukito-samples/src/test/java/org/jukito/samples/FordMustangTest.java b/jukito-samples/src/test/java/org/jukito/samples/FordMustangTest.java
@@ -24,9 +24,8 @@
 
 import static org.mockito.Mockito.verify;
 
-
 /**
- * A simple test with one mock (engine) and one real object (FordMustang)
+ * A simple test with one mock (engine) and one real object (FordMustang).
  */
 @RunWith(JukitoRunner.class)
 public class FordMustangTest {

diff --git a/jukito-samples/src/test/java/org/jukito/samples/FordMustangTest2.java b/jukito-samples/src/test/java/org/jukito/samples/FordMustangTest2.java
@@ -26,7 +26,7 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * A simple test with one real DOC (binding in test)
+ * A simple test with one real DOC (binding in test).
  */
 @RunWith(JukitoRunner.class)
 public class FordMustangTest2 {

diff --git a/jukito-samples/src/test/java/org/jukito/samples/FordMustangTest3.java b/jukito-samples/src/test/java/org/jukito/samples/FordMustangTest3.java
@@ -16,14 +16,14 @@
 
 package org.jukito.samples;
 
+import javax.inject.Inject;
+
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.samples.modules.DieselLineModule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.inject.Inject;
-
 import static org.mockito.Mockito.verify;
 
 /**

diff --git a/jukito/pom.xml b/jukito/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>

diff --git a/jukito/src/main/java/org/jukito/All.java b/jukito/src/main/java/org/jukito/All.java
@@ -16,13 +16,13 @@
 
 package org.jukito;
 
-import com.google.inject.BindingAnnotation;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.google.inject.BindingAnnotation;
+
 /**
  * This annotation can be used on one or more parameter of a test function.
  * The test function will be executed multiple times, one for each value bound

diff --git a/jukito/src/main/java/org/jukito/BindingsCollector.java b/jukito/src/main/java/org/jukito/BindingsCollector.java
@@ -16,6 +16,11 @@
 
 package org.jukito;
 
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
 import com.google.inject.AbstractModule;
 import com.google.inject.Binding;
 import com.google.inject.Key;
@@ -39,11 +44,6 @@
 import com.google.inject.spi.StaticInjectionRequest;
 import com.google.inject.spi.UntargettedBinding;
 
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 /**
  * Collects all the bindings from a Guice module, so that Jukito can identify missing
  * bindings and bind them to mock or instances.

diff --git a/jukito/src/main/java/org/jukito/Description.java b/jukito/src/main/java/org/jukito/Description.java
@@ -22,7 +22,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation can be used for better test description (instead of camel case test method)
+ * Annotation can be used for better test description (instead of camel case test method).
  */
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)