feat(Linter) is ok

Author: martinmeerAT

Makefile

@@ -13,4 +13,4 @@ doc:
 mkTest:
 	./gradlew test
 	./gradlew checkstyleMain
-	./gradlew jacocoTestReport
+	#./gradlew jacocoTestReport

build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     //checkstyle
     id("com.github.ben-manes.versions") version "0.51.0"
     //id("nu.studer.dotenv") version "3.0.0"
+    id("checkstyle")
 }
 
 group = "org.martinmeer"
@@ -89,6 +90,7 @@ dependencies {
         }
     }
     implementation("io.github.cdimascio:dotenv-java:3.1.0")
+    implementation("com.puppycrawl.tools:checkstyle:10.21.2")
 
 }
 

src/main/java/org/martinmeer/otkassistant/core/model/sceletal/AbstractInputData.java

@@ -1,8 +1,6 @@
 package org.martinmeer.otkassistant.core.model.sceletal;
 
 import lombok.Getter;
-import org.springframework.stereotype.Component;
-
 
 @Getter
 public abstract class AbstractInputData {

src/main/java/org/martinmeer/otkassistant/core/service/SchemaAwareNamedParameterJdbcTemplate.java

@@ -43,10 +43,10 @@ public <T> T queryWithSchema(String sql, Map<String, Object> params, Class<T> cl
         }
     }
 
-    private String sanitizeSchemaName(String schemaName) {
-        if (!schemaName.matches("^[a-zA-Z0-9_]+$")) {
-            throw new IllegalArgumentException("Invalid schema name: " + schemaName);
+    private String sanitizeSchemaName(String nameForSanitize) {
+        if (!nameForSanitize.matches("^[a-zA-Z0-9_]+$")) {
+            throw new IllegalArgumentException("Invalid schema name: " + nameForSanitize);
         }
-        return schemaName;
+        return nameForSanitize;
     }
 }

src/main/java/org/martinmeer/otkassistant/core/web/ApiController.java

@@ -5,14 +5,20 @@
 import org.martinmeer.otkassistant.core.service.MainServiceFactory;
 import org.martinmeer.otkassistant.core.service.MainService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Map;
 
 @CrossOrigin(origins = "https://otk-help.martinmeer.com/")
 @RestController // Parse JSON for response automatically
 @RequestMapping("/api")
 @Setter
+
 public class ApiController {
 
     private MainServiceFactory mainServiceFactory;
@@ -31,7 +37,7 @@ public ApiController(MainServiceFactory mainServiceFactory) {
         String page = request.getInputData(); // "ost22"
         String input = request.getInputString(); // "exampleType:10.00"
 
-        /**Call main service for separate page*/
+
         MainService mainService = mainServiceFactory.getService(page);
 
         if (mainService == null) {

src/main/java/org/martinmeer/otkassistant/core/web/GlobalExceptionHandler.java

@@ -42,4 +42,4 @@ public ResponseEntity<Map<String, String>> handleInvalidScale(InvalidScaleExcept
                 .status(HttpStatus.BAD_REQUEST)
                 .body(errorResponse);
     }
-}
+}

src/main/java/org/martinmeer/otkassistant/ost22/model/OstInputData.java

@@ -8,9 +8,6 @@
 @Getter
 public class OstInputData extends AbstractInputData {
 
-    protected String TEST;
-
-
     @Override
     protected String normalize(String input) {
         return input.toLowerCase().trim();

src/main/java/org/martinmeer/otkassistant/ost22/model/OstNSpace.java

@@ -1,10 +1,11 @@
+/*
 package org.martinmeer.otkassistant.ost22.model;
 
 import java.util.Arrays;
 
-/**Contains field names from frontend, MUST be compared to*/
+//Contains field names from frontend, MUST be compared to/
+
 public enum OstNSpace {
-    
     //From PUT request
     NOM_DIMENSION("nom_dimension"),
     TYPE_OF_DETAIL(""),
@@ -27,7 +28,8 @@ public enum OstNSpace {
         this.substr = substr;
     }
 
-/**This method returns constant name by string value*/
+//This method returns constant name by string value
+
     public static OstNSpace valueFromEnum(String substr) {
         return Arrays.stream(OstNSpace.values())
                 .filter(e -> e.substr.equals(substr))
@@ -43,3 +45,4 @@ public String toString() {
 
     private final String substr;
 }
+*/

src/main/java/org/martinmeer/otkassistant/ost22/service/OstMainService.java

@@ -58,12 +58,12 @@ public Map<String, String> generateOutput(String page, String input) {
     }
 
 
-    private void generateDefinedData(SchemaAwareNamedParameterJdbcTemplate jdbcTemplate) {
+    private void generateDefinedData(SchemaAwareNamedParameterJdbcTemplate template) {
         setNominalDimension(inputData.getInputDimension());
         setDimensionDefinition();
         generateSql();
-        if (validate(jdbcTemplate)) {
-            fetchBaseDeviance(jdbcTemplate);
+        if (validate(template)) {
+            fetchBaseDeviance(template);
             setDeviances();
         } else {
             throw new RuntimeException("Проверьте правильность введенных данных");
@@ -111,7 +111,7 @@ private void generateSql() {
         this.sql = sqlBuilder.buildSelectSql();
     }
 
-    private boolean validate(SchemaAwareNamedParameterJdbcTemplate jdbcTemplate) {
+    private boolean validate(SchemaAwareNamedParameterJdbcTemplate template) {
         Boolean testValue;
         //select exist (select 1 <<from ost22.def_deviances where nom_dim_range @> 20.0>>);
 
@@ -120,14 +120,14 @@ private boolean validate(SchemaAwareNamedParameterJdbcTemplate jdbcTemplate) {
                 + subquery
                 + ");";
         Map<String, Object> params = Collections.singletonMap("value", nominalDimension);
-        testValue = jdbcTemplate.queryWithSchema(validateSql, params, Boolean.class);
+        testValue = template.queryWithSchema(validateSql, params, Boolean.class);
         return testValue;
     }
 
-    private void fetchBaseDeviance(SchemaAwareNamedParameterJdbcTemplate jdbcTemplate) {
+    private void fetchBaseDeviance(SchemaAwareNamedParameterJdbcTemplate template) {
         try {
             Map<String, Object> params = Collections.singletonMap("value", nominalDimension);
-            baseDeviance = jdbcTemplate.queryWithSchema(sql, params, BigDecimal.class);
+            baseDeviance = template.queryWithSchema(sql, params, BigDecimal.class);
         } catch (RuntimeException e) {
             throw new RuntimeException("Проверьте правильность введенных данных");
         }

src/main/java/org/martinmeer/otkassistant/ost22/web/InvalidScaleException.java

@@ -4,4 +4,4 @@ public class InvalidScaleException extends RuntimeException {
     public InvalidScaleException(String message) {
         super(message);
     }
-}
+}