From 503302ee2464d03e4da70703931ce5ff09ab6358 Mon Sep 17 00:00:00 2001
From: Philip Rego <regop412@gmail.com>
Date: Wed, 3 Oct 2018 19:03:20 -0400
Subject: [PATCH] upgrade to java 10, remove unused import, update deprecated
 validator.

---
 .../catalog/cdc/CatalogConsumerDrivenContractTest.java          | 2 --
 .../main/java/com/ewolff/microservice/customer/Customer.java    | 2 +-
 .../com/ewolff/microservice/order/clients/CatalogClient.java    | 1 +
 microservice-demo/pom.xml                                       | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/microservice-demo/microservice-demo-catalog/src/test/java/com/ewolff/microservice/catalog/cdc/CatalogConsumerDrivenContractTest.java b/microservice-demo/microservice-demo-catalog/src/test/java/com/ewolff/microservice/catalog/cdc/CatalogConsumerDrivenContractTest.java
index 1f6cc2b..17b67fa 100644
--- a/microservice-demo/microservice-demo-catalog/src/test/java/com/ewolff/microservice/catalog/cdc/CatalogConsumerDrivenContractTest.java
+++ b/microservice-demo/microservice-demo-catalog/src/test/java/com/ewolff/microservice/catalog/cdc/CatalogConsumerDrivenContractTest.java
@@ -11,8 +11,6 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
 import com.ewolff.microservice.catalog.CatalogApp;
 
 @RunWith(SpringJUnit4ClassRunner.class)
diff --git a/microservice-demo/microservice-demo-customer/src/main/java/com/ewolff/microservice/customer/Customer.java b/microservice-demo/microservice-demo-customer/src/main/java/com/ewolff/microservice/customer/Customer.java
index 94b2342..f440ce8 100644
--- a/microservice-demo/microservice-demo-customer/src/main/java/com/ewolff/microservice/customer/Customer.java
+++ b/microservice-demo/microservice-demo-customer/src/main/java/com/ewolff/microservice/customer/Customer.java
@@ -8,7 +8,7 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.hibernate.validator.constraints.Email;
+import javax.validation.constraints.Email;
 
 @Entity
 public class Customer {
diff --git a/microservice-demo/microservice-demo-order/src/main/java/com/ewolff/microservice/order/clients/CatalogClient.java b/microservice-demo/microservice-demo-order/src/main/java/com/ewolff/microservice/order/clients/CatalogClient.java
index 1be0b59..a7da406 100644
--- a/microservice-demo/microservice-demo-order/src/main/java/com/ewolff/microservice/order/clients/CatalogClient.java
+++ b/microservice-demo/microservice-demo-order/src/main/java/com/ewolff/microservice/order/clients/CatalogClient.java
@@ -89,6 +89,7 @@ public Collection<Item> findAll() {
 		return pagedResources.getContent();
 	}
 
+	@SuppressWarnings("unused")
 	private Collection<Item> getItemsCache() {
 		return itemsCache;
 	}
diff --git a/microservice-demo/pom.xml b/microservice-demo/pom.xml
index d88a6be..510407b 100644
--- a/microservice-demo/pom.xml
+++ b/microservice-demo/pom.xml
@@ -24,7 +24,7 @@
 	</modules>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>10</java.version>
 		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
 	</properties>