diff --git a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java index ada3040..6c2bd8e 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java +++ b/src/main/java/inc/sdt/controlcentermanagement/application/DefaultTubeService.java @@ -50,9 +50,9 @@ class DefaultTubeService implements TubeService { DeployRequest deployRequest = DeployRequest.builder() .assetCode(request.getAssetCode()) - .deviceType("nodeq") .appName(request.getSlotNumber()) .commandType(CommandType.JSON) + .name("") // TODO .parameters(tubeMap) .build(); @@ -83,9 +83,9 @@ class DefaultTubeService implements TubeService { resultMap.forEach((assetCode, slot) -> slot.forEach((slotNumber, tube) -> { DeployRequest deployRequest = DeployRequest.builder() .assetCode(assetCode) - .deviceType("nodeq") .appName(slotNumber) .commandType(CommandType.JSON) + .name("") // TODO .parameters(tube) .build(); diff --git a/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java b/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java index 8ef98d4..89d80fb 100644 --- a/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java +++ b/src/main/java/inc/sdt/controlcentermanagement/domain/DeployRequest.java @@ -7,17 +7,16 @@ import java.util.Map; */ public class DeployRequest { private String assetCode; - private String deviceType; private String appName; private String commandType; -// private String fileName; // TODO: deployer에 추가되면 추가 + private String name; private Map parameters; - public DeployRequest(String assetCode, String deviceType, String appName, String commandType, Map parameters) { + public DeployRequest(String assetCode, String appName, String commandType, String name, Map parameters) { this.assetCode = assetCode; - this.deviceType = deviceType; this.appName = appName; this.commandType = commandType; + this.name = name; this.parameters = parameters; } @@ -29,9 +28,6 @@ public class DeployRequest { return assetCode; } - public String getDeviceType() { - return deviceType; - } public String getAppName() { return appName; @@ -41,6 +37,10 @@ public class DeployRequest { return commandType; } + public String getName() { + return name; + } + public Map getParameters() { return parameters; } @@ -49,18 +49,18 @@ public class DeployRequest { public String toString() { return "DeployRequest{" + "assetCode='" + assetCode + '\'' + - ", deviceType='" + deviceType + '\'' + ", appName='" + appName + '\'' + - ", commandType=" + commandType + + ", commandType='" + commandType + '\'' + + ", name='" + name + '\'' + ", parameters=" + parameters + '}'; } public static final class Builder { private String assetCode; - private String deviceType; private String appName; private String commandType; + private String name; private Map parameters; private Builder() { @@ -71,11 +71,6 @@ public class DeployRequest { return this; } - public Builder deviceType(String deviceType) { - this.deviceType = deviceType; - return this; - } - public Builder appName(String appName) { this.appName = appName; return this; @@ -86,13 +81,18 @@ public class DeployRequest { return this; } + public Builder name(String name) { + this.name = name; + return this; + } + public Builder parameters(Map parameters) { this.parameters = parameters; return this; } public DeployRequest build() { - return new DeployRequest(assetCode, deviceType, appName, commandType, parameters); + return new DeployRequest(assetCode, appName, commandType, name, parameters); } } }