From 6c55c15255bd0ca73e35ff55620433ff3866337e Mon Sep 17 00:00:00 2001
From: Vadim Tkachenko <vt@homeclimatecontrol.com>
Date: Wed, 20 Mar 2024 21:20:27 -0700
Subject: [PATCH] Adjusted .editorconfig and corrected mistakes it pointed out
 (#309)

---
 .editorconfig                                 | 19 +++++++++++++++++++
 app/hcc-minimal/src/main/resources/log4j2.xml |  2 +-
 app/hcc-quarkus/src/main/resources/log4j2.xml |  2 +-
 .../src/main/resources/log4j2.xml             |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index fe1ba7fbd..705de4f69 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,24 @@ ij_formatter_tags_enabled = true
 ij_smart_tabs = false
 ij_wrap_on_typing = false
 
+# Ignore these, they've been created by tools or third parties
+[{gradlew,gradlew.bat,*.diff,client_secrets.json}]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+
+# Cans of worms, let's deal with them when the rest is taken care of
+[/submodules/**]
+charset = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_style = unset
+indent_size = unset
+
 [*.conf]
 indent_size = 2
 tab_width = 2
@@ -749,6 +767,7 @@ ij_jsp_keep_indents_on_empty_lines = false
 ij_jspx_keep_indents_on_empty_lines = false
 
 [{*.markdown,*.md}]
+trim_trailing_whitespace = false
 ij_markdown_force_one_space_after_blockquote_symbol = true
 ij_markdown_force_one_space_after_header_symbol = true
 ij_markdown_force_one_space_after_list_bullet = true
diff --git a/app/hcc-minimal/src/main/resources/log4j2.xml b/app/hcc-minimal/src/main/resources/log4j2.xml
index 26331684b..264665321 100644
--- a/app/hcc-minimal/src/main/resources/log4j2.xml
+++ b/app/hcc-minimal/src/main/resources/log4j2.xml
@@ -87,7 +87,7 @@
                 <!-- Set your comfortable debug level for the long term log. -->
                 <ThresholdFilter level="warn"  onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-    </RollingFile>
+        </RollingFile>
 
     </Appenders>
     <Loggers>
diff --git a/app/hcc-quarkus/src/main/resources/log4j2.xml b/app/hcc-quarkus/src/main/resources/log4j2.xml
index 26331684b..264665321 100644
--- a/app/hcc-quarkus/src/main/resources/log4j2.xml
+++ b/app/hcc-quarkus/src/main/resources/log4j2.xml
@@ -87,7 +87,7 @@
                 <!-- Set your comfortable debug level for the long term log. -->
                 <ThresholdFilter level="warn"  onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-    </RollingFile>
+        </RollingFile>
 
     </Appenders>
     <Loggers>
diff --git a/app/hcc-springboot/src/main/resources/log4j2.xml b/app/hcc-springboot/src/main/resources/log4j2.xml
index 54c78fbb9..55ae43731 100644
--- a/app/hcc-springboot/src/main/resources/log4j2.xml
+++ b/app/hcc-springboot/src/main/resources/log4j2.xml
@@ -87,7 +87,7 @@
                 <!-- Set your comfortable debug level for the long term log. -->
                 <ThresholdFilter level="warn"  onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
-    </RollingFile>
+        </RollingFile>
 
     </Appenders>
     <Loggers>