This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch refactor in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 38edd51c70ce32dfe818f92fb2c0af0a24e42677 Author: zqr10159 <[email protected]> AuthorDate: Tue Apr 23 15:14:38 2024 +0800 [fix]Fix import errors. --- .../hertzbeat/collector/collect/dns/DnsCollectImpl.java | 17 +++++++++-------- .../collect/http/SslCertificateCollectImpl.java | 5 +++-- .../collector/collect/nginx/NginxCollectImpl.java | 12 ++++++------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java index f85e766ec..cb68a92df 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImpl.java @@ -17,6 +17,8 @@ package org.apache.hertzbeat.collector.collect.dns; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import java.io.IOException; import java.time.Duration; import java.time.temporal.ChronoUnit; @@ -24,7 +26,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; -import org.springframework.util.StopWatch; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.collector.collect.AbstractCollect; @@ -34,6 +40,7 @@ import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.DnsProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; +import org.springframework.util.StopWatch; import org.xbill.DNS.DClass; import org.xbill.DNS.Message; import org.xbill.DNS.Name; @@ -45,13 +52,7 @@ import org.xbill.DNS.Resolver; import org.xbill.DNS.Section; import org.xbill.DNS.SimpleResolver; import org.xbill.DNS.Type; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; + /** * dns protocol collection implementation diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java index f93666604..ad44a3186 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/http/SslCertificateCollectImpl.java @@ -29,7 +29,7 @@ import java.util.Date; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLException; import javax.net.ssl.SSLPeerUnverifiedException; -import org.springframework.util.StringUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.dispatch.DispatchConstants; import org.apache.hertzbeat.common.constants.CollectorConstants; @@ -39,7 +39,8 @@ import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.hertzbeat.common.util.IpDomainUtil; -import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; + /** * ssl Certificate diff --git a/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java index e0c4015d7..f520e03e7 100644 --- a/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java +++ b/collector/src/main/java/org/apache/hertzbeat/collector/collect/nginx/NginxCollectImpl.java @@ -27,6 +27,11 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.collector.collect.AbstractCollect; import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient; @@ -48,15 +53,10 @@ import org.apache.http.client.methods.RequestBuilder; import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - /** * nginx collect */ + @Slf4j public class NginxCollectImpl extends AbstractCollect { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
