From 84af73badf780aa25f312d9b9da105ecfd45f575 Mon Sep 17 00:00:00 2001
From: Andrew Brown <abr3374@wgu.edu>
Date: Wed, 8 Jan 2025 14:40:52 -0500
Subject: [PATCH] Update to #96

---
 .idea/workspace.xml                           | 19 ++++++++----
 .../sfgdi/SfgDiApplication.java               |  7 +++++
 .../sfgdi/config/GreetingServiceConfig.java   | 10 ++++---
 .../sfgdi/config/SfgConstructorConfig.java    | 30 +++++++++++++++++++
 4 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/guru/springframework/sfgdi/config/SfgConstructorConfig.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 55621f8b0..218a9e360 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0693ea74-0fc8-46f0-8a7b-a3fbafcd58bc" name="Changes" comment="Update to #94">
-      <change afterPath="$PROJECT_DIR$/src/main/java/guru/springframework/sfgdi/config/SfgConfiguration.java" afterDir="false" />
+    <list default="true" id="0693ea74-0fc8-46f0-8a7b-a3fbafcd58bc" name="Changes" comment="Update to #95">
+      <change afterPath="$PROJECT_DIR$/src/main/java/guru/springframework/sfgdi/config/SfgConstructorConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java" afterDir="false" />
@@ -207,7 +207,7 @@
       <workItem from="1735945259891" duration="1003000" />
       <workItem from="1736178054222" duration="749000" />
       <workItem from="1736277516599" duration="6536000" />
-      <workItem from="1736359200516" duration="4685000" />
+      <workItem from="1736359200516" duration="5357000" />
     </task>
     <task id="LOCAL-00001" summary="All changes prior to &quot;Assignment 4&quot;">
       <option name="closed" value="true" />
@@ -329,7 +329,15 @@
       <option name="project" value="LOCAL" />
       <updated>1736364004544</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="Update to #95">
+      <option name="closed" value="true" />
+      <created>1736364609129</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1736364609129</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -354,7 +362,8 @@
     <MESSAGE value="Update to #92" />
     <MESSAGE value="Update to #93" />
     <MESSAGE value="Update to #94" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update to #94" />
+    <MESSAGE value="Update to #95" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update to #95" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
diff --git a/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java b/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java
index e8283c574..ff697a58f 100644
--- a/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java
+++ b/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java
@@ -1,6 +1,7 @@
 package guru.springframework.sfgdi;
 
 import guru.springframework.sfgdi.config.SfgConfiguration;
+import guru.springframework.sfgdi.config.SfgConstructorConfig;
 import guru.springframework.sfgdi.controllers.*;
 import guru.springframework.sfgdi.datasource.FakeDataSource;
 import guru.springframework.sfgdi.services.PrototypeBean;
@@ -62,6 +63,12 @@ public static void main(String[] args) {
 		System.out.println(sfgConfiguration.getUsername());
 		System.out.println(sfgConfiguration.getPassword());
 		System.out.println(sfgConfiguration.getJdbcurl());
+
+		System.out.println("---------- Constructor Binding");
+		SfgConstructorConfig sfgConstructorConfig = ctx.getBean(SfgConstructorConfig.class);
+		System.out.println(sfgConstructorConfig.getUsername());
+		System.out.println(sfgConstructorConfig.getPassword());
+		System.out.println(sfgConstructorConfig.getJdbcurl());
 	}
 
 }
diff --git a/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java b/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java
index cca51f8a9..8683e9e32 100644
--- a/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java
+++ b/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java
@@ -6,18 +6,20 @@
 import guru.springframework.sfgdi.repositories.EnglishGreetingRepository;
 import guru.springframework.sfgdi.repositories.EnglishGreetingRepositoryImpl;
 import guru.springframework.sfgdi.services.*;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.*;
 
+@EnableConfigurationProperties(SfgConstructorConfig.class)
 @ImportResource("classpath:sfgdi-config.xml")
 @Configuration
 public class GreetingServiceConfig {
 
 	@Bean
-	FakeDataSource fakeDataSource(SfgConfiguration sfgConfiguration) {
+	FakeDataSource fakeDataSource(SfgConstructorConfig sfgConstructorConfig) {
 		FakeDataSource fakeDataSource = new FakeDataSource();
-		fakeDataSource.setUsername(sfgConfiguration.getUsername());
-		fakeDataSource.setPassword(sfgConfiguration.getPassword());
-		fakeDataSource.setJdbcurl(sfgConfiguration.getJdbcurl());
+		fakeDataSource.setUsername(sfgConstructorConfig.getUsername());
+		fakeDataSource.setPassword(sfgConstructorConfig.getPassword());
+		fakeDataSource.setJdbcurl(sfgConstructorConfig.getJdbcurl());
 		return fakeDataSource;
 	}
 
diff --git a/src/main/java/guru/springframework/sfgdi/config/SfgConstructorConfig.java b/src/main/java/guru/springframework/sfgdi/config/SfgConstructorConfig.java
new file mode 100644
index 000000000..0a17f5faa
--- /dev/null
+++ b/src/main/java/guru/springframework/sfgdi/config/SfgConstructorConfig.java
@@ -0,0 +1,30 @@
+package guru.springframework.sfgdi.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.ConstructorBinding;
+
+@ConstructorBinding
+@ConfigurationProperties("guru")
+public class SfgConstructorConfig {
+	private final String username;
+	private final String password;
+	private final String jdbcurl;
+
+	public SfgConstructorConfig(String username, String password, String jdbcurl) {
+		this.username = username;
+		this.password = password;
+		this.jdbcurl = jdbcurl;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public String getJdbcurl() {
+		return jdbcurl;
+	}
+}