Repository: incubator-griffin Updated Branches: refs/heads/master bd911ea91 -> 3f862cde6
fix a bad practice 1.Format string should use %n rather than \n In format strings, it is generally preferable better to use %n, which will produce the platform-specific line separator. 2.use System.lineSeparator() instead of '\n' 3.trim up some extra long code lines Author: Eugene <toyboxman0...@163.com> Closes #335 from toyboxman/bug-1. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/3f862cde Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/3f862cde Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/3f862cde Branch: refs/heads/master Commit: 3f862cde6b9486714e7bc4e08a61ed1b4a6b7d03 Parents: bd911ea Author: Eugene <toyboxman0...@163.com> Authored: Thu Jul 5 17:35:31 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Thu Jul 5 17:35:31 2018 +0800 ---------------------------------------------------------------------- .../griffin/core/metric/MetricStoreImpl.java | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/3f862cde/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java ---------------------------------------------------------------------- diff --git a/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java b/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java index d36cc82..09458f3 100644 --- a/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java +++ b/service/src/main/java/org/apache/griffin/core/metric/MetricStoreImpl.java @@ -70,7 +70,7 @@ public class MetricStoreImpl implements MetricStore { if (!user.isEmpty() && !password.isEmpty()) { String encodedAuth = buildBasicAuthString(user, password); Header[] requestHeaders = new Header[]{ - new BasicHeader(org.apache.http.HttpHeaders.AUTHORIZATION, encodedAuth)}; + new BasicHeader(org.apache.http.HttpHeaders.AUTHORIZATION, encodedAuth)}; builder.setDefaultHeaders(requestHeaders); } this.client = builder.build(); @@ -81,7 +81,7 @@ public class MetricStoreImpl implements MetricStore { this.urlGet = urlBase.concat("/_search?filter_path=hits.hits._source"); this.urlPost = urlBase.concat("/_bulk"); this.urlDelete = urlBase.concat("/_delete_by_query"); - this.indexMetaData = String.format("{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }\n", INDEX, TYPE); + this.indexMetaData = String.format("{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", INDEX, TYPE); this.mapper = new ObjectMapper(); } @@ -99,14 +99,14 @@ public class MetricStoreImpl implements MetricStore { } } - private HttpEntity getHttpEntityForSearch(String metricName, int from, int size, long tmst) throws JsonProcessingException { + private HttpEntity getHttpEntityForSearch(String metricName, int from, int size, long tmst) + throws JsonProcessingException { Map<String, Object> map = new HashMap<>(); Map<String, Object> queryParam = new HashMap<>(); -// Map<String, Object> rangeQuery = Collections.singletonMap("tmst", Collections.singletonMap("gte", tmst)); -// queryParam.put("must", Collections.singletonMap("range", rangeQuery)); Map<String, Object> termQuery = Collections.singletonMap("name.keyword", metricName); queryParam.put("filter", Collections.singletonMap("term", termQuery)); - Map<String, Object> sortParam = Collections.singletonMap("tmst", Collections.singletonMap("order", "desc")); + Map<String, Object> sortParam = Collections + .singletonMap("tmst", Collections.singletonMap("order", "desc")); map.put("query", Collections.singletonMap("bool", queryParam)); map.put("sort", sortParam); map.put("from", from); @@ -117,12 +117,15 @@ public class MetricStoreImpl implements MetricStore { private List<MetricValue> getMetricValuesFromResponse(Response response) throws IOException { List<MetricValue> metricValues = new ArrayList<>(); JsonNode jsonNode = mapper.readTree(EntityUtils.toString(response.getEntity())); - if (jsonNode.hasNonNull("hits") && jsonNode.get("hits").hasNonNull("hits")) { + if (jsonNode.hasNonNull("hits") && jsonNode.get("hits") + .hasNonNull("hits")) { for (JsonNode node : jsonNode.get("hits").get("hits")) { JsonNode sourceNode = node.get("_source"); - Map<String, Object> value = JsonUtil.toEntity(sourceNode.get("value").toString(), new TypeReference<Map<String, Object>>() { - }); - MetricValue metricValue = new MetricValue(sourceNode.get("name").asText(), Long.parseLong(sourceNode.get("tmst").asText()), value); + Map<String, Object> value = JsonUtil.toEntity(sourceNode.get("value").toString(), + new TypeReference<Map<String, Object>>() { + }); + MetricValue metricValue = new MetricValue(sourceNode.get("name").asText(), + Long.parseLong(sourceNode.get("tmst").asText()), value); metricValues.add(metricValue); } } @@ -143,16 +146,15 @@ public class MetricStoreImpl implements MetricStore { for (MetricValue metricValue : metricValues) { bulkRequestBody.append(indexMetaData); bulkRequestBody.append(JsonUtil.toJson(metricValue)); - bulkRequestBody.append("\n"); + bulkRequestBody.append(System.lineSeparator()); } return bulkRequestBody.toString(); } - @Override public ResponseEntity deleteMetricValues(String metricName) throws IOException { Map<String, Object> param = Collections.singletonMap("query", - Collections.singletonMap("term", Collections.singletonMap("name.keyword", metricName))); + Collections.singletonMap("term", Collections.singletonMap("name.keyword", metricName))); HttpEntity entity = new NStringEntity(JsonUtil.toJson(param), ContentType.APPLICATION_JSON); Response response = client.performRequest("POST", urlDelete, Collections.emptyMap(), entity); return getResponseEntityFromResponse(response);
