From 8d8d8cdd639591c0c4c49b355db1152e310c22d6 Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <khoerr@ksmpartners.com>
Date: Thu, 27 Jan 2022 13:57:10 -0500
Subject: Revert to Java 11 and enable Lombok ext

---
 .devcontainer/devcontainer.json                          | 6 +++++-
 .devcontainer/docker-compose.yml                         | 2 +-
 .gitignore                                               | 3 ---
 .vscode/settings.json                                    | 4 ++++
 pom.xml                                                  | 4 ++--
 src/main/java/dev/submelon/pantry/PantryApplication.java | 6 ------
 src/main/resources/application.properties                | 1 +
 7 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a89c455..a4f46b9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,7 +13,11 @@
 	
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"vscjava.vscode-java-pack"
+		"vscjava.vscode-java-pack",
+		"gabrielbb.vscode-lombok",
+		"redhat.vscode-yaml",
+		"visualstudioexptteam.vscodeintellicode",
+		"redhat.fabric8-analytics",
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 2818283..e4dc533 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       dockerfile: Dockerfile
       args:
         # Volume directory for hosted files. This directory is created on image build with proper permissions. This is set as an env-var in the Dockerfile
-        VARIANT: "17"
+        VARIANT: "11"
 
         # Options
         INSTALL_MAVEN: "true"
diff --git a/.gitignore b/.gitignore
index 549e00a..82d968e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,3 @@ target/
 build/
 !**/src/main/**/build/
 !**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..aa344eb
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -javaagent:\"/home/vscode/.vscode-server/extensions/gabrielbb.vscode-lombok-1.0.1/server/lombok.jar\"",
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b6bcac5..0fcc421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<name>pantry</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
-		<java.version>17</java.version>
+		<java.version>11</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<optional>true</optional>
+			<version>1.18.12</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/dev/submelon/pantry/PantryApplication.java b/src/main/java/dev/submelon/pantry/PantryApplication.java
index 8bfcee5..0c2a5b5 100644
--- a/src/main/java/dev/submelon/pantry/PantryApplication.java
+++ b/src/main/java/dev/submelon/pantry/PantryApplication.java
@@ -2,18 +2,12 @@ package dev.submelon.pantry;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
 @RestController
 public class PantryApplication {
 
-  @RequestMapping("/")
-  public String home() {
-    return "Check this out: http://localhost:8080/items";
-  }
-
   public static void main(String[] args) {
     SpringApplication.run(PantryApplication.class, args);
   }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index da7f829..dff3088 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,3 +4,4 @@ spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 spring.datasource.username=pantry-user
 spring.datasource.password=i2j9ds0g
 spring.jpa.show-sql=true
+spring.jpa.open-in-view=true
-- 
cgit