From 7d24e825fb81351256f5cb53778fc1afd3c85c17 Mon Sep 17 00:00:00 2001
From: Hallvard Traetteberg <hal@ntnu.no>
Date: Thu, 25 Nov 2021 11:16:27 +0100
Subject: [PATCH] Fixes checkstyle warnings
---
.../core/src/main/java/todolist/json/TodoPersistence.java | 4 +++-
.../java/todolist/json/internal/TodoModelSerializer.java | 2 --
.../src/main/java/todolist/json/internal/TodoModule.java | 5 ++---
.../todolist/json/internal/TodoSettingsDeserializer.java | 8 ++++----
.../todolist/json/internal/TodoSettingsSerializer.java | 3 ++-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/todolist/core/src/main/java/todolist/json/TodoPersistence.java b/todolist/core/src/main/java/todolist/json/TodoPersistence.java
index 6fe1f80..ba808c7 100644
--- a/todolist/core/src/main/java/todolist/json/TodoPersistence.java
+++ b/todolist/core/src/main/java/todolist/json/TodoPersistence.java
@@ -12,7 +12,6 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.EnumSet;
import java.util.Set;
-
import todolist.core.TodoModel;
import todolist.json.internal.TodoModule;
@@ -22,6 +21,9 @@ import todolist.json.internal.TodoModule;
*/
public class TodoPersistence {
+ /**
+ * Used to indicate what parts of a TodoModel to serialize.
+ */
public enum TodoModelParts {
SETTINGS, LISTS, LIST_CONTENTS
}
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java b/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java
index da847fb..cfaf818 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoModelSerializer.java
@@ -4,9 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
-import java.util.EnumSet;
import java.util.Set;
-
import todolist.core.AbstractTodoList;
import todolist.core.TodoModel;
import todolist.json.TodoPersistence.TodoModelParts;
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoModule.java b/todolist/core/src/main/java/todolist/json/internal/TodoModule.java
index 96101cf..36f9032 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoModule.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoModule.java
@@ -1,10 +1,9 @@
package todolist.json.internal;
-import java.util.EnumSet;
-import java.util.Set;
-
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.util.EnumSet;
+import java.util.Set;
import todolist.core.AbstractTodoList;
import todolist.core.TodoItem;
import todolist.core.TodoModel;
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java
index f6aee4d..1468450 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsDeserializer.java
@@ -23,12 +23,12 @@ class TodoSettingsDeserializer extends JsonDeserializer<TodoSettings> {
TodoSettings deserialize(JsonNode jsonNode) {
if (jsonNode instanceof ObjectNode) {
- ObjectNode objectNode = (ObjectNode) jsonNode;
- TodoSettings settings = new TodoSettings();
- JsonNode todoItemsSortOrderNode = objectNode.get(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING);
+ var objectNode = (ObjectNode) jsonNode;
+ var settings = new TodoSettings();
+ var todoItemsSortOrderNode = objectNode.get(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING);
if (todoItemsSortOrderNode instanceof TextNode) {
try {
- TodoItemsSortOrder sortOrder = TodoItemsSortOrder.valueOf(todoItemsSortOrderNode.asText());
+ var sortOrder = TodoItemsSortOrder.valueOf(todoItemsSortOrderNode.asText());
settings.setTodoItemsSortOrder(sortOrder);
} catch (IllegalArgumentException iae) {
// ignore unknown sort order constant
diff --git a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java
index 31bf770..8e0e1ad 100644
--- a/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java
+++ b/todolist/core/src/main/java/todolist/json/internal/TodoSettingsSerializer.java
@@ -17,7 +17,8 @@ class TodoSettingsSerializer extends JsonSerializer<TodoSettings> {
SerializerProvider serializerProvider)
throws IOException {
jsonGen.writeStartObject();
- jsonGen.writeStringField(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING, settings.getTodoItemsSortOrder().name());
+ var sortOrderName = settings.getTodoItemsSortOrder().name();
+ jsonGen.writeStringField(TodoSettings.TODO_ITEM_SORT_ORDER_SETTING, sortOrderName);
jsonGen.writeEndObject();
}
}
--
GitLab