Sonar fixes

gpspatacean · Aug 25, 2024 · 9ee509e · 9ee509e
1 parent d43ee4b
commit 9ee509e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/.../java/com/spatacean/json/schema/podo/generator/core/generators/JsonSchemaParserTests.java b/.../java/com/spatacean/json/schema/podo/generator/core/generators/JsonSchemaParserTests.java
@@ -10,7 +10,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.junit.Assert.*;
 
@@ -35,7 +34,7 @@ public JsonSchemaParserTests() throws JsonProcessingException {
     public void testBasicProperties() {
         assertEquals("Name of the main Schema is \"Product\"", "Product", generatorData.getName());
         assertEquals("Main Schema should have 4 models", 4, generatorData.getModels().size());
-        final List<String> models = generatorData.getModels().stream().map(ModelData::getModelName).collect(Collectors.toList());
+        final List<String> models = generatorData.getModels().stream().map(ModelData::getModelName).toList();
         assertTrue("Main Schema should have \"Product\", \"dimensions\", \"review\" models", models.containsAll(Arrays.asList("Product", "dimensions", "review")));
     }
 

diff --git a/...t/java/com/spatacean/json/schema/podo/generator/core/services/GeneratorsHandlerTests.java b/...t/java/com/spatacean/json/schema/podo/generator/core/services/GeneratorsHandlerTests.java
@@ -22,8 +22,8 @@
  */
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class GeneratorsHandlerTests {
-    private final static String testGeneratorName = "test-generator";
-    private final static GeneratorsHandler generatorService = GeneratorsHandler.getInstance();
+    private static final String testGeneratorName = "test-generator";
+    private static final GeneratorsHandler generatorService = GeneratorsHandler.getInstance();
 
     @Test
     public void testBasicGeneratorData() {

diff --git a/...est/java/com/spatacean/json/schema/podo/generator/core/specification/JsonSchemaTests.java b/...est/java/com/spatacean/json/schema/podo/generator/core/specification/JsonSchemaTests.java
@@ -16,24 +16,25 @@
 import static org.junit.Assert.assertTrue;
 
 public class JsonSchemaTests {
-    private static final String jsonSchemaAsJson = "{\n" +
-            "  \"$schema\": \"https://json-schema.org/draft/2020-12/schema\",\n" +
-            "  \"$id\": \"https://example.com/product.schema.json\",\n" +
-            "  \"title\": \"Product\",\n" +
-            "  \"description\": \"A product from Acme's catalog\",\n" +
-            "  \"type\": \"object\",\n" +
-            "  \"properties\": {\n" +
-            "    \"productId\": {\n" +
-            "      \"description\": \"The unique identifier for a product\",\n" +
-            "      \"type\": \"integer\"\n" +
-            "    },\n" +
-            "    \"productName\": {\n" +
-            "      \"description\": \"Name of the product\",\n" +
-            "      \"type\": \"string\"\n" +
-            "    }\n" +
-            "  },\n" +
-            "  \"required\": [ \"productId\", \"productName\" ]\n" +
-            "}";
+    private static final String JSON_SCHEMA_AS_JSON = """
+            {
+              "$schema": "https://json-schema.org/draft/2020-12/schema",
+              "$id": "https://example.com/product.schema.json",
+              "title": "Product",
+              "description": "A product from Acme's catalog",
+              "type": "object",
+              "properties": {
+                "productId": {
+                  "description": "The unique identifier for a product",
+                  "type": "integer"
+                },
+                "productName": {
+                  "description": "Name of the product",
+                  "type": "string"
+                }
+              },
+              "required": [ "productId", "productName" ]
+            }""";
     private final ObjectMapper objectMapper = ObjectMapperFactory.createDefaultObjectMapper();
     private JsonSchema jsonSchemaTest;
 
@@ -61,7 +62,7 @@ public void Setup() {
 
     @Test
     public void simpleDeserialization() throws JsonProcessingException {
-        final JsonSchema jsonSchema = objectMapper.readValue(jsonSchemaAsJson, JsonSchema.class);
+        final JsonSchema jsonSchema = objectMapper.readValue(JSON_SCHEMA_AS_JSON, JsonSchema.class);
         assert jsonSchema != null;
         assertEquals("Product", jsonSchema.getTitle());
         assertEquals("A product from Acme's catalog", jsonSchema.getDescription());

diff --git a/...est/java/com/spatacean/json/schema/podo/generator/core/specification/PropertiesTests.java b/...est/java/com/spatacean/json/schema/podo/generator/core/specification/PropertiesTests.java
@@ -14,7 +14,7 @@
 import static org.junit.Assert.assertEquals;
 
 public class PropertiesTests {
-    private static final String propertiesJson = "{\n" +
+    private static final String PROPERTIES_JSON = "{\n" +
             "\t\t\"prop1\":{\n" +
             "\t\t\t\"description\":\"Description of 1st property\",\n" +
             "\t\t\t\"type\":\"object\"\n" +
@@ -44,7 +44,7 @@ public void Setup() {
     @Test
     public void testFullSerialization() throws JsonProcessingException {
         final String actual = objectMapper.writeValueAsString(properties);
-        final String liniarExpected = propertiesJson.replaceAll("[\\r\\n\\t]", "");
+        final String liniarExpected = PROPERTIES_JSON.replaceAll("[\\r\\n\\t]", "");
         assertEquals(liniarExpected, actual);
     }
 

diff --git a/.../test/java/com/spatacean/json/schema/podo/generator/core/specification/PropertyTests.java b/.../test/java/com/spatacean/json/schema/podo/generator/core/specification/PropertyTests.java
@@ -9,7 +9,7 @@
 import static org.junit.Assert.*;
 
 public class PropertyTests {
-    private static final String propertyJson = "{\n" +
+    private static final String PROPERTY_JSON = "{\n" +
             "\t\"productId\":{\n" +
             "\t\t\"description\":\"The unique identifier for a product\",\n" +
             "\t\t\"type\":\"integer\"\n" +
@@ -20,7 +20,7 @@ public class PropertyTests {
 
     @Test
     public void nonNullObjectIsReturned() throws JsonProcessingException {
-        final Property property = objectMapper.readValue(propertyJson, Property.class);
+        final Property property = objectMapper.readValue(PROPERTY_JSON, Property.class);
         assertNotNull(property);
     }
 
@@ -32,7 +32,7 @@ public void objectToJsonString() throws JsonProcessingException {
                 .type(JsonDataTypes.INTEGER)
                 .build();
         final String result = objectMapper.writeValueAsString(property);
-        final String linearizedExpectedJson = propertyJson.replaceAll("[\\n\\t]", "");
+        final String linearizedExpectedJson = PROPERTY_JSON.replaceAll("[\\n\\t]", "");
         assertEquals(linearizedExpectedJson, result);
     }
 

diff --git a/...t/java/com/spatacean/json/schema/podo/generator/core/specification/SchemaArraysTests.java b/...t/java/com/spatacean/json/schema/podo/generator/core/specification/SchemaArraysTests.java
@@ -25,7 +25,7 @@
  */
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class SchemaArraysTests {
-    private final ObjectMapper objectMapper = ObjectMapperFactory.createDefaultObjectMapper();
+    private final ObjectMapper defaultObjectMapper = ObjectMapperFactory.createDefaultObjectMapper();
 
     @Test
     public void DeserializeArrayWithSimpleTypes() throws JsonProcessingException {
@@ -34,7 +34,7 @@ public void DeserializeArrayWithSimpleTypes() throws JsonProcessingException {
             assertFalse("Test Failure: failed to read input file", false);
         }
         final String schema = jsonSchema.get();
-        final JsonSchema workingSchema = objectMapper.readValue(schema, JsonSchema.class);
+        final JsonSchema workingSchema = defaultObjectMapper.readValue(schema, JsonSchema.class);
         final Properties properties = workingSchema.getProperties();
         final Optional<Property> tagsProperty = properties.getPropertyByName("tags");
         if (!tagsProperty.isPresent()) {
@@ -51,7 +51,7 @@ public void DeserializeArrayWithComplexTypes() throws JsonProcessingException {
             assertFalse("Test Failure: failed to read input file", false);
         }
         final String schema = jsonSchema.get();
-        final JsonSchema workingSchema = objectMapper.readValue(schema, JsonSchema.class);
+        final JsonSchema workingSchema = defaultObjectMapper.readValue(schema, JsonSchema.class);
         final Properties properties = workingSchema.getProperties();
         final Optional<Property> reviews = properties.getPropertyByName("reviews");
         if (!reviews.isPresent()) {