From ae3bde7335544e13493122bc3fbec4283ecdb04f Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 2 Mar 2019 17:02:38 +0100
Subject: [PATCH] big refactoring: cleanup

---
 src/main/java/de/deadlocker8/budgetmaster/Main.java        | 1 +
 .../budgetmaster/authentication/WebSecurityConfig.java     | 7 -------
 .../deadlocker8/budgetmaster/database/DatabaseService.java | 7 +------
 .../budgetmaster/repeating/endoption/RepeatingEnd.java     | 1 -
 .../de/deadlocker8/budgetmaster/reports/ColumnType.java    | 2 +-
 .../budgetmaster/reports/ReportGeneratorService.java       | 2 ++
 .../deadlocker8/budgetmaster/services/HelpersService.java  | 7 +------
 .../deadlocker8/budgetmaster/services/ImportService.java   | 2 +-
 .../budgetmaster/transactions/TransactionController.java   | 2 ++
 src/main/resources/templates/error/403.ftl                 | 4 ++--
 src/main/resources/templates/error/404.ftl                 | 4 ++--
 src/main/resources/templates/error/418.ftl                 | 4 ++--
 src/main/resources/templates/error/500.ftl                 | 4 ++--
 src/main/resources/templates/login.ftl                     | 4 ++--
 14 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/src/main/java/de/deadlocker8/budgetmaster/Main.java b/src/main/java/de/deadlocker8/budgetmaster/Main.java
index 5ec244a51..4a059ba5a 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/Main.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/Main.java
@@ -33,6 +33,7 @@ public class Main extends SpringBootServletInitializer implements ApplicationRun
 		prepare(new String[0]);
 	}
 
+	@SuppressWarnings("ConstantConditions")
 	private static Path prepare(String[] args)
 	{
 		Localization.setDelegate(new Localization.LocalizationDelegate()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
index a253242be..c9f9862b2 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/WebSecurityConfig.java
@@ -8,17 +8,10 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.DefaultRedirectStrategy;
 import org.springframework.security.web.RedirectStrategy;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 @Configuration
 @EnableWebSecurity
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
index a9d11fcb1..b839c70bc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
@@ -90,12 +90,7 @@ public class DatabaseService
 		Database database = new Database(categories, accounts, filteredTransactions);
 		LOGGER.debug("Created database JSON with " + database.getTransactions().size() + " transactions, " + database.getCategories().size() + " categories and " + database.getAccounts().size() + " accounts");
 
-		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().registerTypeAdapter(DateTime.class, new JsonSerializer<DateTime>(){
-			@Override
-			public JsonElement serialize(DateTime json, Type typeOfSrc, JsonSerializationContext context) {
-				return new JsonPrimitive(ISODateTimeFormat.date().print(json));
-			}
-		}).create();
+		Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().setPrettyPrinting().registerTypeAdapter(DateTime.class, (JsonSerializer<DateTime>) (json, typeOfSrc, context) -> new JsonPrimitive(ISODateTimeFormat.date().print(json))).create();
 		return gson.toJson(database);
 	}
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
index d7b3e4bf9..71a3e176a 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEnd.java
@@ -2,7 +2,6 @@ package de.deadlocker8.budgetmaster.repeating.endoption;
 
 import com.google.gson.annotations.Expose;
 import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
 
 import javax.persistence.*;
 import java.util.List;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java
index afb9a7c4b..f006336f2 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ColumnType.java
@@ -20,7 +20,7 @@ public enum ColumnType
 	private String name;
 	private float proportion;
 
-	private ColumnType(String name, float proportion)
+	ColumnType(String name, float proportion)
 	{
 		this.name = name;
 		this.proportion = proportion;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
index 41faab5b8..13423df74 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
@@ -45,6 +45,7 @@ public class ReportGeneratorService
 		return chapter;
 	}
 
+	@SuppressWarnings({"SameParameterValue", "ConstantConditions"})
 	private PdfPTable generateTable(ReportConfiguration reportConfiguration, int tableWidth, AmountType amountType)
 	{
 		List<ReportColumn> columns = reportConfiguration.getReportSettings().getColumnsSortedAndFiltered();
@@ -278,6 +279,7 @@ public class ReportGeneratorService
 		}
 	}
 
+	@SuppressWarnings("SameParameterValue")
 	private BaseColor getBaseColor(Color color)
 	{
 		return new BaseColor((float) color.getRed(), (float) color.getGreen(), (float) color.getBlue());
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 0de8b5083..dbb32dd30 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -161,12 +161,7 @@ public class HelpersService
 		return years;
 	}
 
-	/**
-	 * Replaces line breaks and tabs with spaces
-	 *
-	 * @param text
-	 * @return String
-	 */
+	 // Replaces line breaks and tabs with spaces
 	public String getFlatText(String text)
 	{
 		text = text.replace("\n", " ");
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
index 59700cc2d..3dff05d49 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
@@ -60,7 +60,7 @@ public class ImportService
 				existingCategory = categoryRepository.findByNameAndColorAndType(category.getName(), category.getColor(), category.getType());
 			}
 
-			int newCategoryID = -1;
+			int newCategoryID;
 			if(existingCategory == null)
 			{
 				//category does not exist --> create it
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 5510bbee6..dd1ba553a 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -134,6 +134,7 @@ public class TransactionController extends BaseController
 		return "transactions/newTransaction";
 	}
 
+	@SuppressWarnings("ConstantConditions")
 	@RequestMapping(value = "/transactions/newTransaction", method = RequestMethod.POST)
 	public String post(Model model, @CookieValue("currentDate") String cookieDate,
 					   @ModelAttribute("NewTransaction") Transaction transaction, BindingResult bindingResult,
@@ -176,6 +177,7 @@ public class TransactionController extends BaseController
 			transaction.setTags(new ArrayList<>());
 			for(Tag currentTag : tags)
 			{
+				//noinspection ConstantConditions
 				transaction = addTagForTransaction(currentTag.getName(), transaction);
 			}
 		}
diff --git a/src/main/resources/templates/error/403.ftl b/src/main/resources/templates/error/403.ftl
index 16b4bc82f..739ecdb6b 100644
--- a/src/main/resources/templates/error/403.ftl
+++ b/src/main/resources/templates/error/403.ftl
@@ -11,9 +11,9 @@
                 <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1">
                     <div class="card background-color">
                         <div class="card-content">
-                            <span class="card-title">
+                            <div class="card-title">
                                 <div id="logo-container" class="center-align"><@header.logo "logo" ""/></div>
-                            </span>
+                            </div>
                             <div class="row">
                                 <div class="col s12 center-align">
                                     <h1>🔒 403</h1>
diff --git a/src/main/resources/templates/error/404.ftl b/src/main/resources/templates/error/404.ftl
index ac3f84a12..731c809d1 100644
--- a/src/main/resources/templates/error/404.ftl
+++ b/src/main/resources/templates/error/404.ftl
@@ -11,9 +11,9 @@
                 <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1">
                     <div class="card background-color">
                         <div class="card-content">
-                            <span class="card-title">
+                            <div class="card-title">
                                 <div id="logo-container" class="center-align"><@header.logo "logo" ""/></div>
-                            </span>
+                            </div>
                             <div class="row">
                                 <div class="col s12 center-align">
                                     <h1>😔 404</h1>
diff --git a/src/main/resources/templates/error/418.ftl b/src/main/resources/templates/error/418.ftl
index df734f8f1..d6ec27ea5 100644
--- a/src/main/resources/templates/error/418.ftl
+++ b/src/main/resources/templates/error/418.ftl
@@ -11,9 +11,9 @@
                 <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1">
                     <div class="card background-color">
                         <div class="card-content">
-                            <span class="card-title">
+                            <div class="card-title">
                                 <div id="logo-container" class="center-align"><@header.logo "logo" ""/></div>
-                            </span>
+                            </div>
                             <div class="row">
                                 <div class="col s12 center-align">
                                     <img id="teapot" src="<@s.url '/images/teapot.png'/>">
diff --git a/src/main/resources/templates/error/500.ftl b/src/main/resources/templates/error/500.ftl
index 41b417ad7..947f71173 100644
--- a/src/main/resources/templates/error/500.ftl
+++ b/src/main/resources/templates/error/500.ftl
@@ -11,9 +11,9 @@
                 <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1">
                     <div class="card background-color">
                         <div class="card-content">
-                            <span class="card-title">
+                            <div class="card-title">
                                 <div id="logo-container" class="center-align"><@header.logo "logo" ""/></div>
-                            </span>
+                            </div>
                             <div class="row">
                                 <div class="col s12 center-align">
                                     <h1>😔 500</h1>
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index d6bda0528..ba0be4d76 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -11,9 +11,9 @@
                 <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1">
                     <div class="card" id="card-login">
                         <div class="card-content">
-                            <span class="card-title">
+                            <div class="card-title">
                                 <div id="logo-container" class="center-align"><@header.logo "logo" ""/></div>
-                            </span>
+                            </div>
                             <form action="<@s.url '/login'/>" method="post">
                                 <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
                                 <input type="hidden" name="username" value="Default">
-- 
GitLab