Source code refactoring

N1nt4nd0 · N1nt4nd0 · commit 7b791d6a8620 · 2025-06-30T12:54:58.000+03:00
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/business/McRemapperUseCases.java b/src/main/java/ru/feodorkek/dev/mcremapper/business/McRemapperUseCases.java
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/business/impl/McRemapperUseCasesImpl.java b/src/main/java/ru/feodorkek/dev/mcremapper/business/impl/McRemapperUseCasesImpl.java
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/config/McRemapperConfig.java b/src/main/java/ru/feodorkek/dev/mcremapper/config/McRemapperConfig.java
@@ -2,11 +2,11 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import ru.feodorkek.dev.mcremapper.config.properties.McRemapperProperties;
 import ru.feodorkek.dev.mcremapper.core.McRemapperProvider;
+import ru.feodorkek.dev.mcremapper.properties.McRemapperProperties;
 import ru.feodorkek.dev.mcremapper.service.MappingsLoaderService;
 import ru.feodorkek.dev.mcremapper.service.McRemapperService;
-import ru.feodorkek.dev.mcremapper.service.impl.McRemapperServiceImpl;
+import ru.feodorkek.dev.mcremapper.service.McRemapperServiceImpl;
 
 @Configuration
 public class McRemapperConfig {
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/config/MvcControllerAdvice.java b/src/main/java/ru/feodorkek/dev/mcremapper/config/MvcControllerAdvice.java
@@ -1,4 +1,4 @@
-package ru.feodorkek.dev.mcremapper.config.exception;
+package ru.feodorkek.dev.mcremapper.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.ui.Model;
@@ -8,7 +8,7 @@
 
 @Slf4j
 @ControllerAdvice(basePackageClasses = MvcControllerPackage.class)
-public class MvcControllerExceptionHandler {
+public class MvcControllerAdvice {
 
     @ExceptionHandler
     public String handleException(final Exception exception, final Model model) {
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/config/OpenApiConfig.java b/src/main/java/ru/feodorkek/dev/mcremapper/config/OpenApiConfig.java
@@ -6,7 +6,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import ru.feodorkek.dev.mcremapper.config.properties.OpenApiInfoProperties;
+import ru.feodorkek.dev.mcremapper.properties.OpenApiInfoProperties;
 
 @Configuration
 @RequiredArgsConstructor
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/config/PropertiesConvertersConfig.java b/src/main/java/ru/feodorkek/dev/mcremapper/config/PropertiesConvertersConfig.java
@@ -5,11 +5,11 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
-import ru.feodorkek.dev.mcremapper.config.properties.converters.PatternConverter;
+import ru.feodorkek.dev.mcremapper.properties.converters.PatternConverter;
 
 @Configuration
 @RequiredArgsConstructor
-public class PropertiesConverterConfig {
+public class PropertiesConvertersConfig {
 
     private final PatternConverter patternConverter;
 
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/config/RestControllerAdvice.java b/src/main/java/ru/feodorkek/dev/mcremapper/config/RestControllerAdvice.java
@@ -1,20 +1,20 @@
-package ru.feodorkek.dev.mcremapper.config.exception;
+package ru.feodorkek.dev.mcremapper.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import ru.feodorkek.dev.mcremapper.controller.rest.RestControllerPackage;
-import ru.feodorkek.dev.mcremapper.dto.ExceptionDtoOut;
+import ru.feodorkek.dev.mcremapper.dto.ExceptionResponse;
 
 @Slf4j
 @ControllerAdvice(basePackageClasses = RestControllerPackage.class)
-public class RestControllerExceptionHandler {
+public class RestControllerAdvice {
 
     @ExceptionHandler
-    public ResponseEntity<ExceptionDtoOut> handleException(final Exception exception) {
+    public ResponseEntity<ExceptionResponse> handleException(final Exception exception) {
         log.error("RestController error occurred", exception);
-        return ResponseEntity.internalServerError().body(new ExceptionDtoOut(exception.getMessage()));
+        return ResponseEntity.internalServerError().body(new ExceptionResponse(exception.getMessage()));
     }
 
 }
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/controller/mvc/McRemapperPublicMvcController.java b/src/main/java/ru/feodorkek/dev/mcremapper/controller/mvc/McRemapperPublicMvcController.java
@@ -5,7 +5,7 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
-import ru.feodorkek.dev.mcremapper.config.properties.RestPublicEndpointsProperties;
+import ru.feodorkek.dev.mcremapper.properties.RestPublicEndpointsProperties;
 import ru.feodorkek.dev.mcremapper.service.McRemapperService;
 
 @Controller
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/controller/rest/McRemapperPublicRestController.java b/src/main/java/ru/feodorkek/dev/mcremapper/controller/rest/McRemapperPublicRestController.java
@@ -9,18 +9,18 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import ru.feodorkek.dev.mcremapper.business.McRemapperUseCases;
-import ru.feodorkek.dev.mcremapper.dto.MaybeRemapDtoIn;
-import ru.feodorkek.dev.mcremapper.dto.MaybeRemapDtoOut;
-import ru.feodorkek.dev.mcremapper.dto.McRemapperInfoDtoOut;
+import ru.feodorkek.dev.mcremapper.dto.MaybeRemapRequest;
+import ru.feodorkek.dev.mcremapper.dto.MaybeRemapResponse;
+import ru.feodorkek.dev.mcremapper.dto.McRemapperInfoResponse;
+import ru.feodorkek.dev.mcremapper.usecase.McRemapperUseCases;
 
 @Tag(name = "McRemapper public usages")
 @CrossOrigin
 @RestController
 @RequiredArgsConstructor
 public class McRemapperPublicRestController {
 
-    private final McRemapperUseCases mcRemapperUseCases;
+    private final McRemapperUseCases useCases;
 
     @Operation(summary = "Ping endpoint")
     @GetMapping("${mc-remapper.web.rest.endpoints.public.ping}")
@@ -30,15 +30,15 @@ public ResponseEntity<String> ping() {
 
     @Operation(summary = "Remap input minecraft source code")
     @PostMapping("${mc-remapper.web.rest.endpoints.public.mc-remapper-maybe-remap}")
-    public ResponseEntity<MaybeRemapDtoOut> maybeRemap(
-            @RequestBody final MaybeRemapDtoIn maybeRemapDtoIn) {
-        return ResponseEntity.ok(mcRemapperUseCases.maybeRemap(maybeRemapDtoIn));
+    public ResponseEntity<MaybeRemapResponse> maybeRemap(
+            @RequestBody final MaybeRemapRequest request) {
+        return ResponseEntity.ok(useCases.maybeRemap(request));
     }
 
     @Operation(summary = "Get info")
     @GetMapping("${mc-remapper.web.rest.endpoints.public.mc-remapper-info}")
-    public ResponseEntity<McRemapperInfoDtoOut> getInfo() {
-        return ResponseEntity.ok(mcRemapperUseCases.getInfo());
+    public ResponseEntity<McRemapperInfoResponse> getInfo() {
+        return ResponseEntity.ok(useCases.getInfo());
     }
 
 }
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/dto/ExceptionResponse.java b/src/main/java/ru/feodorkek/dev/mcremapper/dto/ExceptionResponse.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 
 @Data
-public class ExceptionDtoOut {
+public class ExceptionResponse {
 
     private final String errorMessage;
 
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/dto/MaybeRemapRequest.java b/src/main/java/ru/feodorkek/dev/mcremapper/dto/MaybeRemapRequest.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 
 @Data
-public class MaybeRemapDtoIn {
+public class MaybeRemapRequest {
 
     private final String mcRemapperProviderName;
     private final String mappedSource;
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/dto/MaybeRemapResponse.java b/src/main/java/ru/feodorkek/dev/mcremapper/dto/MaybeRemapResponse.java
@@ -4,7 +4,7 @@
 import ru.feodorkek.dev.mcremapper.core.MaybeRemapResult;
 
 @Data
-public class MaybeRemapDtoOut {
+public class MaybeRemapResponse {
 
     private final MaybeRemapResult result;
 
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/dto/McRemapperInfoResponse.java b/src/main/java/ru/feodorkek/dev/mcremapper/dto/McRemapperInfoResponse.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 @Data
-public class McRemapperInfoDtoOut {
+public class McRemapperInfoResponse {
 
     private final List<String> mcVersions;
     private final int sourceMinLen;
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/properties/McRemapperProperties.java b/src/main/java/ru/feodorkek/dev/mcremapper/properties/McRemapperProperties.java
@@ -1,4 +1,4 @@
-package ru.feodorkek.dev.mcremapper.config.properties;
+package ru.feodorkek.dev.mcremapper.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/properties/OpenApiInfoProperties.java b/src/main/java/ru/feodorkek/dev/mcremapper/properties/OpenApiInfoProperties.java
@@ -1,4 +1,4 @@
-package ru.feodorkek.dev.mcremapper.config.properties;
+package ru.feodorkek.dev.mcremapper.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/properties/RestPublicEndpointsProperties.java b/src/main/java/ru/feodorkek/dev/mcremapper/properties/RestPublicEndpointsProperties.java
@@ -1,4 +1,4 @@
-package ru.feodorkek.dev.mcremapper.config.properties;
+package ru.feodorkek.dev.mcremapper.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/properties/converters/PatternConverter.java b/src/main/java/ru/feodorkek/dev/mcremapper/properties/converters/PatternConverter.java
@@ -1,4 +1,4 @@
-package ru.feodorkek.dev.mcremapper.config.properties.converters;
+package ru.feodorkek.dev.mcremapper.properties.converters;
 
 import lombok.NonNull;
 import org.springframework.core.convert.converter.Converter;
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/service/MappingsLoaderServiceImpl.java b/src/main/java/ru/feodorkek/dev/mcremapper/service/MappingsLoaderServiceImpl.java
@@ -1,11 +1,9 @@
-package ru.feodorkek.dev.mcremapper.service.impl;
+package ru.feodorkek.dev.mcremapper.service;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
 import ru.feodorkek.dev.mcremapper.exception.McRemapperException;
-import ru.feodorkek.dev.mcremapper.service.MappingsLoaderService;
-import ru.feodorkek.dev.mcremapper.util.StringUnit;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -21,7 +19,7 @@ public class MappingsLoaderServiceImpl implements MappingsLoaderService {
 
     @Override
     public Map<String, String> loadMappingsFromResourcePath(final String resourcePath) {
-        if (StringUnit.isBlank(resourcePath)) {
+        if (resourcePath == null || resourcePath.isBlank()) {
             throw new McRemapperException("Mapping resource path cannot be blank");
         }
         try {
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/service/McRemapperServiceImpl.java b/src/main/java/ru/feodorkek/dev/mcremapper/service/McRemapperServiceImpl.java
@@ -1,4 +1,4 @@
-package ru.feodorkek.dev.mcremapper.service.impl;
+package ru.feodorkek.dev.mcremapper.service;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -7,8 +7,6 @@
 import ru.feodorkek.dev.mcremapper.core.McRemapperProvider;
 import ru.feodorkek.dev.mcremapper.core.RemapEntry;
 import ru.feodorkek.dev.mcremapper.exception.McRemapperException;
-import ru.feodorkek.dev.mcremapper.service.McRemapperService;
-import ru.feodorkek.dev.mcremapper.util.StringUnit;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,7 +33,7 @@ public List<String> getRegisteredProviderNames() {
 
     @Override
     public void setCurrentProvider(final String providerName) {
-        if (StringUnit.isBlank(providerName)) {
+        if (providerName == null || providerName.isBlank()) {
             throw new McRemapperException("Minecraft version name cannot be blank");
         }
         if (!providers.containsKey(providerName)) {
@@ -52,7 +50,7 @@ public void registerProvider(final McRemapperProvider mcRemapperProvider) {
 
     @Override
     public void validateMappedSource(final String mappedSource) {
-        if (StringUnit.isBlank(mappedSource)) {
+        if (mappedSource == null || mappedSource.isBlank()) {
             throw new McRemapperException("Mapped source cannot be blank");
         }
         if (mappedSource.length() <= maybeRemapSourceMinLen) {
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/usecase/McRemapperUseCases.java b/src/main/java/ru/feodorkek/dev/mcremapper/usecase/McRemapperUseCases.java
@@ -0,0 +1,13 @@
+package ru.feodorkek.dev.mcremapper.usecase;
+
+import ru.feodorkek.dev.mcremapper.dto.MaybeRemapRequest;
+import ru.feodorkek.dev.mcremapper.dto.MaybeRemapResponse;
+import ru.feodorkek.dev.mcremapper.dto.McRemapperInfoResponse;
+
+public interface McRemapperUseCases {
+
+    MaybeRemapResponse maybeRemap(MaybeRemapRequest request);
+
+    McRemapperInfoResponse getInfo();
+
+}
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/usecase/McRemapperUseCasesImpl.java b/src/main/java/ru/feodorkek/dev/mcremapper/usecase/McRemapperUseCasesImpl.java
@@ -0,0 +1,29 @@
+package ru.feodorkek.dev.mcremapper.usecase;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import ru.feodorkek.dev.mcremapper.dto.MaybeRemapRequest;
+import ru.feodorkek.dev.mcremapper.dto.MaybeRemapResponse;
+import ru.feodorkek.dev.mcremapper.dto.McRemapperInfoResponse;
+import ru.feodorkek.dev.mcremapper.service.McRemapperService;
+
+@Service
+@RequiredArgsConstructor
+public class McRemapperUseCasesImpl implements McRemapperUseCases {
+
+    private final McRemapperService mcRemapperService;
+
+    @Override
+    public MaybeRemapResponse maybeRemap(final MaybeRemapRequest request) {
+        mcRemapperService.setCurrentProvider(request.getMcRemapperProviderName());
+        mcRemapperService.validateMappedSource(request.getMappedSource());
+        return new MaybeRemapResponse(mcRemapperService.maybeRemap(request.getMappedSource()));
+    }
+
+    @Override
+    public McRemapperInfoResponse getInfo() {
+        return new McRemapperInfoResponse(mcRemapperService.getRegisteredProviderNames(),
+                mcRemapperService.getMaybeRemapSourceMinLen(), mcRemapperService.getMaybeRemapSourceMaxLen());
+    }
+
+}
diff --git a/src/main/java/ru/feodorkek/dev/mcremapper/util/StringUnit.java b/src/main/java/ru/feodorkek/dev/mcremapper/util/StringUnit.java
