Compare commits

..

No commits in common. "b2aaa8564269974977c96256d533d869d4322d6c" and "385925dac0398832523b2dca7ed32db0b5be8970" have entirely different histories.

11 changed files with 14 additions and 29 deletions

View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.interplug.qcast.biz.estimate.EstimateService;
import com.interplug.qcast.biz.estimate.dto.PlanSyncResponse;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.batch.core.Job;
@ -75,7 +74,7 @@ public class PlanConfrimConfiguration implements JobExecutionListener {
@Bean
public ItemWriter<PlanSyncResponse> planConfirmWriter() {
return items -> {
estimateService.setPlanConfirmSyncSave(new ArrayList<>(items.getItems()));
estimateService.setPlanConfirmSyncSave((List<PlanSyncResponse>) items.getItems());
};
}
}

View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.interplug.qcast.biz.displayItem.DisplayItemService;
import com.interplug.qcast.biz.displayItem.dto.BomSyncResponse;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.batch.core.Job;
@ -75,7 +74,7 @@ public class BomConfiguration implements JobExecutionListener {
@Bean
public ItemWriter<BomSyncResponse> bomWriter() {
return items -> {
displayItemService.setBomSyncSave(new ArrayList<>(items.getItems()));
displayItemService.setBomSyncSave((List<BomSyncResponse>) items.getItems());
};
}
}

View File

@ -103,7 +103,7 @@ public class MaterialConfiguration implements JobExecutionListener {
@Bean
public ItemWriter<ItemSyncResponse> materialWriter() {
return items -> {
displayItemService.setItemSyncSave(new ArrayList<>(items.getItems()));
displayItemService.setItemSyncSave((List<ItemSyncResponse>) items.getItems());
};
}
}

View File

@ -4,7 +4,6 @@ import com.interplug.qcast.biz.displayItem.DisplayItemService;
import com.interplug.qcast.biz.displayItem.dto.PriceItemSyncResponse;
import com.interplug.qcast.biz.displayItem.dto.PriceSyncResponse;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
@ -142,7 +141,7 @@ public class PriceJobConfiguration implements JobExecutionListener {
private <T> ItemWriter<T> createWriter(Consumer<List<T>> processor, String writerName) {
return items -> {
try {
List<T> itemList = new ArrayList<>(items.getItems());
List<T> itemList = (List<T>) items.getItems();
processor.accept(itemList);
log.info("{}Writer: {} items 처리 완료", writerName, items.size());
} catch (Exception e) {

View File

@ -5,7 +5,6 @@ import com.interplug.qcast.biz.specialNote.dto.SpecialNoteItemRequest;
import com.interplug.qcast.biz.specialNote.dto.SpecialNoteRequest;
import com.interplug.qcast.biz.specialNote.dto.SpecialNoteSyncResponse;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
@ -158,7 +157,7 @@ public class SpecialNoteDispItemJobConfiguration implements JobExecutionListener
private <T> ItemWriter<T> createWriter(Consumer<List<T>> processor, String writerName) {
return items -> {
try {
List<T> itemList = new ArrayList<>(items.getItems());
List<T> itemList = (List<T>) items.getItems();
processor.accept(itemList);
log.info("{}Writer: {} items 처리 완료", writerName, items.size());
} catch (Exception e) {

View File

@ -10,7 +10,6 @@ import com.interplug.qcast.biz.user.dto.StoreSyncResponse;
import com.interplug.qcast.biz.user.dto.StoreSyncResquest;
import com.interplug.qcast.biz.user.dto.UserRequest;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
@ -213,7 +212,7 @@ public class StoreJobConfiguration implements JobExecutionListener {
private <T> ItemWriter<T> createWriter(Consumer<List<T>> processor, String writerName) {
return items -> {
try {
List<T> itemList = new ArrayList<>(items.getItems());
List<T> itemList = (List<T>) items.getItems();
processor.accept(itemList);
log.info("{}Writer: {} items 처리 완료", writerName, items.size());
} catch (Exception e) {

View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.interplug.qcast.biz.user.UserService;
import com.interplug.qcast.biz.user.dto.AdminUserSyncResponse;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.batch.core.Job;
@ -83,7 +82,7 @@ public class AdminUserConfiguration implements JobExecutionListener {
@Bean
public ItemWriter<AdminUserSyncResponse> adminUserWriter() {
return items -> {
userService.setAdminUserSyncSave(new ArrayList<>(items.getItems()));
userService.setAdminUserSyncSave((List<AdminUserSyncResponse>) items.getItems());
};
}
}

View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.interplug.qcast.biz.user.UserService;
import com.interplug.qcast.biz.user.dto.BusinessChargerSyncResponse;
import com.interplug.qcast.util.InterfaceQsp;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.springframework.batch.core.Job;
@ -79,7 +78,7 @@ public class BusinessChargerConfiguration implements JobExecutionListener {
@Bean
public ItemWriter<BusinessChargerSyncResponse> businessChargerWriter() {
return items -> {
userService.setBusinessChargerSyncSave(new ArrayList<>(items.getItems()));
userService.setBusinessChargerSyncSave((List<BusinessChargerSyncResponse>) items.getItems());
};
}
}

View File

@ -1,6 +1,5 @@
package com.interplug.qcast.batch.system;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
@ -127,7 +126,7 @@ public class CommonCodeConfiguration implements JobExecutionListener {
private <T> ItemWriter<T> createWriter(Consumer<List<T>> processor, String writerName) {
return items -> {
try {
List<T> itemList = new ArrayList<>(items.getItems());
List<T> itemList = (List<T>) items.getItems();
processor.accept(itemList);
log.info("{}Writer: {} items 처리 완료", writerName, items.size());
} catch (Exception e) {

View File

@ -3,7 +3,7 @@ package com.interplug.qcast.config.json;
import com.fasterxml.jackson.core.SerializableString;
import com.fasterxml.jackson.core.io.CharacterEscapes;
import com.fasterxml.jackson.core.io.SerializedString;
import org.springframework.web.util.HtmlUtils;
import org.apache.commons.lang3.StringEscapeUtils;
/**
* <pre>
@ -50,7 +50,7 @@ public class HtmlCharacterEscapes extends CharacterEscapes {
sb.append(String.format("%04x", ch));
serializedString = new SerializedString(sb.toString());
} else {
serializedString = new SerializedString(HtmlUtils.htmlEscape(Character.toString(charAt)));
serializedString = new SerializedString(StringEscapeUtils.escapeHtml4(Character.toString(charAt)));
}
return serializedString;

View File

@ -53,7 +53,6 @@ public class InterfaceQsp {
// GET 요청 requestObject를 쿼리 스트링으로 변환
if (HttpMethod.GET.equals(httpMethod) && requestObject != null) {
ObjectMapper om = new ObjectMapper();
@SuppressWarnings("unchecked")
Map<String, Object> params = om.convertValue(requestObject, Map.class); // Object -> Map 변환
String queryString =
params.entrySet().stream()
@ -160,17 +159,11 @@ public class InterfaceQsp {
}
}
if (responseObject == null) {
@SuppressWarnings("unchecked")
T result = (T) dataJson;
return result;
return (T) dataJson;
} else if (responseObject instanceof Class<?>) {
@SuppressWarnings("unchecked")
Class<T> responseClass = (Class<T>) responseObject;
return om.readValue(dataJson, responseClass);
return om.readValue(dataJson, (Class<T>) responseObject);
} else if (responseObject instanceof TypeReference<?>) {
@SuppressWarnings("unchecked")
TypeReference<T> responseType = (TypeReference<T>) responseObject;
return om.readValue(dataJson, responseType);
return om.readValue(dataJson, (TypeReference<T>) responseObject);
} else {
throw new IllegalArgumentException("Unsupported responseType");
}