Use non-spring package names for samples

samples/samples-messaging-camel/.springBeans

@@ -7,6 +7,7 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
+		<config>java:com.example.CamelMessagingApplication</config>
 	</configs>
 	<autoconfigs>
 	</autoconfigs>

samples/samples-messaging-camel/src/main/java/com/example/BookDeleted.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-camel/src/main/java/com/example/BookDeleter.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

samples/samples-messaging-camel/src/main/java/com/example/BookReturned.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-camel/src/main/java/com/example/BookRouteConfiguration.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
 
 import org.apache.activemq.camel.component.ActiveMQComponent;
 import org.apache.camel.RoutesBuilder;

samples/samples-messaging-camel/src/main/java/com/example/BookService.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
 
 import org.apache.camel.Exchange;
 import org.slf4j.Logger;

samples/samples-messaging-camel/src/main/java/com/example/CamelMessagingApplication.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel;
+package com.example;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

samples/samples-messaging-camel/src/test/groovy/com/example/CamelMessagingApplicationSpec.groovy

@@ -14,8 +14,10 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.camel
+package com.example
 
+import com.example.BookDeleter;
+import com.example.CamelMessagingApplication;
 import com.jayway.jsonpath.DocumentContext
 import com.jayway.jsonpath.JsonPath
 import com.toomuchcoding.jsonassert.JsonAssertion

samples/samples-messaging-integration/.springBeans

@@ -7,6 +7,7 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
+		<config>java:com.example.IntegrationMessagingApplication</config>
 	</configs>
 	<autoconfigs>
 	</autoconfigs>

samples/samples-messaging-integration/src/main/java/com/example/BookDeleted.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-integration/src/main/java/com/example/BookListener.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -50,5 +50,5 @@ public class BookListener {
 		bookSuccessfulyDeleted.set(true);
 	}
 
-	private AtomicBoolean bookSuccessfulyDeleted = new AtomicBoolean(false);
+	public AtomicBoolean bookSuccessfulyDeleted = new AtomicBoolean(false);
 }

samples/samples-messaging-integration/src/main/java/com/example/BookReturned.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-integration/src/main/java/com/example/BookService.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

samples/samples-messaging-integration/src/main/java/com/example/IntegrationMessagingApplication.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

samples/samples-messaging-integration/src/main/resources/integration-context.xml

@@ -32,17 +32,17 @@
 					   ref="bookListener"
 					   method="returnBook"/>
 
-	<json-to-object-transformer input-channel="input" type="org.springframework.cloud.contract.verifier.samples.messaging.BookReturned"
+	<json-to-object-transformer input-channel="input" type="com.example.BookReturned"
 	output-channel="inputChannel"/>
 
 	<service-activator input-channel="deleteChannel"
 					   ref="bookListener"
 					   method="bookDeleted"/>
 
-	<json-to-object-transformer input-channel="delete" type="org.springframework.cloud.contract.verifier.samples.messaging.BookDeleted"
+	<json-to-object-transformer input-channel="delete" type="com.example.BookDeleted"
 								output-channel="deleteChannel"/>
 
-	<beans:bean id="bookListener" class="org.springframework.cloud.contract.verifier.samples.messaging.BookListener"/>
+	<beans:bean id="bookListener" class="com.example.BookListener"/>
 
 
 	<!-- REQUIRED FOR TESTING -->

samples/samples-messaging-integration/src/test/groovy/com/example/IntegrationMessagingApplicationSpec.groovy

@@ -14,22 +14,24 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging
+package com.example
+
+import javax.inject.Inject
 
-import com.jayway.jsonpath.DocumentContext
-import com.jayway.jsonpath.JsonPath
-import com.toomuchcoding.jsonassert.JsonAssertion
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.SpringApplicationContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
+
 import spock.lang.Specification
 
-import javax.inject.Inject
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import com.toomuchcoding.jsonassert.JsonAssertion
 // Context configuration would end up in base class
 @ContextConfiguration(classes = [IntegrationMessagingApplication], loader = SpringApplicationContextLoader)
 @DirtiesContext

samples/samples-messaging-spring/.springBeans

@@ -7,6 +7,7 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
+		<config>java:com.example.SpringMessagingApplication</config>
 	</configs>
 	<autoconfigs>
 	</autoconfigs>

samples/samples-messaging-spring/src/main/java/com/example/BookDeleted.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-spring/src/main/java/com/example/BookListener.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;

samples/samples-messaging-spring/src/main/java/com/example/BookReturned.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-spring/src/main/java/com/example/BookService.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
 
 import javax.jms.JMSException;
 import javax.jms.Message;

samples/samples-messaging-spring/src/main/java/com/example/SpringMessagingApplication.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring;
+package com.example;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

samples/samples-messaging-spring/src/test/groovy/com/example/SpringApplicationSpec.groovy

@@ -14,25 +14,26 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring
+package com.example
 
-import com.jayway.jsonpath.DocumentContext
-import com.jayway.jsonpath.JsonPath
-import com.toomuchcoding.jsonassert.JsonAssertion
+import javax.inject.Inject
 
-import org.junit.BeforeClass;
+import org.junit.BeforeClass
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.SpringApplicationContextLoader
 import org.springframework.cloud.contract.spec.Contract
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ContextConfiguration
+
 import spock.lang.Specification
 import spock.util.concurrent.PollingConditions
 
-import javax.inject.Inject
+import com.jayway.jsonpath.DocumentContext
+import com.jayway.jsonpath.JsonPath
+import com.toomuchcoding.jsonassert.JsonAssertion
 /**
  * SPIKE ON TESTS FROM NOTES IN MessagingSpec
  */

samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
 
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder

samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
 
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
 import org.springframework.context.annotation.Bean

samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.spring.config
+package com.example.config
 
 import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
 import org.springframework.jms.core.MessageCreator

samples/samples-messaging-stream/.springBeans

@@ -7,6 +7,7 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
+		<config>java:com.example.StreamMessagingApplication</config>
 	</configs>
 	<autoconfigs>
 	</autoconfigs>

samples/samples-messaging-stream/src/main/java/com/example/BookDeleted.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-stream/src/main/java/com/example/BookListener.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

samples/samples-messaging-stream/src/main/java/com/example/BookReturned.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import java.io.Serializable;
 

samples/samples-messaging-stream/src/main/java/com/example/BookService.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

samples/samples-messaging-stream/src/main/java/com/example/DeleteSink.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import org.springframework.cloud.stream.annotation.Input;
 import org.springframework.cloud.stream.messaging.Sink;

samples/samples-messaging-stream/src/main/java/com/example/StreamMessagingApplication.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging;
+package com.example;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

samples/samples-messaging-stream/src/test/groovy/com/example/StreamMessagingApplicationSpec.groovy

@@ -14,22 +14,24 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.contract.verifier.samples.messaging
+package com.example
+
+import javax.inject.Inject
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.cloud.contract.spec.Contract
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
+import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
+import org.springframework.test.annotation.DirtiesContext
+import org.springframework.test.context.ContextConfiguration
+
+import spock.lang.Specification
 
 import com.jayway.jsonpath.DocumentContext
 import com.jayway.jsonpath.JsonPath
 import com.toomuchcoding.jsonassert.JsonAssertion
-import org.springframework.cloud.contract.spec.Contract
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging
-import org.springframework.cloud.contract.verifier.messaging.ContractVerifierObjectMapper
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration
-import spock.lang.Specification
-
-import javax.inject.Inject
 /**
  * SPIKE ON TESTS FROM NOTES IN MessagingSpec
  */