Skip to content

Commit 0f788b3

Browse files
YuLuotomsun28
andauthored
[chore] optimize code style (apache#1984)
Signed-off-by: yuluo-yx <[email protected]> Co-authored-by: tomsun28 <[email protected]>
1 parent 056b686 commit 0f788b3

File tree

47 files changed

+96
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+96
-120
lines changed

collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/CacheIdentifier.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import lombok.Builder;
2222
import lombok.Data;
2323

24-
2524
/**
2625
* resource identifier in cache
2726
*/

collector/src/main/java/org/apache/hertzbeat/collector/collect/common/cache/ConnectionCommonCache.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.hertzbeat.collector.collect.common.cache;
1919

20-
2120
import com.google.common.util.concurrent.ThreadFactoryBuilder;
2221
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
2322
import java.util.Map;

collector/src/main/java/org/apache/hertzbeat/collector/collect/common/ssh/CommonSshClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.sshd.common.kex.BuiltinDHFactories;
2727
import org.apache.sshd.core.CoreModuleProperties;
2828

29-
3029
/**
3130
* common ssh pool client
3231
*/

collector/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcSpiLoader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
@Order(value = Ordered.HIGHEST_PRECEDENCE)
3232
public class JdbcSpiLoader implements CommandLineRunner {
3333

34-
3534
@Override
3635
public void run(String... args) throws Exception {
3736
log.info("start load jdbc drivers");

collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public class DnsCollectImpl extends AbstractCollect {
9090
private static final String AUTHORITY_ROW_COUNT = "authorityRowCount";
9191
private static final String ADDITIONAL_ROW_COUNT = "additionalRowCount";
9292

93-
9493
@Override
9594
public void preCheck(Metrics metrics) throws IllegalArgumentException {
9695
// compatible with monitoring template configurations of older versions
@@ -207,7 +206,6 @@ private List<String> getSectionInfo(Message message, int section) {
207206
return infoList;
208207
}
209208

210-
211209
@Data
212210
@Builder
213211
@NoArgsConstructor

collector/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
import org.w3c.dom.Node;
8888
import org.w3c.dom.NodeList;
8989

90-
9190
/**
9291
* http https collect
9392
*/
@@ -102,7 +101,7 @@ public class HttpCollectImpl extends AbstractCollect {
102101
private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
103102
HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
104103
HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
105-
104+
106105
public HttpCollectImpl() {
107106
}
108107

@@ -140,7 +139,7 @@ public void collect(CollectRep.MetricsData.Builder builder,
140139
}
141140
// todo This code converts an InputStream directly to a String. For large data in Prometheus exporters,
142141
// this could create large objects, potentially impacting JVM memory space significantly.
143-
// Option 1: Parse using InputStream, but this requires significant code changes;
142+
// Option 1: Parse using InputStream, but this requires significant code changes;
144143
// Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
145144
String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
146145
if (StringUtils.hasText(resp)) {
@@ -149,22 +148,21 @@ public void collect(CollectRep.MetricsData.Builder builder,
149148
Long responseTime = System.currentTimeMillis() - startTime;
150149
String parseType = metrics.getHttp().getParseType();
151150
try {
152-
if (DispatchConstants.PARSE_DEFAULT.equals(parseType)) {
153-
parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
154-
} else if (DispatchConstants.PARSE_JSON_PATH.equals(parseType)) {
155-
parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
156-
} else if (DispatchConstants.PARSE_PROM_QL.equalsIgnoreCase(parseType)) {
157-
parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
158-
} else if (DispatchConstants.PARSE_PROMETHEUS.equals(parseType)) {
159-
parseResponseByPrometheusExporter(resp, metrics.getAliasFields(), builder);
160-
} else if (DispatchConstants.PARSE_XML_PATH.equals(parseType)) {
161-
parseResponseByXmlPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
162-
} else if (DispatchConstants.PARSE_WEBSITE.equals(parseType)) {
163-
parseResponseByWebsite(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
164-
} else if (DispatchConstants.PARSE_SITE_MAP.equals(parseType)) {
165-
parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
166-
} else {
167-
parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
151+
switch (parseType) {
152+
case DispatchConstants.PARSE_JSON_PATH ->
153+
parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
154+
case DispatchConstants.PARSE_PROM_QL ->
155+
parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
156+
case DispatchConstants.PARSE_PROMETHEUS ->
157+
parseResponseByPrometheusExporter(resp, metrics.getAliasFields(), builder);
158+
case DispatchConstants.PARSE_XML_PATH ->
159+
parseResponseByXmlPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
160+
case DispatchConstants.PARSE_WEBSITE ->
161+
parseResponseByWebsite(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
162+
case DispatchConstants.PARSE_SITE_MAP ->
163+
parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
164+
default ->
165+
parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
168166
}
169167
} catch (Exception e) {
170168
log.info("parse error: {}.", e.getMessage(), e);
@@ -202,12 +200,12 @@ public void collect(CollectRep.MetricsData.Builder builder,
202200
}
203201
}
204202
}
205-
203+
206204
@Override
207205
public String supportProtocol() {
208206
return DispatchConstants.PROTOCOL_HTTP;
209207
}
210-
208+
211209
private void parseResponseByWebsite(String resp, List<String> aliasFields, HttpProtocol http,
212210
CollectRep.MetricsData.Builder builder, Long responseTime) {
213211
CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
@@ -223,7 +221,7 @@ private void parseResponseByWebsite(String resp, List<String> aliasFields, HttpP
223221
}
224222
builder.addValues(valueRowBuilder.build());
225223
}
226-
224+
227225
private void parseResponseBySiteMap(String resp, List<String> aliasFields,
228226
CollectRep.MetricsData.Builder builder) {
229227
List<String> siteUrls = new LinkedList<>();
@@ -306,11 +304,11 @@ private void parseResponseBySiteMap(String resp, List<String> aliasFields,
306304
builder.addValues(valueRowBuilder.build());
307305
}
308306
}
309-
307+
310308
private void parseResponseByXmlPath(String resp, List<String> aliasFields, HttpProtocol http,
311309
CollectRep.MetricsData.Builder builder) {
312310
}
313-
311+
314312
private void parseResponseByJsonPath(String resp, List<String> aliasFields, HttpProtocol http,
315313
CollectRep.MetricsData.Builder builder, Long responseTime) {
316314
List<Object> results = JsonPathParser.parseContentWithJsonPath(resp, http.getParseScript());
@@ -362,15 +360,15 @@ private void parseResponseByJsonPath(String resp, List<String> aliasFields, Http
362360
}
363361
}
364362
}
365-
363+
366364
private void parseResponseByPromQl(String resp, List<String> aliasFields, HttpProtocol http,
367365
CollectRep.MetricsData.Builder builder) {
368366
AbstractPrometheusParse prometheusParser = PrometheusParseCreater.getPrometheusParse();
369367
prometheusParser.handle(resp, aliasFields, http, builder);
370368
}
371-
369+
372370
private static final Map<Long, ExporterParser> EXPORTER_PARSER_TABLE = new ConcurrentHashMap<>();
373-
371+
374372
private void parseResponseByPrometheusExporter(String resp, List<String> aliasFields,
375373
CollectRep.MetricsData.Builder builder) {
376374
if (!EXPORTER_PARSER_TABLE.containsKey(builder.getId())) {
@@ -405,7 +403,7 @@ private void parseResponseByPrometheusExporter(String resp, List<String> aliasFi
405403
}
406404
}
407405
}
408-
406+
409407
private void parseResponseByDefault(String resp, List<String> aliasFields, HttpProtocol http,
410408
CollectRep.MetricsData.Builder builder, Long responseTime) {
411409
JsonElement element = JsonParser.parseString(resp);
@@ -419,7 +417,7 @@ private void parseResponseByDefault(String resp, List<String> aliasFields, HttpP
419417
getValueFromJson(aliasFields, builder, responseTime, element, keywordNum);
420418
}
421419
}
422-
420+
423421
private void getValueFromJson(List<String> aliasFields, CollectRep.MetricsData.Builder builder, Long responseTime, JsonElement element, int keywordNum) {
424422
if (element.isJsonObject()) {
425423
JsonObject object = element.getAsJsonObject();
@@ -442,7 +440,7 @@ private void getValueFromJson(List<String> aliasFields, CollectRep.MetricsData.B
442440
builder.addValues(valueRowBuilder.build());
443441
}
444442
}
445-
443+
446444
/**
447445
* create httpContext
448446
* @param httpProtocol http protocol
@@ -467,7 +465,7 @@ public HttpContext createHttpContext(HttpProtocol httpProtocol) {
467465
}
468466
return null;
469467
}
470-
468+
471469
/**
472470
* create http request
473471
* @param httpProtocol http params
@@ -531,7 +529,7 @@ public HttpUriRequest createHttpRequest(HttpProtocol httpProtocol) {
531529
} else {
532530
requestBuilder.addHeader(HttpHeaders.ACCEPT, "*/*");
533531
}
534-
532+
535533
if (httpProtocol.getAuthorization() != null) {
536534
HttpProtocol.Authorization authorization = httpProtocol.getAuthorization();
537535
if (DispatchConstants.BEARER_TOKEN.equalsIgnoreCase(authorization.getType())) {
@@ -546,16 +544,16 @@ public HttpUriRequest createHttpRequest(HttpProtocol httpProtocol) {
546544
}
547545
}
548546
}
549-
547+
550548
// if it has payload, would override post params
551549
if (StringUtils.hasLength(httpProtocol.getPayload())) {
552550
requestBuilder.setEntity(new StringEntity(httpProtocol.getPayload(), StandardCharsets.UTF_8));
553551
}
554-
552+
555553
// uri
556554
String uri = CollectUtil.replaceUriSpecialChar(httpProtocol.getUrl());
557555
if (IpDomainUtil.isHasSchema(httpProtocol.getHost())) {
558-
556+
559557
requestBuilder.setUri(httpProtocol.getHost() + ":" + httpProtocol.getPort() + uri);
560558
} else {
561559
String ipAddressType = IpDomainUtil.checkIpAddressType(httpProtocol.getHost());
@@ -569,7 +567,7 @@ public HttpUriRequest createHttpRequest(HttpProtocol httpProtocol) {
569567
requestBuilder.setUri(CollectorConstants.HTTP_HEADER + baseUri);
570568
}
571569
}
572-
570+
573571
// custom timeout
574572
int timeout = CollectUtil.getTimeout(httpProtocol.getTimeout(), 0);
575573
if (timeout > 0) {
@@ -582,7 +580,7 @@ public HttpUriRequest createHttpRequest(HttpProtocol httpProtocol) {
582580
}
583581
return requestBuilder.build();
584582
}
585-
583+
586584
private boolean checkSuccessInvoke(Metrics metrics, int statusCode) {
587585
List<String> successCodes = metrics.getHttp().getSuccessCodes();
588586
Set<Integer> successCodeSet = successCodes != null ? successCodes.stream().map(code -> {

collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,25 @@ private void parseLine(Map<String, MetricFamily> metricMap, StrBuffer buffer) {
8181
buffer.skipBlankTabs();
8282
if (buffer.isEmpty()) return;
8383
switch (buffer.charAt(0)) {
84-
case '#':
84+
case '#' -> {
8585
buffer.read();
8686
this.currentMetricFamily = null;
8787
this.parseComment(metricMap, buffer);
88-
break;
89-
case ENTER:
90-
break;
91-
default:
88+
}
89+
case ENTER -> {}
90+
default -> {
9291
this.currentBucket = null;
9392
this.currentQuantile = null;
9493
this.parseMetric(buffer);
94+
}
9595
}
9696
}
9797

9898
private void parseComment(Map<String, MetricFamily> metricMap, StrBuffer buffer) {
9999
buffer.skipBlankTabs();
100-
if (buffer.isEmpty()) return;
100+
if (buffer.isEmpty()) {
101+
return;
102+
}
101103
String token = this.readTokenUnitWhitespace(buffer);
102104
if (EOF.equals(token)) {
103105
return;
@@ -160,7 +162,9 @@ private void parseMetric(StrBuffer buffer) {
160162

161163
private void readLabels(MetricFamily.Metric metric, StrBuffer buffer) {
162164
buffer.skipBlankTabs();
163-
if (buffer.isEmpty()) return;
165+
if (buffer.isEmpty()) {
166+
return;
167+
}
164168
metric.setLabelPair(new ArrayList<>());
165169
if (buffer.charAt(0) == LEFT_CURLY_BRACKET) {
166170
buffer.read();
@@ -172,11 +176,15 @@ private void readLabels(MetricFamily.Metric metric, StrBuffer buffer) {
172176

173177
private void startReadLabelName(MetricFamily.Metric metric, StrBuffer buffer) {
174178
buffer.skipBlankTabs();
175-
if (buffer.isEmpty()) return;
179+
if (buffer.isEmpty()) {
180+
return;
181+
}
176182
if (buffer.charAt(0) == RIGHT_CURLY_BRACKET) {
177183
buffer.read();
178184
buffer.skipBlankTabs();
179-
if (buffer.isEmpty()) return;
185+
if (buffer.isEmpty()) {
186+
return;
187+
}
180188
this.readLabelValue(metric, new MetricFamily.Label(), buffer);
181189
return;
182190
}
@@ -194,7 +202,9 @@ private void startReadLabelName(MetricFamily.Metric metric, StrBuffer buffer) {
194202

195203
private void startReadLabelValue(MetricFamily.Metric metric, MetricFamily.Label label, StrBuffer buffer) {
196204
buffer.skipBlankTabs();
197-
if (buffer.isEmpty()) return;
205+
if (buffer.isEmpty()) {
206+
return;
207+
}
198208
char c = buffer.read();
199209
if (c != QUOTES) {
200210
throw new ParseException("expected '\"' at start of label value, line: " + buffer.toStr());
@@ -211,7 +221,9 @@ private void startReadLabelValue(MetricFamily.Metric metric, MetricFamily.Label
211221
} else {
212222
metric.getLabelPair().add(label);
213223
}
214-
if (buffer.isEmpty()) return;
224+
if (buffer.isEmpty()) {
225+
return;
226+
}
215227
c = buffer.read();
216228
switch (c) {
217229
case COMMA -> this.startReadLabelName(metric, buffer);
@@ -378,15 +390,10 @@ private String readTokenAsLabelValue(StrBuffer buffer) {
378390
escaped = false;
379391
} else {
380392
switch (c) {
381-
case QUOTES:
382-
return builder.toString();
383-
case ENTER:
384-
throw new ParseException("parse label value error, next line");
385-
case '\\':
386-
escaped = true;
387-
break;
388-
default:
389-
builder.append(c);
393+
case QUOTES -> { return builder.toString(); }
394+
case ENTER -> throw new ParseException("parse label value error, next line");
395+
case '\\' -> escaped = true;
396+
default -> builder.append(c);
390397
}
391398
}
392399
}

collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import lombok.ToString;
2424

2525
/**
26-
*
26+
* MetricFamily.
2727
*/
2828
@Data
2929
@ToString

collector/src/main/java/org/apache/hertzbeat/collector/collect/nebulagraph/NebulaGraphCollectImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.apache.http.protocol.HttpContext;
4848
import org.apache.http.util.EntityUtils;
4949

50-
5150
/**
5251
* NebulaGraph collect
5352
*/

collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import org.apache.http.protocol.HttpContext;
5555
import org.apache.http.util.EntityUtils;
5656

57-
5857
/**
5958
* nginx collect
6059
*/

0 commit comments

Comments
 (0)