[PMD] FieldNamingConventions, [공통] Core CommonConstants 로 변경
This commit is contained in:
@@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
@RequestMapping(path = "/api/household/daily/farming")
|
@RequestMapping(path = "/api/household/daily/farming")
|
||||||
public class SaveDailyFarmingController {
|
public class SaveDailyFarmingController {
|
||||||
private final DailyRecordPortIn dailyRecordPortIn;
|
private final DailyRecordPortIn dailyRecordPortIn;
|
||||||
private final SaveDailyFarmingPortIn DailyFarmingPortIn;
|
private final SaveDailyFarmingPortIn dailyFarmingPortIn;
|
||||||
private final SaveDailyFarmingValidator DailyFarmingValidator;
|
private final SaveDailyFarmingValidator dailyFarmingValidator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 농업생산 조회
|
* 일계부 농업생산 조회
|
||||||
@@ -34,7 +34,7 @@ public class SaveDailyFarmingController {
|
|||||||
|
|
||||||
reqVO.setId(Long.parseLong(id));
|
reqVO.setId(Long.parseLong(id));
|
||||||
|
|
||||||
GetDailyFarmingDto detail = DailyFarmingPortIn.detail(reqVO);
|
GetDailyFarmingDto detail = dailyFarmingPortIn.detail(reqVO);
|
||||||
if (detail == null) {
|
if (detail == null) {
|
||||||
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
|
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
|
||||||
}
|
}
|
||||||
@@ -51,7 +51,7 @@ public class SaveDailyFarmingController {
|
|||||||
@PostMapping(path = "/save")
|
@PostMapping(path = "/save")
|
||||||
ResponseEntity<?> create(@Valid @RequestBody SaveDailyFarmingReqVO formVO, BindingResult bindingResult) {
|
ResponseEntity<?> create(@Valid @RequestBody SaveDailyFarmingReqVO formVO, BindingResult bindingResult) {
|
||||||
|
|
||||||
DailyFarmingValidator.validate(formVO, bindingResult);
|
dailyFarmingValidator.validate(formVO, bindingResult);
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||||
.body(bindingResult.getFieldErrors());
|
.body(bindingResult.getFieldErrors());
|
||||||
@@ -63,7 +63,7 @@ public class SaveDailyFarmingController {
|
|||||||
formVO.setGroupNo(dailyRecord.getGroupNo());
|
formVO.setGroupNo(dailyRecord.getGroupNo());
|
||||||
formVO.setDailyId(dailyRecord.getId());
|
formVO.setDailyId(dailyRecord.getId());
|
||||||
|
|
||||||
DailyFarmingPortIn.create(formVO);
|
dailyFarmingPortIn.create(formVO);
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
return ResponseEntity.status(HttpStatus.OK).body(formVO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
package app.module.core.config.application.converter;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonGenerator;
|
|
||||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
|
||||||
import com.fasterxml.jackson.databind.SerializerProvider;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* RestController 응답시 LocalDateTime 필드 속성의 JSON 직렬화를 위해 선언됨.
|
|
||||||
*/
|
|
||||||
public class CustomLocalDateTimeSerializer extends JsonSerializer<LocalDateTime> {
|
|
||||||
|
|
||||||
private static final DateTimeFormatter formatter =
|
|
||||||
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void serialize(
|
|
||||||
LocalDateTime localDateTime,
|
|
||||||
JsonGenerator jsonGenerator,
|
|
||||||
SerializerProvider serializerProvider)
|
|
||||||
throws IOException {
|
|
||||||
jsonGenerator.writeString(formatter.format(localDateTime));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package app.module.core.config.application.converter;
|
|
||||||
|
|
||||||
import org.springframework.core.convert.converter.Converter;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import org.thymeleaf.util.StringUtils;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* String 문자열을 LocalDateTime 으로 변환해주는 Converter. 현재 사용하지 않는다!
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class StringToLocalDateTimeConverter implements Converter<String, LocalDateTime> {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public LocalDateTime convert(String source) {
|
|
||||||
return StringUtils.isEmpty(source) ? null : LocalDateTime.parse(source);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,13 +18,13 @@ import java.util.Optional;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
class URIAncestryService implements URIAncestryPortIn {
|
class URIAncestryService implements URIAncestryPortIn {
|
||||||
|
|
||||||
private final app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn URICurrentMatchingPortIn;
|
private final app.module.core.usecase.uri.currentmatch.ports.URICurrentMatchingPortIn uriCurrentMatchingPortIn;
|
||||||
private final URIViewPortIn uriViewPortIn;
|
private final URIViewPortIn uriViewPortIn;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<URIAncestry> connect(AppType appType, String uri) {
|
public List<URIAncestry> connect(AppType appType, String uri) {
|
||||||
List<URIAncestry> hierarchy = new ArrayList<>();
|
List<URIAncestry> hierarchy = new ArrayList<>();
|
||||||
URICurrentMatching currentMatchingURI = URICurrentMatchingPortIn.connect(appType, uri);
|
URICurrentMatching currentMatchingURI = uriCurrentMatchingPortIn.connect(appType, uri);
|
||||||
URIAncestry mm =
|
URIAncestry mm =
|
||||||
new URIAncestry(
|
new URIAncestry(
|
||||||
currentMatchingURI.getId(),
|
currentMatchingURI.getId(),
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
package app.module.front.config.constants;
|
|
||||||
|
|
||||||
public final class CommonConstants {
|
|
||||||
private CommonConstants() {
|
|
||||||
throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 단위의 직접입력 코드
|
|
||||||
*/
|
|
||||||
public static final String UNIT_CODE_SELF = "code.record.unit.self";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 작업 면적의 직접입력 코드
|
|
||||||
*/
|
|
||||||
public static final String AREA_CODE_OTHER = "code.record.area.self";
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.expense.adapters.web.validator;
|
package app.module.front.usecase.daily.expense.adapters.web.validator;
|
||||||
|
|
||||||
import app.module.front.config.constants.CommonConstants;
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
|
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.tika.utils.StringUtils;
|
import org.apache.tika.utils.StringUtils;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package app.module.front.usecase.daily.expense.ports.application;
|
package app.module.front.usecase.daily.expense.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.core.config.constants.DailyRecordConstants;
|
import app.module.core.config.constants.DailyRecordConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.config.constants.CommonConstants;
|
|
||||||
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
|
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
|
||||||
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto;
|
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto;
|
||||||
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
|
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.farming.adapters.web.validator;
|
package app.module.front.usecase.daily.farming.adapters.web.validator;
|
||||||
|
|
||||||
import app.module.front.config.constants.CommonConstants;
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
|
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.tika.utils.StringUtils;
|
import org.apache.tika.utils.StringUtils;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package app.module.front.usecase.daily.farming.ports.application;
|
package app.module.front.usecase.daily.farming.ports.application;
|
||||||
|
|
||||||
import app.module.core.config.application.util.DailyUtil;
|
import app.module.core.config.application.util.DailyUtil;
|
||||||
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.config.constants.CommonConstants;
|
|
||||||
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
|
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto;
|
||||||
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto;
|
import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto;
|
||||||
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
|
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.forestry.adapters.web.validator;
|
package app.module.front.usecase.daily.forestry.adapters.web.validator;
|
||||||
|
|
||||||
import app.module.front.config.constants.CommonConstants;
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
|
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.tika.utils.StringUtils;
|
import org.apache.tika.utils.StringUtils;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package app.module.front.usecase.daily.forestry.ports.application;
|
package app.module.front.usecase.daily.forestry.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.core.config.constants.DailyRecordConstants;
|
import app.module.core.config.constants.DailyRecordConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.config.constants.CommonConstants;
|
|
||||||
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
|
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto;
|
||||||
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto;
|
import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto;
|
||||||
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
|
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.income.adapters.web.validator;
|
package app.module.front.usecase.daily.income.adapters.web.validator;
|
||||||
|
|
||||||
import app.module.front.config.constants.CommonConstants;
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
|
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.tika.utils.StringUtils;
|
import org.apache.tika.utils.StringUtils;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package app.module.front.usecase.daily.income.ports.application;
|
package app.module.front.usecase.daily.income.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.core.config.constants.DailyRecordConstants;
|
import app.module.core.config.constants.DailyRecordConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.config.constants.CommonConstants;
|
|
||||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
||||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
|
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto;
|
||||||
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
|
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.work.adapters.web.validator;
|
package app.module.front.usecase.daily.work.adapters.web.validator;
|
||||||
|
|
||||||
import app.module.front.config.constants.CommonConstants;
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.apache.tika.utils.StringUtils;
|
import org.apache.tika.utils.StringUtils;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package app.module.front.usecase.daily.work.ports.application;
|
package app.module.front.usecase.daily.work.ports.application;
|
||||||
|
|
||||||
|
import app.module.core.config.constants.CommonConstants;
|
||||||
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||||
import app.module.front.config.application.util.AuditUtil;
|
import app.module.front.config.application.util.AuditUtil;
|
||||||
import app.module.front.config.constants.CommonConstants;
|
|
||||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto;
|
||||||
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkMonthDto;
|
import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkMonthDto;
|
||||||
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
|
||||||
|
|||||||
Reference in New Issue
Block a user