diff --git a/mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/AssetResponse.java b/mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/DeviceRequest.java similarity index 65% rename from mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/AssetResponse.java rename to mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/DeviceRequest.java index b03bb25..f31f049 100644 --- a/mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/AssetResponse.java +++ b/mtconnect-api/src/main/java/io/github/protocol/mtconnect/api/DeviceRequest.java @@ -5,6 +5,6 @@ @Getter @Setter -public class AssetResponse { - MTConnectAssets assets; +public class DeviceRequest { + private String id; } diff --git a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtConnectServer.java b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtConnectServer.java index 080d35b..634c51b 100644 --- a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtConnectServer.java +++ b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtConnectServer.java @@ -7,7 +7,7 @@ import io.github.openfacade.http.HttpServerFactory; import io.github.openfacade.http.SyncRequestHandler; import io.github.protocol.mtconnect.api.AssetRequest; -import io.github.protocol.mtconnect.api.AssetResponse; +import io.github.protocol.mtconnect.api.MTConnectAssets; import io.github.protocol.mtconnect.common.XmlUtil; import io.netty.handler.codec.http.HttpResponseStatus; @@ -35,11 +35,11 @@ public CompletableFuture start() { class MtAssetsHandler implements SyncRequestHandler { @Override public HttpResponse handle(HttpRequest request) { - AssetResponse assetResponse = mtProcessor.asset(new AssetRequest()); + MTConnectAssets mtConnectAssets = mtProcessor.asset(new AssetRequest()); // convert the response to http response String body; try { - body = XmlUtil.toXml(assetResponse.getAssets()); + body = XmlUtil.toXml(mtConnectAssets); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtProcessor.java b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtProcessor.java index 68a3697..66f9982 100644 --- a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtProcessor.java +++ b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MtProcessor.java @@ -1,8 +1,11 @@ package io.github.protocol.mtconnect.server; import io.github.protocol.mtconnect.api.AssetRequest; -import io.github.protocol.mtconnect.api.AssetResponse; +import io.github.protocol.mtconnect.api.DeviceRequest; +import io.github.protocol.mtconnect.api.MTConnectAssets; +import io.github.protocol.mtconnect.api.MTConnectDevices; public interface MtProcessor { - AssetResponse asset(AssetRequest assetRequest); + MTConnectAssets asset(AssetRequest assetRequest); + MTConnectDevices device(DeviceRequest deviceRequest); } diff --git a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java index 8a9cba1..9c09a60 100644 --- a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java +++ b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/IoTDAMtProcessor.java @@ -1,7 +1,9 @@ package io.github.protocol.mtconnect.server.impl; import io.github.protocol.mtconnect.api.AssetRequest; -import io.github.protocol.mtconnect.api.AssetResponse; +import io.github.protocol.mtconnect.api.DeviceRequest; +import io.github.protocol.mtconnect.api.MTConnectAssets; +import io.github.protocol.mtconnect.api.MTConnectDevices; import io.github.protocol.mtconnect.server.MtProcessor; public class IoTDAMtProcessor implements MtProcessor { @@ -15,7 +17,12 @@ public IoTDAMtProcessor(String ak, String sk) { } @Override - public AssetResponse asset(AssetRequest assetRequest) { + public MTConnectAssets asset(AssetRequest assetRequest) { + return null; + } + + @Override + public MTConnectDevices device(DeviceRequest deviceRequest) { return null; } } diff --git a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java index 5364a86..958ab7a 100644 --- a/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java +++ b/mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java @@ -1,8 +1,9 @@ package io.github.protocol.mtconnect.server.impl; import io.github.protocol.mtconnect.api.AssetRequest; -import io.github.protocol.mtconnect.api.AssetResponse; +import io.github.protocol.mtconnect.api.DeviceRequest; import io.github.protocol.mtconnect.api.MTConnectAssets; +import io.github.protocol.mtconnect.api.MTConnectDevices; import io.github.protocol.mtconnect.server.MtProcessor; import java.util.HashMap; @@ -16,10 +17,12 @@ public class MemoryMtProcessor implements MtProcessor { Map mtConnectAssetsMap = new HashMap<>(); @Override - public AssetResponse asset(AssetRequest assetRequest) { - MTConnectAssets assets = mtConnectAssetsMap.get(assetRequest.getId()); - AssetResponse assetResponse = new AssetResponse(); - assetResponse.setAssets(assets); - return assetResponse; + public MTConnectAssets asset(AssetRequest assetRequest) { + return mtConnectAssetsMap.get(assetRequest.getId()); + } + + @Override + public MTConnectDevices device(DeviceRequest deviceRequest) { + return null; } }