diff --git a/.travis.yml b/.travis.yml index 9bcf999..49e2b87 100644 --- 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 index a300d54..7515e08 100644 --- 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/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java index 48a5f51..d83fd03 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-javascript-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 services() { - return Nullsafe.nullsafe(ImmutableSet. of()); - } + @Produces + @Default + @SuppressWarnings(CompilerWarnings.STATIC_METHOD) + Set services() { + return Nullsafe.nullsafe(ImmutableSet. of()); + } } diff --git a/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/src/test/java/com/github/sebhoss/contract/example/CdiJavaScriptInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/src/test/java/com/github/sebhoss/contract/example/CdiJavaScriptInsuranceCompanyTest.java index 3a0648e..1b0eea1 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/src/test/java/com/github/sebhoss/contract/example/CdiJavaScriptInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-javascript-example/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/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java index 48a5f51..93c20c2 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-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 services() { return Nullsafe.nullsafe(ImmutableSet. of()); } diff --git a/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/src/test/java/com/github/sebhoss/contract/example/CdiJexlInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/src/test/java/com/github/sebhoss/contract/example/CdiJexlInsuranceCompanyTest.java index ce97bfc..ae97409 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/src/test/java/com/github/sebhoss/contract/example/CdiJexlInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-jexl-example/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/contract-examples/contract-cdi-examples/contract-cdi-juel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/contract-examples/contract-cdi-examples/contract-cdi-juel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java index 48a5f51..93c20c2 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-juel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-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 services() { return Nullsafe.nullsafe(ImmutableSet. of()); } diff --git a/contract-examples/contract-cdi-examples/contract-cdi-juel-example/src/test/java/com/github/sebhoss/contract/example/CdiJuelInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-juel-example/src/test/java/com/github/sebhoss/contract/example/CdiJuelInsuranceCompanyTest.java index c690956..f239b0d 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-juel-example/src/test/java/com/github/sebhoss/contract/example/CdiJuelInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-juel-example/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/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java b/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java index 8b989e6..93c20c2 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/src/main/java/com/github/sebhoss/contract/example/PaxExamConfiguration.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-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 services() { return Nullsafe.nullsafe(ImmutableSet. of()); } diff --git a/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/src/test/java/com/github/sebhoss/contract/example/CdiMvelInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/src/test/java/com/github/sebhoss/contract/example/CdiMvelInsuranceCompanyTest.java index 8c22654..8248ace 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/src/test/java/com/github/sebhoss/contract/example/CdiMvelInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-mvel-example/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/contract-examples/contract-cdi-examples/contract-cdi-ognl-example/src/test/java/com/github/sebhoss/contract/example/CdiOgnlInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-ognl-example/src/test/java/com/github/sebhoss/contract/example/CdiOgnlInsuranceCompanyTest.java index ddf9154..9b89c28 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-ognl-example/src/test/java/com/github/sebhoss/contract/example/CdiOgnlInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-ognl-example/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/contract-examples/contract-cdi-examples/contract-cdi-spel-example/src/test/java/com/github/sebhoss/contract/example/CdiSpElInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-spel-example/src/test/java/com/github/sebhoss/contract/example/CdiSpElInsuranceCompanyTest.java index 2644aac..9ff7d8c 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-spel-example/src/test/java/com/github/sebhoss/contract/example/CdiSpElInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-spel-example/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/contract-examples/contract-cdi-examples/contract-cdi-uel-example/src/test/java/com/github/sebhoss/contract/example/CdiUelInsuranceCompanyTest.java b/contract-examples/contract-cdi-examples/contract-cdi-uel-example/src/test/java/com/github/sebhoss/contract/example/CdiUelInsuranceCompanyTest.java index ae6e732..2284452 100644 --- a/contract-examples/contract-cdi-examples/contract-cdi-uel-example/src/test/java/com/github/sebhoss/contract/example/CdiUelInsuranceCompanyTest.java +++ b/contract-examples/contract-cdi-examples/contract-cdi-uel-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 index d1c84e9..298b4ec 100644 --- a/contract-examples/contract-example-model/pom.xml +++ b/contract-examples/contract-example-model/pom.xml @@ -45,4 +45,26 @@ junit + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + \ No newline at end of file diff --git a/contract-examples/contract-example-model/src/main/java/com/github/sebhoss/contract/example/InsuranceCompanyTest.java b/contract-examples/contract-example-model/src/main/java/com/github/sebhoss/contract/example/InsuranceCompanyTest.java index b310621..5bdadee 100644 --- a/contract-examples/contract-example-model/src/main/java/com/github/sebhoss/contract/example/InsuranceCompanyTest.java +++ b/contract-examples/contract-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/contract-examples/contract-guice-examples/contract-guice-javascript-example/src/test/java/com/github/sebhoss/contract/example/JavaScriptInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-javascript-example/src/test/java/com/github/sebhoss/contract/example/GuiceJavaScriptInsuranceCompanyTest.java similarity index 81% rename from contract-examples/contract-guice-examples/contract-guice-javascript-example/src/test/java/com/github/sebhoss/contract/example/JavaScriptInsuranceCompanyTest.java rename to contract-examples/contract-guice-examples/contract-guice-javascript-example/src/test/java/com/github/sebhoss/contract/example/GuiceJavaScriptInsuranceCompanyTest.java index 951f53a..cb57029 100644 --- a/contract-examples/contract-guice-examples/contract-guice-javascript-example/src/test/java/com/github/sebhoss/contract/example/JavaScriptInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-javascript-example/src/test/java/com/github/sebhoss/contract/example/GuiceJavaScriptInsuranceCompanyTest.java @@ -14,7 +14,7 @@ /** * 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. @@ -22,7 +22,7 @@ public class JavaScriptInsuranceCompanyTest extends InsuranceCompanyTest { @Before public void createCompany() { final Injector injector = Guice.createInjector(new GuiceJavaScriptModule()); - insurance = injector.getInstance(InsuranceCompany.class); + setInsuranceCompany(injector.getInstance(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-guice-examples/contract-guice-jexl-example/src/test/java/com/github/sebhoss/contract/example/JexlInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-jexl-example/src/test/java/com/github/sebhoss/contract/example/GuiceJexlInsuranceCompanyTest.java similarity index 82% rename from contract-examples/contract-guice-examples/contract-guice-jexl-example/src/test/java/com/github/sebhoss/contract/example/JexlInsuranceCompanyTest.java rename to contract-examples/contract-guice-examples/contract-guice-jexl-example/src/test/java/com/github/sebhoss/contract/example/GuiceJexlInsuranceCompanyTest.java index 6d6167e..ab47555 100644 --- a/contract-examples/contract-guice-examples/contract-guice-jexl-example/src/test/java/com/github/sebhoss/contract/example/JexlInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-jexl-example/src/test/java/com/github/sebhoss/contract/example/GuiceJexlInsuranceCompanyTest.java @@ -14,7 +14,7 @@ /** * 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. @@ -22,7 +22,7 @@ public class JexlInsuranceCompanyTest extends InsuranceCompanyTest { @Before public void createCompany() { final Injector injector = Guice.createInjector(new GuiceJexlModule()); - insurance = injector.getInstance(InsuranceCompany.class); + setInsuranceCompany(injector.getInstance(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-guice-examples/contract-guice-juel-example/src/test/java/com/github/sebhoss/contract/example/JuelInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-juel-example/src/test/java/com/github/sebhoss/contract/example/GuiceJuelInsuranceCompanyTest.java similarity index 82% rename from contract-examples/contract-guice-examples/contract-guice-juel-example/src/test/java/com/github/sebhoss/contract/example/JuelInsuranceCompanyTest.java rename to contract-examples/contract-guice-examples/contract-guice-juel-example/src/test/java/com/github/sebhoss/contract/example/GuiceJuelInsuranceCompanyTest.java index c757ec4..02b1fd5 100644 --- a/contract-examples/contract-guice-examples/contract-guice-juel-example/src/test/java/com/github/sebhoss/contract/example/JuelInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-juel-example/src/test/java/com/github/sebhoss/contract/example/GuiceJuelInsuranceCompanyTest.java @@ -14,7 +14,7 @@ /** * 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. @@ -22,7 +22,7 @@ public class JuelInsuranceCompanyTest extends InsuranceCompanyTest { @Before public void createCompany() { final Injector injector = Guice.createInjector(new GuiceJuelModule()); - insurance = injector.getInstance(InsuranceCompany.class); + setInsuranceCompany(injector.getInstance(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-guice-examples/contract-guice-mvel-example/src/test/java/com/github/sebhoss/contract/example/MvelInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-mvel-example/src/test/java/com/github/sebhoss/contract/example/GuiceMvelInsuranceCompanyTest.java similarity index 82% rename from contract-examples/contract-guice-examples/contract-guice-mvel-example/src/test/java/com/github/sebhoss/contract/example/MvelInsuranceCompanyTest.java rename to contract-examples/contract-guice-examples/contract-guice-mvel-example/src/test/java/com/github/sebhoss/contract/example/GuiceMvelInsuranceCompanyTest.java index feb6f33..e744098 100644 --- a/contract-examples/contract-guice-examples/contract-guice-mvel-example/src/test/java/com/github/sebhoss/contract/example/MvelInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-mvel-example/src/test/java/com/github/sebhoss/contract/example/GuiceMvelInsuranceCompanyTest.java @@ -14,7 +14,7 @@ /** * 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. @@ -22,7 +22,7 @@ public class MvelInsuranceCompanyTest extends InsuranceCompanyTest { @Before public void createCompany() { final Injector injector = Guice.createInjector(new GuiceMvelModule()); - insurance = injector.getInstance(InsuranceCompany.class); + setInsuranceCompany(injector.getInstance(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-guice-examples/contract-guice-ognl-example/src/test/java/com/github/sebhoss/contract/example/OgnlInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-ognl-example/src/test/java/com/github/sebhoss/contract/example/GuiceOgnlInsuranceCompanyTest.java similarity index 82% rename from contract-examples/contract-guice-examples/contract-guice-ognl-example/src/test/java/com/github/sebhoss/contract/example/OgnlInsuranceCompanyTest.java rename to contract-examples/contract-guice-examples/contract-guice-ognl-example/src/test/java/com/github/sebhoss/contract/example/GuiceOgnlInsuranceCompanyTest.java index 74438ca..6120837 100644 --- a/contract-examples/contract-guice-examples/contract-guice-ognl-example/src/test/java/com/github/sebhoss/contract/example/OgnlInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-ognl-example/src/test/java/com/github/sebhoss/contract/example/GuiceOgnlInsuranceCompanyTest.java @@ -14,7 +14,7 @@ /** * 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. @@ -22,7 +22,7 @@ public class OgnlInsuranceCompanyTest extends InsuranceCompanyTest { @Before public void createCompany() { final Injector injector = Guice.createInjector(new GuiceOgnlModule()); - insurance = injector.getInstance(InsuranceCompany.class); + setInsuranceCompany(injector.getInstance(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-guice-examples/contract-guice-spel-example/src/test/java/com/github/sebhoss/contract/example/GuiceSpELInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-spel-example/src/test/java/com/github/sebhoss/contract/example/GuiceSpELInsuranceCompanyTest.java index aca2872..5aa08c3 100644 --- a/contract-examples/contract-guice-examples/contract-guice-spel-example/src/test/java/com/github/sebhoss/contract/example/GuiceSpELInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-spel-example/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/contract-examples/contract-guice-examples/contract-guice-uel-example/src/test/java/com/github/sebhoss/contract/example/GuiceUelInsuranceCompanyTest.java b/contract-examples/contract-guice-examples/contract-guice-uel-example/src/test/java/com/github/sebhoss/contract/example/GuiceUelInsuranceCompanyTest.java index ffd5988..104e5e0 100644 --- a/contract-examples/contract-guice-examples/contract-guice-uel-example/src/test/java/com/github/sebhoss/contract/example/GuiceUelInsuranceCompanyTest.java +++ b/contract-examples/contract-guice-examples/contract-guice-uel-example/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/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/main/java/com/github/sebhoss/contract/example/SpringJavaScriptConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/main/java/com/github/sebhoss/contract/example/SpringJavaScriptConfiguration.java index 439b916..00968c3 100644 --- a/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/main/java/com/github/sebhoss/contract/example/SpringJavaScriptConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-javascript-example/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/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/test/java/com/github/sebhoss/contract/example/SpringJavaScriptInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/test/java/com/github/sebhoss/contract/example/SpringJavaScriptInsuranceCompanyTest.java index cd439c2..95d1cf8 100644 --- a/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/test/java/com/github/sebhoss/contract/example/SpringJavaScriptInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-javascript-example/src/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/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/main/java/com/github/sebhoss/contract/example/SpringJexlConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/main/java/com/github/sebhoss/contract/example/SpringJexlConfiguration.java index d7b6006..9581226 100644 --- a/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/main/java/com/github/sebhoss/contract/example/SpringJexlConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-jexl-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; diff --git a/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/test/java/com/github/sebhoss/contract/example/SpringJEXLInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/test/java/com/github/sebhoss/contract/example/SpringJEXLInsuranceCompanyTest.java index b0db6fa..205a14b 100644 --- a/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/test/java/com/github/sebhoss/contract/example/SpringJEXLInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-jexl-example/src/test/java/com/github/sebhoss/contract/example/SpringJEXLInsuranceCompanyTest.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 SpringJEXLInsuranceCompanyTest extends InsuranceCompanyTest { @SuppressWarnings(CompilerWarnings.RESOURCE) public void createCompany() { final ApplicationContext context = new AnnotationConfigApplicationContext(SpringJexlConfiguration.class); - insurance = context.getBean(InsuranceCompany.class); + setInsuranceCompany(context.getBean(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-spring-examples/contract-spring-juel-example/src/main/java/com/github/sebhoss/contract/example/SpringJuelConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-juel-example/src/main/java/com/github/sebhoss/contract/example/SpringJuelConfiguration.java index 11fe2d2..f7f4417 100644 --- a/contract-examples/contract-spring-examples/contract-spring-juel-example/src/main/java/com/github/sebhoss/contract/example/SpringJuelConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-juel-example/src/main/java/com/github/sebhoss/contract/example/SpringJuelConfiguration.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.DefaultJUELConfiguration; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-examples/contract-spring-examples/contract-spring-juel-example/src/test/java/com/github/sebhoss/contract/example/SpringJUELInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-juel-example/src/test/java/com/github/sebhoss/contract/example/SpringJUELInsuranceCompanyTest.java index 31cf4cb..5d21fcd 100644 --- a/contract-examples/contract-spring-examples/contract-spring-juel-example/src/test/java/com/github/sebhoss/contract/example/SpringJUELInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-juel-example/src/test/java/com/github/sebhoss/contract/example/SpringJUELInsuranceCompanyTest.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 SpringJUELInsuranceCompanyTest extends InsuranceCompanyTest { @SuppressWarnings(CompilerWarnings.RESOURCE) public void createCompany() { final ApplicationContext context = new AnnotationConfigApplicationContext(SpringJuelConfiguration.class); - insurance = context.getBean(InsuranceCompany.class); + setInsuranceCompany(context.getBean(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/main/java/com/github/sebhoss/contract/example/SpringMvelConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/main/java/com/github/sebhoss/contract/example/SpringMvelConfiguration.java index cb1ff82..b52e2a1 100644 --- a/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/main/java/com/github/sebhoss/contract/example/SpringMvelConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/main/java/com/github/sebhoss/contract/example/SpringMvelConfiguration.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.DefaultMVELConfiguration; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/test/java/com/github/sebhoss/contract/example/SpringMVELInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/test/java/com/github/sebhoss/contract/example/SpringMVELInsuranceCompanyTest.java index fdeaf5a..d7a7465 100644 --- a/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/test/java/com/github/sebhoss/contract/example/SpringMVELInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-mvel-example/src/test/java/com/github/sebhoss/contract/example/SpringMVELInsuranceCompanyTest.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 SpringMVELInsuranceCompanyTest extends InsuranceCompanyTest { @SuppressWarnings(CompilerWarnings.RESOURCE) public void createCompany() { final ApplicationContext context = new AnnotationConfigApplicationContext(SpringMvelConfiguration.class); - insurance = context.getBean(InsuranceCompany.class); + setInsuranceCompany(context.getBean(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/main/java/com/github/sebhoss/contract/example/SpringOgnlConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/main/java/com/github/sebhoss/contract/example/SpringOgnlConfiguration.java index b61d836..7a4249e 100644 --- a/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/main/java/com/github/sebhoss/contract/example/SpringOgnlConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/main/java/com/github/sebhoss/contract/example/SpringOgnlConfiguration.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.DefaultOGNLConfiguration; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/test/java/com/github/sebhoss/contract/example/SpringOgnlInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/test/java/com/github/sebhoss/contract/example/SpringOgnlInsuranceCompanyTest.java index dc9364a..9b0dfef 100644 --- a/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/test/java/com/github/sebhoss/contract/example/SpringOgnlInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-ognl-example/src/test/java/com/github/sebhoss/contract/example/SpringOgnlInsuranceCompanyTest.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 SpringOgnlInsuranceCompanyTest extends InsuranceCompanyTest { @SuppressWarnings(CompilerWarnings.RESOURCE) public void createCompany() { final ApplicationContext context = new AnnotationConfigApplicationContext(SpringOgnlConfiguration.class); - insurance = context.getBean(InsuranceCompany.class); + setInsuranceCompany(context.getBean(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-spring-examples/contract-spring-spel-example/src/main/java/com/github/sebhoss/contract/example/SpringSpELConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-spel-example/src/main/java/com/github/sebhoss/contract/example/SpringSpELConfiguration.java index fb9f346..29a196f 100644 --- a/contract-examples/contract-spring-examples/contract-spring-spel-example/src/main/java/com/github/sebhoss/contract/example/SpringSpELConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-spel-example/src/main/java/com/github/sebhoss/contract/example/SpringSpELConfiguration.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.DefaultSpELConfiguration; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-examples/contract-spring-examples/contract-spring-spel-example/src/test/java/com/github/sebhoss/contract/example/SpringSpELInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-spel-example/src/test/java/com/github/sebhoss/contract/example/SpringSpELInsuranceCompanyTest.java index 4d43aa5..e8cd591 100644 --- a/contract-examples/contract-spring-examples/contract-spring-spel-example/src/test/java/com/github/sebhoss/contract/example/SpringSpELInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-spel-example/src/test/java/com/github/sebhoss/contract/example/SpringSpELInsuranceCompanyTest.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 SpringSpELInsuranceCompanyTest extends InsuranceCompanyTest { @SuppressWarnings(CompilerWarnings.RESOURCE) public void createCompany() { final ApplicationContext context = new AnnotationConfigApplicationContext(SpringSpELConfiguration.class); - insurance = context.getBean(InsuranceCompany.class); + setInsuranceCompany(context.getBean(InsuranceCompany.class)); } } diff --git a/contract-examples/contract-spring-examples/contract-spring-uel-example/src/main/java/com/github/sebhoss/contract/example/SpringUelConfiguration.java b/contract-examples/contract-spring-examples/contract-spring-uel-example/src/main/java/com/github/sebhoss/contract/example/SpringUelConfiguration.java index 7325369..476669c 100644 --- a/contract-examples/contract-spring-examples/contract-spring-uel-example/src/main/java/com/github/sebhoss/contract/example/SpringUelConfiguration.java +++ b/contract-examples/contract-spring-examples/contract-spring-uel-example/src/main/java/com/github/sebhoss/contract/example/SpringUelConfiguration.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.DefaultUELConfiguration; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-examples/contract-spring-examples/contract-spring-uel-example/src/test/java/com/github/sebhoss/contract/example/SpringUELInsuranceCompanyTest.java b/contract-examples/contract-spring-examples/contract-spring-uel-example/src/test/java/com/github/sebhoss/contract/example/SpringUELInsuranceCompanyTest.java index 133fc38..97f41b5 100644 --- a/contract-examples/contract-spring-examples/contract-spring-uel-example/src/test/java/com/github/sebhoss/contract/example/SpringUELInsuranceCompanyTest.java +++ b/contract-examples/contract-spring-examples/contract-spring-uel-example/src/test/java/com/github/sebhoss/contract/example/SpringUELInsuranceCompanyTest.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 SpringUELInsuranceCompanyTest extends InsuranceCompanyTest { @SuppressWarnings(CompilerWarnings.RESOURCE) public void createCompany() { final ApplicationContext context = new AnnotationConfigApplicationContext(SpringUelConfiguration.class); - insurance = context.getBean(InsuranceCompany.class); + setInsuranceCompany(context.getBean(InsuranceCompany.class)); } } diff --git a/contract-frameworks/contract-cdi/contract-cdi-defaults/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-defaults/pom.xml index 858508b..e4e5330 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-defaults/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-defaults/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-interceptor @@ -36,5 +40,54 @@ com.github.sebhoss.contract contract-paranamer + + javax.el + javax.el-api + + + com.thoughtworks.paranamer + paranamer + + + ch.qos.cal10n + cal10n-api + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-interceptor + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-javascript/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-javascript/pom.xml index 9e0f34e..8ea657b 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-javascript/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-javascript/pom.xml @@ -28,6 +28,14 @@ + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-cdi-defaults @@ -37,4 +45,46 @@ contract-scriptengine + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-cdi-defaults + + com.github.sebhoss.contract:contract-scriptengine + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-jexl/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-jexl/pom.xml index 85267a5..4110594 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-jexl/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-jexl/pom.xml @@ -28,6 +28,14 @@ + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-cdi-defaults @@ -36,5 +44,51 @@ com.github.sebhoss.contract contract-jexl + + org.apache.commons + commons-jexl + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-cdi-defaults + + com.github.sebhoss.contract:contract-jexl + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-juel/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-juel/pom.xml index a682f5b..822354f 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-juel/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-juel/pom.xml @@ -28,13 +28,69 @@ + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-cdi-defaults + + + javax.el-api + javax.el + + com.github.sebhoss.contract contract-juel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-cdi-defaults + + com.github.sebhoss.contract:contract-juel + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-mvel/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-mvel/pom.xml index 3274baf..0c72d4e 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-mvel/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-mvel/pom.xml @@ -30,11 +30,52 @@ com.github.sebhoss.contract - contract-cdi-defaults + contract-annotations + + + com.github.sebhoss.contract + contract-verifier com.github.sebhoss.contract contract-mvel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-mvel + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-ognl/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-ognl/pom.xml index cdd9963..504fc82 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-ognl/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-ognl/pom.xml @@ -28,6 +28,14 @@ + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-cdi-defaults @@ -37,4 +45,46 @@ contract-ognl + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-cdi-defaults + + com.github.sebhoss.contract:contract-ognl + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-spel/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-spel/pom.xml index ca6560e..89a8148 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-spel/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-spel/pom.xml @@ -28,6 +28,14 @@ + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-cdi-defaults @@ -37,4 +45,46 @@ contract-spel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-cdi-defaults + + com.github.sebhoss.contract:contract-spel + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/contract-cdi-uel/pom.xml b/contract-frameworks/contract-cdi/contract-cdi-uel/pom.xml index e8e6006..1537c9d 100644 --- a/contract-frameworks/contract-cdi/contract-cdi-uel/pom.xml +++ b/contract-frameworks/contract-cdi/contract-cdi-uel/pom.xml @@ -28,6 +28,14 @@ + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-cdi-defaults @@ -35,6 +43,54 @@ com.github.sebhoss.contract contract-uel + + + javax.el + org.glassfish + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + com.github.sebhoss.contract:contract-cdi-defaults + + com.github.sebhoss.contract:contract-uel + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-cdi/pom.xml b/contract-frameworks/contract-cdi/pom.xml index be0d33c..c2f645b 100644 --- a/contract-frameworks/contract-cdi/pom.xml +++ b/contract-frameworks/contract-cdi/pom.xml @@ -47,6 +47,12 @@ javax.enterprise cdi-api provided + + + javax.el + javax.el-api + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-defaults/pom.xml b/contract-frameworks/contract-guice/contract-guice-defaults/pom.xml index 74fdd64..5c1914d 100644 --- a/contract-frameworks/contract-guice/contract-guice-defaults/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-defaults/pom.xml @@ -23,4 +23,64 @@ contract-guice-defaults + + + + + + + com.github.sebhoss.contract + contract-annotations + + + com.github.sebhoss.contract + contract-verifier + + + com.github.sebhoss.contract + contract-aop + + + com.github.sebhoss.contract + contract-paranamer + + + ch.qos.cal10n + cal10n-api + + + com.thoughtworks.paranamer + paranamer + + + aopalliance + aopalliance + + + com.google.inject.extensions + guice-multibindings + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-javascript/pom.xml b/contract-frameworks/contract-guice/contract-guice-javascript/pom.xml index 9185579..12a35e7 100644 --- a/contract-frameworks/contract-guice/contract-guice-javascript/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-javascript/pom.xml @@ -28,13 +28,67 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults + + + paranamer + com.thoughtworks.paranamer + + + contract-aop + com.github.sebhoss.contract + + + contract-paranamer + com.github.sebhoss.contract + + + guice-multibindings + com.google.inject.extensions + + com.github.sebhoss.contract contract-scriptengine + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-jexl/pom.xml b/contract-frameworks/contract-guice/contract-guice-jexl/pom.xml index 5aaf92e..8fd2c4e 100644 --- a/contract-frameworks/contract-guice/contract-guice-jexl/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-jexl/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults @@ -37,4 +41,36 @@ contract-jexl + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-juel/pom.xml b/contract-frameworks/contract-guice/contract-guice-juel/pom.xml index 0d6eebe..dc696d6 100644 --- a/contract-frameworks/contract-guice/contract-guice-juel/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-juel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults @@ -36,5 +40,41 @@ com.github.sebhoss.contract contract-juel + + de.odysseus.juel + juel-api + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-mvel/pom.xml b/contract-frameworks/contract-guice/contract-guice-mvel/pom.xml index cc638ac..fe12634 100644 --- a/contract-frameworks/contract-guice/contract-guice-mvel/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-mvel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults @@ -37,4 +41,36 @@ contract-mvel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-ognl/pom.xml b/contract-frameworks/contract-guice/contract-guice-ognl/pom.xml index 8f3c4de..fd5d710 100644 --- a/contract-frameworks/contract-guice/contract-guice-ognl/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-ognl/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults @@ -37,4 +41,36 @@ contract-ognl + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-spel/pom.xml b/contract-frameworks/contract-guice/contract-guice-spel/pom.xml index 73c1599..da195e5 100644 --- a/contract-frameworks/contract-guice/contract-guice-spel/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-spel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults @@ -37,4 +41,36 @@ contract-spel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/contract-guice-uel/pom.xml b/contract-frameworks/contract-guice/contract-guice-uel/pom.xml index f8600bf..390c83d 100644 --- a/contract-frameworks/contract-guice/contract-guice-uel/pom.xml +++ b/contract-frameworks/contract-guice/contract-guice-uel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-guice-defaults @@ -36,5 +40,41 @@ com.github.sebhoss.contract contract-uel + + org.glassfish + javax.el + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-guice/pom.xml b/contract-frameworks/contract-guice/pom.xml index 3be8fe5..444c6b5 100644 --- a/contract-frameworks/contract-guice/pom.xml +++ b/contract-frameworks/contract-guice/pom.xml @@ -43,21 +43,9 @@ - - com.github.sebhoss.contract - contract-aop - - - com.github.sebhoss.contract - contract-paranamer - com.google.inject guice - - com.google.inject.extensions - guice-multibindings - \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/pom.xml b/contract-frameworks/contract-spring/contract-spring-defaults/pom.xml index 51da7cc..f1afab6 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-defaults/pom.xml @@ -23,4 +23,56 @@ contract-spring-defaults + + + + + + + com.github.sebhoss.contract + contract-verifier + + + org.springframework + spring-core + + + com.github.sebhoss.contract + contract-aspect + + + javax.inject + javax.inject + + + ch.qos.cal10n + cal10n-api + + + com.github.sebhoss + null-analysis + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/AspectConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/AspectConfiguration.java index 94f00ca..058b91e 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/AspectConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/AspectConfiguration.java @@ -6,6 +6,8 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; /** * Enables Spring-AOP. diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/BaseConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/BaseConfiguration.java index 545242b..b6f7b47 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/BaseConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/configuration/BaseConfiguration.java @@ -10,12 +10,15 @@ import com.github.sebhoss.contract.verifier.ParameterNamesLookupConfiguration; import com.github.sebhoss.contract.verifier.impl.ErrorMessageConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + /** * Base configuration for Spring-based projects. Extend this class and @Import a specific language configuration. */ @Configuration @Import({ AspectConfiguration.class, ParameterNamesLookupConfiguration.class, - ContractConfiguration.class, ErrorMessageConfiguration.class }) + ContractConfiguration.class, ErrorMessageConfiguration.class }) public abstract class BaseConfiguration { // Meta-configuration diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ContractConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ContractConfiguration.java index 7faeeae..0bff010 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ContractConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ContractConfiguration.java @@ -13,13 +13,16 @@ import com.github.sebhoss.contract.verifier.impl.ContractSyntaxCheckConfiguration; import com.github.sebhoss.contract.verifier.impl.ContractVerifierConfiguration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + /** * Meta-configuration for several contract interfaces. */ @Configuration @Import({ ContractExceptionFactoryConfiguration.class, ContractRetrievalConfiguration.class, - ContractSemanticCheckConfiguration.class, ContractSyntaxCheckConfiguration.class, - ContractVerifierConfiguration.class, ContractAspectConfiguration.class }) + ContractSemanticCheckConfiguration.class, ContractSyntaxCheckConfiguration.class, + ContractVerifierConfiguration.class, ContractAspectConfiguration.class }) public class ContractConfiguration { // Meta-configuration diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ParameterNamesLookupConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ParameterNamesLookupConfiguration.java index 754377a..2ff3c75 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ParameterNamesLookupConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/ParameterNamesLookupConfiguration.java @@ -6,10 +6,12 @@ */ package com.github.sebhoss.contract.verifier; -import org.springframework.core.LocalVariableTableParameterNameDiscoverer; - import com.github.sebhoss.warnings.CompilerWarnings; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.LocalVariableTableParameterNameDiscoverer; + /** * Configuration for the {@link ParameterNamesLookup}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractAspectConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractAspectConfiguration.java index 1445bd6..7bd40a1 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractAspectConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractAspectConfiguration.java @@ -12,6 +12,9 @@ import com.github.sebhoss.contract.verifier.ContractVerifierFactory; import com.github.sebhoss.nullanalysis.Nullsafe; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * Configuration for the {@link ContractAspect}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractExceptionFactoryConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractExceptionFactoryConfiguration.java index a0e81d0..4e4384e 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractExceptionFactoryConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractExceptionFactoryConfiguration.java @@ -13,6 +13,9 @@ import com.github.sebhoss.contract.verifier.ContractExceptionFactory; import com.github.sebhoss.nullanalysis.Nullsafe; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * Configures the {@link ContractExceptionFactory}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractRetrievalConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractRetrievalConfiguration.java index fa0b8fe..0bd9ef4 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractRetrievalConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractRetrievalConfiguration.java @@ -9,6 +9,9 @@ import com.github.sebhoss.contract.verifier.ContractRetrieval; import com.github.sebhoss.warnings.CompilerWarnings; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * Configuration for the {@link ContractRetrieval}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSemanticCheckConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSemanticCheckConfiguration.java index 8eed5e8..d49f668 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSemanticCheckConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSemanticCheckConfiguration.java @@ -11,6 +11,9 @@ import com.github.sebhoss.contract.verifier.ContractSemanticCheck; import com.github.sebhoss.warnings.CompilerWarnings; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * Configuration for the {@link ContractSemanticCheck}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSyntaxCheckConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSyntaxCheckConfiguration.java index 2d0797c..6dbd077 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSyntaxCheckConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractSyntaxCheckConfiguration.java @@ -11,6 +11,9 @@ import com.github.sebhoss.contract.verifier.ContractSyntaxCheck; import com.github.sebhoss.warnings.CompilerWarnings; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * Configuration for the {@link ContractSyntaxCheck}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractVerifierConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractVerifierConfiguration.java index a319497..3c4664a 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractVerifierConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ContractVerifierConfiguration.java @@ -11,7 +11,9 @@ import com.github.sebhoss.contract.verifier.ContractContextFactory; import com.github.sebhoss.contract.verifier.ContractVerifierFactory; import com.github.sebhoss.contract.verifier.ParameterNamesLookupConfiguration; -import com.github.sebhoss.warnings.CompilerWarnings; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; /** * Configuration for the {@link ContractVerifierFactory}. @@ -47,7 +49,6 @@ public class ContractVerifierConfiguration { * @return A context-based {@link ContractVerifierFactory}. */ @Bean - @SuppressWarnings(CompilerWarnings.NULL) public ContractVerifierFactory contextBasedFactory() { return new ContextBasedContractVerifierFactory(retrieval.annotationBasedRetrieval(), syntaxCheck.noSyntaxChecks(), namesLookup.localVariableTableLookup(), semanticCheck.noSemanticChecks(), diff --git a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ErrorMessageConfiguration.java b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ErrorMessageConfiguration.java index 8576d70..ab649b7 100644 --- a/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ErrorMessageConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-defaults/src/main/java/com/github/sebhoss/contract/verifier/impl/ErrorMessageConfiguration.java @@ -13,6 +13,9 @@ import com.github.sebhoss.warnings.CompilerWarnings; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + /** * Configuration for the {@link IMessageConveyor}. */ diff --git a/contract-frameworks/contract-spring/contract-spring-javascript/pom.xml b/contract-frameworks/contract-spring/contract-spring-javascript/pom.xml index e776cd0..ecd434c 100644 --- a/contract-frameworks/contract-spring/contract-spring-javascript/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-javascript/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults @@ -36,5 +40,41 @@ com.github.sebhoss.contract contract-scriptengine + + com.github.sebhoss + null-analysis + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/configuration/DefaultJavaScriptConfiguration.java b/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/configuration/DefaultJavaScriptConfiguration.java index 008642a..49001d3 100644 --- a/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/configuration/DefaultJavaScriptConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/configuration/DefaultJavaScriptConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.JavaScriptConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/verifier/JavaScriptConfiguration.java b/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/verifier/JavaScriptConfiguration.java index 8a02fc6..4032015 100644 --- a/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/verifier/JavaScriptConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-javascript/src/main/java/com/github/sebhoss/contract/verifier/JavaScriptConfiguration.java @@ -9,6 +9,9 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.github.sebhoss.nullanalysis.Nullsafe; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-frameworks/contract-spring/contract-spring-jexl/pom.xml b/contract-frameworks/contract-spring/contract-spring-jexl/pom.xml index bcc0ff7..cb9170c 100644 --- a/contract-frameworks/contract-spring/contract-spring-jexl/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-jexl/pom.xml @@ -28,13 +28,75 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults + + + commons-logging + commons-logging + + com.github.sebhoss.contract contract-jexl + + org.apache.commons + commons-jexl + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + + + commons-logging + commons-logging + + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/configuration/DefaultJEXLConfiguration.java b/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/configuration/DefaultJEXLConfiguration.java index e11a7dc..caee6c8 100644 --- a/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/configuration/DefaultJEXLConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/configuration/DefaultJEXLConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.JexlConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/verifier/JexlConfiguration.java b/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/verifier/JexlConfiguration.java index 0ddcd0f..dc62b13 100644 --- a/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/verifier/JexlConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-jexl/src/main/java/com/github/sebhoss/contract/verifier/JexlConfiguration.java @@ -7,6 +7,8 @@ package com.github.sebhoss.contract.verifier; import org.apache.commons.jexl2.JexlEngine; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-frameworks/contract-spring/contract-spring-juel/pom.xml b/contract-frameworks/contract-spring/contract-spring-juel/pom.xml index 5625c08..9311fad 100644 --- a/contract-frameworks/contract-spring/contract-spring-juel/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-juel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults @@ -36,5 +40,45 @@ com.github.sebhoss.contract contract-juel + + de.odysseus.juel + juel-api + + + com.github.sebhoss + null-analysis + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/configuration/DefaultJUELConfiguration.java b/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/configuration/DefaultJUELConfiguration.java index 0bc5fb5..c2e4290 100644 --- a/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/configuration/DefaultJUELConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/configuration/DefaultJUELConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.JuelConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/verifier/JuelConfiguration.java b/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/verifier/JuelConfiguration.java index 18b80c7..d19c227 100644 --- a/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/verifier/JuelConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-juel/src/main/java/com/github/sebhoss/contract/verifier/JuelConfiguration.java @@ -8,6 +8,9 @@ import javax.el.ExpressionFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.github.sebhoss.nullanalysis.Nullsafe; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-frameworks/contract-spring/contract-spring-mvel/pom.xml b/contract-frameworks/contract-spring/contract-spring-mvel/pom.xml index e2039d8..e76f4a7 100644 --- a/contract-frameworks/contract-spring/contract-spring-mvel/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-mvel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults @@ -37,4 +41,36 @@ contract-mvel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/configuration/DefaultMVELConfiguration.java b/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/configuration/DefaultMVELConfiguration.java index 5788541..1bd449c 100644 --- a/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/configuration/DefaultMVELConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/configuration/DefaultMVELConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.MvelConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/verifier/MvelConfiguration.java b/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/verifier/MvelConfiguration.java index 1146c63..8561a18 100644 --- a/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/verifier/MvelConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-mvel/src/main/java/com/github/sebhoss/contract/verifier/MvelConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.verifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.github.sebhoss.warnings.CompilerWarnings; /** diff --git a/contract-frameworks/contract-spring/contract-spring-ognl/pom.xml b/contract-frameworks/contract-spring/contract-spring-ognl/pom.xml index 554e681..a1ffa08 100644 --- a/contract-frameworks/contract-spring/contract-spring-ognl/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-ognl/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults @@ -37,4 +41,36 @@ contract-ognl + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/configuration/DefaultOGNLConfiguration.java b/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/configuration/DefaultOGNLConfiguration.java index 7683d60..750a865 100644 --- a/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/configuration/DefaultOGNLConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/configuration/DefaultOGNLConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.OgnlConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/verifier/OgnlConfiguration.java b/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/verifier/OgnlConfiguration.java index 00dfddd..aff022c 100644 --- a/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/verifier/OgnlConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-ognl/src/main/java/com/github/sebhoss/contract/verifier/OgnlConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.verifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.github.sebhoss.warnings.CompilerWarnings; /** diff --git a/contract-frameworks/contract-spring/contract-spring-spel/pom.xml b/contract-frameworks/contract-spring/contract-spring-spel/pom.xml index c8ae460..88731ea 100644 --- a/contract-frameworks/contract-spring/contract-spring-spel/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-spel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults @@ -37,4 +41,36 @@ contract-spel + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/configuration/DefaultSpELConfiguration.java b/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/configuration/DefaultSpELConfiguration.java index 24574bd..9bff203 100644 --- a/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/configuration/DefaultSpELConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/configuration/DefaultSpELConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.SpElConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/verifier/SpElConfiguration.java b/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/verifier/SpElConfiguration.java index 398b7bf..46bfbd8 100644 --- a/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/verifier/SpElConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-spel/src/main/java/com/github/sebhoss/contract/verifier/SpElConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.verifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.github.sebhoss.warnings.CompilerWarnings; /** diff --git a/contract-frameworks/contract-spring/contract-spring-uel/pom.xml b/contract-frameworks/contract-spring/contract-spring-uel/pom.xml index 4631d6a..7f3efa2 100644 --- a/contract-frameworks/contract-spring/contract-spring-uel/pom.xml +++ b/contract-frameworks/contract-spring/contract-spring-uel/pom.xml @@ -28,6 +28,10 @@ + + com.github.sebhoss.contract + contract-verifier + com.github.sebhoss.contract contract-spring-defaults @@ -36,5 +40,45 @@ com.github.sebhoss.contract contract-uel + + org.glassfish + javax.el + + + com.github.sebhoss + null-analysis + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + + com.github.sebhoss:suppress-warnings + + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + 1.0.9 + + + META-INF/beans.xml + + + + + \ No newline at end of file diff --git a/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/DefaultUELConfiguration.java b/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/DefaultUELConfiguration.java index 049fe49..8deb80b 100644 --- a/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/DefaultUELConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/DefaultUELConfiguration.java @@ -6,6 +6,9 @@ */ package com.github.sebhoss.contract.configuration; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; + import com.github.sebhoss.contract.verifier.UelConfiguration; /** diff --git a/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/package-info.java b/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/package-info.java deleted file mode 100644 index 864613a..0000000 --- a/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/configuration/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright © 2012 Sebastian Hoß - * This work is free. You can redistribute it and/or modify it under the - * terms of the Do What The Fuck You Want To Public License, Version 2, - * as published by Sam Hocevar. See http://www.wtfpl.net/ for more details. - */ -/** - * Default configurations for Spring-based projects. - */ -package com.github.sebhoss.contract.configuration; diff --git a/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/verifier/UelConfiguration.java b/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/verifier/UelConfiguration.java index b9556d6..c21761f 100644 --- a/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/verifier/UelConfiguration.java +++ b/contract-frameworks/contract-spring/contract-spring-uel/src/main/java/com/github/sebhoss/contract/verifier/UelConfiguration.java @@ -8,6 +8,9 @@ import javax.el.ExpressionFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import com.github.sebhoss.nullanalysis.Nullsafe; import com.github.sebhoss.warnings.CompilerWarnings; diff --git a/contract-frameworks/contract-spring/pom.xml b/contract-frameworks/contract-spring/pom.xml index 81252a8..43766d7 100644 --- a/contract-frameworks/contract-spring/pom.xml +++ b/contract-frameworks/contract-spring/pom.xml @@ -43,18 +43,9 @@ - - com.github.sebhoss.contract - contract-aspect - - - - org.springframework - spring-aop - org.springframework - spring-aspects + spring-context \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0938b7a..99c70d3 100644 --- a/pom.xml +++ b/pom.xml @@ -391,4 +391,39 @@ --> + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + + xml + 256m + + true + + + + com.versioneye + versioneye-maven-plugin + 3.1.0 + + ${VERSION_EYE_KEY} + false + 54876dff03a57b9cf2009956 + + + + org.eluder.coveralls + coveralls-maven-plugin + 3.0.1 + + ${COVERALLS_TOKEN} + + + +