Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

[general] Refactoring chunithm UpsertUserAll request and some clean up

Browse Source
This commit is contained in:
samnyan
2020-03-28 22:23:22 +09:00
parent 9a4ca3a612
commit 528b2f8b4d
70 changed files with 310 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/icu/samnyan/aqua/sega/diva/controller/DivaController.java
View File

@@ -246,7 +246,7 @@ public class DivaController {
}
@PostMapping(value = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public String fileRequest(@RequestParam String query, @RequestParam(required = false) MultipartFile bin) throws IOException, ServletException {
public String fileRequest(@RequestParam String query, @RequestParam(required = false) MultipartFile bin) {
Map<String, Object> body = parse(query);

2
src/main/java/icu/samnyan/aqua/sega/diva/filter/DivaCompressionFilter.java
View File

@@ -53,7 +53,7 @@ public class DivaCompressionFilter extends OncePerRequestFilter {
}
@Override
protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
protected boolean shouldNotFilter(HttpServletRequest request) {
String path = request.getServletPath();
return !path.startsWith("/diva");
}

1
src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.java
View File

@@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Optional;
/**
* @author samnyan (privateamusement@protonmail.com)

1
src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java
View File

@@ -2,7 +2,6 @@ package icu.samnyan.aqua.sega.diva.model.gamedata;
import icu.samnyan.aqua.sega.diva.model.common.ContestLeague;
import icu.samnyan.aqua.sega.diva.model.common.ContestNormaType;
import icu.samnyan.aqua.sega.diva.model.common.ContestStageLimit;
import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
import icu.samnyan.aqua.sega.util.URIEncoder;
import lombok.AllArgsConstructor;

12
src/main/java/icu/samnyan/aqua/sega/diva/util/DivaMapper.java
View File

@@ -2,9 +2,11 @@ package icu.samnyan.aqua.sega.diva.util;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.json.JsonWriteFeature;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import icu.samnyan.aqua.sega.util.jackson.BooleanNumberDeserializer;
@@ -26,17 +28,19 @@ public class DivaMapper {
private final ObjectMapper mapper;
public DivaMapper() {
mapper = new ObjectMapper().configure(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS, true);
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
SimpleModule module = new SimpleModule();
module.addSerializer(LocalDateTime.class, new DivaDateTimeSerializer());
module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0")));
module.addDeserializer(ZonedDateTime.class, new ZonedDateTimeDeserializer());
module.addSerializer(Boolean.class, new BooleanNumberSerializer());
module.addSerializer(boolean.class, new BooleanNumberSerializer());
module.addDeserializer(Boolean.class, new BooleanNumberDeserializer());
module.addDeserializer(boolean.class, new BooleanNumberDeserializer());
module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.0")));
module.addDeserializer(ZonedDateTime.class, new ZonedDateTimeDeserializer());
mapper = JsonMapper.builder().enable(JsonWriteFeature.WRITE_NUMBERS_AS_STRINGS)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.build();
mapper.registerModule(module);
}