From f97430a1b3540c0bca403482b47f55d7d10b6c14 Mon Sep 17 00:00:00 2001 From: Kim YoungJin Date: Tue, 8 Nov 2022 20:03:20 +0900 Subject: [PATCH] [#noissue] Optimized imports --- .../test/plugin/HttpClient4PluginController.java | 1 - .../pinpoint/test/plugin/KafkaPluginController.java | 7 ------- .../java/com/pinpoint/test/plugin/SimpleRoute.java | 1 - .../test/plugin/JasyncMysqlR2dbcDatabase.java | 2 -- .../pinpoint/test/plugin/MariadbR2dbcDatabase.java | 1 - .../com/pinpoint/test/plugin/MssqlR2dbcDatabase.java | 1 - .../pinpoint/test/plugin/OracleR2dbcDatabase.java | 8 +------- .../test/plugin/PostgresqlR2dbcDatabase.java | 3 --- .../test/plugin/SpringDataR2dbcPluginController.java | 3 --- .../pinpoint/test/plugin/VertxPluginTestStarter.java | 1 - .../test/plugin/Vertx4PluginTestStarter.java | 4 ---- .../pinpoint/batch/alarm/DataCollectorFactory.java | 8 +++++++- .../FluxAndMonoSubscribeOrReturnInterceptor.java | 2 -- .../bootstrap/java9/module/ModuleBuilder.java | 10 ++++++++-- .../mapper/flink/TFAgentStatBatchMapper.java | 5 +---- .../pinpoint/common/server/bo/AgentInfoBo.java | 4 ---- .../bo/codec/stat/AgentStatCoderConfiguration.java | 1 - .../metric/collector/MetricCollectorApp.java | 1 - .../navercorp/pinpoint/metric/web/MetricWebApp.java | 1 - .../metric/web/controller/UriStatController.java | 7 ++++++- .../web/service/SystemMetricDataServiceImpl.java | 4 ---- .../pinpoint/plugin/kafka/KafkaClientITBase.java | 6 +----- .../pinpoint/plugin/kafka/KafkaClientITBase.java | 8 +------- .../interceptor/util/KafkaResponseDataProvider.java | 2 -- .../util/KafkaResponseDataProviderFactory.java | 5 ----- ...PostgresqlConnectionConfigurationInterceptor.java | 1 - .../TNonblockingSocketConstructInterceptor.java | 12 +++++------- .../pinpoint/plugin/vertx/VertxConstants.java | 1 - ...tpClientRequestImplHandleResponseInterceptor.java | 2 -- .../monitor/metric/buffer/DefaultBufferMetric.java | 4 ---- .../context/provider/sampler/UrlSamplerConfig.java | 1 - .../transformer/DefaultHierarchyCaches.java | 3 --- .../io/CommandHeaderTBaseDeserializerFactory.java | 2 -- .../io/CommandHeaderTBaseSerializerFactory.java | 2 -- .../dao/hbase/config/AgentStatDaoConfiguration.java | 1 - .../pinpoint/web/view/ServerInstanceSerializer.java | 2 -- .../pinpoint/web/vo/tree/SortByRequestConverter.java | 3 --- 37 files changed, 30 insertions(+), 100 deletions(-) diff --git a/agent-testweb/httpclient4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/HttpClient4PluginController.java b/agent-testweb/httpclient4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/HttpClient4PluginController.java index 88eb67698bcc..7d11430ff33e 100644 --- a/agent-testweb/httpclient4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/HttpClient4PluginController.java +++ b/agent-testweb/httpclient4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/HttpClient4PluginController.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; @RestController public class HttpClient4PluginController { diff --git a/agent-testweb/kafka-plugin-testweb/src/main/java/com/pinpoint/test/plugin/KafkaPluginController.java b/agent-testweb/kafka-plugin-testweb/src/main/java/com/pinpoint/test/plugin/KafkaPluginController.java index 67c881c71364..92d2a4a08624 100644 --- a/agent-testweb/kafka-plugin-testweb/src/main/java/com/pinpoint/test/plugin/KafkaPluginController.java +++ b/agent-testweb/kafka-plugin-testweb/src/main/java/com/pinpoint/test/plugin/KafkaPluginController.java @@ -1,15 +1,8 @@ package com.pinpoint.test.plugin; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.common.serialization.StringSerializer; -import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.net.InetAddress; -import java.util.Properties; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/agent-testweb/redis-lettuce-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SimpleRoute.java b/agent-testweb/redis-lettuce-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SimpleRoute.java index 6819753082ab..c1e1dad46552 100644 --- a/agent-testweb/redis-lettuce-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SimpleRoute.java +++ b/agent-testweb/redis-lettuce-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SimpleRoute.java @@ -24,7 +24,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; import reactor.core.publisher.Mono; -import reactor.core.scheduler.Schedulers; @Configuration public class SimpleRoute { diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/JasyncMysqlR2dbcDatabase.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/JasyncMysqlR2dbcDatabase.java index 9d38d1822454..1835b225f037 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/JasyncMysqlR2dbcDatabase.java +++ b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/JasyncMysqlR2dbcDatabase.java @@ -24,12 +24,10 @@ import io.netty.util.CharsetUtil; import io.r2dbc.spi.ConnectionFactory; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import java.time.Duration; @Component @Qualifier("jasync-mysql") diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java index 5c5fcb3afbca..d36f2a568056 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java +++ b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MariadbR2dbcDatabase.java @@ -20,7 +20,6 @@ import org.mariadb.r2dbc.MariadbConnectionConfiguration; import org.mariadb.r2dbc.MariadbConnectionFactory; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MssqlR2dbcDatabase.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MssqlR2dbcDatabase.java index db71b2edb75a..f3b6c3b5de5d 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MssqlR2dbcDatabase.java +++ b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MssqlR2dbcDatabase.java @@ -20,7 +20,6 @@ import io.r2dbc.mssql.MssqlConnectionFactory; import io.r2dbc.spi.ConnectionFactory; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/OracleR2dbcDatabase.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/OracleR2dbcDatabase.java index 2c0d6938763d..50aa68c046f7 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/OracleR2dbcDatabase.java +++ b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/OracleR2dbcDatabase.java @@ -20,18 +20,12 @@ import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.ConnectionFactoryOptions; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import static io.r2dbc.spi.ConnectionFactoryOptions.DATABASE; -import static io.r2dbc.spi.ConnectionFactoryOptions.DRIVER; -import static io.r2dbc.spi.ConnectionFactoryOptions.HOST; -import static io.r2dbc.spi.ConnectionFactoryOptions.PASSWORD; -import static io.r2dbc.spi.ConnectionFactoryOptions.PORT; -import static io.r2dbc.spi.ConnectionFactoryOptions.USER; +import static io.r2dbc.spi.ConnectionFactoryOptions.*; @Component @Qualifier("oracle") diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/PostgresqlR2dbcDatabase.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/PostgresqlR2dbcDatabase.java index c06a3d22e298..19c90ba5161c 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/PostgresqlR2dbcDatabase.java +++ b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/PostgresqlR2dbcDatabase.java @@ -3,10 +3,7 @@ import io.r2dbc.postgresql.PostgresqlConnectionConfiguration; import io.r2dbc.postgresql.PostgresqlConnectionFactory; import io.r2dbc.spi.ConnectionFactory; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SpringDataR2dbcPluginController.java b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SpringDataR2dbcPluginController.java index 2efaecafb8ed..6495c161718c 100644 --- a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SpringDataR2dbcPluginController.java +++ b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/java/com/pinpoint/test/plugin/SpringDataR2dbcPluginController.java @@ -17,13 +17,11 @@ package com.pinpoint.test.plugin; import io.r2dbc.spi.Connection; -import io.r2dbc.spi.Result; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.r2dbc.core.DatabaseClient; @@ -31,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; import java.sql.SQLException; diff --git a/agent-testweb/vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/VertxPluginTestStarter.java b/agent-testweb/vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/VertxPluginTestStarter.java index fecab631b7e9..611cb6c410fb 100644 --- a/agent-testweb/vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/VertxPluginTestStarter.java +++ b/agent-testweb/vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/VertxPluginTestStarter.java @@ -20,7 +20,6 @@ import io.vertx.core.Handler; import io.vertx.core.Promise; import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientRequest; import io.vertx.core.http.HttpClientResponse; import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpServerOptions; diff --git a/agent-testweb/vertx-4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/Vertx4PluginTestStarter.java b/agent-testweb/vertx-4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/Vertx4PluginTestStarter.java index 6902b3f85543..486129b98123 100644 --- a/agent-testweb/vertx-4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/Vertx4PluginTestStarter.java +++ b/agent-testweb/vertx-4-plugin-testweb/src/main/java/com/pinpoint/test/plugin/Vertx4PluginTestStarter.java @@ -17,12 +17,8 @@ package com.pinpoint.test.plugin; import io.vertx.core.AbstractVerticle; -import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.Promise; -import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientRequest; -import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpServerOptions; import io.vertx.core.http.HttpServerRequest; import io.vertx.core.net.SelfSignedCertificate; diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/DataCollectorFactory.java b/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/DataCollectorFactory.java index 7ca2c831a85a..a20f043aebf3 100644 --- a/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/DataCollectorFactory.java +++ b/batch/src/main/java/com/navercorp/pinpoint/batch/alarm/DataCollectorFactory.java @@ -16,7 +16,13 @@ package com.navercorp.pinpoint.batch.alarm; -import com.navercorp.pinpoint.batch.alarm.collector.*; +import com.navercorp.pinpoint.batch.alarm.collector.AgentEventDataCollector; +import com.navercorp.pinpoint.batch.alarm.collector.AgentStatDataCollector; +import com.navercorp.pinpoint.batch.alarm.collector.DataCollector; +import com.navercorp.pinpoint.batch.alarm.collector.DataSourceDataCollector; +import com.navercorp.pinpoint.batch.alarm.collector.FileDescriptorDataCollector; +import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo; diff --git a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptor.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptor.java index 05c3c5369034..f647f19a943c 100644 --- a/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptor.java +++ b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptor.java @@ -18,8 +18,6 @@ import com.navercorp.pinpoint.bootstrap.async.AsyncContextAccessorUtils; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; -import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; diff --git a/bootstraps/bootstrap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java b/bootstraps/bootstrap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java index fa61f6a21b13..2162223cdad1 100644 --- a/bootstraps/bootstrap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java +++ b/bootstraps/bootstrap-java9/src/main/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilder.java @@ -26,9 +26,15 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.jar.JarFile; -import java.util.stream.Collectors; /** * @author Woonduk Kang(emeroad) diff --git a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapper.java b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapper.java index 67917e641776..0ba6378df532 100644 --- a/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapper.java +++ b/collector/src/main/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapper.java @@ -16,13 +16,10 @@ package com.navercorp.pinpoint.collector.mapper.flink; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatBo; -import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; -import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; -import com.navercorp.pinpoint.common.util.CollectionUtils; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStatBatch; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Component; import java.util.List; diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/AgentInfoBo.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/AgentInfoBo.java index f5b4055fcfd7..a6d6cb982500 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/AgentInfoBo.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/AgentInfoBo.java @@ -18,10 +18,6 @@ import com.navercorp.pinpoint.common.buffer.AutomaticBuffer; import com.navercorp.pinpoint.common.buffer.Buffer; -import org.apache.commons.lang3.StringUtils; - - -import java.util.Comparator; /** * @author emeroad diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCoderConfiguration.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCoderConfiguration.java index 9ecbf685d272..a433a83a635b 100644 --- a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCoderConfiguration.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCoderConfiguration.java @@ -1,7 +1,6 @@ package com.navercorp.pinpoint.common.server.bo.codec.stat; import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceBo; -import com.navercorp.pinpoint.common.server.bo.stat.AgentUriStatBo; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/collector/MetricCollectorApp.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/collector/MetricCollectorApp.java index c6892c1888ee..4036acecef0a 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/collector/MetricCollectorApp.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/collector/MetricCollectorApp.java @@ -8,7 +8,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.Profile; -import org.springframework.context.annotation.PropertySource; @SpringBootConfiguration @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, TransactionAutoConfiguration.class, KafkaAutoConfiguration.class}) diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/MetricWebApp.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/MetricWebApp.java index 871fcc6c3c2e..01c1bf770e38 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/MetricWebApp.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/MetricWebApp.java @@ -3,7 +3,6 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.Profile; -import org.springframework.context.annotation.PropertySource; @ImportResource({"classpath:pinot-web/applicationContext-web-pinot.xml"}) @Import(WebMetricPropertySources.class) diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/UriStatController.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/UriStatController.java index 0eb1c421265f..50322f5bdc61 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/UriStatController.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/UriStatController.java @@ -20,7 +20,12 @@ import com.navercorp.pinpoint.metric.common.model.UriStat; import com.navercorp.pinpoint.metric.web.model.UriStatSummary; import com.navercorp.pinpoint.metric.web.service.UriStatService; -import com.navercorp.pinpoint.metric.web.util.*; +import com.navercorp.pinpoint.metric.web.util.Range; +import com.navercorp.pinpoint.metric.web.util.TimePrecision; +import com.navercorp.pinpoint.metric.web.util.TimeWindow; +import com.navercorp.pinpoint.metric.web.util.TimeWindowSampler; +import com.navercorp.pinpoint.metric.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.metric.web.util.UriStatQueryParameter; import com.navercorp.pinpoint.metric.web.view.UriStatView; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataServiceImpl.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataServiceImpl.java index 949fdec47598..d342764e1e18 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataServiceImpl.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataServiceImpl.java @@ -20,7 +20,6 @@ import com.navercorp.pinpoint.metric.common.model.MetricDataName; import com.navercorp.pinpoint.metric.common.model.MetricDataType; import com.navercorp.pinpoint.metric.common.model.MetricTag; -import com.navercorp.pinpoint.metric.common.model.SystemMetric; import com.navercorp.pinpoint.metric.common.model.Tag; import com.navercorp.pinpoint.metric.web.dao.SystemMetricDao; import com.navercorp.pinpoint.metric.web.mapping.Field; @@ -32,9 +31,6 @@ import com.navercorp.pinpoint.metric.web.model.basic.metric.group.GroupingRule; import com.navercorp.pinpoint.metric.web.model.chart.SystemMetricPoint; import com.navercorp.pinpoint.metric.web.util.TimeWindow; -import com.navercorp.pinpoint.metric.web.util.MetricsQueryParameter; -import com.navercorp.pinpoint.metric.web.model.SampledSystemMetric; -import com.navercorp.pinpoint.metric.web.model.chart.SystemMetricChart; import com.navercorp.pinpoint.metric.web.util.metric.DoubleUncollectedDataCreator; import com.navercorp.pinpoint.metric.web.util.metric.LongUncollectedDataCreator; import com.navercorp.pinpoint.metric.web.util.metric.TimeSeriesBuilder; diff --git a/plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java b/plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java index 920c97b0164a..fc81773b1427 100644 --- a/plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java +++ b/plugins-it/kafka-it/kafka-2-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java @@ -31,11 +31,7 @@ import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.annotation; import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.event; -import static test.pinpoint.plugin.kafka.KafkaITConstants.KAFKA_CLIENT_INTERNAL_SERVICE_TYPE; -import static test.pinpoint.plugin.kafka.KafkaITConstants.KAFKA_CLIENT_SERVICE_TYPE; -import static test.pinpoint.plugin.kafka.KafkaITConstants.MAX_TRACE_WAIT_TIME; -import static test.pinpoint.plugin.kafka.KafkaITConstants.PARTITION; -import static test.pinpoint.plugin.kafka.KafkaITConstants.TOPIC; +import static test.pinpoint.plugin.kafka.KafkaITConstants.*; /** * @author Younsung Hwang diff --git a/plugins-it/kafka-it/kafka-3-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java b/plugins-it/kafka-it/kafka-3-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java index b54cae902969..c62961ab2862 100644 --- a/plugins-it/kafka-it/kafka-3-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java +++ b/plugins-it/kafka-it/kafka-3-it/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaClientITBase.java @@ -25,19 +25,13 @@ import org.apache.kafka.clients.producer.Callback; import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; -import test.pinpoint.plugin.kafka.Kafka3UnitServer; -import test.pinpoint.plugin.kafka.KafkaITConstants; import test.pinpoint.plugin.kafka.TestConsumerRecordEntryPoint; import java.lang.reflect.Method; import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.annotation; import static com.navercorp.pinpoint.bootstrap.plugin.test.Expectations.event; -import static test.pinpoint.plugin.kafka.KafkaITConstants.KAFKA_CLIENT_INTERNAL_SERVICE_TYPE; -import static test.pinpoint.plugin.kafka.KafkaITConstants.KAFKA_CLIENT_SERVICE_TYPE; -import static test.pinpoint.plugin.kafka.KafkaITConstants.MAX_TRACE_WAIT_TIME; -import static test.pinpoint.plugin.kafka.KafkaITConstants.PARTITION; -import static test.pinpoint.plugin.kafka.KafkaITConstants.TOPIC; +import static test.pinpoint.plugin.kafka.KafkaITConstants.*; /** * @author Younsung Hwang diff --git a/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProvider.java b/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProvider.java index 7361a33e6459..6e860659b821 100644 --- a/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProvider.java +++ b/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProvider.java @@ -1,7 +1,5 @@ package com.navercorp.pinpoint.plugin.kafka.interceptor.util; -import org.apache.kafka.common.requests.FetchResponse; - import java.util.Map; public interface KafkaResponseDataProvider { diff --git a/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProviderFactory.java b/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProviderFactory.java index 22918bd86529..8a0cc3e1805b 100644 --- a/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProviderFactory.java +++ b/plugins/kafka/src/main/java/com/navercorp/pinpoint/plugin/kafka/interceptor/util/KafkaResponseDataProviderFactory.java @@ -1,13 +1,8 @@ package com.navercorp.pinpoint.plugin.kafka.interceptor.util; import com.navercorp.pinpoint.plugin.kafka.KafkaVersion; -import org.apache.kafka.common.TopicPartition; -import org.apache.kafka.common.Uuid; -import org.apache.kafka.common.message.FetchResponseData; import java.lang.reflect.Method; -import java.util.LinkedHashMap; -import java.util.Map; public final class KafkaResponseDataProviderFactory { diff --git a/plugins/spring-data-r2dbc/src/main/java/com/navercorp/pinpoint/plugin/spring/r2dbc/interceptor/postgresql/PostgresqlConnectionConfigurationInterceptor.java b/plugins/spring-data-r2dbc/src/main/java/com/navercorp/pinpoint/plugin/spring/r2dbc/interceptor/postgresql/PostgresqlConnectionConfigurationInterceptor.java index 15755971427f..747eccc48c52 100644 --- a/plugins/spring-data-r2dbc/src/main/java/com/navercorp/pinpoint/plugin/spring/r2dbc/interceptor/postgresql/PostgresqlConnectionConfigurationInterceptor.java +++ b/plugins/spring-data-r2dbc/src/main/java/com/navercorp/pinpoint/plugin/spring/r2dbc/interceptor/postgresql/PostgresqlConnectionConfigurationInterceptor.java @@ -19,7 +19,6 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo; -import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo; import com.navercorp.pinpoint.common.util.ArrayArgumentUtils; import com.navercorp.pinpoint.plugin.spring.r2dbc.SpringDataR2dbcConstants; import com.navercorp.pinpoint.plugin.spring.r2dbc.interceptor.SetDatabaseInfoInterceptor; diff --git a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java index 461b61bef6a9..1637da5c6a78 100644 --- a/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java +++ b/plugins/thrift/src/main/java/com/navercorp/pinpoint/plugin/thrift/interceptor/transport/TNonblockingSocketConstructInterceptor.java @@ -16,18 +16,16 @@ package com.navercorp.pinpoint.plugin.thrift.interceptor.transport; -import java.net.Socket; -import java.net.SocketAddress; - -import com.navercorp.pinpoint.common.util.ArrayArgumentUtils; -import com.navercorp.pinpoint.common.util.ArrayUtils; -import org.apache.thrift.transport.TNonblockingSocket; - import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor; import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; +import com.navercorp.pinpoint.common.util.ArrayArgumentUtils; import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketAddressFieldAccessor; import com.navercorp.pinpoint.plugin.thrift.field.accessor.SocketFieldAccessor; +import org.apache.thrift.transport.TNonblockingSocket; + +import java.net.Socket; +import java.net.SocketAddress; /** * @author HyunGil Jeong diff --git a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxConstants.java b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxConstants.java index f3d7fe649a82..4282f85bf3b0 100644 --- a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxConstants.java +++ b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/VertxConstants.java @@ -17,7 +17,6 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeProvider; -import com.navercorp.pinpoint.common.trace.UriExtractorType; /** * @author jaehong.kim diff --git a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/HttpClientRequestImplHandleResponseInterceptor.java b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/HttpClientRequestImplHandleResponseInterceptor.java index 421241e76949..5455204ec5d0 100644 --- a/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/HttpClientRequestImplHandleResponseInterceptor.java +++ b/plugins/vertx/src/main/java/com/navercorp/pinpoint/plugin/vertx/interceptor/HttpClientRequestImplHandleResponseInterceptor.java @@ -15,7 +15,6 @@ */ package com.navercorp.pinpoint.plugin.vertx.interceptor; -import com.navercorp.pinpoint.bootstrap.async.AsyncContextAccessor; import com.navercorp.pinpoint.bootstrap.async.AsyncContextAccessorUtils; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; @@ -24,7 +23,6 @@ import com.navercorp.pinpoint.bootstrap.interceptor.AsyncContextSpanEventSimpleAroundInterceptor; import com.navercorp.pinpoint.common.trace.AnnotationKey; import com.navercorp.pinpoint.common.util.ArrayArgumentUtils; -import com.navercorp.pinpoint.common.util.ArrayUtils; import com.navercorp.pinpoint.plugin.vertx.VertxConstants; import com.navercorp.pinpoint.plugin.vertx.VertxHttpClientConfig; import io.vertx.core.http.impl.HttpClientResponseImpl; diff --git a/profiler-optional/profiler-optional-jdk8/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/buffer/DefaultBufferMetric.java b/profiler-optional/profiler-optional-jdk8/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/buffer/DefaultBufferMetric.java index dd6a4f6da928..3290a40d6499 100644 --- a/profiler-optional/profiler-optional-jdk8/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/buffer/DefaultBufferMetric.java +++ b/profiler-optional/profiler-optional-jdk8/src/main/java/com/navercorp/pinpoint/profiler/monitor/metric/buffer/DefaultBufferMetric.java @@ -16,10 +16,6 @@ package com.navercorp.pinpoint.profiler.monitor.metric.buffer; -import com.navercorp.pinpoint.profiler.monitor.metric.buffer.BufferMetric; -import com.navercorp.pinpoint.profiler.monitor.metric.buffer.BufferMetricSnapshot; -import com.navercorp.pinpoint.profiler.monitor.metric.buffer.BufferType; - import javax.management.ObjectName; import java.lang.management.BufferPoolMXBean; import java.lang.management.ManagementFactory; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/sampler/UrlSamplerConfig.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/sampler/UrlSamplerConfig.java index 5cefd510226e..d743afc70e76 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/sampler/UrlSamplerConfig.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/sampler/UrlSamplerConfig.java @@ -17,7 +17,6 @@ package com.navercorp.pinpoint.profiler.context.provider.sampler; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import com.navercorp.pinpoint.bootstrap.sampler.Sampler; import com.navercorp.pinpoint.bootstrap.util.NumberUtils; import com.navercorp.pinpoint.common.util.MapUtils; import com.navercorp.pinpoint.profiler.sampler.CountingSamplerFactory; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCaches.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCaches.java index ec6253c76396..01d20dee1d31 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCaches.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCaches.java @@ -19,9 +19,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; - -import java.util.concurrent.ExecutionException; - /** * @author jaehong.kim */ diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseDeserializerFactory.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseDeserializerFactory.java index b347b4a6d468..f3c0f817cac5 100644 --- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseDeserializerFactory.java +++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseDeserializerFactory.java @@ -18,8 +18,6 @@ import com.navercorp.pinpoint.io.util.TypeLocator; import org.apache.thrift.TBase; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TProtocolFactory; import java.util.Arrays; diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseSerializerFactory.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseSerializerFactory.java index acf4e30d449a..c284c064f2c4 100644 --- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseSerializerFactory.java +++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/CommandHeaderTBaseSerializerFactory.java @@ -18,8 +18,6 @@ import com.navercorp.pinpoint.io.util.TypeLocator; import org.apache.thrift.TBase; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TProtocolFactory; import java.util.Arrays; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/config/AgentStatDaoConfiguration.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/config/AgentStatDaoConfiguration.java index 3f05a9c2182b..9b49980381fd 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/config/AgentStatDaoConfiguration.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/config/AgentStatDaoConfiguration.java @@ -4,7 +4,6 @@ import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceBo; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; -import com.navercorp.pinpoint.common.server.bo.stat.AgentUriStatBo; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/ServerInstanceSerializer.java b/web/src/main/java/com/navercorp/pinpoint/web/view/ServerInstanceSerializer.java index 2e9716c431ba..31937980dc8f 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/view/ServerInstanceSerializer.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/view/ServerInstanceSerializer.java @@ -21,11 +21,9 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.nodes.ServerInstance; - import org.springframework.stereotype.Component; import java.io.IOException; -import java.util.Objects; /** * @author emeroad diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/SortByRequestConverter.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/SortByRequestConverter.java index de59841610d9..a17e0673a1c3 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/SortByRequestConverter.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/tree/SortByRequestConverter.java @@ -1,10 +1,7 @@ package com.navercorp.pinpoint.web.vo.tree; -import com.navercorp.pinpoint.web.vo.agent.AgentInfo; import org.springframework.core.convert.converter.Converter; -import java.util.Comparator; - /** * @author intr3p1d */