Rename properties
Rename `webwolf.url.*` to `webwolf.*.url` making it easier to move to a configuration class as no nested property is necessary
This commit is contained in:
parent
48fd7f310e
commit
f8dda37027
@ -42,8 +42,8 @@ webgoat.default.language=en
|
|||||||
webwolf.host=${WEBWOLF_HOST:127.0.0.1}
|
webwolf.host=${WEBWOLF_HOST:127.0.0.1}
|
||||||
webwolf.port=${WEBWOLF_PORT:9090}
|
webwolf.port=${WEBWOLF_PORT:9090}
|
||||||
webwolf.url=http://${webwolf.host}:${webwolf.port}/WebWolf
|
webwolf.url=http://${webwolf.host}:${webwolf.port}/WebWolf
|
||||||
webwolf.url.landingpage=http://${webwolf.host}:${webwolf.port}/landing
|
webwolf.landingpage.url=http://${webwolf.host}:${webwolf.port}/landing
|
||||||
webwolf.url.mail=http://${webwolf.host}:${webwolf.port}/mail
|
webwolf.mail.url=http://${webwolf.host}:${webwolf.port}/mail
|
||||||
|
|
||||||
spring.jackson.serialization.indent_output=true
|
spring.jackson.serialization.indent_output=true
|
||||||
spring.jackson.serialization.write-dates-as-timestamps=false
|
spring.jackson.serialization.write-dates-as-timestamps=false
|
||||||
|
@ -46,7 +46,7 @@ public class Assignment7 extends AssignmentEndpoint {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private RestTemplate restTemplate;
|
private RestTemplate restTemplate;
|
||||||
@Value("${webwolf.url.mail}")
|
@Value("${webwolf.mail.url}")
|
||||||
private String webWolfMailURL;
|
private String webWolfMailURL;
|
||||||
|
|
||||||
@GetMapping("/challenge/7/reset-password/{link}")
|
@GetMapping("/challenge/7/reset-password/{link}")
|
||||||
|
@ -52,7 +52,7 @@ public class ResetLinkAssignmentForgotPassword extends AssignmentEndpoint {
|
|||||||
private final String webWolfMailURL;
|
private final String webWolfMailURL;
|
||||||
|
|
||||||
public ResetLinkAssignmentForgotPassword(RestTemplate restTemplate,
|
public ResetLinkAssignmentForgotPassword(RestTemplate restTemplate,
|
||||||
@Value("${webwolf.url.mail}") String webWolfMailURL) {
|
@Value("${webwolf.mail.url}") String webWolfMailURL) {
|
||||||
this.restTemplate = restTemplate;
|
this.restTemplate = restTemplate;
|
||||||
this.webWolfMailURL = webWolfMailURL;
|
this.webWolfMailURL = webWolfMailURL;
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ public class SimpleMailAssignment extends AssignmentEndpoint {
|
|||||||
private final String webWolfURL;
|
private final String webWolfURL;
|
||||||
private RestTemplate restTemplate;
|
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.restTemplate = restTemplate;
|
||||||
this.webWolfURL = webWolfURL;
|
this.webWolfURL = webWolfURL;
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ import java.net.URISyntaxException;
|
|||||||
@RestController
|
@RestController
|
||||||
public class LandingAssignment extends AssignmentEndpoint {
|
public class LandingAssignment extends AssignmentEndpoint {
|
||||||
|
|
||||||
@Value("${webwolf.url.landingpage}")
|
@Value("${webwolf.landingpage.url}")
|
||||||
private String landingPageUrl;
|
private String landingPageUrl;
|
||||||
|
|
||||||
@PostMapping("/WebWolf/landing")
|
@PostMapping("/WebWolf/landing")
|
||||||
|
@ -43,7 +43,7 @@ public class MailAssignment extends AssignmentEndpoint {
|
|||||||
private final String webWolfURL;
|
private final String webWolfURL;
|
||||||
private RestTemplate restTemplate;
|
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.restTemplate = restTemplate;
|
||||||
this.webWolfURL = webWolfURL;
|
this.webWolfURL = webWolfURL;
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ public class SimpleXXE extends AssignmentEndpoint {
|
|||||||
@Value("${webgoat.server.directory}")
|
@Value("${webgoat.server.directory}")
|
||||||
private String webGoatHomeDirectory;
|
private String webGoatHomeDirectory;
|
||||||
|
|
||||||
@Value("${webwolf.url.landingpage}")
|
@Value("${webwolf.landingpage.url}")
|
||||||
private String webWolfURL;
|
private String webWolfURL;
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user