test: add the testcase of devices

Signed-off-by: zhiheng123 <[email protected]>
Co-authored-by: ZhangJian He <[email protected]>

Author: zhiheng123

mtconnect-client/src/main/java/io/github/protocol/mtconnect/client/MTConnectClient.java

@@ -1,12 +1,12 @@
 package io.github.protocol.mtconnect.client;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.openfacade.http.HttpClient;
 import io.github.openfacade.http.HttpClientFactory;
 import io.github.openfacade.http.HttpResponse;
 import io.github.protocol.mtconnect.api.MTConnectDevices;
+import io.github.protocol.mtconnect.common.XmlUtil;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -15,34 +15,27 @@ public class MTConnectClient {
     private final MTConnectClientConfiguration config;
 
     private final HttpClient httpClient;
-    private static final ObjectMapper MAPPER = new ObjectMapper();
 
     public MTConnectClient(MTConnectClientConfiguration configuration) {
         this.config = configuration;
         this.httpClient = HttpClientFactory.createHttpClient(configuration.httpConfig());
     }
-    
-    public MTConnectDevices deivce(String Id) {
-        return null;
-    };
 
-    public static <T> T toObject(String json, Class<T> type) throws JsonProcessingException {
-        if (json == null || json.isEmpty()) {
-            return null;
-        }
-        return MAPPER.readValue(json, type);
+    public MTConnectDevices device(String Id) {
+        return null;
     }
 
-    public MTConnectDevices deivces() throws ExecutionException, InterruptedException {
+    public MTConnectDevices devices() throws ExecutionException, InterruptedException {
         String url = String.format("http://%s:%s/devices", config.host(), config.port());
         CompletableFuture<HttpResponse> future = httpClient.get(url);
 
         CompletableFuture<MTConnectDevices> resp = future.thenCompose(response -> {
             if (response.statusCode() >= 200 && response.statusCode() < 300) {
                 try {
-                    MTConnectDevices body = toObject(Arrays.toString(response.body()), MTConnectDevices.class);
+                    String string = new String(response.body(), StandardCharsets.UTF_8);
+                    MTConnectDevices body = XmlUtil.fromXml(string, MTConnectDevices.class);
                     return CompletableFuture.completedFuture(body);
-                } catch (JsonProcessingException e) {
+                } catch (Exception e) {
                     return CompletableFuture.failedFuture(e);
                 }
             } else {
@@ -51,5 +44,5 @@ public MTConnectDevices deivces() throws ExecutionException, InterruptedExceptio
         });
 
         return resp.get();
-    };
+    }
 }

mtconnect-server/pom.xml

@@ -17,6 +17,12 @@
             <artifactId>mtconnect-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.protocol-laboratory</groupId>
+            <artifactId>mtconnect-client</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.huaweicloud.sdk</groupId>
             <artifactId>huaweicloud-sdk-iotda</artifactId>
@@ -37,12 +43,6 @@
             <artifactId>vertx-web</artifactId>
             <version>${vertx.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.github.protocol-laboratory</groupId>
-            <artifactId>mtconnect-client</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/MTConnectServer.java

@@ -7,7 +7,9 @@
 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.DeviceRequest;
 import io.github.protocol.mtconnect.api.MTConnectAssets;
+import io.github.protocol.mtconnect.api.MTConnectDevices;
 import io.github.protocol.mtconnect.common.XmlUtil;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
@@ -29,10 +31,11 @@ public MTConnectServer(MTConnectServerConfiguration configuration) {
 
     public CompletableFuture<Void> start() {
         this.httpServer.addSyncRoute("/assets", HttpMethod.GET, new MtAssetsHandler());
+        this.httpServer.addSyncRoute("/devices", HttpMethod.GET, new MtDevicesHandler());
         return httpServer.start();
     }
 
-    public int getHttpPort() {
+    public int httpPort() {
         return httpServer.listenPort();
     }
 
@@ -51,4 +54,20 @@ public HttpResponse handle(HttpRequest request) {
             return new HttpResponse(HttpResponseStatus.OK.code(), body.getBytes(StandardCharsets.UTF_8));
         }
     }
+
+    class MtDevicesHandler implements SyncRequestHandler {
+        @Override
+        public HttpResponse handle(HttpRequest request) {
+            MTConnectDevices devices = mtProcessor.device(new DeviceRequest());
+            // convert the response to http response
+            String body;
+            try {
+                body = XmlUtil.toXml(devices);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+
+            return new HttpResponse(HttpResponseStatus.OK.code(), body.getBytes(StandardCharsets.UTF_8));
+        }
+    }
 }

mtconnect-server/src/main/java/io/github/protocol/mtconnect/server/impl/MemoryMtProcessor.java

@@ -14,7 +14,8 @@
  */
 public class MemoryMtProcessor implements MTProcessor {
 
-    Map<String, MTConnectAssets> mtConnectAssetsMap = new HashMap<>();
+    private final Map<String, MTConnectAssets> mtConnectAssetsMap = new HashMap<>();
+
     private MTConnectDevices devices;
 
     @Override
@@ -24,10 +25,10 @@ public MTConnectAssets asset(AssetRequest assetRequest) {
 
     @Override
     public MTConnectDevices device(DeviceRequest deviceRequest) {
-        return null;
+        return devices;
     }
 
-    public void updateDevice(MTConnectDevices devices) {
+    public void updateDevices(MTConnectDevices devices) {
         this.devices = devices;
     }
 }

mtconnect-server/src/test/java/io/github/protocol/mtconnect/server/MTConnectDeviceTest.java

@@ -8,9 +8,9 @@
 import io.github.protocol.mtconnect.client.MTConnectClient;
 import io.github.protocol.mtconnect.client.MTConnectClientConfiguration;
 import io.github.protocol.mtconnect.server.impl.MemoryMtProcessor;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.ExecutionException;
 
@@ -19,7 +19,7 @@ public class MTConnectDeviceTest {
     private int port;
     private final String localHost = "127.0.0.1";
 
-    // start memery server
+    // start memory server
     private MemoryMtProcessor startMemoryServer() {
         MTConnectServerConfiguration configuration = new MTConnectServerConfiguration();
         HttpServerConfig httpServerConfig = new HttpServerConfig.Builder()
@@ -33,7 +33,7 @@ private MemoryMtProcessor startMemoryServer() {
         MTConnectServer mtConnectServer = new MTConnectServer(configuration);
         mtConnectServer.start().join();
 
-        port = mtConnectServer.getHttpPort();
+        port = mtConnectServer.httpPort();
 
         return mtProcessor;
     }
@@ -43,9 +43,10 @@ public void testDevices() throws ExecutionException, InterruptedException {
         MemoryMtProcessor memoryMtProcessor = startMemoryServer();
         MTConnectDevices devices = new MTConnectDevices();
         Device device = new Device();
+        device.setId("test_id");
 
         devices.setDevices(Collections.singletonList(device));
-        memoryMtProcessor.updateDevice(devices);
+        memoryMtProcessor.updateDevices(devices);
 
         MTConnectClientConfiguration configuration = new MTConnectClientConfiguration();
         HttpClientConfig httpClientConfig = new HttpClientConfig.Builder().build();
@@ -54,8 +55,7 @@ public void testDevices() throws ExecutionException, InterruptedException {
         configuration.setPort(port);
         MTConnectClient mtConnectClient = new MTConnectClient(configuration);
 
-        // use client show device
-        MTConnectDevices resp = mtConnectClient.deivces();
-        System.out.println(resp.getDevices());
+        MTConnectDevices resp = mtConnectClient.devices();
+        Assertions.assertEquals(device.getId(), resp.getDevices().get(0).getId());
     }
 }