formatting work

2016-08-02 12:34:08 +03:00
parent 52445091db
commit e83b4b8523
9 changed files with 105 additions and 116 deletions
@@ -16,87 +16,80 @@ import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.ResponseExtractor;
 import org.springframework.web.client.RestTemplate;

-
 //@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = SpringDemoApplication.class, loader = SpringApplicationContextLoader.class)
@WebAppConfiguration
@IntegrationTest
 public class SpringIntegrationTest {
-	protected static ResponseResults latestResponse = null;
+    protected static ResponseResults latestResponse = null;

-	protected RestTemplate restTemplate = null;
+    protected RestTemplate restTemplate = null;

-	protected void executeGet(String url) throws IOException{
-		final Map<String,String> headers = new HashMap<>();
-		headers.put("Accept","application/json");
-		final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
-		final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
+    protected void executeGet(String url) throws IOException {
+        final Map<String, String> headers = new HashMap<>();
+        headers.put("Accept", "application/json");
+        final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
+        final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();

-		if (restTemplate == null){
-			restTemplate = new RestTemplate();
-		}
+        if (restTemplate == null) {
+            restTemplate = new RestTemplate();
+        }

-		restTemplate.setErrorHandler(errorHandler);
-		latestResponse = restTemplate.execute(url,
-				HttpMethod.GET,
-				requestCallback,
-				new ResponseExtractor<ResponseResults>(){
-			@Override
-			public ResponseResults extractData(ClientHttpResponse response) throws IOException {
-				if (errorHandler.hadError){
-					return (errorHandler.getResults());
-				} else{
-					return (new ResponseResults(response));
-				}
-			}
-		});
+        restTemplate.setErrorHandler(errorHandler);
+        latestResponse = restTemplate.execute(url, HttpMethod.GET, requestCallback, new ResponseExtractor<ResponseResults>() {
+            @Override
+            public ResponseResults extractData(ClientHttpResponse response) throws IOException {
+                if (errorHandler.hadError) {
+                    return (errorHandler.getResults());
+                } else {
+                    return (new ResponseResults(response));
+                }
+            }
+        });

-	}
-	
-	protected void executePost(String url) throws IOException{
-		final Map<String,String> headers = new HashMap<>();
-		headers.put("Accept","application/json");
-		final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
-		final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
+    }

-		if (restTemplate == null){
-			restTemplate = new RestTemplate();
-		}
+    protected void executePost(String url) throws IOException {
+        final Map<String, String> headers = new HashMap<>();
+        headers.put("Accept", "application/json");
+        final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
+        final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();

-		restTemplate.setErrorHandler(errorHandler);
-		latestResponse = restTemplate.execute(url,
-				HttpMethod.POST,
-				requestCallback,
-				new ResponseExtractor<ResponseResults>(){
-			@Override
-			public ResponseResults extractData(ClientHttpResponse response) throws IOException {
-				if (errorHandler.hadError){
-					return (errorHandler.getResults());
-				} else{
-					return (new ResponseResults(response));
-				}
-			}
-		});
+        if (restTemplate == null) {
+            restTemplate = new RestTemplate();
+        }

-	}
+        restTemplate.setErrorHandler(errorHandler);
+        latestResponse = restTemplate.execute(url, HttpMethod.POST, requestCallback, new ResponseExtractor<ResponseResults>() {
+            @Override
+            public ResponseResults extractData(ClientHttpResponse response) throws IOException {
+                if (errorHandler.hadError) {
+                    return (errorHandler.getResults());
+                } else {
+                    return (new ResponseResults(response));
+                }
+            }
+        });

-	private class ResponseResultErrorHandler implements ResponseErrorHandler{
-		private ResponseResults results = null;
-		private Boolean hadError = false;
+    }

-		private ResponseResults getResults(){
-			return results;
-		}
+    private class ResponseResultErrorHandler implements ResponseErrorHandler {
+        private ResponseResults results = null;
+        private Boolean hadError = false;

-		@Override
-		public boolean hasError(ClientHttpResponse response) throws IOException{
-			hadError = response.getRawStatusCode() >= 400;
-			return hadError;
-		}
+        private ResponseResults getResults() {
+            return results;
+        }

-		@Override
-		public void handleError(ClientHttpResponse response) throws IOException {
-			results =  new ResponseResults(response);
-		}
-	}
+        @Override
+        public boolean hasError(ClientHttpResponse response) throws IOException {
+            hadError = response.getRawStatusCode() >= 400;
+            return hadError;
+        }
+
+        @Override
+        public void handleError(ClientHttpResponse response) throws IOException {
+            results = new ResponseResults(response);
+        }
+    }
 }