From 5cbf1836f0b38e4610c7570bf603f67cb702ce76 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Wed, 30 Aug 2017 13:03:38 +0200
Subject: [PATCH] Fixed checkstyole

---
 .../cloud/contract/maven/verifier/RunMojo.java             | 5 ++---
 .../cloud/contract/wiremock/JettyFaultInjector.java        | 6 ++----
 .../cloud/contract/wiremock/TomcatFaultInjector.java       | 7 ++-----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java
index cce6c5f9df..a9365621ad 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/RunMojo.java
@@ -34,8 +34,7 @@ import org.springframework.cloud.contract.stubrunner.BatchStubRunner;
 import org.springframework.cloud.contract.stubrunner.StubRunner;
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptions;
 import org.springframework.cloud.contract.stubrunner.StubRunnerOptionsBuilder;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
+import org.springframework.util.StringUtils;
 
 /**
  *
@@ -122,7 +121,7 @@ public class RunMojo extends AbstractMojo {
 		BatchStubRunner batchStubRunner = null;
 		StubRunnerOptionsBuilder optionsBuilder = new StubRunnerOptionsBuilder()
 				.withStubsClassifier(this.stubsClassifier);
-		if (isNullOrEmpty(this.stubs)) {
+		if (StringUtils.isEmpty(this.stubs)) {
 			StubRunnerOptions options = optionsBuilder
 					.withMinMaxPort(this.httpPort, this.httpPort)
 					.build();
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/JettyFaultInjector.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/JettyFaultInjector.java
index ab3e2822b8..0fa92e8f89 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/JettyFaultInjector.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/JettyFaultInjector.java
@@ -18,12 +18,10 @@ package org.springframework.cloud.contract.wiremock;
 
 import java.io.IOException;
 import java.nio.channels.ByteChannel;
-
+import java.nio.charset.Charset;
 import javax.servlet.http.HttpServletResponse;
 
 import com.github.tomakehurst.wiremock.core.FaultInjector;
-import com.google.common.base.Charsets;
-
 import org.eclipse.jetty.io.ChannelEndPoint;
 import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.server.Response;
@@ -39,7 +37,7 @@ import static com.github.tomakehurst.wiremock.jetty9.JettyUtils.unwrapResponse;
 public class JettyFaultInjector implements FaultInjector {
 
 	private static final byte[] GARBAGE = "lskdu018973t09sylgasjkfg1][]'./.sdlv"
-			.getBytes(Charsets.UTF_8);
+			.getBytes(Charset.forName("UTF-8"));
 
 	private final Response response;
 	private final ByteChannel socket;
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/TomcatFaultInjector.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/TomcatFaultInjector.java
index 0abf792f85..ee8cd003a5 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/TomcatFaultInjector.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/TomcatFaultInjector.java
@@ -19,16 +19,13 @@ package org.springframework.cloud.contract.wiremock;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
-
+import java.nio.charset.Charset;
 import javax.servlet.http.HttpServletResponse;
 
 import com.github.tomakehurst.wiremock.common.Exceptions;
 import com.github.tomakehurst.wiremock.core.FaultInjector;
-import com.google.common.base.Charsets;
-
 import org.apache.coyote.Response;
 import org.apache.tomcat.util.net.SocketWrapperBase;
-
 import org.springframework.util.ReflectionUtils;
 
 import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
@@ -40,7 +37,7 @@ import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked;
 public class TomcatFaultInjector implements FaultInjector {
 
 	private static final byte[] GARBAGE = "lskdu018973t09sylgasjkfg1][]'./.sdlv"
-			.getBytes(Charsets.UTF_8);
+			.getBytes(Charset.forName("UTF-8"));
 	private final Response response;
 	private SocketWrapperBase<?> socket;