socket client

src/main/java/com/eactive/testmaster/server/mapper/ServerMapper.java

@@ -3,9 +3,12 @@ package com.eactive.testmaster.server.mapper;
 
 import com.eactive.testmaster.common.exception.NotFoundException;
 import com.eactive.testmaster.server.dto.ServerDTO;
+import com.eactive.testmaster.server.dto.ServerOptionDTO;
 import com.eactive.testmaster.server.entity.Server;
-import com.eactive.testmaster.server.entity.ServerRepository;
+import com.eactive.testmaster.server.entity.ServerOption;
+import com.eactive.testmaster.server.repository.ServerRepository;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
@@ -47,12 +50,7 @@ public class ServerMapper {
         dto.setScheme(server.getScheme());
         dto.setBasePath(server.getBasePath());
         dto.setEnabled(server.isEnabled());
-        dto.setLengthFieldInclude(server.isLengthFieldInclude());
-        dto.setMessageKeyInclude(server.isMessageKeyInclude());
-        dto.setLengthFieldLength(server.getLengthFieldLength());
-        dto.setLengthFieldOffset(server.getLengthFieldOffset());
-        dto.setMessageKeyLength(server.getMessageKeyLength());
-        dto.setMessageKeyOffset(server.getMessageKeyOffset());
+        dto.setServerOptions(mapOptionsDTO(server.getServerOptions()));
 
         return dto;
     }
@@ -72,15 +70,66 @@ public class ServerMapper {
         server.setScheme(dto.getScheme());
         server.setBasePath(dto.getBasePath());
         server.setEnabled(dto.isEnabled());
-        server.setLengthFieldInclude(dto.isLengthFieldInclude());
-        server.setMessageKeyInclude(dto.isMessageKeyInclude());
-        server.setLengthFieldLength(dto.getLengthFieldLength());
-        server.setLengthFieldOffset(dto.getLengthFieldOffset());
-        server.setMessageKeyLength(dto.getMessageKeyLength());
-        server.setMessageKeyOffset(dto.getMessageKeyOffset());
+        server.setServerOptions(mapOptions(dto.getServerOptions()));
 
         return server;
     }
+    public List<ServerOption> mapOptions(List<ServerOptionDTO> dtos) {
+        if (dtos == null) {
+            return null;
+        }
+        return dtos.stream().map(this::map).filter(Objects::nonNull).collect(Collectors.toList());
+    }
+
+    public List<ServerOptionDTO> mapOptionsDTO(List<ServerOption> entities) {
+        if (entities == null) {
+            return null;
+        }
+        return entities.stream().map(this::map).filter(Objects::nonNull).collect(Collectors.toList());
+    }
+
+
+    public ServerOption map(ServerOptionDTO dto){
+        if (dto == null) {
+            return null;
+        }
+
+        if (dto.getOptionKey() == null && dto.getOptionName() == null && dto.getDefaultValue() == null && dto.getOffset() == null && dto.getLength() == null) {
+            return null;
+        }
+
+        ServerOption serverOption = new ServerOption();
+
+        serverOption.setOptionId(dto.getOptionId());
+        serverOption.setOptionKey(dto.getOptionKey());
+        serverOption.setOptionName(dto.getOptionName());
+        serverOption.setDefaultValue(dto.getDefaultValue());
+        serverOption.setOffset(dto.getOffset());
+        serverOption.setLength(dto.getLength());
+        serverOption.setEnabled(dto.isEnabled());
+
+        return serverOption;
+
+    }
+
+    public ServerOptionDTO map(ServerOption entity){
+        if (entity == null) {
+            return null;
+        }
+
+        ServerOptionDTO dto = new ServerOptionDTO();
+
+        dto.setOptionId(entity.getOptionId());
+        dto.setOptionKey(entity.getOptionKey());
+        dto.setOptionName(entity.getOptionName());
+        dto.setDefaultValue(entity.getDefaultValue());
+        dto.setOffset(entity.getOffset());
+        dto.setLength(entity.getLength());
+        dto.setEnabled(entity.isEnabled());
+
+        return dto;
+    }
+
 
     public List<ServerDTO> map(List<Server> servers) {
         return servers.stream().map(this::map).collect(Collectors.toList());