diff --git a/.gitignore b/.gitignore index cdd0675..3fdbef8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ out/ ### VS Code ### .vscode/ -/.idea/ \ No newline at end of file +/.idea/ + +### Project ### +/temp/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3bc34d2..12edfb7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' } -group = 'org.elitclass' +group = 'org.mobidgim' version = '0.0.1-SNAPSHOT' java { @@ -19,8 +19,13 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + compileOnly 'org.projectlombok:lombok:1.18.30' + annotationProcessor 'org.projectlombok:lombok:1.18.30' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.3' + } tasks.named('test') { diff --git a/src/main/java/org/elitclass/mobidigimproject/service/service.java b/src/main/java/org/elitclass/mobidigimproject/service/service.java deleted file mode 100644 index 9d01377..0000000 --- a/src/main/java/org/elitclass/mobidigimproject/service/service.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.elitclass.mobidigimproject.service; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.stereotype.Service; - -import java.io.IOException; -import java.util.Map; - -@Service -public class service { - private void saveFileToData(Map data) throws IOException { - ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(data); - - } -} diff --git a/src/main/java/org/elitclass/mobidigimproject/MobidigimProjectApplication.java b/src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java similarity index 88% rename from src/main/java/org/elitclass/mobidigimproject/MobidigimProjectApplication.java rename to src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java index 69b6088..066aed8 100644 --- a/src/main/java/org/elitclass/mobidigimproject/MobidigimProjectApplication.java +++ b/src/main/java/org/mobidgim/mobidigimproject/MobidigimProjectApplication.java @@ -1,4 +1,4 @@ -package org.elitclass.mobidigimproject; +package org.mobidgim.mobidigimproject; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/org/mobidgim/mobidigimproject/common/api/Api.java b/src/main/java/org/mobidgim/mobidigimproject/common/api/Api.java new file mode 100644 index 0000000..215b7fa --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/common/api/Api.java @@ -0,0 +1,46 @@ +package org.mobidgim.mobidigimproject.common.api; + +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.mobidgim.mobidigimproject.common.error.ErrorCodeIfs; + +@AllArgsConstructor +@NoArgsConstructor +@Data +public class Api { + + private Result result; + @Valid + private T body; + + public static Api OK(T Data){ + var api = new Api(); + api.result = Result.OK(); + api.body = Data; + return api; + } + public static Api ERROR(Result result){ + var api = new Api(); + api.result = result; + return api; + } + public static Api ERROR(ErrorCodeIfs errorCodeIfs){ + var api = new Api(); + api.result = Result.ERROR(errorCodeIfs); + return api; + } + public static Api ERROR(ErrorCodeIfs errorCodeIfs, Throwable tx){ + var api = new Api(); + api.result = Result.ERROR(errorCodeIfs,tx); + return api; + } + public static Api ERROR(ErrorCodeIfs errorCodeIfs, String description){ + var api = new Api(); + api.result = Result.ERROR(errorCodeIfs,description); + return api; + } + + +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/common/api/Result.java b/src/main/java/org/mobidgim/mobidigimproject/common/api/Result.java new file mode 100644 index 0000000..b5755aa --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/common/api/Result.java @@ -0,0 +1,48 @@ +package org.mobidgim.mobidigimproject.common.api; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.mobidgim.mobidigimproject.common.error.ErrorCode; +import org.mobidgim.mobidigimproject.common.error.ErrorCodeIfs; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@Builder +public class Result { + private Integer resultCode; + private String resultMessage; + private String resultDescription; + + public static Result OK(){ + return Result.builder() + .resultCode(ErrorCode.OK.getErrorCode()) + .resultMessage(ErrorCode.OK.getErrorDescription()) + .resultDescription("성공") + .build(); + } + public static Result ERROR(ErrorCodeIfs errorCodeIfs){ + return Result.builder() + .resultCode(errorCodeIfs.getErrorCode()) + .resultMessage(errorCodeIfs.getErrorDescription()) + .resultDescription("에러") + .build(); + } + public static Result ERROR(ErrorCodeIfs errorCodeIfs,Throwable tx){ + return Result.builder() + .resultCode(errorCodeIfs.getErrorCode()) + .resultMessage(errorCodeIfs.getErrorDescription()) + .resultDescription(tx.getLocalizedMessage()) + .build(); + } + public static Result ERROR(ErrorCodeIfs errorCodeIfs,String Description){ + return Result.builder() + .resultCode(errorCodeIfs.getErrorCode()) + .resultMessage(errorCodeIfs.getErrorDescription()) + .resultDescription(Description) + .build(); + } +} + diff --git a/src/main/java/org/mobidgim/mobidigimproject/common/error/ErrorCode.java b/src/main/java/org/mobidgim/mobidigimproject/common/error/ErrorCode.java new file mode 100644 index 0000000..85a03a7 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/common/error/ErrorCode.java @@ -0,0 +1,20 @@ +package org.mobidgim.mobidigimproject.common.error; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@AllArgsConstructor +@Getter +public enum ErrorCode implements ErrorCodeIfs { + + OK(200, 200, "성공"), + BAD_REQUEST(HttpStatus.BAD_REQUEST.value(), 400, "잘못된 요청"), + NULL_POINT(HttpStatus.INTERNAL_SERVER_ERROR.value(), 512, "NULL POINT"), + SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), 500, "서버 에러"); + + private final Integer httpStatusCode; + private final Integer errorCode; + private final String errorDescription; + +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/common/error/ErrorCodeIfs.java b/src/main/java/org/mobidgim/mobidigimproject/common/error/ErrorCodeIfs.java new file mode 100644 index 0000000..0c10d87 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/common/error/ErrorCodeIfs.java @@ -0,0 +1,10 @@ +package org.mobidgim.mobidigimproject.common.error; + +public interface ErrorCodeIfs { + + Integer getHttpStatusCode(); + + Integer getErrorCode(); + + String getErrorDescription(); +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/config/objectmapper/ObjectMapperConfig.java b/src/main/java/org/mobidgim/mobidigimproject/config/objectmapper/ObjectMapperConfig.java new file mode 100644 index 0000000..9809e1e --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/config/objectmapper/ObjectMapperConfig.java @@ -0,0 +1,28 @@ +package org.mobidgim.mobidigimproject.config.objectmapper; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class ObjectMapperConfig { + + @Bean + public ObjectMapper objectMapper() { + var objectMapper = new ObjectMapper(); + + objectMapper.registerModule(new Jdk8Module()); + objectMapper.registerModule(new JavaTimeModule()); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); + objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + objectMapper.setPropertyNamingStrategy(new PropertyNamingStrategies.SnakeCaseStrategy()); + + return objectMapper; + } +} \ No newline at end of file diff --git a/src/main/java/org/mobidgim/mobidigimproject/config/swagger/SwaggerConfig.java b/src/main/java/org/mobidgim/mobidigimproject/config/swagger/SwaggerConfig.java new file mode 100644 index 0000000..60407b9 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/config/swagger/SwaggerConfig.java @@ -0,0 +1,15 @@ +package org.mobidgim.mobidigimproject.config.swagger; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.core.jackson.ModelResolver; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public ModelResolver modelResolver(ObjectMapper objectMapper) { + return new ModelResolver(objectMapper); + } +} + diff --git a/src/main/java/org/mobidgim/mobidigimproject/controller/Controller.java b/src/main/java/org/mobidgim/mobidigimproject/controller/Controller.java new file mode 100644 index 0000000..d6fe50f --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/controller/Controller.java @@ -0,0 +1,34 @@ +package org.mobidgim.mobidigimproject.controller; + +import jakarta.servlet.ServletResponse; +import lombok.AllArgsConstructor; +import org.mobidgim.mobidigimproject.common.api.Api; +import org.mobidgim.mobidigimproject.model.device.DeviceDTO; +import org.mobidgim.mobidigimproject.model.register.RegisterDTO; +import org.mobidgim.mobidigimproject.service.SettingService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; + +@RestController +@RequestMapping("/setting") +@AllArgsConstructor +public class Controller { + + private SettingService settingService; + + @PostMapping("/device") + public Api settingDevice(@RequestBody DeviceDTO request) throws IOException { + settingService.saveFileWithDevice(request); + + return Api.OK(request); + } + @PostMapping("/register") + public Api settingRegister(@RequestBody RegisterDTO request)throws IOException{ + settingService.saveFileWithRegister(request); + return Api.OK(request); + } +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java new file mode 100644 index 0000000..5aed725 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/DeviceDTO.java @@ -0,0 +1,36 @@ +package org.mobidgim.mobidigimproject.model.device; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonUnwrapped; +import lombok.Getter; +import lombok.Setter; +import org.mobidgim.mobidigimproject.model.device.subDTO.Imu; +import org.mobidgim.mobidigimproject.model.device.subDTO.*; + +import java.util.List; + +@Getter +@Setter +@JsonInclude(JsonInclude.Include.NON_NULL) +public class DeviceDTO { + + @JsonUnwrapped + private Wifi wifiConfig; + + @JsonUnwrapped + private Ethernet ethernetConfig; + + @JsonUnwrapped + private Server serverConfig; + + @JsonUnwrapped + private CanBus canBusConfig; + + @JsonUnwrapped + private Rs485 rs485Config; + + @JsonUnwrapped + private Imu imuConfig; + + private List wifiSSID; +} \ No newline at end of file diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java new file mode 100644 index 0000000..66972c3 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/WifiSSIDS.java @@ -0,0 +1,13 @@ +package org.mobidgim.mobidigimproject.model.device; + + +import lombok.Data; +import org.mobidgim.mobidigimproject.model.device.enums.WiFiSecurity; + + +@Data +public class WifiSSIDS { + private String wifiSSID; + private String wifiPassword; + private WiFiSecurity wifiSecurity; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/CanBusType.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/CanBusType.java new file mode 100644 index 0000000..075c34f --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/CanBusType.java @@ -0,0 +1,17 @@ +package org.mobidgim.mobidigimproject.model.device.enums; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum CanBusType { + EXTENDED("extended"), + STANDARD("standard"); + private final String Type; + + @JsonValue + public String getType() { + return Type; + } + +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/ImuRemap.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/ImuRemap.java new file mode 100644 index 0000000..4b4aeed --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/ImuRemap.java @@ -0,0 +1,17 @@ +package org.mobidgim.mobidigimproject.model.device.enums; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; + + +@AllArgsConstructor +public enum ImuRemap { + X("x"), + Y("y"); + private final String remap; + + @JsonValue + public String getRemap() { + return remap; + } +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/ImuRemapSign.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/ImuRemapSign.java new file mode 100644 index 0000000..05b913b --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/ImuRemapSign.java @@ -0,0 +1,16 @@ +package org.mobidgim.mobidigimproject.model.device.enums; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum ImuRemapSign { + MINUS("minus"), + PLUS("plus"); + private final String sign; + + @JsonValue + public String getSign() { + return sign; + } +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/Rs485Mode.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/Rs485Mode.java new file mode 100644 index 0000000..ce622cc --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/Rs485Mode.java @@ -0,0 +1,16 @@ +package org.mobidgim.mobidigimproject.model.device.enums; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum Rs485Mode { + HALF_DUPLEX("half"), + FULL_DUPLEX("full"); + private final String value; + + @JsonValue + public String getValue() { + return value; + } +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java new file mode 100644 index 0000000..f6af7e1 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WiFiSecurity.java @@ -0,0 +1,16 @@ +package org.mobidgim.mobidigimproject.model.device.enums; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum WiFiSecurity { + NONE("none"), + WPA_WPA2("wpa/wpa2"); + private final String value; + + @JsonValue + public String getValue() { + return value; + } +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WifiStatic.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WifiStatic.java new file mode 100644 index 0000000..805856e --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/enums/WifiStatic.java @@ -0,0 +1,16 @@ +package org.mobidgim.mobidigimproject.model.device.enums; + +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum WifiStatic { + ON("on") , + OFF("off") ; + private final String Type; + + @JsonValue + public String getType() { + return Type; + } +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/CanBus.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/CanBus.java new file mode 100644 index 0000000..4a244cd --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/CanBus.java @@ -0,0 +1,13 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + + +import lombok.Getter; +import lombok.Setter; +import org.mobidgim.mobidigimproject.model.device.enums.CanBusType; + +@Getter +@Setter +public class CanBus { + private CanBusType canBusType; + private int baudrate; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Ethernet.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Ethernet.java new file mode 100644 index 0000000..0000e09 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Ethernet.java @@ -0,0 +1,12 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class Ethernet { + private String ethIp; + private String ethNetmask; + private String ethGateway; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Imu.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Imu.java new file mode 100644 index 0000000..0d8ec10 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Imu.java @@ -0,0 +1,17 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + +import lombok.Getter; +import lombok.Setter; +import org.mobidgim.mobidigimproject.model.device.enums.ImuRemap; +import org.mobidgim.mobidigimproject.model.device.enums.ImuRemapSign; + +@Getter +@Setter +public class Imu { + private ImuRemap imuRempaX; + private ImuRemap imuRempaY; + private ImuRemap imuRempaZ; + private ImuRemapSign imuRemapXSign; + private ImuRemapSign imuRemapYSign; + private ImuRemapSign imuRemapZSign; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Rs485.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Rs485.java new file mode 100644 index 0000000..c0a2db0 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Rs485.java @@ -0,0 +1,15 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + +import lombok.Getter; +import lombok.Setter; +import org.mobidgim.mobidigimproject.model.device.enums.Rs485Mode; + +@Getter +@Setter +public class Rs485 { + private Rs485Mode rs485Mode; + private int rs485baudrate; + private int rs485dataBits; + private String rs485parity; + private int rs485StopBits; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Server.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Server.java new file mode 100644 index 0000000..f1d97e3 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Server.java @@ -0,0 +1,18 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + +import lombok.*; + +@Getter +@Setter +public class Server { + private String protocolServerIp; + private int protocolServerPort; + private String updateServerIp; + private int updateServerPort; + private String rtcmServerIp; + private int rtcmServerPort; + private String opcUaServerIp; + private int opcUaServerPort; + private String modbusServerIp; + private int modbusServerPort; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Wifi.java b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Wifi.java new file mode 100644 index 0000000..def3447 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/device/subDTO/Wifi.java @@ -0,0 +1,16 @@ +package org.mobidgim.mobidigimproject.model.device.subDTO; + +import lombok.Getter; +import lombok.Setter; +import org.mobidgim.mobidigimproject.model.device.enums.WifiStatic; + +@Getter +@Setter +public class Wifi { + private WifiStatic wifiStatic; + private String wifiIp; + private String netmask; + private String gateway; + private String dns1; + private String dns2; +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/model/register/RegisterDTO.java b/src/main/java/org/mobidgim/mobidigimproject/model/register/RegisterDTO.java new file mode 100644 index 0000000..805a325 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/model/register/RegisterDTO.java @@ -0,0 +1,4 @@ +package org.mobidgim.mobidigimproject.model.register; + +public class RegisterDTO { +} diff --git a/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java b/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java new file mode 100644 index 0000000..eba15f7 --- /dev/null +++ b/src/main/java/org/mobidgim/mobidigimproject/service/SettingService.java @@ -0,0 +1,36 @@ +package org.mobidgim.mobidigimproject.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import org.mobidgim.mobidigimproject.model.device.DeviceDTO; +import org.mobidgim.mobidigimproject.model.register.RegisterDTO; +import org.springframework.boot.context.config.ConfigData; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +@Service +public class SettingService { + + public DeviceDTO saveFileWithDevice(DeviceDTO request) throws IOException { + ObjectMapper mapper = new ObjectMapper(); + mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); + String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request); + String filename = "./temp/deviceConfig.json"; + Files.writeString(Paths.get(filename), json); + + return request; + } + + public RegisterDTO saveFileWithRegister(RegisterDTO request) throws IOException { + ObjectMapper mapper = new ObjectMapper(); + mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); + String json = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(request); + String filename = "./temp/registerConfig.json"; + + return request; + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index eb6fcb7..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=mobidigimProject diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html new file mode 100644 index 0000000..e69de29 diff --git a/src/test/java/org/elitclass/mobidigimproject/MobidigimProjectApplicationTests.java b/src/test/java/org/mobidgim/mobidigimproject/MobidigimProjectApplicationTests.java similarity index 83% rename from src/test/java/org/elitclass/mobidigimproject/MobidigimProjectApplicationTests.java rename to src/test/java/org/mobidgim/mobidigimproject/MobidigimProjectApplicationTests.java index 5d7d533..abc330a 100644 --- a/src/test/java/org/elitclass/mobidigimproject/MobidigimProjectApplicationTests.java +++ b/src/test/java/org/mobidgim/mobidigimproject/MobidigimProjectApplicationTests.java @@ -1,4 +1,4 @@ -package org.elitclass.mobidigimproject; +package org.mobidgim.mobidigimproject; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest;