djb-eapim/elink-test-master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package 이동 반영

Browse Source
This commit is contained in:
현성필
2023-05-16 21:39:12 +09:00
parent 41d405ace4
commit 22250ef62a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/httpmockserver/client/entity/ApiRequestHistory.java
+1
View File
@@ -1,5 +1,6 @@
package com.eactive.httpmockserver.client.entity; package com.eactive.httpmockserver.client.entity;
import com.eactive.httpmockserver.server.entity.Server;
import com.eactive.httpmockserver.user.entity.StaffUser; import com.eactive.httpmockserver.user.entity.StaffUser;
import org.hibernate.annotations.Type; import org.hibernate.annotations.Type;
src/main/java/com/eactive/httpmockserver/client/mapper/ApiRequestMapper.java
+1 -2
View File
@@ -2,12 +2,11 @@ package com.eactive.httpmockserver.client.mapper;
import com.eactive.httpmockserver.client.dto.ApiCollectionDTO; import com.eactive.httpmockserver.client.dto.ApiCollectionDTO;
import com.eactive.httpmockserver.client.dto.ApiRequestDTO; import com.eactive.httpmockserver.client.dto.ApiRequestDTO;
import com.eactive.httpmockserver.client.dto.ApiRequestKeyValueDTO;
import com.eactive.httpmockserver.client.entity.ApiCollection; import com.eactive.httpmockserver.client.entity.ApiCollection;
import com.eactive.httpmockserver.client.entity.ApiRequestInfo; import com.eactive.httpmockserver.client.entity.ApiRequestInfo;
import com.eactive.httpmockserver.common.mapper.CommonMapper; import com.eactive.httpmockserver.common.mapper.CommonMapper;
import com.eactive.httpmockserver.server.mapper.ServerMapper;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy; import org.mapstruct.ReportingPolicy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
src/main/java/com/eactive/httpmockserver/server/controller/ServerMgmtController.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.eactive.httpmockserver.server.controller; package com.eactive.httpmockserver.server.controller;
import com.eactive.httpmockserver.client.mapper.ServerMapper; import com.eactive.httpmockserver.server.mapper.ServerMapper;
import com.eactive.httpmockserver.server.dto.ServerDTO; import com.eactive.httpmockserver.server.dto.ServerDTO;
import com.eactive.httpmockserver.server.dto.ServerSearch; import com.eactive.httpmockserver.server.dto.ServerSearch;
import com.eactive.httpmockserver.server.entity.Server; import com.eactive.httpmockserver.server.entity.Server;
src/main/java/com/eactive/httpmockserver/client/mapper/ServerMapper.java → src/main/java/com/eactive/httpmockserver/server/mapper/ServerMapper.java
+3 -3
View File
@@ -1,4 +1,4 @@
package com.eactive.httpmockserver.client.mapper; package com.eactive.httpmockserver.server.mapper;
import com.eactive.httpmockserver.client.repository.ServerRepository; import com.eactive.httpmockserver.client.repository.ServerRepository;
@@ -18,12 +18,12 @@ public class ServerMapper {
@Autowired @Autowired
ServerRepository serverRepository; ServerRepository serverRepository;
Server mapById(Long id) { public Server mapById(Long id) {
if (id == null || id == 0) return null; if (id == null || id == 0) return null;
return serverRepository.findById(id).orElseThrow(() -> new NotFoundException("Server[" + id + "] not found")); return serverRepository.findById(id).orElseThrow(() -> new NotFoundException("Server[" + id + "] not found"));
} }
Long mapById(Server server) { public Long mapById(Server server) {
if (server == null) return null; if (server == null) return null;
return server.getId(); return server.getId();
} }