diff --git a/web/src/main/java/com/navercorp/pinpoint/web/install/model/AgentInstallationInfo.java b/web/src/main/java/com/navercorp/pinpoint/web/install/model/AgentInstallationInfo.java index 304395c469d3..ec0cf6993bf8 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/install/model/AgentInstallationInfo.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/install/model/AgentInstallationInfo.java @@ -16,15 +16,11 @@ package com.navercorp.pinpoint.web.install.model; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.navercorp.pinpoint.web.view.AgentInstallationInfoSerializer; - import java.util.Objects; /** * @author Taejin Koo */ -@JsonSerialize(using = AgentInstallationInfoSerializer.class) public class AgentInstallationInfo { private static final String PINPOINT_JAVA_AGENT_ARGUMENT = "-javaagent:${pinpointPath}/pinpoint-bootstrap-%s.jar"; @@ -45,7 +41,7 @@ public String getDownloadUrl() { return agentDownloadInfo.getDownloadUrl(); } - public String getJavaInstallationInfo() { + public String getInstallationArgument() { return javaInstallationInfo; } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/AgentInstallationInfoSerializer.java b/web/src/main/java/com/navercorp/pinpoint/web/view/AgentInstallationInfoSerializer.java deleted file mode 100644 index 908b336d49b2..000000000000 --- a/web/src/main/java/com/navercorp/pinpoint/web/view/AgentInstallationInfoSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2017 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 or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.navercorp.pinpoint.web.view; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.navercorp.pinpoint.web.install.model.AgentInstallationInfo; - -import java.io.IOException; - -/** - * @author Taejin Koo - */ -public class AgentInstallationInfoSerializer extends JsonSerializer { - - @Override - public void serialize(AgentInstallationInfo installationInfo, JsonGenerator jgen, SerializerProvider provider) throws IOException { - jgen.writeStartObject(); - - jgen.writeStringField("version", installationInfo.getVersion()); - jgen.writeStringField("downloadUrl", installationInfo.getDownloadUrl()); - jgen.writeStringField("installationArgument", installationInfo.getJavaInstallationInfo()); - - jgen.writeEndObject(); - } - -} -