From 17dd812225f3ff6222a3940f4450b7f4bf6e40ab Mon Sep 17 00:00:00 2001 From: emeroad Date: Wed, 27 Apr 2016 13:48:43 +0900 Subject: [PATCH] #1720 Package name change of the server module - remove com.navercorp.pinpoint.common.bo package --- .../navercorp/pinpoint/common/util/AnnotationTranscoder.java | 2 -- .../pinpoint/common/{bo => util}/IntStringStringValue.java | 2 +- .../navercorp/pinpoint/common/{bo => util}/IntStringValue.java | 2 +- .../pinpoint/common/util/AnnotationTranscoderTest.java | 2 -- .../com/navercorp/pinpoint/web/service/SpanServiceImpl.java | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) rename commons/src/main/java/com/navercorp/pinpoint/common/{bo => util}/IntStringStringValue.java (96%) rename commons/src/main/java/com/navercorp/pinpoint/common/{bo => util}/IntStringValue.java (95%) diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/util/AnnotationTranscoder.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/AnnotationTranscoder.java index 18437389c..1e8100c77 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/util/AnnotationTranscoder.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/AnnotationTranscoder.java @@ -17,8 +17,6 @@ package com.navercorp.pinpoint.common.util; -import com.navercorp.pinpoint.common.bo.IntStringStringValue; -import com.navercorp.pinpoint.common.bo.IntStringValue; import com.navercorp.pinpoint.common.buffer.AutomaticBuffer; import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/bo/IntStringStringValue.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/IntStringStringValue.java similarity index 96% rename from commons/src/main/java/com/navercorp/pinpoint/common/bo/IntStringStringValue.java rename to commons/src/main/java/com/navercorp/pinpoint/common/util/IntStringStringValue.java index 18d2acecd..2a9642dd6 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/bo/IntStringStringValue.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/IntStringStringValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.common.bo; +package com.navercorp.pinpoint.common.util; /** * @author emeroad diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/bo/IntStringValue.java b/commons/src/main/java/com/navercorp/pinpoint/common/util/IntStringValue.java similarity index 95% rename from commons/src/main/java/com/navercorp/pinpoint/common/bo/IntStringValue.java rename to commons/src/main/java/com/navercorp/pinpoint/common/util/IntStringValue.java index d80aa810b..3fec52cfb 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/bo/IntStringValue.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/util/IntStringValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.navercorp.pinpoint.common.bo; +package com.navercorp.pinpoint.common.util; /** * @author emeroad diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/AnnotationTranscoderTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/AnnotationTranscoderTest.java index 3dbc65e65..5175d6fd7 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/AnnotationTranscoderTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/AnnotationTranscoderTest.java @@ -17,8 +17,6 @@ package com.navercorp.pinpoint.common.util; -import com.navercorp.pinpoint.common.bo.IntStringValue; -import com.navercorp.pinpoint.common.util.AnnotationTranscoder; import com.navercorp.pinpoint.thrift.dto.TIntStringValue; import org.apache.thrift.TException; diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java index c4bcd9b8b..cee5153e1 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/service/SpanServiceImpl.java @@ -19,7 +19,6 @@ package com.navercorp.pinpoint.web.service; import java.util.ArrayList; import java.util.List; -import com.navercorp.pinpoint.common.bo.*; import com.navercorp.pinpoint.common.server.bo.AnnotationBo; import com.navercorp.pinpoint.common.server.bo.ApiMetaDataBo; import com.navercorp.pinpoint.common.server.bo.SpanBo; @@ -29,6 +28,7 @@ import com.navercorp.pinpoint.common.server.bo.StringMetaDataBo; import com.navercorp.pinpoint.common.trace.AnnotationKey; import com.navercorp.pinpoint.common.util.AnnotationKeyUtils; import com.navercorp.pinpoint.common.util.DefaultSqlParser; +import com.navercorp.pinpoint.common.util.IntStringStringValue; import com.navercorp.pinpoint.common.util.OutputParameterParser; import com.navercorp.pinpoint.common.util.SqlParser; import com.navercorp.pinpoint.web.calltree.span.CallTree;