Skip to content

Commit a42b156

Browse files
lor6lor6
authored
Merge pull request eugenp#5881 from eugenp/BAEL-10844-v2
fix test names, missing templates
2 parents bae8465 + 95b1a9b commit a42b156

File tree

30 files changed

+277
-33
lines changed

30 files changed

+277
-33
lines changed

‎spring-boot-autoconfiguration/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationIntegrationTest.java renamed to ‎spring-boot-autoconfiguration/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationLiveTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@RunWith(SpringJUnit4ClassRunner.class)
1414
@SpringBootTest(classes = AutoconfigurationApplication.class)
1515
@EnableJpaRepositories(basePackages = { "com.baeldung.autoconfiguration.example" })
16-
public class AutoconfigurationIntegrationTest {
16+
public class AutoconfigurationLiveTest {
1717

1818
@Autowired
1919
private MyUserRepository userRepository;

‎spring-boot-autoconfiguration/src/test/java/org/baeldung/SpringContextIntegrationTest.java renamed to ‎spring-boot-autoconfiguration/src/test/java/com/baeldung/autoconfiguration/SpringContextLiveTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung;
1+
package com.baeldung.autoconfiguration;
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;
@@ -11,7 +11,7 @@
1111
@RunWith(SpringRunner.class)
1212
@SpringBootTest(classes = AutoconfigurationApplication.class)
1313
@EnableJpaRepositories(basePackages = { "com.baeldung.autoconfiguration.example" })
14-
public class SpringContextIntegrationTest {
14+
public class SpringContextLiveTest {
1515

1616
@Test
1717
public void whenSpringContextIsBootstrapped_thenNoExceptions() {

‎spring-boot-bootstrap/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>org.baeldung</groupId>
5+
<groupId>com.baeldung</groupId>
66
<artifactId>spring-boot-bootstrap</artifactId>
77
<packaging>jar</packaging>
88
<name>spring-boot-bootstrap</name>

‎spring-boot-bootstrap/src/main/java/org/baeldung/Application.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/Application.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung;
1+
package com.baeldung;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -9,9 +9,9 @@
99

1010
@ServletComponentScan
1111
@SpringBootApplication
12-
@ComponentScan("org.baeldung")
13-
@EnableJpaRepositories("org.baeldung.persistence.repo")
14-
@EntityScan("org.baeldung.persistence.model")
12+
@ComponentScan("com.baeldung")
13+
@EnableJpaRepositories("com.baeldung.persistence.repo")
14+
@EntityScan("com.baeldung.persistence.model")
1515
public class Application {
1616

1717
public static void main(String[] args) {

‎spring-boot-bootstrap/src/main/java/org/baeldung/cloud/config/CloudDataSourceConfig.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/cloud/config/CloudDataSourceConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.cloud.config;
1+
package com.baeldung.cloud.config;
22

33
import org.springframework.cloud.config.java.AbstractCloudConfig;
44
import org.springframework.context.annotation.Bean;

‎spring-boot-bootstrap/src/main/java/org/baeldung/config/SecurityConfig.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/config/SecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.config;
1+
package com.baeldung.config;
22

33
import org.springframework.context.annotation.Configuration;
44
import org.springframework.security.config.annotation.web.builders.HttpSecurity;

‎spring-boot-bootstrap/src/main/java/org/baeldung/persistence/model/Book.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/persistence/model/Book.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.persistence.model;
1+
package com.baeldung.persistence.model;
22

33
import javax.persistence.Column;
44
import javax.persistence.Entity;

‎spring-boot-bootstrap/src/main/java/org/baeldung/persistence/repo/BookRepository.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/persistence/repo/BookRepository.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.baeldung.persistence.repo;
1+
package com.baeldung.persistence.repo;
22

3-
import org.baeldung.persistence.model.Book;
43
import org.springframework.data.repository.CrudRepository;
54

5+
import com.baeldung.persistence.model.Book;
6+
67
import java.util.List;
78
import java.util.Optional;
89

‎spring-boot-bootstrap/src/main/java/org/baeldung/web/BookController.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/web/BookController.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
package org.baeldung.web;
1+
package com.baeldung.web;
22

3-
import org.baeldung.persistence.model.Book;
4-
import org.baeldung.persistence.repo.BookRepository;
5-
import org.baeldung.web.exception.BookIdMismatchException;
6-
import org.baeldung.web.exception.BookNotFoundException;
73
import org.springframework.beans.factory.annotation.Autowired;
84
import org.springframework.http.HttpStatus;
95
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -17,6 +13,11 @@
1713
import org.springframework.web.bind.annotation.ResponseStatus;
1814
import org.springframework.web.bind.annotation.RestController;
1915

16+
import com.baeldung.persistence.model.Book;
17+
import com.baeldung.persistence.repo.BookRepository;
18+
import com.baeldung.web.exception.BookIdMismatchException;
19+
import com.baeldung.web.exception.BookNotFoundException;
20+
2021
import java.util.List;
2122

2223
@RestController

‎spring-boot-bootstrap/src/main/java/org/baeldung/web/RestExceptionHandler.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/web/RestExceptionHandler.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package org.baeldung.web;
1+
package com.baeldung.web;
22

3-
import org.baeldung.web.exception.BookIdMismatchException;
4-
import org.baeldung.web.exception.BookNotFoundException;
53
import org.hibernate.exception.ConstraintViolationException;
64
import org.springframework.dao.DataIntegrityViolationException;
75
import org.springframework.http.HttpHeaders;
@@ -12,6 +10,9 @@
1210
import org.springframework.web.context.request.WebRequest;
1311
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
1412

13+
import com.baeldung.web.exception.BookIdMismatchException;
14+
import com.baeldung.web.exception.BookNotFoundException;
15+
1516
@ControllerAdvice
1617
public class RestExceptionHandler extends ResponseEntityExceptionHandler {
1718

‎spring-boot-bootstrap/src/main/java/org/baeldung/web/SimpleController.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/web/SimpleController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.web;
1+
package com.baeldung.web;
22

33
import org.springframework.beans.factory.annotation.Value;
44
import org.springframework.stereotype.Controller;

‎spring-boot-bootstrap/src/main/java/org/baeldung/web/exception/BookIdMismatchException.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/web/exception/BookIdMismatchException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.web.exception;
1+
package com.baeldung.web.exception;
22

33
public class BookIdMismatchException extends RuntimeException {
44

‎spring-boot-bootstrap/src/main/java/org/baeldung/web/exception/BookNotFoundException.java renamed to ‎spring-boot-bootstrap/src/main/java/com/baeldung/web/exception/BookNotFoundException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung.web.exception;
1+
package com.baeldung.web.exception;
22

33
public class BookNotFoundException extends RuntimeException {
44

‎spring-boot-bootstrap/src/test/java/org/baeldung/SpringBootBootstrapIntegrationTest.java renamed to ‎spring-boot-bootstrap/src/test/java/com/baeldung/SpringBootBootstrapLiveTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung;
1+
package com.baeldung;
22

33
import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
44
import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
@@ -7,15 +7,16 @@
77

88
import java.util.List;
99

10-
import org.baeldung.persistence.model.Book;
1110
import org.junit.Test;
1211
import org.springframework.http.HttpStatus;
1312
import org.springframework.http.MediaType;
1413

14+
import com.baeldung.persistence.model.Book;
15+
1516
import io.restassured.RestAssured;
1617
import io.restassured.response.Response;
1718

18-
public class SpringBootBootstrapIntegrationTest {
19+
public class SpringBootBootstrapLiveTest {
1920

2021
private static final String API_ROOT = "http://localhost:8080/api/books";
2122

‎spring-boot-bootstrap/src/test/java/org/baeldung/SpringContextIntegrationTest.java renamed to ‎spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.baeldung;
1+
package com.baeldung;
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;

‎spring-boot-mvc/src/main/java/com/baeldung/annotations/VehicleFactoryApplication.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55

6-
// @SpringBootApplication
6+
@SpringBootApplication
77
public class VehicleFactoryApplication {
88

9-
// public static void main(String[] args) {
10-
// SpringApplication.run(VehicleFactoryApplication.class, args);
11-
// }
9+
public static void main(String[] args) {
10+
SpringApplication.run(VehicleFactoryApplication.class, args);
11+
}
1212

1313
}

‎spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationUnitTest.java renamed to ‎spring-boot-vue/src/test/java/com/baeldung/springbootmvc/SpringBootMvcApplicationIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@RunWith(SpringRunner.class)
1717
@SpringBootTest
1818
@AutoConfigureMockMvc
19-
public class SpringBootMvcApplicationUnitTest {
19+
public class SpringBootMvcApplicationIntegrationTest {
2020

2121
@Autowired
2222
private MockMvc mockMvc;

‎spring-boot/src/main/resources/templates/customer.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<html>
2+
<head>
3+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
4+
<title>Customer Page</title>
5+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
6+
</head>
7+
<body>
8+
<br />
9+
<form action="customer" method="POST">
10+
Contact Info: <input type="text" name="contactInfo" /> <br />
11+
<input type="submit" value="Submit" />
12+
</form>
13+
<br /><br />
14+
<span th:text="${message}"></span><br />
15+
</body>
16+
</html>

‎spring-boot/src/main/resources/templates/customers.html

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<html xmlns:th="http://www.thymeleaf.org">
3+
<head th:include="layout :: headerFragment">
4+
</head>
5+
<body>
6+
<div id="container">
7+
<h1>
8+
Hello, <span th:text="${username}">--name--</span>.
9+
</h1>
10+
<table class="table table-striped">
11+
<thead>
12+
<tr>
13+
<th>ID</th>
14+
<th>Name</th>
15+
<th>Address</th>
16+
<th>Service Rendered</th>
17+
</tr>
18+
</thead>
19+
<tbody>
20+
<tr th:each="customer : ${customers}">
21+
<td th:text="${customer.id}">Text ...</td>
22+
<td th:text="${customer.name}">Text ...</td>
23+
<td th:text="${customer.address}">Text ...</td>
24+
<td th:text="${customer.serviceRendered}">Text...</td>
25+
</tr>
26+
</tbody>
27+
</table>
28+
<div id="pagefoot" th:include="layout :: footerFragment">Footer
29+
</div>
30+
</div>
31+
<!-- container -->
32+
</body>
33+
</html>

‎spring-boot/src/main/resources/templates/displayallbeans.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<html>
2+
<head>
3+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
4+
<title>Baeldung</title>
5+
</head>
6+
<body>
7+
<h2 th:text="${header}"></h2>
8+
<p th:text="${message}"></p>
9+
</body>
10+
</html>

‎spring-boot/src/main/resources/templates/error-404.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
6+
</head>
7+
<body>
8+
<div class="container">
9+
<div class="jumbotron" >
10+
<h1 class="text-center"><i class="fa fa-frown-o"> </i> Sorry, we couldn't find the page you were looking for. </h1>
11+
<p class="text-center"><a class="btn btn-primary" href="/"><i class="fa fa-home"></i>Go Home</a></p>
12+
</div></div>
13+
</body>
14+
</html>

‎spring-boot/src/main/resources/templates/error-500.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
6+
</head>
7+
<body>
8+
<div class="container">
9+
<div class="jumbotron" >
10+
<h1 class="text-center"><i class="fa fa-frown-o"> </i> Sorry, something went wrong! </h1>
11+
12+
<h2 class="text-center">We're fixing it.</h2>
13+
<p class="text-center"><a class="btn btn-primary" href="/"><i class="fa fa-home"></i>Go Home</a></p>
14+
</div></div>
15+
</body>
16+
</html>

‎spring-boot/src/main/resources/templates/error.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />
5+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
6+
</head>
7+
<body>
8+
<div class="container">
9+
<div class="jumbotron" >
10+
<h1 class="text-center"><i class="fa fa-frown-o"> </i> Something went wrong! </h1>
11+
12+
<h2 class="text-center">Our Engineers are on it.</h2>
13+
<p class="text-center"><a class="btn btn-primary" href="/"><i class="fa fa-home"></i>Go Home</a></p>
14+
</div></div>
15+
</body>
16+
</html>

‎spring-boot/src/main/resources/templates/error/404.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<html>
2+
<head>
3+
<title>RESOURCE NOT FOUND</title>
4+
</head>
5+
<body>
6+
<h1>404 RESOURCE NOT FOUND</h1>
7+
</body>
8+
</html>

‎spring-boot/src/main/resources/templates/external.html

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!DOCTYPE html>
2+
<html xmlns:th="http://www.thymeleaf.org">
3+
<head th:include="layout :: headerFragment">
4+
</head>
5+
<body>
6+
<div class="container">
7+
<div class="jumbotron text-center">
8+
<h1>Customer Portal</h1>
9+
</div>
10+
<div>
11+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam
12+
erat lectus, vehicula feugiat ultricies at, tempus sed ante. Cras
13+
arcu erat, lobortis vitae quam et, mollis pharetra odio. Nullam sit
14+
amet congue ipsum. Nunc dapibus odio ut ligula venenatis porta non
15+
id dui. Duis nec tempor tellus. Suspendisse id blandit ligula, sit
16+
amet varius mauris. Nulla eu eros pharetra, tristique dui quis,
17+
vehicula libero. Aenean a neque sit amet tellus porttitor rutrum nec
18+
at leo.</p>
19+
20+
<h2>Existing Customers</h2>
21+
<div class="well">
22+
<b>Enter the intranet: </b><a th:href="@{/customers}">customers</a>
23+
</div>
24+
</div>
25+
<div id="pagefoot" th:include="layout :: footerFragment">Footer
26+
</div>
27+
</div>
28+
<!-- container -->
29+
30+
</body>
31+
</html>

‎spring-boot/src/main/resources/templates/index.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<html>
2+
<head>
3+
<title>WebJars Demo</title>
4+
<link rel="stylesheet" href="/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" />
5+
</head>
6+
<body>
7+
<h1>Welcome Home</h1>
8+
<div class="container"><br/>
9+
<div class="alert alert-success">
10+
<a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
11+
<strong>Success!</strong> It is working as we expected.
12+
</div>
13+
</div>
14+
15+
<script src="/webjars/jquery/3.1.1/jquery.min.js"></script>
16+
<script src="/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js"></script>
17+
18+
</body>
19+
</html>

‎spring-boot/src/main/resources/templates/international.html

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!DOCTYPE html>
2+
<html xmlns:th="http://www.thymeleaf.org">
3+
<head>
4+
<meta charset="ISO-8859-1" />
5+
<title>Home</title>
6+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
7+
<script src="internationalization.js"></script>
8+
</head>
9+
<body>
10+
<h1 th:text="#{greeting}"></h1>
11+
12+
<br /><br />
13+
<span th:text="#{lang.change}"></span>:
14+
<select id="locales">
15+
<option value=""></option>
16+
<option value="en" th:text="#{lang.eng}"></option>
17+
<option value="fr" th:text="#{lang.fr}"></option>
18+
</select>
19+
</body>
20+
</html>

0 commit comments

Comments
 (0)