add versioneye & coveralls;

fix dependency problems of modules (examples still need work) Signed-off-by: Sebastian Hoß <mail@shoss.de>
sebhoss · Dec 9, 2014 · b142c7f · b142c7f
1 parent c91e644
commit b142c7f
Show file tree

Hide file tree

Showing 90 changed files with 1,343 additions and 84 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,7 @@
 language: java
 jdk:
-  - oraclejdk8
+- oraclejdk8
+env:
+  global:
+  - secure: Opjnt4LKgJcC+OqMV6s+aok6ocSS3iREtxTH67HdH+52v1CQxRiBmKx4omxoPwYS5pw2/z87yzYNz4bMMHehnU97aNpWGnXXeMYmbKah5pl5QHJ0nWDyvrluNIAsAkt5IyPUeIVfu+RcvZUNNkMPKFXg8pzD0bvUed05oCzVTCU=
+  - secure: hWHwRA7x5SiqWNh0BIUVMkMmTbWiEDqssI6075YPiAWEwwa46EZTk3+57JQ94nUKbMvKyXHMAviOTiW+TvOWRnfK3a+92ksufe/l+U0N+OT8/6x6KGL8q/y3ULsu8wrl7VigRT2lW46EiT6h+K7iR9dRNM7At6Dws/wMjzraRYk=
diff --git a/README.textile b/README.textile
@@ -1,4 +1,4 @@
-h1. annotated-contracts "!https://secure.travis-ci.org/sebhoss/annotated-contracts.png!":http://travis-ci.org/sebhoss/annotated-contracts "!https://www.ohloh.net/p/annotated-contracts/widgets/project_thin_badge.gif!":https://www.ohloh.net/p/annotated-contracts/
+h1. annotated-contracts "!https://www.ohloh.net/p/annotated-contracts/widgets/project_thin_badge.gif!":https://www.ohloh.net/p/annotated-contracts/ "!https://secure.travis-ci.org/sebhoss/annotated-contracts.png!":http://travis-ci.org/sebhoss/annotated-contracts !https://coveralls.io/repos/sebhoss/annotated-contracts/badge.png(Coverage Status)!:https://coveralls.io/r/sebhoss/annotated-contracts
 
 p. "Design by Contract":http://en.wikipedia.org/wiki/Design_by_contract based on annotations. It allows easy usage of contracts without any need for extra JVM parameters, JVM agents, special classloaders or compilers. Instead it leverages "dependency injection":http://en.wikipedia.org/wiki/Dependency_injection to capture method calls which are annotation with a contract. The project is highly flexible and can be extended to support new contract annotations and other contract clause definitions (see below).
 

diff --git a/...cript-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/...cript-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java
@@ -12,16 +12,18 @@
 import javax.enterprise.inject.Produces;
 
 import com.github.sebhoss.nullanalysis.Nullsafe;
+import com.github.sebhoss.warnings.CompilerWarnings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Service;
 
 // TODO: We only need this for pax-exam
 class PaxExamConfiguration {
 
-    @Produces
-    @Default
-    Set<Service> services() {
-        return Nullsafe.nullsafe(ImmutableSet.<Service> of());
-    }
+	@Produces
+	@Default
+	@SuppressWarnings(CompilerWarnings.STATIC_METHOD)
+	Set<Service> services() {
+		return Nullsafe.nullsafe(ImmutableSet.<Service> of());
+	}
 
 }
diff --git a/.../src/test/java/com/github/sebhoss/contract/example/CdiJavaScriptInsuranceCompanyTest.java b/.../src/test/java/com/github/sebhoss/contract/example/CdiJavaScriptInsuranceCompanyTest.java
@@ -29,6 +29,6 @@ public class CdiJavaScriptInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 }
diff --git a/...-jexl-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/...-jexl-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java
@@ -12,6 +12,7 @@
 import javax.enterprise.inject.Produces;
 
 import com.github.sebhoss.nullanalysis.Nullsafe;
+import com.github.sebhoss.warnings.CompilerWarnings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Service;
 
@@ -20,6 +21,7 @@ class PaxExamConfiguration {
 
     @Produces
     @Default
+    @SuppressWarnings(CompilerWarnings.STATIC_METHOD)
     Set<Service> services() {
         return Nullsafe.nullsafe(ImmutableSet.<Service> of());
     }

diff --git a/...xample/src/test/java/com/github/sebhoss/contract/example/CdiJexlInsuranceCompanyTest.java b/...xample/src/test/java/com/github/sebhoss/contract/example/CdiJexlInsuranceCompanyTest.java
@@ -29,7 +29,7 @@ public class CdiJexlInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 
 }
diff --git a/...-juel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/...-juel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java
@@ -12,6 +12,7 @@
 import javax.enterprise.inject.Produces;
 
 import com.github.sebhoss.nullanalysis.Nullsafe;
+import com.github.sebhoss.warnings.CompilerWarnings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.Service;
 
@@ -20,6 +21,7 @@ class PaxExamConfiguration {
 
     @Produces
     @Default
+    @SuppressWarnings(CompilerWarnings.STATIC_METHOD)
     Set<Service> services() {
         return Nullsafe.nullsafe(ImmutableSet.<Service> of());
     }

diff --git a/...xample/src/test/java/com/github/sebhoss/contract/example/CdiJuelInsuranceCompanyTest.java b/...xample/src/test/java/com/github/sebhoss/contract/example/CdiJuelInsuranceCompanyTest.java
@@ -29,7 +29,7 @@ public class CdiJuelInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 
 }
diff --git a/...-mvel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/...-mvel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java
@@ -17,11 +17,11 @@
 import com.google.common.util.concurrent.Service;
 
 // TODO: We only need this for pax-exam
-@SuppressWarnings(CompilerWarnings.STATIC_METHOD)
 class PaxExamConfiguration {
 
     @Produces
     @Default
+    @SuppressWarnings(CompilerWarnings.STATIC_METHOD)
     Set<Service> services() {
         return Nullsafe.nullsafe(ImmutableSet.<Service> of());
     }

diff --git a/...xample/src/test/java/com/github/sebhoss/contract/example/CdiMvelInsuranceCompanyTest.java b/...xample/src/test/java/com/github/sebhoss/contract/example/CdiMvelInsuranceCompanyTest.java
@@ -29,7 +29,7 @@ public class CdiMvelInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 
 }
diff --git a/...xample/src/test/java/com/github/sebhoss/contract/example/CdiOgnlInsuranceCompanyTest.java b/...xample/src/test/java/com/github/sebhoss/contract/example/CdiOgnlInsuranceCompanyTest.java
@@ -29,7 +29,7 @@ public class CdiOgnlInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 
 }
diff --git a/...xample/src/test/java/com/github/sebhoss/contract/example/CdiSpElInsuranceCompanyTest.java b/...xample/src/test/java/com/github/sebhoss/contract/example/CdiSpElInsuranceCompanyTest.java
@@ -29,7 +29,7 @@ public class CdiSpElInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 
 }
diff --git a/...example/src/test/java/com/github/sebhoss/contract/example/CdiUelInsuranceCompanyTest.java b/...example/src/test/java/com/github/sebhoss/contract/example/CdiUelInsuranceCompanyTest.java
@@ -29,7 +29,7 @@ public class CdiUelInsuranceCompanyTest extends InsuranceCompanyTest {
      */
     @Before
     public void bind() {
-        insurance = injectedCompany;
+        setInsuranceCompany(injectedCompany);
     }
 
 }
diff --git a/contract-examples/contract-example-model/pom.xml b/contract-examples/contract-example-model/pom.xml
@@ -45,4 +45,26 @@
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
+
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <!--                                   BUILD                                 -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
+        <configuration>
+          <!--
+            Ignore common annotations because @SuppressWarnings is not retained
+            in byte code. There the plugin detects a false positive.
+           -->
+          <usedDependencies>
+            <usedDependency>com.github.sebhoss:suppress-warnings</usedDependency>
+          </usedDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/...example-model/src/main/java/com/github/sebhoss/contract/example/InsuranceCompanyTest.java b/...example-model/src/main/java/com/github/sebhoss/contract/example/InsuranceCompanyTest.java
@@ -6,14 +6,14 @@
  */
 package com.github.sebhoss.contract.example;
 
-import org.eclipse.jdt.annotation.Nullable;
+import com.github.sebhoss.nullanalysis.Nullsafe;
+import com.github.sebhoss.warnings.CompilerWarnings;
+
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import com.github.sebhoss.warnings.CompilerWarnings;
-
 /**
  * Test cases for the {@link InsuranceCompany}.
  */
@@ -22,17 +22,24 @@ public abstract class InsuranceCompanyTest {
 
     /** Catches expected exceptions */
     @Rule
-    public ExpectedException   thrown = ExpectedException.none();
+    public ExpectedException thrown = ExpectedException.none();
 
-    @Nullable
-    protected InsuranceCompany insurance;
+    private InsuranceCompany insurance;
+
+    protected InsuranceCompany getInsuranceCompany() {
+        return insurance;
+    }
+
+    protected void setInsuranceCompany(final InsuranceCompany insurance) {
+        this.insurance = insurance;
+    }
 
     /**
      * Ensures that the insurance company can calculate payouts based on a positive damage input.
      */
     @Test
     public void shouldAcceptPositiveDamages() {
-        final double result = insurance.calculateCover(10);
+        final double result = Nullsafe.nullsafe(getInsuranceCompany()).calculateCover(10);
 
         Assert.assertEquals(5.0, result, 0d);
     }
@@ -45,7 +52,7 @@ public void shouldNotAcceptNegativeDamages() {
         thrown.expect(IllegalStateException.class);
         thrown.expectMessage("Reported damage must be positive!");
 
-        insurance.calculateCover(-10);
+        Nullsafe.nullsafe(getInsuranceCompany()).calculateCover(-10);
     }
 
     /**
@@ -56,7 +63,7 @@ public void shouldNotAcceptHighDamages() {
         thrown.expect(IllegalStateException.class);
         thrown.expectMessage("We won't pay that!");
 
-        insurance.calculateCover(5001);
+        Nullsafe.nullsafe(getInsuranceCompany()).calculateCover(5001);
     }
 
     /**
@@ -67,7 +74,7 @@ public void shouldNotPerformHighPayout() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("We can't pay that much!");
 
-        insurance.calculateCover(5000);
+        Nullsafe.nullsafe(getInsuranceCompany()).calculateCover(5000);
     }
 
 }
diff --git a/...ample/JavaScriptInsuranceCompanyTest.java → .../GuiceJavaScriptInsuranceCompanyTest.java b/...ample/JavaScriptInsuranceCompanyTest.java → .../GuiceJavaScriptInsuranceCompanyTest.java
@@ -14,15 +14,15 @@
 /**
  * Test cases for a JavaScript {@link InsuranceCompany}.
  */
-public class JavaScriptInsuranceCompanyTest extends InsuranceCompanyTest {
+public class GuiceJavaScriptInsuranceCompanyTest extends InsuranceCompanyTest {
 
     /**
      * Creates a new insurance company for each test.
      */
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceJavaScriptModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...act/example/JexlInsuranceCompanyTest.java → ...xample/GuiceJexlInsuranceCompanyTest.java b/...act/example/JexlInsuranceCompanyTest.java → ...xample/GuiceJexlInsuranceCompanyTest.java
@@ -14,15 +14,15 @@
 /**
  * Test cases for a JEXL {@link InsuranceCompany}.
  */
-public class JexlInsuranceCompanyTest extends InsuranceCompanyTest {
+public class GuiceJexlInsuranceCompanyTest extends InsuranceCompanyTest {
 
     /**
      * Creates a new insurance company for each test.
      */
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceJexlModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...act/example/JuelInsuranceCompanyTest.java → ...xample/GuiceJuelInsuranceCompanyTest.java b/...act/example/JuelInsuranceCompanyTest.java → ...xample/GuiceJuelInsuranceCompanyTest.java
@@ -14,15 +14,15 @@
 /**
  * Test cases for a JUEL {@link InsuranceCompany}.
  */
-public class JuelInsuranceCompanyTest extends InsuranceCompanyTest {
+public class GuiceJuelInsuranceCompanyTest extends InsuranceCompanyTest {
 
     /**
      * Creates a new insurance company for each test.
      */
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceJuelModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...act/example/MvelInsuranceCompanyTest.java → ...xample/GuiceMvelInsuranceCompanyTest.java b/...act/example/MvelInsuranceCompanyTest.java → ...xample/GuiceMvelInsuranceCompanyTest.java
@@ -14,15 +14,15 @@
 /**
  * Test cases for a MVEL {@link InsuranceCompany}.
  */
-public class MvelInsuranceCompanyTest extends InsuranceCompanyTest {
+public class GuiceMvelInsuranceCompanyTest extends InsuranceCompanyTest {
 
     /**
      * Creates a new insurance company for each test.
      */
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceMvelModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...act/example/OgnlInsuranceCompanyTest.java → ...xample/GuiceOgnlInsuranceCompanyTest.java b/...act/example/OgnlInsuranceCompanyTest.java → ...xample/GuiceOgnlInsuranceCompanyTest.java
@@ -14,15 +14,15 @@
 /**
  * Test cases for a OGNL {@link InsuranceCompany}.
  */
-public class OgnlInsuranceCompanyTest extends InsuranceCompanyTest {
+public class GuiceOgnlInsuranceCompanyTest extends InsuranceCompanyTest {
 
     /**
      * Creates a new insurance company for each test.
      */
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceOgnlModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...mple/src/test/java/com/github/sebhoss/contract/example/GuiceSpELInsuranceCompanyTest.java b/...mple/src/test/java/com/github/sebhoss/contract/example/GuiceSpELInsuranceCompanyTest.java
@@ -22,7 +22,7 @@ public class GuiceSpELInsuranceCompanyTest extends InsuranceCompanyTest {
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceSpELModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...ample/src/test/java/com/github/sebhoss/contract/example/GuiceUelInsuranceCompanyTest.java b/...ample/src/test/java/com/github/sebhoss/contract/example/GuiceUelInsuranceCompanyTest.java
@@ -22,7 +22,7 @@ public class GuiceUelInsuranceCompanyTest extends InsuranceCompanyTest {
     @Before
     public void createCompany() {
         final Injector injector = Guice.createInjector(new GuiceUelModule());
-        insurance = injector.getInstance(InsuranceCompany.class);
+        setInsuranceCompany(injector.getInstance(InsuranceCompany.class));
     }
 
 }
diff --git a/...mple/src/main/java/com/github/sebhoss/contract/example/SpringJavaScriptConfiguration.java b/...mple/src/main/java/com/github/sebhoss/contract/example/SpringJavaScriptConfiguration.java
@@ -6,6 +6,10 @@
  */
 package com.github.sebhoss.contract.example;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
 import com.github.sebhoss.contract.configuration.DefaultJavaScriptConfiguration;
 import com.github.sebhoss.warnings.CompilerWarnings;
 

diff --git a/...c/test/java/com/github/sebhoss/contract/example/SpringJavaScriptInsuranceCompanyTest.java b/...c/test/java/com/github/sebhoss/contract/example/SpringJavaScriptInsuranceCompanyTest.java
@@ -7,6 +7,8 @@
 package com.github.sebhoss.contract.example;
 
 import org.junit.Before;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import com.github.sebhoss.warnings.CompilerWarnings;
 
@@ -22,7 +24,7 @@ public class SpringJavaScriptInsuranceCompanyTest extends InsuranceCompanyTest {
     @SuppressWarnings(CompilerWarnings.RESOURCE)
     public void createCompany() {
         final ApplicationContext context = new AnnotationConfigApplicationContext(SpringJavaScriptConfiguration.class);
-        insurance = context.getBean(InsuranceCompany.class);
+        setInsuranceCompany(context.getBean(InsuranceCompany.class));
     }
 
 }
diff --git a/...xl-example/src/main/java/com/github/sebhoss/contract/example/SpringJexlConfiguration.java b/...xl-example/src/main/java/com/github/sebhoss/contract/example/SpringJexlConfiguration.java
@@ -6,6 +6,10 @@
  */
 package com.github.sebhoss.contract.example;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
 import com.github.sebhoss.contract.configuration.DefaultJEXLConfiguration;
 import com.github.sebhoss.warnings.CompilerWarnings;