Merge "Fix sonar issues in ElasticSearchController"

1 files changed, 9 insertions, 10 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java
index 1adf0dba..37c4eb77 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElasticSearchController.java
@@ -105,23 +105,22 @@ public class ElasticSearchController extends RestrictedBaseController{
 		
 		SuggestResult result = client.execute(suggest);
 		System.err.println(result.getJsonObject().toString());
-		return new ResponseEntity<Result>(new Result(result.getJsonObject().toString()),HttpStatus.OK);
+		return new ResponseEntity<>(new Result(result.getJsonObject().toString()),HttpStatus.OK);
 	}
 	
-	@RequestMapping(value="/es_search/{task}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)  	
+	@RequestMapping(value="/es_search/{task}",method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Result> doSearch(@PathVariable("task") String task) throws IOException {
 		JSONObject obj = new JSONObject(task);
 		String searchTerm = obj.getString("data");
 		String searchSize = obj.getString("size");
-		// String searchFuzzy = obj.getString("fuzzy");
-		
+
 		JestClientFactory factory = new JestClientFactory();
 		factory.setHttpClientConfig(new HttpClientConfig
 			.Builder("http://todo_elastic_search_server")
 		    .multiThreaded(true)
 		    .build());
 		JestClient client = factory.getObject();
-		
+
 		Search search = new Search.Builder("{\n"
 			+"\"query\" : {\n"
 				+"\"query_string\" : {\n"
@@ -129,16 +128,16 @@ public class ElasticSearchController extends RestrictedBaseController{
 				+"}\n"
     		+"}\n"
 		+"}").addIndex("customer").setParameter(Parameters.SIZE,Integer.valueOf(searchSize)).build();
-		
+
 		SearchResult result = client.execute(search);
 		System.err.println(result.getJsonObject().toString());
-		return new ResponseEntity<Result>(new Result(result.getJsonObject().toString()),HttpStatus.OK);
+		return new ResponseEntity<>(new Result(result.getJsonObject().toString()),HttpStatus.OK);
 	}
-	
+
 	public ResponseEntity<Result> sendResult(Result result) {
-		return new ResponseEntity<Result>(result, HttpStatus.OK);
+		return new ResponseEntity<>(result, HttpStatus.OK);
 	}
-	
+
 	@Override
 	public boolean isRESTfulCall() {
 		return true;