From 8a14ac103de46c7f08a7b9a53a75c9c027d4db29 Mon Sep 17 00:00:00 2001
From: Andrew Brown <abr3374@wgu.edu>
Date: Wed, 8 Jan 2025 14:30:07 -0500
Subject: [PATCH] Update to #95

---
 .idea/workspace.xml                           | 22 +++++++++---
 .../sfgdi/SfgDiApplication.java               | 21 +++++++++--
 .../sfgdi/config/GreetingServiceConfig.java   | 11 +++---
 .../sfgdi/config/SfgConfiguration.java        | 36 +++++++++++++++++++
 4 files changed, 76 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/guru/springframework/sfgdi/config/SfgConfiguration.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8fec1f5d2..55621f8b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0693ea74-0fc8-46f0-8a7b-a3fbafcd58bc" name="Changes" comment="Update to #93">
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+    <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" />
+      <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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -204,7 +207,7 @@
       <workItem from="1735945259891" duration="1003000" />
       <workItem from="1736178054222" duration="749000" />
       <workItem from="1736277516599" duration="6536000" />
-      <workItem from="1736359200516" duration="3962000" />
+      <workItem from="1736359200516" duration="4685000" />
     </task>
     <task id="LOCAL-00001" summary="All changes prior to &quot;Assignment 4&quot;">
       <option name="closed" value="true" />
@@ -318,7 +321,15 @@
       <option name="project" value="LOCAL" />
       <updated>1736363613801</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Update to #94">
+      <option name="closed" value="true" />
+      <created>1736364004544</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1736364004544</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -342,7 +353,8 @@
     <MESSAGE value="Update to #91" />
     <MESSAGE value="Update to #92" />
     <MESSAGE value="Update to #93" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update to #93" />
+    <MESSAGE value="Update to #94" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update to #94" />
     <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 155f997be..e8283c574 100644
--- a/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java
+++ b/src/main/java/guru/springframework/sfgdi/SfgDiApplication.java
@@ -1,5 +1,6 @@
 package guru.springframework.sfgdi;
 
+import guru.springframework.sfgdi.config.SfgConfiguration;
 import guru.springframework.sfgdi.controllers.*;
 import guru.springframework.sfgdi.datasource.FakeDataSource;
 import guru.springframework.sfgdi.services.PrototypeBean;
@@ -50,12 +51,28 @@ public static void main(String[] args) {
 		PrototypeBean prototypeBean2 = ctx.getBean(PrototypeBean.class);
 		System.out.println(prototypeBean2.getMyScope());
 
+		System.out.println("--------- Fake Data Source");
 		FakeDataSource fakeDataSource = ctx.getBean(FakeDataSource.class);
 		System.out.println(fakeDataSource.getUsername());
 		System.out.println(fakeDataSource.getPassword());
 		System.out.println(fakeDataSource.getJdbcurl());
 
-
-
+		System.out.println("--------- Config Props Bean");
+		SfgConfiguration sfgConfiguration = ctx.getBean(SfgConfiguration.class);
+		System.out.println(sfgConfiguration.getUsername());
+		System.out.println(sfgConfiguration.getPassword());
+		System.out.println(sfgConfiguration.getJdbcurl());
 	}
+
 }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java b/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java
index 7edcbc643..cca51f8a9 100644
--- a/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java
+++ b/src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfig.java
@@ -6,7 +6,6 @@
 import guru.springframework.sfgdi.repositories.EnglishGreetingRepository;
 import guru.springframework.sfgdi.repositories.EnglishGreetingRepositoryImpl;
 import guru.springframework.sfgdi.services.*;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.*;
 
 @ImportResource("classpath:sfgdi-config.xml")
@@ -14,13 +13,11 @@
 public class GreetingServiceConfig {
 
 	@Bean
-	FakeDataSource fakeDataSource(@Value("${guru.username}") String username,
-								  @Value("${guru.password}") String password,
-								  @Value("${guru.jdbcurl}") String jdbcurl) {
+	FakeDataSource fakeDataSource(SfgConfiguration sfgConfiguration) {
 		FakeDataSource fakeDataSource = new FakeDataSource();
-		fakeDataSource.setUsername(username);
-		fakeDataSource.setPassword(password);
-		fakeDataSource.setJdbcurl(jdbcurl);
+		fakeDataSource.setUsername(sfgConfiguration.getUsername());
+		fakeDataSource.setPassword(sfgConfiguration.getPassword());
+		fakeDataSource.setJdbcurl(sfgConfiguration.getJdbcurl());
 		return fakeDataSource;
 	}
 
diff --git a/src/main/java/guru/springframework/sfgdi/config/SfgConfiguration.java b/src/main/java/guru/springframework/sfgdi/config/SfgConfiguration.java
new file mode 100644
index 000000000..a49841d59
--- /dev/null
+++ b/src/main/java/guru/springframework/sfgdi/config/SfgConfiguration.java
@@ -0,0 +1,36 @@
+package guru.springframework.sfgdi.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@ConfigurationProperties("guru")
+@Configuration
+public class SfgConfiguration {
+	private String username;
+	private String password;
+	private String jdbcurl;
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getJdbcurl() {
+		return jdbcurl;
+	}
+
+	public void setJdbcurl(String jdbcurl) {
+		this.jdbcurl = jdbcurl;
+	}
+}