polish

thombergs · thombergs · commit ae6541c25e27 · 2017-08-09T22:18:05.000+02:00
diff --git a/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java b/pact-feign-consumer/src/main/java/com/example/demo/AddressClient.java
@@ -4,23 +4,16 @@
 import org.springframework.hateoas.Resource;
 import org.springframework.hateoas.Resources;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 @FeignClient(value = "addresses", path = "/addresses")
 public interface AddressClient {
 
-	@RequestMapping(method = RequestMethod.GET, path = "/")
-	Resources<Address> getAddresses();
+  @RequestMapping(method = RequestMethod.GET, path = "/")
+  Resources<Address> getAddresses();
 
-	@RequestMapping(method = RequestMethod.GET, path = "/{id}")
-	Resource<Address> getAddress(@PathVariable("id") long id);
-
-	@RequestMapping(method = RequestMethod.PUT, consumes = "text/uri-list", path="/{addressId}/customer")
-	Resource<Address> associateWithCustomer(@PathVariable("addressId") long addressId, @RequestBody String customerUri);
-
-	@RequestMapping(method = RequestMethod.GET, path="/{addressId}/customer")
-	Resource<Customer> getCustomer(@PathVariable("addressId") long addressId);
+  @RequestMapping(method = RequestMethod.GET, path = "/{id}")
+  Resource<Address> getAddress(@PathVariable("id") long id);
 
 }
diff --git a/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java b/pact-feign-consumer/src/test/java/com/example/demo/ConsumerPactVerificationTest.java
@@ -19,7 +19,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(properties = {
-        // overriding producer address
+        // overriding provider address
         "addresses.ribbon.listOfServers: localhost:8888"
 })
 public class ConsumerPactVerificationTest {
@@ -30,10 +30,10 @@ public class ConsumerPactVerificationTest {
   @Autowired
   private AddressClient addressClient;
 
-  @Pact(state = "address-collection", provider = "customerServiceProvider", consumer = "addressClient")
+  @Pact(state = "a collection of 2 addresses", provider = "customerServiceProvider", consumer = "addressClient")
   public RequestResponsePact createAddressCollectionResourcePact(PactDslWithProvider builder) {
     return builder
-            .given("address-collection")
+            .given("a collection of 2 addresses")
             .uponReceiving("a request to the address collection resource")
             .path("/addresses/")
             .method("GET")
@@ -94,10 +94,10 @@ public RequestResponsePact createAddressCollectionResourcePact(PactDslWithProvid
             .toPact();
   }
 
-  @Pact(state = "single-address", provider = "customerServiceProvider", consumer = "addressClient")
+  @Pact(state = "a single address", provider = "customerServiceProvider", consumer = "addressClient")
   public RequestResponsePact createAddressResourcePact(PactDslWithProvider builder) {
     return builder
-            .given("single-address")
+            .given("a single address")
             .uponReceiving("a request to the address resource")
             .path("/addresses/1")
             .method("GET")
@@ -122,14 +122,14 @@ public RequestResponsePact createAddressResourcePact(PactDslWithProvider builder
 
   @Test
   @PactVerification(fragment = "createAddressCollectionResourcePact")
-  public void addressCollectionResourcePact() {
+  public void verifyAddressCollectionPact() {
     Resources<Address> addresses = addressClient.getAddresses();
     assertThat(addresses).hasSize(2);
   }
 
   @Test
   @PactVerification(fragment = "createAddressResourcePact")
-  public void addressResourcePact() {
+  public void verifyAddressPact() {
     Resource<Address> address = addressClient.getAddress(1L);
     assertThat(address).isNotNull();
   }
diff --git a/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java b/pact-spring-data-rest-provider/src/test/java/com/example/demo/ProviderPactVerificationTest.java
@@ -7,17 +7,10 @@
 import au.com.dius.pact.provider.junit.target.HttpTarget;
 import au.com.dius.pact.provider.junit.target.Target;
 import au.com.dius.pact.provider.junit.target.TestTarget;
-import com.example.framework.DatabaseState;
 import com.example.framework.DatabaseStateHolder;
 import com.example.framework.SpringBootStarter;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ConfigurableApplicationContext;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
 @RunWith(PactRunner.class)
 @Provider("customerServiceProvider")
@@ -32,18 +25,17 @@ public class ProviderPactVerificationTest {
           .withDatabaseState("address-collection", "/initial-schema.sql", "/address-collection.sql")
           .build();
 
-  @State("single-address")
+  @State("a single address")
   public void toSingleAddressState() {
     DatabaseStateHolder.setCurrentDatabaseState("single-address");
   }
 
-  @State("address-collection")
+  @State("a collection of 2 addresses")
   public void toAddressCollectionState() {
     DatabaseStateHolder.setCurrentDatabaseState("address-collection");
   }
 
   @TestTarget
   public final Target target = new HttpTarget(8080);
 
-
 }
