Skip to content

Commit 3cced6c

Browse files
committed
Leading slashes when bundling the application as fat jar do not work.
For more information see spring-projects/spring-boot#1744
1 parent 4199a1c commit 3cced6c

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

worblehat-web/src/main/java/de/codecentric/psd/worblehat/web/controller/BorrowBookController.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ public String processSubmit(ModelMap modelMap,
4444

4545
if (result.hasErrors()) {
4646
modelMap.put("borrowFormData", cmd);
47-
return "/borrow";
47+
return "borrow";
4848
}
4949
Book book = bookRepository.findBorrowableBook(cmd.getIsbn());
5050
if(book == null) {
5151
result.rejectValue("isbn", "notBorrowable");
5252
modelMap.put("borrowFormData", cmd);
53-
return "/borrow";
53+
return "borrow";
5454
}
5555
try {
5656
book.borrow(cmd.getEmail());
5757
} catch (BookAlreadyBorrowedException e) {
5858
result.reject("internalError");
5959
modelMap.put("borrowFormData", cmd);
60-
return "/borrow";
60+
return "borrow";
6161
}
6262

63-
return "/home";
63+
return "home";
6464
}
6565

6666
@ExceptionHandler(Exception.class)
6767
public String handleErrors(Exception ex, HttpServletRequest request) {
68-
return "/home";
68+
return "home";
6969
}
7070
}

worblehat-web/src/main/java/de/codecentric/psd/worblehat/web/controller/InsertBookController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String processSubmit(ModelMap modelMap,
4949

5050
modelMap.put("bookDataFormData", cmd);
5151
if (result.hasErrors()) {
52-
return "/insertBooks";
52+
return "insertBooks";
5353
} else {
5454
bookFactory.createBook(cmd.getTitle(), cmd.getAuthor(),
5555
cmd.getEdition(), cmd.getIsbn(),
@@ -59,7 +59,7 @@ public String processSubmit(ModelMap modelMap,
5959
List<Book> books = bookRepository.findAllBooks();
6060
modelMap.addAttribute("books", books);
6161

62-
return "/bookList";
62+
return "bookList";
6363
}
6464
}
6565

worblehat-web/src/main/java/de/codecentric/psd/worblehat/web/controller/NavigationController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class NavigationController {
1212

1313
@RequestMapping(value = "/", method = RequestMethod.GET)
1414
public String home() {
15-
return "/home";
15+
return "home";
1616
}
1717

1818
}

worblehat-web/src/main/java/de/codecentric/psd/worblehat/web/controller/ReturnAllBooksController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public String returnAllBooks(
3636
@ModelAttribute("returnAllBookFormData") @Valid ReturnAllBooksFormData formData,
3737
BindingResult result) {
3838
if (result.hasErrors()) {
39-
return "/returnAllBooks";
39+
return "returnAllBooks";
4040
} else {
4141
bookService.returnAllBooksByBorrower(formData.getEmailAddress());
42-
return "/home";
42+
return "home";
4343
}
4444
}
4545

worblehat-web/src/test/java/de/codecentric/psd/worblehat/web/controller/BorrowBookControllerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void shouldReturnErrorValidatorReturnsErrors() {
5555
String path = booksController.processSubmit(modelMap,
5656
borrowFormData, mockBindingResult);
5757

58-
assertThat(path, is("/borrow"));
58+
assertThat(path, is("borrow"));
5959
assertEquals(borrowFormData, modelMap.get("borrowFormData"));
6060
}
6161

@@ -69,7 +69,7 @@ public void shouldBorrowBook() {
6969
String path = booksController.processSubmit(modelMap,
7070
borrowFormData, mockBindingResult);
7171

72-
assertThat(path, is("/home"));
72+
assertThat(path, is("home"));
7373
assertThat(testBook.getCurrentBorrowing().getBorrowerEmailAddress(), is("[email protected]"));
7474

7575
verify(mockBindingResult).hasErrors();
@@ -82,7 +82,7 @@ public void shouldReturnErrorIfNoBookIsBorrowable() {
8282
String path = booksController.processSubmit(modelMap,
8383
borrowFormData, mockBindingResult);
8484

85-
assertThat(path, is("/borrow"));
85+
assertThat(path, is("borrow"));
8686
assertEquals(borrowFormData, modelMap.get("borrowFormData"));
8787
verify(mockBindingResult).rejectValue("isbn", "notBorrowable");
8888
}

worblehat-web/src/test/java/de/codecentric/psd/worblehat/web/controller/InsertBookControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void shouldAddBook() {
5656

5757
verify(bookFactory).createBook("Test with JUnit", "Horst Tester", "2",
5858
"ISBN-123132-21", 1999);
59-
assertThat(path, is("/bookList"));
59+
assertThat(path, is("bookList"));
6060
assertEquals(cmd, modelMap.get("bookDataFormData"));
6161
}
6262
}

worblehat-web/src/test/java/de/codecentric/psd/worblehat/web/controller/ReturnAllBooksControllerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void shouldReturnAllBook() {
4848
formData.setEmailAddress("[email protected]");
4949
String page = controller.returnAllBooks(
5050
formData, mockBindingResult);
51-
assertThat(page, is("/home"));
51+
assertThat(page, is("home"));
5252
verify(mockBindingResult).hasErrors();
5353
verify(bookService).returnAllBooksByBorrower("[email protected]");
5454
}
@@ -58,7 +58,7 @@ public void shouldNotReturnAllBook() {
5858
when(mockBindingResult.hasErrors()).thenReturn(true);
5959
String page = controller.returnAllBooks(
6060
new ReturnAllBooksFormData(), mockBindingResult);
61-
assertThat(page, is("/returnAllBooks"));
61+
assertThat(page, is("returnAllBooks"));
6262
verify(mockBindingResult).hasErrors();
6363
}
6464
}

0 commit comments

Comments
 (0)