diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/FixedTimeWindowSampler.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/FixedTimeWindowSampler.java similarity index 87% rename from web/src/main/java/com/navercorp/pinpoint/web/util/FixedTimeWindowSampler.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/FixedTimeWindowSampler.java index 183b3290f5c3..ebd12fa144a5 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/FixedTimeWindowSampler.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/FixedTimeWindowSampler.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.server.util.time.Range; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; /** * @author emeroad diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindow.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindow.java similarity index 98% rename from web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindow.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindow.java index 6d75d7493ac5..18acfcf8059d 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindow.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindow.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.server.util.time.Range; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowDownSampler.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowDownSampler.java similarity index 96% rename from web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowDownSampler.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowDownSampler.java index b7c2e27f5b1b..5a9aa1821dda 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowDownSampler.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowDownSampler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.server.util.time.Range; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowFunction.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowFunction.java similarity index 80% rename from web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowFunction.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowFunction.java index 3920a6c5d32a..3a7187879cce 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowFunction.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowFunction.java @@ -1,4 +1,4 @@ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; @FunctionalInterface diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowOneMinuteSampler.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowOneMinuteSampler.java similarity index 93% rename from web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowOneMinuteSampler.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowOneMinuteSampler.java index 2c14daf3d278..8acb519ea885 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowOneMinuteSampler.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowOneMinuteSampler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.server.util.time.Range; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowSampler.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSampler.java similarity index 92% rename from web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowSampler.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSampler.java index a53dd1ec701c..c2db8c0a4737 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowSampler.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSampler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.server.util.time.Range; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSampler.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSlotCentricSampler.java similarity index 95% rename from web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSampler.java rename to commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSlotCentricSampler.java index ac9f99278e0b..56b1277b1611 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSampler.java +++ b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSlotCentricSampler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.util.MathUtils; import com.navercorp.pinpoint.common.server.util.time.Range; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSlotCentricSamplerTest.java similarity index 93% rename from web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java rename to commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSlotCentricSamplerTest.java index a6e0b050ae36..c1d483fbb8a2 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowSlotCentricSamplerTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; import com.navercorp.pinpoint.common.server.util.time.Range; import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; -import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.DEFAULT_IDEAL_NUM_TIMESLOTS; -import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.DEFAULT_MINIMUM_TIMESLOT; +import static com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler.DEFAULT_IDEAL_NUM_TIMESLOTS; +import static com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler.DEFAULT_MINIMUM_TIMESLOT; import static org.junit.jupiter.api.Assertions.assertTrue; /** diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowTest.java similarity index 97% rename from web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java rename to commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowTest.java index cee759cfc3d0..fe80b8c0f03a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/timewindow/TimeWindowTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.navercorp.pinpoint.web.util; +package com.navercorp.pinpoint.common.server.util.timewindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.common.server.util.time.Range; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.time.Instant; import java.util.Iterator; import java.util.concurrent.TimeUnit; diff --git a/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/controller/ExceptionTraceController.java b/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/controller/ExceptionTraceController.java index 7dea07ebb2c7..b91618b1034c 100644 --- a/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/controller/ExceptionTraceController.java +++ b/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/controller/ExceptionTraceController.java @@ -25,9 +25,9 @@ import com.navercorp.pinpoint.exceptiontrace.web.util.GroupByAttributes; import com.navercorp.pinpoint.exceptiontrace.web.view.ExceptionMetaDataView; import com.navercorp.pinpoint.exceptiontrace.web.view.ExceptionTraceView; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.metric.web.util.TimePrecision; import com.navercorp.pinpoint.pinot.tenant.TenantProvider; import jakarta.validation.constraints.NotBlank; diff --git a/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/view/ExceptionTraceView.java b/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/view/ExceptionTraceView.java index e8b1bceb26bd..cacfde543ba9 100644 --- a/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/view/ExceptionTraceView.java +++ b/exceptiontrace/exceptiontrace-web/src/main/java/com/navercorp/pinpoint/exceptiontrace/web/view/ExceptionTraceView.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.navercorp.pinpoint.exceptiontrace.web.model.ExceptionTraceGroup; import com.navercorp.pinpoint.exceptiontrace.web.model.ExceptionTraceValueView; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.util.TimeUtils; import com.navercorp.pinpoint.metric.web.view.TimeSeriesView; import com.navercorp.pinpoint.metric.web.view.TimeseriesValueGroupView; diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentStatV2Controller.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentStatV2Controller.java index a95ad8766984..cd5d20392c90 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentStatV2Controller.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/AgentStatV2Controller.java @@ -25,9 +25,9 @@ import com.navercorp.pinpoint.inspector.web.service.ApdexStatService; import com.navercorp.pinpoint.inspector.web.view.InspectorMetricGroupDataView; import com.navercorp.pinpoint.inspector.web.view.InspectorMetricView; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.pinot.tenant.TenantProvider; import jakarta.validation.constraints.NotBlank; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationStatV2Controller.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationStatV2Controller.java index 89dccc502d8a..e91400f5ee6a 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationStatV2Controller.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/controller/ApplicationStatV2Controller.java @@ -9,9 +9,9 @@ import com.navercorp.pinpoint.inspector.web.service.ApplicationStatService; import com.navercorp.pinpoint.inspector.web.view.InspectorMetricGroupDataView; import com.navercorp.pinpoint.inspector.web.view.InspectorMetricView; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.pinot.tenant.TenantProvider; import jakarta.validation.constraints.NotBlank; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/model/InspectorDataSearchKey.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/model/InspectorDataSearchKey.java index 7f79c9c6dee1..36f654216bcd 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/model/InspectorDataSearchKey.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/model/InspectorDataSearchKey.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.util.StringPrecondition; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.web.util.TimePrecision; import java.util.Objects; diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/AgentStatService.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/AgentStatService.java index 3ca301d5537a..afba6ba57c1a 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/AgentStatService.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/AgentStatService.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.inspector.web.model.InspectorDataSearchKey; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; /** * @author minwoo.jung diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java index 41729f7adcbb..5232e9871f1e 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApdexStatService.java @@ -16,7 +16,6 @@ package com.navercorp.pinpoint.inspector.web.service; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; /** * @author minwoo-jung diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApplicationStatService.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApplicationStatService.java index d203064a690a..05f30edfbfcc 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApplicationStatService.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/ApplicationStatService.java @@ -3,7 +3,7 @@ import com.navercorp.pinpoint.inspector.web.model.InspectorDataSearchKey; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricData; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; public interface ApplicationStatService { InspectorMetricData selectApplicationStat(InspectorDataSearchKey inspectorDataSearchKey, TimeWindow timeWindow); diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultAgentStatService.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultAgentStatService.java index 8420d689b03d..a6c2aec8faf6 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultAgentStatService.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultAgentStatService.java @@ -32,7 +32,7 @@ import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricValue; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.SystemMetricPoint; import com.navercorp.pinpoint.metric.common.util.DoubleUncollectedDataCreator; import com.navercorp.pinpoint.metric.common.util.TimeSeriesBuilder; diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java index 6e790f0d258a..149c15f4d03d 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApdexStatService.java @@ -25,9 +25,9 @@ import com.navercorp.pinpoint.metric.common.model.TagUtils; import com.navercorp.pinpoint.web.component.ApplicationFactory; import com.navercorp.pinpoint.web.service.ApdexScoreService; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSampler; -import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApplicationStatService.java b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApplicationStatService.java index 260e3350d781..00ece9e289b0 100644 --- a/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApplicationStatService.java +++ b/inspector-module/inspector-web/src/main/java/com/navercorp/pinpoint/inspector/web/service/DefaultApplicationStatService.java @@ -14,7 +14,7 @@ import com.navercorp.pinpoint.inspector.web.model.InspectorMetricGroupData; import com.navercorp.pinpoint.inspector.web.model.InspectorMetricValue; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMaxMetricPoint; import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMetricPoint; import com.navercorp.pinpoint.metric.common.model.chart.MinMaxMetricPoint; diff --git a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/model/TimeWindow.java b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/model/TimeWindow.java deleted file mode 100644 index 774b477e0507..000000000000 --- a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/model/TimeWindow.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2024 NAVER Corp. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.navercorp.pinpoint.metric.common.model; - -import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.metric.common.util.TimeWindowDownSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; - -import java.util.Iterator; -import java.util.NoSuchElementException; -import java.util.Objects; - -/** - * @author minwoo-jung - */ -public class TimeWindow implements Iterable { - - private final long windowSlotSize; - - private final Range range; - - private final Range windowRange; - - public TimeWindow(Range range) { - this(range, TimeWindowDownSampler.SAMPLER); - } - - public TimeWindow(Range range, TimeWindowSampler sampler) { - this.range = Objects.requireNonNull(range, "range"); - Objects.requireNonNull(sampler, "sampler"); - this.windowSlotSize = sampler.getWindowSize(range); - this.windowRange = createWindowRange(); - } - - public Iterator iterator() { - return new Itr(); - } - - /** - * converts the timestamp to the matching window slot's reference timestamp - * - * @param timestamp - * @return - */ - public long refineTimestamp(long timestamp) { - long time = (timestamp / windowSlotSize) * windowSlotSize; - return time; - } - - public Range getWindowRange() { - return windowRange; - } - - public long getWindowSlotSize() { - return windowSlotSize; - } - - public long getWindowRangeCount() { - return (windowRange.getRange() / windowSlotSize) + 1; - } - - private Range createWindowRange() { - long from = refineTimestamp(range.getFrom()); - long to = refineTimestamp(range.getTo()); - return Range.between(from, to); - } - - public int getWindowIndex(long time) { - long index = (time - windowRange.getFrom()) / this.windowSlotSize; - return (int)index; - } - - private class Itr implements Iterator { - - private long cursor; - - public Itr() { - this.cursor = windowRange.getFrom(); - } - - @Override - public boolean hasNext() { - if (cursor > windowRange.getTo()) { - return false; - } - return true; - } - - @Override - public Long next() { - long current = cursor; - if (hasNext()) { - cursor += windowSlotSize; - return current; - } - throw new NoSuchElementException(); - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - } -} diff --git a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeSeriesBuilder.java b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeSeriesBuilder.java index 38ed78e41121..b0803e9b655e 100644 --- a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeSeriesBuilder.java +++ b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeSeriesBuilder.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.metric.common.util; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMaxMetricPoint; import com.navercorp.pinpoint.metric.common.model.chart.AvgMinMetricPoint; import com.navercorp.pinpoint.metric.common.model.chart.MinMaxMetricPoint; diff --git a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeUtils.java b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeUtils.java index 1053f02c08aa..d34300aea49c 100644 --- a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeUtils.java +++ b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeUtils.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.metric.common.util; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import java.util.ArrayList; import java.util.List; diff --git a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowDownSampler.java b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowDownSampler.java deleted file mode 100644 index db3fc5375813..000000000000 --- a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowDownSampler.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2024 NAVER Corp. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.navercorp.pinpoint.metric.common.util; - -import com.navercorp.pinpoint.common.server.util.time.Range; - -import java.util.concurrent.TimeUnit; - -/** - * @author minwoo-jung - */ -public class TimeWindowDownSampler implements TimeWindowSampler { - - private static final long ONE_MINUTE = 6000 * 10; - private static final long ONE_HOUR = TimeUnit.HOURS.toMillis(1); - private static final long SIX_HOURS = TimeUnit.HOURS.toMillis(6); - private static final long TWELVE_HOURS = TimeUnit.HOURS.toMillis(12); - private static final long ONE_DAY = TimeUnit.DAYS.toMillis(1); - private static final long TWO_DAY = TimeUnit.DAYS.toMillis(2); - - - public static final TimeWindowSampler SAMPLER = new TimeWindowDownSampler(); - - @Override - public long getWindowSize(Range range) { - final long diff = range.getRange(); - long size; - if (diff <= ONE_HOUR) { - size = ONE_MINUTE; - } else if (diff <= SIX_HOURS) { - size = ONE_MINUTE * 5; - } else if (diff <= TWELVE_HOURS) { - size = ONE_MINUTE * 10; - } else if (diff <= ONE_DAY) { - size = ONE_MINUTE * 20; - } else if (diff <= TWO_DAY) { - size = ONE_MINUTE * 30; - } else { - size = ONE_MINUTE * 60; - } - - return size; - } -} diff --git a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowSampler.java b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowSampler.java deleted file mode 100644 index 6f7c2f26963e..000000000000 --- a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowSampler.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2024 NAVER Corp. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.navercorp.pinpoint.metric.common.util; - -import com.navercorp.pinpoint.common.server.util.time.Range; - -/** - * @author minwoo-jung - */ -public interface TimeWindowSampler { - long getWindowSize(Range range); -} diff --git a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowSlotCentricSampler.java b/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowSlotCentricSampler.java deleted file mode 100644 index 354d62c463c6..000000000000 --- a/metric-module/metric-commons/src/main/java/com/navercorp/pinpoint/metric/common/util/TimeWindowSlotCentricSampler.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2024 NAVER Corp. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.navercorp.pinpoint.metric.common.util; - -import com.navercorp.pinpoint.common.util.MathUtils; -import com.navercorp.pinpoint.common.server.util.time.Range; - -/** - * @author minwoo-jung - */ -public class TimeWindowSlotCentricSampler implements TimeWindowSampler { - - private static final long ONE_SECOND = 1000L; - static final long DEFAULT_MINIMUM_TIMESLOT = 10 * ONE_SECOND; - static final long DEFAULT_IDEAL_NUM_TIMESLOTS = 200; - - private final long minTimeslot; - private final long idealNumTimeslots; - - public TimeWindowSlotCentricSampler() { - this.minTimeslot = DEFAULT_MINIMUM_TIMESLOT; - this.idealNumTimeslots = DEFAULT_IDEAL_NUM_TIMESLOTS; - } - - public TimeWindowSlotCentricSampler(long minTimeslot, long idealNumTimeslots) { - this.minTimeslot = minTimeslot; - this.idealNumTimeslots = idealNumTimeslots; - } - - /** - *

This implementation returns the window size that would generate the number of timeslots closest to - * idealNumTimeslots for a given range. - *

Additionally, the window size is generated in multiples of - * minTimeslot. - * - * @param range range to calculate the time window over - * @return size of the ideal time window - */ - @Override - public long getWindowSize(Range range) { - final long periodMs = range.getRange(); - final long idealTimeslotSize = periodMs / this.idealNumTimeslots; - if (idealTimeslotSize < this.minTimeslot) { - return this.minTimeslot; - } - if (idealTimeslotSize % this.minTimeslot == 0) { - return idealTimeslotSize; - } else { - final long nearestMultipleOfMinTimeslotSize = MathUtils.roundToNearestMultipleOf(idealTimeslotSize, this.minTimeslot); - return findOptimalWindowSize(periodMs, nearestMultipleOfMinTimeslotSize); - } - } - - private long findOptimalWindowSize(long periodMs, long nearestMultipleOfMinTimeslotSize) { - final double idealTimeslotSize = (double)periodMs / this.idealNumTimeslots; - final long timeslotSizeToCompare = nearestMultipleOfMinTimeslotSize < idealTimeslotSize ? - nearestMultipleOfMinTimeslotSize + this.minTimeslot : nearestMultipleOfMinTimeslotSize - this.minTimeslot; - if (Math.abs(nearestMultipleOfMinTimeslotSize - idealTimeslotSize) / ((double)nearestMultipleOfMinTimeslotSize / this.minTimeslot) < - Math.abs(timeslotSizeToCompare - idealTimeslotSize) / ((double)timeslotSizeToCompare / this.minTimeslot)) { - return nearestMultipleOfMinTimeslotSize; - } else { - return timeslotSizeToCompare; - } - } - -} diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java index 8d940408c2b4..846716fdbeb9 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/controller/SystemMetricController.java @@ -18,10 +18,10 @@ import com.navercorp.pinpoint.common.server.util.time.RangeValidator; import com.navercorp.pinpoint.common.server.util.time.Range; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.metric.web.model.MetricDataSearchKey; import com.navercorp.pinpoint.metric.web.model.MetricInfo; import com.navercorp.pinpoint.metric.web.model.SystemMetricData; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/MetricDataSearchKey.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/MetricDataSearchKey.java index b4f1130686bc..bd17b39c31ba 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/MetricDataSearchKey.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/MetricDataSearchKey.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.util.StringPrecondition; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.web.util.TimePrecision; import java.util.Objects; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChart.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChart.java index 8baa4ee0ba15..7281142798a1 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChart.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChart.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.collect.ImmutableList; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.Point; import com.navercorp.pinpoint.metric.common.model.chart.SystemMetricPoint; import com.navercorp.pinpoint.metric.web.view.SystemMetricChartSerializer; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/TimeSeriesChartBuilder.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/TimeSeriesChartBuilder.java index cadad6c81c15..91ac08ba6058 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/TimeSeriesChartBuilder.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/model/chart/TimeSeriesChartBuilder.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.metric.web.model.chart; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.Point; import org.springframework.util.CollectionUtils; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataService.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataService.java index 9be10734a877..a7e6fecfd28c 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataService.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/service/SystemMetricDataService.java @@ -17,7 +17,7 @@ package com.navercorp.pinpoint.metric.web.service; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.web.model.MetricDataSearchKey; import com.navercorp.pinpoint.metric.web.model.SystemMetricData; 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 704e2ab0ecac..8e323b924aeb 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 @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.metric.common.model.MetricDataType; import com.navercorp.pinpoint.metric.common.model.MetricTag; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.SystemMetricPoint; import com.navercorp.pinpoint.metric.common.util.DoubleUncollectedDataCreator; import com.navercorp.pinpoint.metric.common.util.LongUncollectedDataCreator; diff --git a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/view/SystemMetricChartSerializer.java b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/view/SystemMetricChartSerializer.java index 4c2b8cbada5f..34c316d5a7cf 100644 --- a/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/view/SystemMetricChartSerializer.java +++ b/metric-module/metric/src/main/java/com/navercorp/pinpoint/metric/web/view/SystemMetricChartSerializer.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.web.model.chart.Chart; import com.navercorp.pinpoint.metric.common.model.chart.Point; import com.navercorp.pinpoint.metric.web.model.chart.SystemMetricChart; diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java index 0b8d352c03e0..7e2aa660d533 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java @@ -17,12 +17,12 @@ package com.navercorp.pinpoint.metric.web.model.chart; import com.navercorp.pinpoint.common.server.util.time.Range; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.metric.common.model.Tag; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; import com.navercorp.pinpoint.metric.common.model.chart.Point; import com.navercorp.pinpoint.metric.common.model.chart.SystemMetricPoint; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.metric.web.model.SampledSystemMetric; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -40,7 +40,8 @@ public class SystemMetricChartTest { public void createSystemMetricChartTest() { long time = System.currentTimeMillis(); Range range = Range.between(time, time + 30000); - TimeWindowSampler sampler = new TimeWindowSlotCentricSampler(); + // 10 sec, 200 slot + TimeWindowSampler sampler = new TimeWindowSlotCentricSampler(10 * 1000L, 200); TimeWindow timeWindow = new TimeWindow(range, sampler); List tagList1 = List.of(new Tag("cpu", "cpu0")); diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/controller/UriStatController.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/controller/UriStatController.java index 60b2ab1db36e..a183a0ebd91b 100644 --- a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/controller/UriStatController.java +++ b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/controller/UriStatController.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.server.util.time.RangeValidator; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSampler; -import com.navercorp.pinpoint.metric.common.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.metric.web.util.TimePrecision; import com.navercorp.pinpoint.pinot.tenant.TenantProvider; import com.navercorp.pinpoint.uristat.web.chart.UriStatChartType; diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatGroup.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatGroup.java index b254377cb0d7..103cacdae02d 100644 --- a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatGroup.java +++ b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatGroup.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.util.ObjectUtils; import com.navercorp.pinpoint.common.server.util.StringPrecondition; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.web.view.TimeSeriesValueView; import com.navercorp.pinpoint.metric.web.view.TimeseriesChartType; import com.navercorp.pinpoint.metric.web.view.TimeseriesValueGroupView; diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/view/UriStatView.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/view/UriStatView.java index ea0348b98012..4672815e3bec 100644 --- a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/view/UriStatView.java +++ b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/view/UriStatView.java @@ -15,7 +15,7 @@ */ package com.navercorp.pinpoint.uristat.web.view; -import com.navercorp.pinpoint.metric.common.model.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.metric.common.util.TimeUtils; import com.navercorp.pinpoint.uristat.web.chart.UriStatChartType; import com.navercorp.pinpoint.uristat.web.model.UriStatGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCalleeDao.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCalleeDao.java index 3373c4ba3028..e8ad15156312 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCalleeDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCalleeDao.java @@ -30,9 +30,9 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMapUtils; import com.navercorp.pinpoint.web.mapper.RowMapReduceResultExtractor; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.hadoop.hbase.TableName; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCallerDao.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCallerDao.java index c6a813c1381a..9805495ffc8e 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCallerDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapStatisticsCallerDao.java @@ -30,9 +30,9 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMapUtils; import com.navercorp.pinpoint.web.mapper.RowMapReduceResultExtractor; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.hadoop.hbase.TableName; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCalleeMapper.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCalleeMapper.java index b5fc255d2242..789bbf2e0267 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCalleeMapper.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCalleeMapper.java @@ -27,7 +27,7 @@ import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.component.ApplicationFactory; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.commons.lang3.StringUtils; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCallerMapper.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCallerMapper.java index f1068dd2d85c..942307e607ef 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCallerMapper.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsCallerMapper.java @@ -25,7 +25,7 @@ import com.navercorp.pinpoint.web.applicationmap.link.LinkDirection; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.component.ApplicationFactory; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.commons.lang3.StringUtils; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsTimeWindowReducer.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsTimeWindowReducer.java index e6f0c5414827..0c635741b629 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsTimeWindowReducer.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/MapStatisticsTimeWindowReducer.java @@ -2,7 +2,7 @@ import com.navercorp.pinpoint.common.hbase.RowReducer; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; public class MapStatisticsTimeWindowReducer implements RowReducer { diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/RowMapperFactory.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/RowMapperFactory.java index ea709855d4c4..4a6d1ed67766 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/RowMapperFactory.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/RowMapperFactory.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.applicationmap.dao.mapper; import com.navercorp.pinpoint.common.hbase.RowMapper; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; @FunctionalInterface public interface RowMapperFactory { diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogram.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogram.java index ece1c9c2eaea..b7fecac3b8ff 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogram.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogram.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogramList; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.view.AgentResponseTimeViewModel; import com.navercorp.pinpoint.web.view.TimeViewModel; import com.navercorp.pinpoint.web.vo.Application; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramBuilder.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramBuilder.java index c0f29c702b2e..fff5d000d142 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramBuilder.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramBuilder.java @@ -21,8 +21,8 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogramList; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.ResponseTime; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramBuilder.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramBuilder.java index b2bad983fbff..ee4c4455abd7 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramBuilder.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramBuilder.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallData; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.ResponseTime; import org.apache.logging.log4j.LogManager; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/map/FilteredMapBuilder.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/map/FilteredMapBuilder.java index 13c4ccc5e210..f9117a80dcef 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/map/FilteredMapBuilder.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/map/FilteredMapBuilder.java @@ -35,8 +35,8 @@ import com.navercorp.pinpoint.web.filter.visitor.SpanVisitor; import com.navercorp.pinpoint.web.security.ServerMapDataFilter; import com.navercorp.pinpoint.web.service.DotExtractor; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.ResponseHistograms; import com.navercorp.pinpoint.web.vo.scatter.Dot; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallData.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallData.java index 882deb3835d2..75184a417aa3 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallData.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallData.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.link.LinkKey; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import java.util.Collection; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataMap.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataMap.java index b573bf9edacf..e5373b6117bf 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataMap.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataMap.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.link.LinkKey; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import java.util.Collection; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkData.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkData.java index 0cac151a1a40..7843cfb2bc71 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkData.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkData.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.trace.ServiceType; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import java.util.Objects; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkDataMap.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkDataMap.java index 888da847a760..841083334763 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkDataMap.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkDataMap.java @@ -17,7 +17,7 @@ package com.navercorp.pinpoint.web.applicationmap.rawdata; import com.navercorp.pinpoint.web.applicationmap.link.LinkKey; -import com.navercorp.pinpoint.web.util.TimeWindowFunction; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowFunction; import com.navercorp.pinpoint.web.vo.Application; import java.util.Collection; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java index 596c4cf7a0a7..c219a653c54a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/AgentStatController.java @@ -21,10 +21,10 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.service.stat.AgentStatChartService; import com.navercorp.pinpoint.web.service.stat.AgentStatService; -import com.navercorp.pinpoint.web.util.FixedTimeWindowSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSampler; -import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.FixedTimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.PositiveOrZero; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java index c6f59f6b9d24..571fef71d1c4 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationDataSourceController.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.service.appmetric.ApplicationDataSourceService; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.PositiveOrZero; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java index c783546dc164..4d04e08adf88 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/authorization/controller/ApplicationStatController.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.service.appmetric.ApplicationStatChartService; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.PositiveOrZero; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java index c31781fd9329..ac38071b8b85 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java @@ -4,9 +4,9 @@ import com.navercorp.pinpoint.web.applicationmap.histogram.ApdexScore; import com.navercorp.pinpoint.web.component.ApplicationFactory; import com.navercorp.pinpoint.web.service.ApdexScoreService; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSampler; -import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import jakarta.validation.constraints.NotBlank; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/SampledAgentStatDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/SampledAgentStatDao.java index 10a96c3626a7..b3a8aca623ba 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/SampledAgentStatDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/SampledAgentStatDao.java @@ -17,7 +17,7 @@ package com.navercorp.pinpoint.web.dao; import com.navercorp.pinpoint.web.service.stat.ChartTypeSupport; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import org.springframework.stereotype.Repository; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/appmetric/ApplicationMetricDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/appmetric/ApplicationMetricDao.java index bf1f5facbc51..0df2e22e52f8 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/appmetric/ApplicationMetricDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/appmetric/ApplicationMetricDao.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.dao.appmetric; import com.navercorp.pinpoint.web.service.stat.ChartTypeSupport; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggregationStatData; import java.util.List; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/appmetric/DefaultApplicationMetricDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/appmetric/DefaultApplicationMetricDao.java index b3e55a712a45..1a40bb4c6294 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/appmetric/DefaultApplicationMetricDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/appmetric/DefaultApplicationMetricDao.java @@ -24,7 +24,7 @@ import com.navercorp.pinpoint.web.dao.appmetric.ApplicationMetricDao; import com.navercorp.pinpoint.web.mapper.stat.SampledApplicationStatResultExtractor; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.ApplicationStatSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggregationStatData; import java.util.List; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/DefaultSampledAgentStatDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/DefaultSampledAgentStatDao.java index a8e06055015b..2e6438df7cae 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/DefaultSampledAgentStatDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/DefaultSampledAgentStatDao.java @@ -7,7 +7,7 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.dao.SampledAgentStatDao; import com.navercorp.pinpoint.web.mapper.stat.AgentStatMapperV2; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import java.util.List; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/HbaseSampledDataSourceDao.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/HbaseSampledDataSourceDao.java index 74632a2ddc2b..f59896b787d9 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/HbaseSampledDataSourceDao.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/HbaseSampledDataSourceDao.java @@ -26,7 +26,7 @@ import com.navercorp.pinpoint.web.mapper.stat.AgentStatMapperV2; import com.navercorp.pinpoint.web.mapper.stat.SampledDataSourceResultExtractor; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.AgentStatSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.SampledDataSourceList; import org.springframework.stereotype.Repository; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledAgentStatResultExtractorSupplier.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledAgentStatResultExtractorSupplier.java index 31218a9ed7c1..95a648017150 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledAgentStatResultExtractorSupplier.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledAgentStatResultExtractorSupplier.java @@ -5,7 +5,7 @@ import com.navercorp.pinpoint.web.mapper.stat.AgentStatMapperV2; import com.navercorp.pinpoint.web.mapper.stat.SampledAgentStatResultExtractor; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.AgentStatSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import java.util.List; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledResultsExtractorSupplier.java b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledResultsExtractorSupplier.java index 090f0521eaef..b84248bef68a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledResultsExtractorSupplier.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/dao/hbase/stat/SampledResultsExtractorSupplier.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.hbase.ResultsExtractor; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import com.navercorp.pinpoint.web.mapper.stat.AgentStatMapperV2; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import java.util.List; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractor.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractor.java index e4fbf67371fe..7623c205bbb4 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractor.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractor.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.web.mapper.stat.sampling.AgentStatSamplingHandler; import com.navercorp.pinpoint.web.mapper.stat.sampling.EagerSamplingHandler; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.AgentStatSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledApplicationStatResultExtractor.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledApplicationStatResultExtractor.java index c795bc510ba4..91cb3352b6e2 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledApplicationStatResultExtractor.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledApplicationStatResultExtractor.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.ApplicationStatSampler; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.ApplicationStatSamplingHandler; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.join.EagerSamplingHandler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggregationStatData; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledDataSourceResultExtractor.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledDataSourceResultExtractor.java index 5f4c336b3d4d..52d6b162209e 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledDataSourceResultExtractor.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/SampledDataSourceResultExtractor.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.web.mapper.stat.sampling.AgentStatSamplingHandler; import com.navercorp.pinpoint.web.mapper.stat.sampling.EagerSamplingHandler; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.AgentStatSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.SampledDataSourceList; import org.apache.hadoop.hbase.client.Result; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/EagerSamplingHandler.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/EagerSamplingHandler.java index 39489a728a32..171c8273afd0 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/EagerSamplingHandler.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/EagerSamplingHandler.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.AgentStatSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import java.util.ArrayList; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/join/EagerSamplingHandler.java b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/join/EagerSamplingHandler.java index 639d4fc61067..7869d24af2bf 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/join/EagerSamplingHandler.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/join/EagerSamplingHandler.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinStatBo; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.ApplicationStatSampler; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.ApplicationStatSamplingHandler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggregationStatData; import java.util.*; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreService.java index 7a7d6fcf62d8..9ed5a69cf62a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreService.java @@ -2,7 +2,7 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.applicationmap.histogram.ApdexScore; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreServiceImpl.java index 82168c405cbb..976f78d59ef3 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreServiceImpl.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/ApdexScoreServiceImpl.java @@ -8,7 +8,7 @@ import com.navercorp.pinpoint.web.applicationmap.histogram.ApdexScore; import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.ResponseTime; import com.navercorp.pinpoint.web.vo.stat.SampledApdexScore; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceService.java index 29f9c1e56f48..c5676cd8bba2 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceService.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDataSourceListBo.DataSourceKey; import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.dao.appmetric.ApplicationMetricDao; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceBo; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceListBo; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationStatChartService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationStatChartService.java index fe6731b5048e..8c75990a019f 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationStatChartService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationStatChartService.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.service.appmetric; import com.navercorp.pinpoint.web.service.stat.ChartTypeSupport; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import org.springframework.stereotype.Service; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ChartFunction.java b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ChartFunction.java index 32fd06932464..5114ff93bcc7 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ChartFunction.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/ChartFunction.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.service.appmetric; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggregationStatData; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/DefaultApplicationStatChartService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/DefaultApplicationStatChartService.java index 8d0be04dadb6..c8f4aa40cb18 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/DefaultApplicationStatChartService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/appmetric/DefaultApplicationStatChartService.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.service.appmetric; import com.navercorp.pinpoint.web.dao.appmetric.ApplicationMetricDao; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.AggregationStatData; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/AgentStatChartService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/AgentStatChartService.java index 850ec1480c61..2cecd1180414 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/AgentStatChartService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/AgentStatChartService.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.service.stat; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import java.util.List; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DataSourceChartService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DataSourceChartService.java index 3e5e00a116b9..d98e396ad4ed 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DataSourceChartService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DataSourceChartService.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.dao.SampledAgentStatDao; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.SampledDataSourceList; import com.navercorp.pinpoint.web.vo.stat.chart.agent.DataSourceChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DefaultAgentStatChartService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DefaultAgentStatChartService.java index b6156123205f..d4ec575a7f16 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DefaultAgentStatChartService.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/DefaultAgentStatChartService.java @@ -17,7 +17,7 @@ package com.navercorp.pinpoint.web.service.stat; import com.navercorp.pinpoint.web.dao.SampledAgentStatDao; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/SampledChartFunction.java b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/SampledChartFunction.java index 7ca122390a20..a9fa5f4aefae 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/SampledChartFunction.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/SampledChartFunction.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.service.stat; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/StatChartGroupSerializer.java b/web/src/main/java/com/navercorp/pinpoint/web/view/StatChartGroupSerializer.java index cc24854053b5..1060664fc70f 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/view/StatChartGroupSerializer.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/view/StatChartGroupSerializer.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/ResponseHistograms.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/ResponseHistograms.java index 8a6a0cfc839a..c00f927a1ab4 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/ResponseHistograms.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/ResponseHistograms.java @@ -20,8 +20,8 @@ import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; import java.util.ArrayList; import java.util.Collections; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilder.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilder.java index 9c452b4062cd..5a196ec124a1 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilder.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilder.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.chart; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import org.springframework.util.CollectionUtils; import java.util.ArrayList; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/ChartGroupBuilder.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/ChartGroupBuilder.java index 99fde4df3fba..acbd51a90d30 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/ChartGroupBuilder.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/ChartGroupBuilder.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.vo.stat.chart; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.chart.TimeSeriesChartBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/StatChartGroup.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/StatChartGroup.java index f4ff65eee0a3..ace9e63e1c8c 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/StatChartGroup.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/StatChartGroup.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ActiveTraceChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ActiveTraceChart.java index 6e1fa1b196cb..f872ea2a5c81 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ActiveTraceChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ActiveTraceChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledActiveTrace; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/AgentApdexScoreChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/AgentApdexScoreChart.java index cdeb3a4d87fb..8bd5f89047c9 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/AgentApdexScoreChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/AgentApdexScoreChart.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledApdexScore; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/CpuLoadChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/CpuLoadChart.java index 53d7a87a29a1..9d0ecdfcd341 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/CpuLoadChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/CpuLoadChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledCpuLoad; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChart.java index 03639455560c..4d717f23686d 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChart.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.annotations.VisibleForTesting; import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChart.java index 63b3466c0bab..184596bd03ae 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledDeadlock; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DefaultAgentChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DefaultAgentChart.java index 23860b766edf..e97f692d3952 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DefaultAgentChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DefaultAgentChart.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DirectBufferChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DirectBufferChart.java index ba2d13f404a1..08ffc7655863 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DirectBufferChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DirectBufferChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledDirectBuffer; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/FileDescriptorChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/FileDescriptorChart.java index 2ad9410b42ac..d4c3af3b2990 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/FileDescriptorChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/FileDescriptorChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledFileDescriptor; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcChart.java index dd90c3e7326b..3d44e6878c4c 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledJvmGc; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcDetailedChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcDetailedChart.java index 67907e0d65a6..ac2048be5b3c 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcDetailedChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/JvmGcDetailedChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.SampledJvmGcDetailed; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/LoadedClassCountChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/LoadedClassCountChart.java index 2cda8fe33b12..a82e6fa629d8 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/LoadedClassCountChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/LoadedClassCountChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledLoadedClassCount; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChart.java index 431c610aa32c..04f076012050 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledLoadedClassCount; import com.navercorp.pinpoint.web.vo.stat.SampledResponseTime; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TotalThreadCountChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TotalThreadCountChart.java index 33fe6c44b1bb..5e549b65007a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TotalThreadCountChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TotalThreadCountChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledTotalThreadCount; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TransactionChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TransactionChart.java index f38e74f7879a..a211cc058e7d 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TransactionChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/TransactionChart.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.agent; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledTransaction; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChart.java index e411f0504e5b..721c0be521ee 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChart.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinActiveTraceBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinIntFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinActiveTraceBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationApdexScoreChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationApdexScoreChart.java index 9453edce6f4a..28a66ba6b438 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationApdexScoreChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationApdexScoreChart.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.vo.stat.chart.application; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChart.java index 51e030dd0e3b..955833cf7b27 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChart.java @@ -17,7 +17,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinCpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDoubleFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinCpuLoadBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChart.java index 9fd5a303cec6..92f6680efb2a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChart.java @@ -17,7 +17,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDataSourceBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinIntFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceBo; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChart.java index cb5f8bf0c67c..4c9fdd96c701 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChart.java @@ -17,7 +17,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDirectBufferBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDirectBufferBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChart.java index 5791a67c053c..1ddf1ceee840 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChart.java @@ -17,7 +17,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinFileDescriptorBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinFileDescriptorBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChart.java index 143daa3213cd..1e3af24bddc0 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChart.java @@ -17,7 +17,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLoadedClassBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinLoadedClassBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChart.java index fbb6bda04ead..b1fa4a9eebe4 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChart.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinMemoryBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinMemoryBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChart.java index 9fd8af7bfb86..1511ee9cab6a 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChart.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinResponseTimeBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinResponseTimeBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChart.java index 2864c02d502f..03a9163b2842 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChart.java @@ -17,7 +17,7 @@ package com.navercorp.pinpoint.web.vo.stat.chart.application; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinTotalThreadCountBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChart.java index 2f728fd7914d..41d17f47b4f5 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChart.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinTransactionBo; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.AggreJoinTransactionBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultApplicationChart.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultApplicationChart.java index 3bd353e7e0e9..9ac5e0fba025 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultApplicationChart.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultApplicationChart.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.vo.stat.chart.application; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultStatChartGroup.java b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultStatChartGroup.java index 2b5ee4d73978..cc290d8574cd 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultStatChartGroup.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/vo/stat/chart/application/DefaultStatChartGroup.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.web.vo.stat.chart.application; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java index 0bbe15a1b838..bd1dabb3209f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java @@ -25,8 +25,8 @@ import com.navercorp.pinpoint.common.trace.HistogramSchema; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSlotCentricSampler; import com.navercorp.pinpoint.web.view.AgentResponseTimeViewModel; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.ResponseTime; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java index 43c91352fa18..f55f19188225 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java @@ -3,8 +3,8 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.link.LinkKey; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/service/FilteredMapServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/service/FilteredMapServiceImplTest.java index 8fa86ee84ff8..0d2289517c15 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/service/FilteredMapServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/service/FilteredMapServiceImplTest.java @@ -42,8 +42,8 @@ import com.navercorp.pinpoint.web.hyperlink.HyperLinkFactory; import com.navercorp.pinpoint.web.service.AgentInfoService; import com.navercorp.pinpoint.web.service.ServerInstanceDatasourceService; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowDownSampler; import com.navercorp.pinpoint.web.view.AgentResponseTimeViewModel; import com.navercorp.pinpoint.web.view.AgentResponseTimeViewModelList; import com.navercorp.pinpoint.web.view.ResponseTimeViewModel; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractorTest.java index 0296b9b1e498..2b7f1d7c8930 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/SampledAgentStatResultExtractorTest.java @@ -20,9 +20,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.AgentStatSampler; -import com.navercorp.pinpoint.web.util.FixedTimeWindowSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.FixedTimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; import com.navercorp.pinpoint.web.vo.stat.SampledAgentStatDataPoint; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java index 5f38fbd4bc36..185b5cee3e34 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java @@ -25,7 +25,7 @@ import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.DataSourceSampler; import com.navercorp.pinpoint.web.test.util.DataSourceTestUtils; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.chart.agent.DataSourceChart; import org.apache.commons.lang3.RandomUtils; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java index f245c224514c..f8e40effe361 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.web.vo.chart; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.web.util.TimeWindowSampler; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindowSampler; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java index 54f22a1de076..cc611cf42a13 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.DataSourceSampler; import com.navercorp.pinpoint.web.test.util.DataSourceTestUtils; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java index 199c9b8a412b..ddc5dd8bea23 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo; import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.DeadlockSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.SampledDeadlock; import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java index 523fd1824f2e..aec00dee51d7 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.ResponseTimeBo; import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.ResponseTimeSampler; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.SampledResponseTime; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java index de6283ad57dc..613599713a8f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinIntFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinActiveTraceBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java index 751eccd5b1eb..0946f96968f9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDoubleFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinCpuLoadBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java index 4f8316c8e1b3..df5870322f08 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinIntFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceBo; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java index 8c0de2ab5697..1a97b807f179 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDirectBufferBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java index 4ee365643667..1b3552af06f4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinFileDescriptorBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java index 36acade60f03..13d1c5a0f439 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinLoadedClassBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java index 4c5244e53989..9a31caac4e06 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinMemoryBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java index db3e279f549d..c6c2279bd583 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinResponseTimeBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java index b15f4b279d9b..8cfe94a322f8 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinTotalThreadCountBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java index 0d9d83bf36ab..7356c5cd8a46 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.web.util.TimeWindow; +import com.navercorp.pinpoint.common.server.util.timewindow.TimeWindow; import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinTransactionBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder;