From 592e05b02421fb851b22f0ae31195f79b83b6647 Mon Sep 17 00:00:00 2001
From: joshwanf <17016446+joshwanf@users.noreply.github.com>
Date: Thu, 22 Jan 2026 15:57:01 -0500
Subject: [PATCH 1/2] use google-java-format to format .java files

---
 benefit-decision-toolkit.code-workspace | 48 +++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/benefit-decision-toolkit.code-workspace b/benefit-decision-toolkit.code-workspace
index 7277c2f9..be135d1b 100644
--- a/benefit-decision-toolkit.code-workspace
+++ b/benefit-decision-toolkit.code-workspace
@@ -2,35 +2,36 @@
   "folders": [
     {
       "name": "🏗️ Builder API",
-      "path": "./builder-api"
+      "path": "./builder-api",
     },
     {
       "name": "📚 Library API",
-      "path": "./library-api"
+      "path": "./library-api",
     },
     {
       "name": "🎨 Builder Frontend",
-      "path": "./builder-frontend"
+      "path": "./builder-frontend",
     },
     {
       "name": "📋 Project Root",
-      "path": "."
-    }
+      "path": ".",
+    },
   ],
   "settings": {
     // Java settings for API modules
     "java.import.maven.enabled": true,
     "java.compile.nullAnalysis.mode": "automatic",
     "[java]": {
-      "editor.defaultFormatter": "redhat.java"
+      "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code",
     },
+    "java.format.enabled": false,
     "[xml]": {
-      "editor.defaultFormatter": "redhat.vscode-xml"
+      "editor.defaultFormatter": "redhat.vscode-xml",
     },
 
     // Node.js settings for frontend modules
     "[javascript, typescript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
+      "editor.defaultFormatter": "esbenp.prettier-vscode",
     },
     "[css]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
     "editor.formatOnSave": true,
@@ -43,7 +44,7 @@
     "files.associations": {
       "*.env.example": "properties",
       "devbox.json": "jsonc",
-      "process-compose.yml": "yaml"
+      "process-compose.yml": "yaml",
     },
 
     // Exclude irrelevant folders from search
@@ -51,7 +52,7 @@
       "**/node_modules": true,
       "**/target": true,
       "**/.quarkus": true,
-      "**/dist": true
+      "**/dist": true,
     },
 
     // File watcher excludes for performance
@@ -59,8 +60,8 @@
       "**/node_modules/**": true,
       "**/target/**": true,
       "**/.quarkus/**": true,
-      "**/dist/**": true
-    }
+      "**/dist/**": true,
+    },
   },
   "extensions": {
     "recommendations": [
@@ -69,6 +70,7 @@
       "vscjava.vscode-java-debug",
       "vscjava.vscode-maven",
       "redhat.vscode-quarkus",
+      "josevseb.google-java-format-for-vs-code",
 
       // Frontend development
       "bradlc.vscode-tailwindcss",
@@ -82,8 +84,8 @@
       "ms-vscode.remote-containers",
 
       // Project-specific
-      "jetpack-io.devbox"
-    ]
+      "jetpack-io.devbox",
+    ],
   },
   "tasks": {
     "version": "2.0.0",
@@ -94,15 +96,15 @@
         "command": "devbox services up",
         "group": {
           "kind": "build",
-          "isDefault": true
+          "isDefault": true,
         },
         "presentation": {
           "echo": true,
           "reveal": "always",
           "focus": false,
-          "panel": "shared"
+          "panel": "shared",
         },
-        "problemMatcher": []
+        "problemMatcher": [],
       },
       {
         "label": "🔨 Build All APIs",
@@ -111,15 +113,15 @@
         "group": "build",
         "presentation": {
           "echo": true,
-          "reveal": "always"
-        }
+          "reveal": "always",
+        },
       },
       {
         "label": "📦 Install All Frontend Dependencies",
         "type": "shell",
         "command": "cd builder-frontend && npm install",
-        "group": "build"
-      }
-    ]
-  }
+        "group": "build",
+      },
+    ],
+  },
 }

From 4f159b259dc2f68861b0fb01cf67e91e779bae9d Mon Sep 17 00:00:00 2001
From: joshwanf <17016446+joshwanf@users.noreply.github.com>
Date: Sat, 24 Jan 2026 15:50:08 -0500
Subject: [PATCH 2/2] Use redhat.java extension with java formatter definitions

---
 .vscode/java.format.xml                 | 16 ++++++++++++++++
 benefit-decision-toolkit.code-workspace |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 .vscode/java.format.xml

diff --git a/.vscode/java.format.xml b/.vscode/java.format.xml
new file mode 100644
index 00000000..490998c3
--- /dev/null
+++ b/.vscode/java.format.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="21">
+    <profile kind="CodeFormatterProfile" name="Custom" version="21">
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="80" />
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_array_initializer" value="true" />
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer"
+            value="48" />
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation"
+            value="48" />
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation"
+            value="48" />
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_declaration"
+            value="48" />
+
+    </profile>
+</profiles>
\ No newline at end of file
diff --git a/benefit-decision-toolkit.code-workspace b/benefit-decision-toolkit.code-workspace
index be135d1b..0cf0344f 100644
--- a/benefit-decision-toolkit.code-workspace
+++ b/benefit-decision-toolkit.code-workspace
@@ -21,11 +21,14 @@
     // Java settings for API modules
     "java.import.maven.enabled": true,
     "java.compile.nullAnalysis.mode": "automatic",
+    "java.format.settings.url": "./.vscode/java.format.xml",
+    "java.format.settings.profile": "Custom",
     "[java]": {
-      "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code",
+      "editor.defaultFormatter": "redhat.java",
     },
-    "java.format.enabled": false,
     "[xml]": {
+      "editor.autoClosingBrackets": "never",
+      "files.trimFinalNewlines": true,
       "editor.defaultFormatter": "redhat.vscode-xml",
     },
 
@@ -70,7 +73,6 @@
       "vscjava.vscode-java-debug",
       "vscjava.vscode-maven",
       "redhat.vscode-quarkus",
-      "josevseb.google-java-format-for-vs-code",
 
       // Frontend development
       "bradlc.vscode-tailwindcss",