Rename properties

Rename `webwolf.url.*` to `webwolf.*.url` making it easier to move to a configuration class as no nested property is necessary
elaOnMars · Nov 23, 2021 · f8dda37 · f8dda37
1 parent 48fd7f3
commit f8dda37
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/webgoat-container/src/main/resources/application-webgoat.properties b/webgoat-container/src/main/resources/application-webgoat.properties
@@ -42,8 +42,8 @@ webgoat.default.language=en
 webwolf.host=${WEBWOLF_HOST:127.0.0.1}
 webwolf.port=${WEBWOLF_PORT:9090}
 webwolf.url=http://${webwolf.host}:${webwolf.port}/WebWolf
-webwolf.url.landingpage=http://${webwolf.host}:${webwolf.port}/landing
-webwolf.url.mail=http://${webwolf.host}:${webwolf.port}/mail
+webwolf.landingpage.url=http://${webwolf.host}:${webwolf.port}/landing
+webwolf.mail.url=http://${webwolf.host}:${webwolf.port}/mail
 
 spring.jackson.serialization.indent_output=true
 spring.jackson.serialization.write-dates-as-timestamps=false

diff --git a/...-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge7/Assignment7.java b/...-lessons/challenge/src/main/java/org/owasp/webgoat/challenges/challenge7/Assignment7.java
@@ -46,7 +46,7 @@ public class Assignment7 extends AssignmentEndpoint {
 
     @Autowired
     private RestTemplate restTemplate;
-    @Value("${webwolf.url.mail}")
+    @Value("${webwolf.mail.url}")
     private String webWolfMailURL;
 
     @GetMapping("/challenge/7/reset-password/{link}")

diff --git a/...set/src/main/java/org/owasp/webgoat/password_reset/ResetLinkAssignmentForgotPassword.java b/...set/src/main/java/org/owasp/webgoat/password_reset/ResetLinkAssignmentForgotPassword.java
@@ -52,7 +52,7 @@ public class ResetLinkAssignmentForgotPassword extends AssignmentEndpoint {
     private final String webWolfMailURL;
 
     public ResetLinkAssignmentForgotPassword(RestTemplate restTemplate,
-                                             @Value("${webwolf.url.mail}") String webWolfMailURL) {
+                                             @Value("${webwolf.mail.url}") String webWolfMailURL) {
         this.restTemplate = restTemplate;
         this.webWolfMailURL = webWolfMailURL;
     }

diff --git a/...s/password-reset/src/main/java/org/owasp/webgoat/password_reset/SimpleMailAssignment.java b/...s/password-reset/src/main/java/org/owasp/webgoat/password_reset/SimpleMailAssignment.java
@@ -48,7 +48,7 @@ public class SimpleMailAssignment extends AssignmentEndpoint {
     private final String webWolfURL;
     private RestTemplate restTemplate;
 
-    public SimpleMailAssignment(RestTemplate restTemplate, @Value("${webwolf.url.mail}") String webWolfURL) {
+    public SimpleMailAssignment(RestTemplate restTemplate, @Value("${webwolf.mail.url}") String webWolfURL) {
         this.restTemplate = restTemplate;
         this.webWolfURL = webWolfURL;
     }

diff --git a/...-introduction/src/main/java/org/owasp/webgoat/webwolf_introduction/LandingAssignment.java b/...-introduction/src/main/java/org/owasp/webgoat/webwolf_introduction/LandingAssignment.java
@@ -43,7 +43,7 @@
 @RestController
 public class LandingAssignment extends AssignmentEndpoint {
 
-    @Value("${webwolf.url.landingpage}")
+    @Value("${webwolf.landingpage.url}")
     private String landingPageUrl;
 
     @PostMapping("/WebWolf/landing")

diff --git a/...olf-introduction/src/main/java/org/owasp/webgoat/webwolf_introduction/MailAssignment.java b/...olf-introduction/src/main/java/org/owasp/webgoat/webwolf_introduction/MailAssignment.java
@@ -43,7 +43,7 @@ public class MailAssignment extends AssignmentEndpoint {
     private final String webWolfURL;
     private RestTemplate restTemplate;
 
-    public MailAssignment(RestTemplate restTemplate, @Value("${webwolf.url.mail}") String webWolfURL) {
+    public MailAssignment(RestTemplate restTemplate, @Value("${webwolf.mail.url}") String webWolfURL) {
         this.restTemplate = restTemplate;
         this.webWolfURL = webWolfURL;
     }

diff --git a/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java b/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/SimpleXXE.java
@@ -57,7 +57,7 @@ public class SimpleXXE extends AssignmentEndpoint {
     @Value("${webgoat.server.directory}")
     private String webGoatHomeDirectory;
 
-    @Value("${webwolf.url.landingpage}")
+    @Value("${webwolf.landingpage.url}")
     private String webWolfURL;