");
+ }
+}
\ No newline at end of file
diff --git a/spring-boot-servlet/src/main/java/com/baeldung/servlets/springboot/SpringRegistrationBeanServlet.java b/spring-boot-servlet/src/main/java/com/baeldung/servlets/springboot/SpringRegistrationBeanServlet.java
new file mode 100644
index 0000000000..4a34465894
--- /dev/null
+++ b/spring-boot-servlet/src/main/java/com/baeldung/servlets/springboot/SpringRegistrationBeanServlet.java
@@ -0,0 +1,19 @@
+package com.baeldung.servlets.springboot;
+
+import com.baeldung.servlets.GenericCustomServlet;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class SpringRegistrationBeanServlet {
+
+ @Bean
+ public ServletRegistrationBean genericCustomServlet() {
+ ServletRegistrationBean bean = new ServletRegistrationBean(new GenericCustomServlet(), "/springregistrationbeanservlet/*");
+ bean.setLoadOnStartup(1);
+ return bean;
+ }
+}
+
+
diff --git a/spring-boot-servlet/src/main/java/com/baeldung/servlets/springboot/embedded/EmbeddedTomcatExample.java b/spring-boot-servlet/src/main/java/com/baeldung/servlets/springboot/embedded/EmbeddedTomcatExample.java
new file mode 100644
index 0000000000..b2458f33c7
--- /dev/null
+++ b/spring-boot-servlet/src/main/java/com/baeldung/servlets/springboot/embedded/EmbeddedTomcatExample.java
@@ -0,0 +1,16 @@
+package com.baeldung.servlets.springboot.embedded;
+
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class EmbeddedTomcatExample {
+
+ @Bean
+ public EmbeddedServletContainerFactory servletContainer() {
+ TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
+ return tomcat;
+ }
+}
diff --git a/spring-boot-servlet/src/main/resources/application.properties b/spring-boot-servlet/src/main/resources/application.properties
new file mode 100644
index 0000000000..4e9e2b4cf1
--- /dev/null
+++ b/spring-boot-servlet/src/main/resources/application.properties
@@ -0,0 +1,10 @@
+#Server Configuration
+#server.port=8080
+#server.context-path=/javabootdata
+#Resource Handling
+#spring.resources.static-locations=classpath:/WEB-INF/resources
+#spring.mvc.view.prefix=/WEB-INF/
+#spring.mvc.view.suffix=.jsp
+#spring.resources.cache-period=3600
+servlet.name=dispatcherExample
+servlet.mapping=/dispatcherExampleURL
\ No newline at end of file
diff --git a/spring-boot-servlet/src/main/resources/custom.properties b/spring-boot-servlet/src/main/resources/custom.properties
new file mode 100644
index 0000000000..34f31bcd50
--- /dev/null
+++ b/spring-boot-servlet/src/main/resources/custom.properties
@@ -0,0 +1,4 @@
+dispatcher.servlet.name=dispatcherExample
+dispatcher.servlet.mapping=/dispatcherExampleURL
+example.servlet.name=dispatcherExample
+example.servlet.mapping=/dispatcherExampleURL
\ No newline at end of file
diff --git a/spring-boot-servlet/src/main/webapp/WEB-INF/context.xml b/spring-boot-servlet/src/main/webapp/WEB-INF/context.xml
new file mode 100644
index 0000000000..263bed4430
--- /dev/null
+++ b/spring-boot-servlet/src/main/webapp/WEB-INF/context.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-boot-servlet/src/main/webapp/WEB-INF/dispatcher.xml b/spring-boot-servlet/src/main/webapp/WEB-INF/dispatcher.xml
new file mode 100644
index 0000000000..ade8e66777
--- /dev/null
+++ b/spring-boot-servlet/src/main/webapp/WEB-INF/dispatcher.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/spring-boot-servlet/src/main/webapp/WEB-INF/web.xml b/spring-boot-servlet/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..60a4b079de
--- /dev/null
+++ b/spring-boot-servlet/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,40 @@
+
+
+ JSP
+
+ index.html
+ index.htm
+ index.jsp
+
+
+
+
+ EEWebXmlServlet
+ com.baeldung.servlets.javaee.EEWebXmlServlet
+
+
+
+ EEWebXmlServlet
+ /eewebxmlservlet
+
+
+
+
+ SpringBootWebXmlServlet
+ org.springframework.web.servlet.DispatcherServlet
+
+ contextConfigLocation
+ /WEB-INF/dispatcher.xml
+
+ 1
+
+
+
+ SpringBootWebXmlServlet
+ /
+
+
+
+
diff --git a/spring-boot-servlet/src/main/webapp/annotationservlet.jsp b/spring-boot-servlet/src/main/webapp/annotationservlet.jsp
new file mode 100644
index 0000000000..f21748df50
--- /dev/null
+++ b/spring-boot-servlet/src/main/webapp/annotationservlet.jsp
@@ -0,0 +1 @@
+
Annotation Servlet!
\ No newline at end of file
diff --git a/spring-boot-servlet/src/main/webapp/index.jsp b/spring-boot-servlet/src/main/webapp/index.jsp
new file mode 100644
index 0000000000..e534282777
--- /dev/null
+++ b/spring-boot-servlet/src/main/webapp/index.jsp
@@ -0,0 +1 @@
+
Hello!
\ No newline at end of file
diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index 05173ef318..d0a02c69fc 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -7,3 +7,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [A Guide to Spring in Eclipse STS](http://www.baeldung.com/eclipse-sts-spring)
- [Introduction to WebJars](http://www.baeldung.com/maven-webjars)
- [Create a Fat Jar App with Spring Boot](http://www.baeldung.com/deployable-fat-jar-spring-boot)
+- [The @ServletComponentScan Annotation in Spring Boot](http://www.baeldung.com/spring-servletcomponentscan)
+- [A Custom Data Binder in Spring MVC](http://www.baeldung.com/spring-mvc-custom-data-binder)
+- [Intro to Building an Application with Spring Boot](http://www.baeldung.com/intro-to-spring-boot)
diff --git a/spring-boot/src/main/java/com/baeldung/utils/Application.java b/spring-boot/src/main/java/com/baeldung/utils/Application.java
index 1f637eec11..a3d9f9130c 100644
--- a/spring-boot/src/main/java/com/baeldung/utils/Application.java
+++ b/spring-boot/src/main/java/com/baeldung/utils/Application.java
@@ -12,7 +12,7 @@ public class Application {
@RolesAllowed("*")
public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
+ SpringApplication.run(Application.class, args);
}
}
diff --git a/spring-boot/src/main/java/com/baeldung/utils/controller/UtilsController.java b/spring-boot/src/main/java/com/baeldung/utils/controller/UtilsController.java
index a14d0b26c6..7b4827cdf2 100644
--- a/spring-boot/src/main/java/com/baeldung/utils/controller/UtilsController.java
+++ b/spring-boot/src/main/java/com/baeldung/utils/controller/UtilsController.java
@@ -35,7 +35,7 @@ public class UtilsController {
// }
WebUtils.setSessionAttribute(request, "parameter", param);
- model.addAttribute("parameter", "You set: "+(String) WebUtils.getSessionAttribute(request, "parameter"));
+ model.addAttribute("parameter", "You set: "+(String) WebUtils.getSessionAttribute(request, "parameter"));
return "utils";
}
diff --git a/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerTest.java b/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerTest.java
new file mode 100644
index 0000000000..7aed45dbb0
--- /dev/null
+++ b/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerTest.java
@@ -0,0 +1,41 @@
+package com.baeldung.utils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.MockitoAnnotations;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+
+import com.baeldung.utils.controller.UtilsController;
+
+public class UtilsControllerTest {
+
+ @InjectMocks
+ private UtilsController utilsController;
+
+ private MockMvc mockMvc;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ this.mockMvc = MockMvcBuilders.standaloneSetup(utilsController)
+ .build();
+
+ }
+
+ @Test
+ public void givenParameter_setRequestParam_andSetSessionAttribute() throws Exception {
+ String param = "testparam";
+ this.mockMvc.perform(
+ post("/setParam")
+ .param("param", param)
+ .sessionAttr("parameter", param))
+ .andExpect(status().isOk());
+ }
+
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplicationLiveTest.java b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplicationLiveTest.java
deleted file mode 100644
index aa39232bb2..0000000000
--- a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplicationLiveTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.baeldung.spring.cloud.bootstrap.gateway;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.*;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-public class GatewayApplicationLiveTest {
-
- @Test
- public void testAccess() throws Exception {
- TestRestTemplate testRestTemplate = new TestRestTemplate();
- String testUrl = "http://localhost:8080";
-
- ResponseEntity response = testRestTemplate.getForEntity(testUrl + "/book-service/books", String.class);
- Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
- Assert.assertNotNull(response.getBody());
-
- //try the protected resource and confirm the redirect to login
- response = testRestTemplate.getForEntity(testUrl + "/book-service/books/1", String.class);
- Assert.assertEquals(HttpStatus.FOUND, response.getStatusCode());
- Assert.assertEquals("http://localhost:8080/login", response.getHeaders().get("Location").get(0));
-
- //login as user/password
- MultiValueMap form = new LinkedMultiValueMap<>();
- form.add("username", "user");
- form.add("password", "password");
- response = testRestTemplate.postForEntity(testUrl + "/login", form, String.class);
-
- //extract the session from the cookie and propagate it to the next request
- String sessionCookie = response.getHeaders().get("Set-Cookie").get(0).split(";")[0];
- HttpHeaders headers = new HttpHeaders();
- headers.add("Cookie", sessionCookie);
- HttpEntity httpEntity = new HttpEntity<>(headers);
-
- //request the protected resource
- response = testRestTemplate.exchange(testUrl + "/book-service/books/1", HttpMethod.GET, httpEntity, String.class);
- Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
- Assert.assertNotNull(response.getBody());
-
- //request the admin protected resource to determine it is still protected
- response = testRestTemplate.exchange(testUrl + "/rating-service/ratings/all", HttpMethod.GET, httpEntity, String.class);
- Assert.assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode());
-
- //login as the admin
- form.clear();
- form.add("username", "admin");
- form.add("password", "admin");
- response = testRestTemplate.postForEntity(testUrl + "/login", form, String.class);
-
- //extract the session from the cookie and propagate it to the next request
- sessionCookie = response.getHeaders().get("Set-Cookie").get(0).split(";")[0];
- headers = new HttpHeaders();
- headers.add("Cookie", sessionCookie);
- httpEntity = new HttpEntity<>(headers);
-
- //request the protected resource
- response = testRestTemplate.exchange(testUrl + "/rating-service/ratings/all", HttpMethod.GET, httpEntity, String.class);
- Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
- Assert.assertNotNull(response.getBody());
-
- //request the discovery resources as the admin
- response = testRestTemplate.exchange(testUrl + "/discovery", HttpMethod.GET, httpEntity, String.class);
- Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
- }
-
-}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/IntegrationLiveTest.java b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/IntegrationLiveTest.java
new file mode 100644
index 0000000000..47a4b744eb
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/IntegrationLiveTest.java
@@ -0,0 +1,201 @@
+package com.baeldung.spring.cloud.bootstrap.gateway;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.apache.http.entity.ContentType;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.http.*;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+public class IntegrationLiveTest {
+
+ private TestRestTemplate testRestTemplate = new TestRestTemplate();
+ private String testUrl = "http://localhost:8080";
+
+ @Test
+ public void testAccess() throws Exception {
+ ResponseEntity response = testRestTemplate.getForEntity(testUrl + "/book-service/books", String.class);
+ Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
+ Assert.assertNotNull(response.getBody());
+
+ //try the protected resource and confirm the redirect to login
+ response = testRestTemplate.getForEntity(testUrl + "/book-service/books/1", String.class);
+ Assert.assertEquals(HttpStatus.FOUND, response.getStatusCode());
+ Assert.assertEquals("http://localhost:8080/login", response.getHeaders().get("Location").get(0));
+
+ //login as user/password
+ MultiValueMap form = new LinkedMultiValueMap<>();
+ form.add("username", "user");
+ form.add("password", "password");
+ response = testRestTemplate.postForEntity(testUrl + "/login", form, String.class);
+
+ //extract the session from the cookie and propagate it to the next request
+ String sessionCookie = response.getHeaders().get("Set-Cookie").get(0).split(";")[0];
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Cookie", sessionCookie);
+ HttpEntity httpEntity = new HttpEntity<>(headers);
+
+ addBook();
+
+ //request the protected resource
+ response = testRestTemplate.exchange(testUrl + "/book-service/books/1", HttpMethod.GET, httpEntity, String.class);
+ Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
+ Assert.assertNotNull(response.getBody());
+
+ addRatings();
+
+ //request the admin protected resource to determine it is still protected
+ response = testRestTemplate.exchange(testUrl + "/rating-service/ratings", HttpMethod.GET, httpEntity, String.class);
+ Assert.assertEquals(HttpStatus.FORBIDDEN, response.getStatusCode());
+
+ //login as the admin
+ form.clear();
+ form.add("username", "admin");
+ form.add("password", "admin");
+ response = testRestTemplate.postForEntity(testUrl + "/login", form, String.class);
+
+ //extract the session from the cookie and propagate it to the next request
+ sessionCookie = response.getHeaders().get("Set-Cookie").get(0).split(";")[0];
+ headers = new HttpHeaders();
+ headers.add("Cookie", sessionCookie);
+ httpEntity = new HttpEntity<>(headers);
+
+ //request the protected resource
+ response = testRestTemplate.exchange(testUrl + "/rating-service/ratings", HttpMethod.GET, httpEntity, String.class);
+ Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
+ Assert.assertNotNull(response.getBody());
+
+ //request the discovery resources as the admin
+ response = testRestTemplate.exchange(testUrl + "/discovery", HttpMethod.GET, httpEntity, String.class);
+ Assert.assertEquals(HttpStatus.OK, response.getStatusCode());
+ }
+
+ private void addRatings() {
+ //login as user/password
+ MultiValueMap form = new LinkedMultiValueMap<>();
+ form.add("username", "user");
+ form.add("password", "password");
+ ResponseEntity response = testRestTemplate.postForEntity(testUrl + "/login", form, String.class);
+
+ //extract the session from the cookie and propagate it to the next request
+ String sessionCookie = response.getHeaders().get("Set-Cookie").get(0).split(";")[0];
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Cookie", sessionCookie);
+ headers.add("ContentType", ContentType.APPLICATION_JSON.getMimeType());
+ Rating rating = new Rating(1L, 4);
+
+ HttpEntity httpEntity = new HttpEntity<>(rating, headers);
+
+ //request the protected resource
+ ResponseEntity bookResponse = testRestTemplate.postForEntity(testUrl + "/rating-service/ratings", httpEntity, Rating.class);
+ Assert.assertEquals(HttpStatus.OK, bookResponse.getStatusCode());
+ Assert.assertEquals(rating.getBookId(), bookResponse.getBody().getBookId());
+ Assert.assertEquals(rating.getStars(), bookResponse.getBody().getStars());
+ }
+
+ private void addBook(){
+ //login as user/password
+ MultiValueMap form = new LinkedMultiValueMap<>();
+ form.add("username", "admin");
+ form.add("password", "admin");
+ ResponseEntity response = testRestTemplate.postForEntity(testUrl + "/login", form, String.class);
+
+ //extract the session from the cookie and propagate it to the next request
+ String sessionCookie = response.getHeaders().get("Set-Cookie").get(0).split(";")[0];
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Cookie", sessionCookie);
+ headers.add("ContentType", ContentType.APPLICATION_JSON.getMimeType());
+ Book book = new Book("Baeldung", "How to spring cloud");
+
+ HttpEntity httpEntity = new HttpEntity<>(book, headers);
+
+ //request the protected resource
+ ResponseEntity bookResponse = testRestTemplate.postForEntity(testUrl + "/book-service/books", httpEntity, Book.class);
+ Assert.assertEquals(HttpStatus.OK, bookResponse.getStatusCode());
+ Assert.assertEquals(book.getAuthor(), bookResponse.getBody().getAuthor());
+ Assert.assertEquals(book.getTitle(), bookResponse.getBody().getTitle());
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static class Book {
+
+ private Long id;
+ private String author;
+ private String title;
+
+ public Book() {
+ }
+
+ public Book(String author, String title) {
+ this.author = author;
+ this.title = title;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static class Rating {
+ private Long id;
+ private Long bookId;
+ private int stars;
+
+ public Rating() {
+ }
+
+ public Rating(Long bookId, int stars) {
+ this.bookId = bookId;
+ this.stars = stars;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getBookId() {
+ return bookId;
+ }
+
+ public void setBookId(Long bookId) {
+ this.bookId = bookId;
+ }
+
+ public int getStars() {
+ return stars;
+ }
+
+ public void setStars(int stars) {
+ this.stars = stars;
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml b/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml
index 9a99054ed5..c351c444f6 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml
@@ -42,6 +42,17 @@
spring-boot-starter-data-redis
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ com.h2database
+ h2
+ runtime
+
+
org.springframework.bootspring-boot-starter-test
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
index 25ad2a83b2..c5499cd924 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java
@@ -3,35 +3,11 @@ package com.baeldung.spring.cloud.bootstrap.svcbook;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Arrays;
-import java.util.List;
@SpringBootApplication
@EnableEurekaClient
-@RestController
-@RequestMapping("/books")
public class BookServiceApplication {
public static void main(String[] args) {
SpringApplication.run(BookServiceApplication.class, args);
}
-
- private List bookList = Arrays.asList(
- new Book(1L, "Baeldung goes to the market", "Tim Schimandle"),
- new Book(2L, "Baeldung goes to the park", "Slavisa")
- );
-
- @GetMapping("")
- public List findAllBooks() {
- return bookList;
- }
-
- @GetMapping("/{bookId}")
- public Book findBook(@PathVariable Long bookId) {
- return bookList.stream().filter(b -> b.getId().equals(bookId)).findFirst().orElse(null);
- }
}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java
index 300b4d7c5a..6aa996c575 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java
@@ -2,6 +2,7 @@ package com.baeldung.spring.cloud.bootstrap.svcbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -22,8 +23,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
http.httpBasic()
.disable()
.authorizeRequests()
- .antMatchers("/books").permitAll()
- .antMatchers("/books/*").hasAnyRole("USER", "ADMIN")
+ .antMatchers(HttpMethod.GET, "/books").permitAll()
+ .antMatchers(HttpMethod.GET, "/books/*").permitAll()
+ .antMatchers(HttpMethod.POST, "/books").hasRole("ADMIN")
+ .antMatchers(HttpMethod.PATCH, "/books/*").hasRole("ADMIN")
+ .antMatchers(HttpMethod.DELETE, "/books/*").hasRole("ADMIN")
.anyRequest().authenticated()
.and()
.csrf()
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/Book.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java
similarity index 57%
rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/Book.java
rename to spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java
index e652437454..33ea8dcb81 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/Book.java
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java
@@ -1,16 +1,21 @@
-package com.baeldung.spring.cloud.bootstrap.svcbook;
+package com.baeldung.spring.cloud.bootstrap.svcbook.book;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+@JsonIgnoreProperties(ignoreUnknown = true)
public class Book {
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private String author;
private String title;
- public Book(Long id, String title, String author) {
- this.id = id;
- this.author = author;
- this.title = title;
- }
-
public Book() {
}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java
new file mode 100644
index 0000000000..d00f114b8c
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java
@@ -0,0 +1,40 @@
+package com.baeldung.spring.cloud.bootstrap.svcbook.book;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/books")
+public class BookController {
+
+ @Autowired
+ private BookService bookService;
+
+ @GetMapping("")
+ public List findAllBooks() {
+ return bookService.findAllBooks();
+ }
+
+ @GetMapping("/{bookId}")
+ public Book findBook(@PathVariable Long bookId) {
+ return bookService.findBookById(bookId);
+ }
+
+ @PostMapping("")
+ public Book createBook(@RequestBody Book book) {
+ return bookService.createBook(book);
+ }
+
+ @DeleteMapping("/{bookId}")
+ public void deleteBook(@PathVariable Long bookId) {
+ bookService.deleteBook(bookId);
+ }
+
+ @PatchMapping("/{bookId")
+ public Book updateBook(@RequestBody Map updates, @PathVariable Long bookId) {
+ return bookService.updateBook(updates, bookId);
+ }
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java
new file mode 100644
index 0000000000..f0a4797387
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java
@@ -0,0 +1,11 @@
+package com.baeldung.spring.cloud.bootstrap.svcbook.book;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+class BookNotFoundException extends RuntimeException {
+ BookNotFoundException(String message) {
+ super(message);
+ }
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java
new file mode 100644
index 0000000000..66fd3880c5
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java
@@ -0,0 +1,6 @@
+package com.baeldung.spring.cloud.bootstrap.svcbook.book;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+interface BookRepository extends JpaRepository{
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java
new file mode 100644
index 0000000000..cfcbf15757
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java
@@ -0,0 +1,55 @@
+package com.baeldung.spring.cloud.bootstrap.svcbook.book;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Service
+@Transactional(readOnly = true)
+public class BookService {
+
+ @Autowired
+ private BookRepository bookRepository;
+
+ public List findAllBooks() {
+ return bookRepository.findAll();
+ }
+
+ public Book findBookById(Long bookId) {
+ return Optional.ofNullable(bookRepository.findOne(bookId))
+ .orElseThrow(() -> new BookNotFoundException("Book not found. ID: " + bookId));
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public Book createBook(Book book) {
+ Book newBook = new Book();
+ newBook.setTitle(book.getTitle());
+ newBook.setAuthor(book.getAuthor());
+ return bookRepository.save(newBook);
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public void deleteBook(Long bookId) {
+ bookRepository.delete(bookId);
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public Book updateBook(Map updates, Long bookId) {
+ Book book = findBookById(bookId);
+ updates.keySet().forEach(key -> {
+ switch (key) {
+ case "author":
+ book.setAuthor(updates.get(key));
+ break;
+ case "title":
+ book.setTitle(updates.get(key));
+ }
+ });
+ return bookRepository.save(book);
+ }
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml b/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml
index 35da8beba8..2285286812 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml
@@ -42,6 +42,17 @@
spring-boot-starter-data-redis
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ com.h2database
+ h2
+ runtime
+
+
org.springframework.bootspring-boot-starter-test
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
index 11fb5f06b6..61074e0bcc 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java
@@ -3,39 +3,11 @@ package com.baeldung.spring.cloud.bootstrap.svcrating;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
@SpringBootApplication
@EnableEurekaClient
-@RestController
-@RequestMapping("/ratings")
public class RatingServiceApplication {
public static void main(String[] args) {
SpringApplication.run(RatingServiceApplication.class, args);
}
-
- private List ratingList = Arrays.asList(
- new Rating(1L, 1L, 2),
- new Rating(2L, 1L, 3),
- new Rating(3L, 2L, 4),
- new Rating(4L, 2L, 5)
- );
-
- @GetMapping("")
- public List findRatingsByBookId(@RequestParam Long bookId) {
- return bookId == null || bookId.equals(0L) ? Collections.EMPTY_LIST : ratingList.stream().filter(r -> r.getBookId().equals(bookId)).collect(Collectors.toList());
- }
-
- @GetMapping("/all")
- public List findAllRatings() {
- return ratingList;
- }
}
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java
index 371dc810d5..171fbba7af 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java
@@ -2,6 +2,7 @@ package com.baeldung.spring.cloud.bootstrap.svcrating;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -22,8 +23,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
http.httpBasic()
.disable()
.authorizeRequests()
- .antMatchers("/ratings").hasRole("USER")
- .antMatchers("/ratings/all").hasRole("ADMIN")
+ .regexMatchers("^/ratings\\?bookId.*$").authenticated()
+ .antMatchers(HttpMethod.POST,"/ratings").authenticated()
+ .antMatchers(HttpMethod.PATCH,"/ratings/*").hasRole("ADMIN")
+ .antMatchers(HttpMethod.DELETE,"/ratings/*").hasRole("ADMIN")
+ .antMatchers(HttpMethod.GET,"/ratings").hasRole("ADMIN")
.anyRequest().authenticated()
.and()
.csrf()
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/Rating.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java
similarity index 62%
rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/Rating.java
rename to spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java
index 5dd3572098..ae44f9ae2e 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/Rating.java
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java
@@ -1,6 +1,18 @@
-package com.baeldung.spring.cloud.bootstrap.svcrating;
+package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+@JsonIgnoreProperties(ignoreUnknown = true)
public class Rating {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
private Long id;
private Long bookId;
private int stars;
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java
new file mode 100644
index 0000000000..83452ad747
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java
@@ -0,0 +1,38 @@
+package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/ratings")
+public class RatingController {
+
+ @Autowired
+ private RatingService ratingService;
+
+ @GetMapping("")
+ public List findRatingsByBookId(@RequestParam(required = false, defaultValue = "0") Long bookId) {
+ if (bookId.equals(0L)) {
+ return ratingService.findAllRatings();
+ }
+ return ratingService.findRatingsByBookId(bookId);
+ }
+
+ @PostMapping("")
+ public Rating createRating(@RequestBody Rating rating) {
+ return ratingService.createRating(rating);
+ }
+
+ @DeleteMapping("/{ratingId}")
+ public void deleteRating(@PathVariable Long ratingId) {
+ ratingService.deleteRating(ratingId);
+ }
+
+ @PatchMapping("/{ratingId")
+ public Rating updateRating(@RequestBody Map updates, @PathVariable Long ratingId) {
+ return ratingService.updateRating(updates, ratingId);
+ }
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java
new file mode 100644
index 0000000000..473d636a71
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java
@@ -0,0 +1,11 @@
+package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+class RatingNotFoundException extends RuntimeException {
+ RatingNotFoundException(String message) {
+ super(message);
+ }
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java
new file mode 100644
index 0000000000..08d781b5a3
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java
@@ -0,0 +1,9 @@
+package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+interface RatingRepository extends JpaRepository{
+ List findRatingsByBookId(Long bookId);
+}
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java
new file mode 100644
index 0000000000..a2360b7be5
--- /dev/null
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java
@@ -0,0 +1,57 @@
+package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Service
+@Transactional(readOnly = true)
+public class RatingService {
+
+ @Autowired
+ private RatingRepository ratingRepository;
+
+ public Rating findRatingById(Long ratingId) {
+ return Optional.ofNullable(ratingRepository.findOne(ratingId))
+ .orElseThrow(() -> new RatingNotFoundException("Rating not found. ID: " + ratingId));
+ }
+
+ public List findRatingsByBookId(Long bookId) {
+ return ratingRepository.findRatingsByBookId(bookId);
+ }
+
+ public List findAllRatings() {
+ return ratingRepository.findAll();
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public Rating createRating(Rating rating) {
+ Rating newRating = new Rating();
+ newRating.setBookId(rating.getBookId());
+ newRating.setStars(rating.getStars());
+ return ratingRepository.save(newRating);
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public void deleteRating(Long ratingId) {
+ ratingRepository.delete(ratingId);
+ }
+
+ @Transactional(propagation = Propagation.REQUIRED)
+ public Rating updateRating(Map updates, Long ratingId) {
+ Rating rating = findRatingById(ratingId);
+ updates.keySet().forEach(key -> {
+ switch (key) {
+ case "stars":
+ rating.setStars(Integer.parseInt(updates.get(key)));
+ break;
+ }
+ });
+ return ratingRepository.save(rating);
+ }
+}
diff --git a/spring-core/src/main/java/com/baeldung/Ebook.java b/spring-core/src/main/java/com/baeldung/Ebook.java
new file mode 100644
index 0000000000..fc29ddfcf5
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/Ebook.java
@@ -0,0 +1,20 @@
+package com.baeldung;
+
+public class Ebook {
+
+ private int bookId;
+ private String bookTitle;
+
+ public int getBookId() {
+ return bookId;
+ }
+ public void setBookId(int bookId) {
+ this.bookId = bookId;
+ }
+ public String getBookTitle() {
+ return bookTitle;
+ }
+ public void setBookTitle(String bookTitle) {
+ this.bookTitle = bookTitle;
+ }
+}
diff --git a/spring-core/src/main/java/com/baeldung/EbookRepository.java b/spring-core/src/main/java/com/baeldung/EbookRepository.java
new file mode 100644
index 0000000000..661283c355
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/EbookRepository.java
@@ -0,0 +1,5 @@
+package com.baeldung;
+
+public interface EbookRepository {
+ String titleById(int id);
+}
diff --git a/spring-core/src/main/java/com/baeldung/LibraryUtils.java b/spring-core/src/main/java/com/baeldung/LibraryUtils.java
new file mode 100644
index 0000000000..49af60c89d
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/LibraryUtils.java
@@ -0,0 +1,12 @@
+package com.baeldung;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class LibraryUtils {
+ @Autowired
+ private EbookRepository eBookRepository;
+
+ public String findBook(int id) {
+ return eBookRepository.titleById(id);
+ }
+}
diff --git a/spring-core/src/main/java/com/baeldung/Member.java b/spring-core/src/main/java/com/baeldung/Member.java
new file mode 100644
index 0000000000..ceebb32017
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/Member.java
@@ -0,0 +1,20 @@
+package com.baeldung;
+
+public class Member {
+
+ private int memberId;
+ private String memberName;
+
+ public int getMemberId() {
+ return memberId;
+ }
+ public void setMemberId(int memberId) {
+ this.memberId = memberId;
+ }
+ public String getMemberName() {
+ return memberName;
+ }
+ public void setMemberName(String memberName) {
+ this.memberName = memberName;
+ }
+}
diff --git a/spring-core/src/main/java/com/baeldung/Reservation.java b/spring-core/src/main/java/com/baeldung/Reservation.java
new file mode 100644
index 0000000000..ed33bb6464
--- /dev/null
+++ b/spring-core/src/main/java/com/baeldung/Reservation.java
@@ -0,0 +1,14 @@
+package com.baeldung;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class Reservation {
+ private Member member;
+ private Ebook eBook;
+
+ @Autowired
+ public Reservation(Member member, Ebook eBook) {
+ this.member = member;
+ this.eBook = eBook;
+ }
+}
diff --git a/spring-data-mongodb/README.md b/spring-data-mongodb/README.md
index d656bc897c..c2a1f703b5 100644
--- a/spring-data-mongodb/README.md
+++ b/spring-data-mongodb/README.md
@@ -9,3 +9,4 @@
- [Custom Cascading in Spring Data MongoDB](http://www.baeldung.com/cascading-with-dbref-and-lifecycle-events-in-spring-data-mongodb)
- [GridFS in Spring Data MongoDB](http://www.baeldung.com/spring-data-mongodb-gridfs)
- [Introduction to Spring Data MongoDB](http://www.baeldung.com/spring-data-mongodb-tutorial)
+- [Spring Data MongoDB: Projections and Aggregations](http://www.baeldung.com/spring-data-mongodb-projections-aggregations)
diff --git a/spring-data-neo4j/README.md b/spring-data-neo4j/README.md
index 0f13d9dbc9..03c9ed333d 100644
--- a/spring-data-neo4j/README.md
+++ b/spring-data-neo4j/README.md
@@ -2,6 +2,7 @@
### Relevant Articles:
- [Introduction to Spring Data Neo4j](http://www.baeldung.com/spring-data-neo4j-intro)
+- [A Guide to Neo4J with Java](http://www.baeldung.com/java-neo4j)
### Build the Project with Tests Running
```
diff --git a/spring-data-rest/src/main/test/com/baeldung/validator/SpringDataRestValidatorTest.java b/spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorTest.java
similarity index 75%
rename from spring-data-rest/src/main/test/com/baeldung/validator/SpringDataRestValidatorTest.java
rename to spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorTest.java
index b185c6d5ab..300fc081d3 100644
--- a/spring-data-rest/src/main/test/com/baeldung/validator/SpringDataRestValidatorTest.java
+++ b/spring-data-rest/src/test/java/com/baeldung/validator/SpringDataRestValidatorTest.java
@@ -1,100 +1,86 @@
-package com.baeldung.validator;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.ResultMatcher;
-import org.springframework.web.context.WebApplicationContext;
-
-import com.baeldung.SpringDataRestApplication;
-import com.baeldung.models.WebsiteUser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = SpringDataRestApplication.class)
-@WebAppConfiguration
-public class SpringDataRestValidatorTest {
- public static final String URL = "http://localhost";
-
- private MockMvc mockMvc;
-
- @Autowired
- protected WebApplicationContext wac;
-
- @Before
- public void setup() {
- mockMvc = webAppContextSetup(wac).build();
- }
-
- @Test
- public void whenStartingApplication_thenCorrectStatusCode() throws Exception {
- mockMvc.perform(get("/users")).andExpect(status().is2xxSuccessful());
- };
-
- @Test
- public void whenAddingNewCorrectUser_thenCorrectStatusCodeAndResponse() throws Exception {
- WebsiteUser user = new WebsiteUser();
- user.setEmail("john.doe@john.com");
- user.setName("John Doe");
-
- mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
- .andExpect(status().is2xxSuccessful())
- .andExpect(redirectedUrl("http://localhost/users/1"));
- }
-
- @Test
- public void whenAddingNewUserWithoutName_thenErrorStatusCodeAndResponse() throws Exception {
- WebsiteUser user = new WebsiteUser();
- user.setEmail("john.doe@john.com");
-
- mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
- .andExpect(status().isNotAcceptable())
- .andExpect(redirectedUrl(null));
- }
-
- @Test
- public void whenAddingNewUserWithEmptyName_thenErrorStatusCodeAndResponse() throws Exception {
- WebsiteUser user = new WebsiteUser();
- user.setEmail("john.doe@john.com");
- user.setName("");
- mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
- .andExpect(status().isNotAcceptable())
- .andExpect(redirectedUrl(null));
- }
-
- @Test
- public void whenAddingNewUserWithoutEmail_thenErrorStatusCodeAndResponse() throws Exception {
- WebsiteUser user = new WebsiteUser();
- user.setName("John Doe");
-
- mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
- .andExpect(status().isNotAcceptable())
- .andExpect(redirectedUrl(null));
- }
-
- @Test
- public void whenAddingNewUserWithEmptyEmail_thenErrorStatusCodeAndResponse() throws Exception {
- WebsiteUser user = new WebsiteUser();
- user.setName("John Doe");
- user.setEmail("");
- mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user)))
- .andExpect(status().isNotAcceptable())
- .andExpect(redirectedUrl(null));
- }
-
-}
+package com.baeldung.validator;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.web.context.WebApplicationContext;
+
+import com.baeldung.SpringDataRestApplication;
+import com.baeldung.models.WebsiteUser;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = SpringDataRestApplication.class)
+@WebAppConfiguration
+public class SpringDataRestValidatorTest {
+ public static final String URL = "http://localhost";
+
+ private MockMvc mockMvc;
+
+ @Autowired
+ protected WebApplicationContext wac;
+
+ @Before
+ public void setup() {
+ mockMvc = webAppContextSetup(wac).build();
+ }
+
+ @Test
+ public void whenStartingApplication_thenCorrectStatusCode() throws Exception {
+ mockMvc.perform(get("/users")).andExpect(status().is2xxSuccessful());
+ };
+
+ @Test
+ public void whenAddingNewCorrectUser_thenCorrectStatusCodeAndResponse() throws Exception {
+ WebsiteUser user = new WebsiteUser();
+ user.setEmail("john.doe@john.com");
+ user.setName("John Doe");
+
+ mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().is2xxSuccessful()).andExpect(redirectedUrl("http://localhost/users/1"));
+ }
+
+ @Test
+ public void whenAddingNewUserWithoutName_thenErrorStatusCodeAndResponse() throws Exception {
+ WebsiteUser user = new WebsiteUser();
+ user.setEmail("john.doe@john.com");
+
+ mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+ }
+
+ @Test
+ public void whenAddingNewUserWithEmptyName_thenErrorStatusCodeAndResponse() throws Exception {
+ WebsiteUser user = new WebsiteUser();
+ user.setEmail("john.doe@john.com");
+ user.setName("");
+ mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+ }
+
+ @Test
+ public void whenAddingNewUserWithoutEmail_thenErrorStatusCodeAndResponse() throws Exception {
+ WebsiteUser user = new WebsiteUser();
+ user.setName("John Doe");
+
+ mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+ }
+
+ @Test
+ public void whenAddingNewUserWithEmptyEmail_thenErrorStatusCodeAndResponse() throws Exception {
+ WebsiteUser user = new WebsiteUser();
+ user.setName("John Doe");
+ user.setEmail("");
+ mockMvc.perform(post("/users", user).contentType(MediaType.APPLICATION_JSON).content(new ObjectMapper().writeValueAsString(user))).andExpect(status().isNotAcceptable()).andExpect(redirectedUrl(null));
+ }
+
+}
diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml
index 2aa9f86a96..e43b3ff774 100644
--- a/spring-data-solr/pom.xml
+++ b/spring-data-solr/pom.xml
@@ -51,12 +51,6 @@
${spring.version}test
-
diff --git a/spring-hibernate4/README.md b/spring-hibernate4/README.md
index 7888e8b4ee..02888c4ad0 100644
--- a/spring-hibernate4/README.md
+++ b/spring-hibernate4/README.md
@@ -12,6 +12,7 @@
- [Hibernate: save, persist, update, merge, saveOrUpdate](http://www.baeldung.com/hibernate-save-persist-update-merge-saveorupdate/)
- [Eager/Lazy Loading In Hibernate](http://www.baeldung.com/hibernate-lazy-eager-loading)
- [Hibernate Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
+- [Hibernate One to Many Annotation Tutorial](http://www.baeldung.com/hibernate-one-to-many)
### Quick Start
@@ -22,3 +23,4 @@ mvn install
mvn cargo:run
```
- **note**: starts on port `8082`
+
diff --git a/spring-jersey/README.md b/spring-jersey/README.md
index 2767ceb9a7..8b2eecc0e1 100644
--- a/spring-jersey/README.md
+++ b/spring-jersey/README.md
@@ -1,3 +1,5 @@
=========
## REST API with Jersey & Spring Example Project
+- [REST API with Jersey and Spring](http://www.baeldung.com/jersey-rest-api-with-spring)
+- [JAX-RS Client with Jersey](http://www.baeldung.com/jersey-jax-rs-client)
diff --git a/spring-mobile/README.md b/spring-mobile/README.md
new file mode 100644
index 0000000000..e3d23bcda6
--- /dev/null
+++ b/spring-mobile/README.md
@@ -0,0 +1,4 @@
+## Relevant articles:
+
+- [A Guide to Spring Mobile](http://www.baeldung.com/spring-mobile)
+
diff --git a/spring-mvc-email/README.md b/spring-mvc-email/README.md
index 0de6532393..aa880188d7 100644
--- a/spring-mvc-email/README.md
+++ b/spring-mvc-email/README.md
@@ -1,3 +1,7 @@
+## Relevant articles:
+
+- [Guide to Spring Email](http://www.baeldung.com/spring-email)
+
## Spring MVC Email
Example Spring MVC project to send email from web form.
@@ -10,4 +14,4 @@ Type http://localhost:8080 in your browser to open the application.
### Sending test emails
-Follow UI links to send simple email, email using template or email with attachment.
\ No newline at end of file
+Follow UI links to send simple email, email using template or email with attachment.
diff --git a/spring-mvc-java/README.md b/spring-mvc-java/README.md
index 0f267c5ec9..4d3e58558b 100644
--- a/spring-mvc-java/README.md
+++ b/spring-mvc-java/README.md
@@ -18,3 +18,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Spring MVC Content Negotiation](http://www.baeldung.com/spring-mvc-content-negotiation-json-xml)
- [Circular Dependencies in Spring](http://www.baeldung.com/circular-dependencies-in-spring)
- [Introduction to HtmlUnit](http://www.baeldung.com/htmlunit)
+- [Spring @RequestMapping New Shortcut Annotations](http://www.baeldung.com/spring-new-requestmapping-shortcuts)
+- [Guide to Spring Handler Mappings](http://www.baeldung.com/spring-handler-mappings)
+- [Uploading and Displaying Excel Files with Spring MVC](http://www.baeldung.com/spring-mvc-excel-files)
diff --git a/spring-mvc-java/persons.xls b/spring-mvc-java/persons.xls
new file mode 100644
index 0000000000..ea270f69cc
Binary files /dev/null and b/spring-mvc-java/persons.xls differ
diff --git a/spring-mvc-java/persons.xlsx b/spring-mvc-java/persons.xlsx
new file mode 100644
index 0000000000..1f58606532
Binary files /dev/null and b/spring-mvc-java/persons.xlsx differ
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index 9513c81064..ef18cef3e0 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -161,26 +161,11 @@
-
- org.apache.poi
- poi
- ${poi.version}
- org.apache.poipoi-ooxml${poi.version}
-
- org.apache.poi
- poi-ooxml-schemas
- ${poi.version}
-
-
- org.jxls
- jxls-jexcel
- ${jexcel.version}
-
@@ -395,7 +380,6 @@
3.16-beta1
- 1.0.6
diff --git a/spring-mvc-java/src/main/java/com/baeldung/excel/ExcelPOIHelper.java b/spring-mvc-java/src/main/java/com/baeldung/excel/ExcelPOIHelper.java
index 5cf74aff63..0519a8f3c7 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/excel/ExcelPOIHelper.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/excel/ExcelPOIHelper.java
@@ -1,140 +1,185 @@
package com.baeldung.excel;
import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FillPatternType;
+
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Map;
import java.util.HashMap;
import java.util.ArrayList;
-import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.stream.IntStream;
-@Service
public class ExcelPOIHelper {
- public Map> readExcel(String fileLocation) throws IOException {
+ public Map> readExcel(String fileLocation) throws IOException {
- Map> data = new HashMap>();
- FileInputStream file = new FileInputStream(new File(fileLocation));
- Workbook workbook = new XSSFWorkbook(file);
- Sheet sheet = workbook.getSheetAt(0);
- int i = 0;
- for (Row row : sheet) {
- data.put(i, new ArrayList());
- for (Cell cell : row) {
- switch (cell.getCellTypeEnum()) {
- case STRING:
- data.get(i)
- .add(cell.getRichStringCellValue()
- .getString());
- break;
- case NUMERIC:
- if (DateUtil.isCellDateFormatted(cell)) {
- data.get(i)
- .add(cell.getDateCellValue() + "");
- } else {
- data.get(i)
- .add(cell.getNumericCellValue() + "");
+ Map> data = new HashMap<>();
+ FileInputStream fis = new FileInputStream(new File(fileLocation));
+
+ if (fileLocation.endsWith(".xls")) {
+ data = readHSSFWorkbook(fis);
+ } else if (fileLocation.endsWith(".xlsx")) {
+ data = readXSSFWorkbook(fis);
+ }
+
+ int maxNrCols = data.values().stream()
+ .mapToInt(List::size)
+ .max()
+ .orElse(0);
+
+ data.values().stream()
+ .filter(ls -> ls.size() < maxNrCols)
+ .forEach(ls -> {
+ IntStream.range(ls.size(), maxNrCols)
+ .forEach(i -> ls.add(new MyCell("")));
+ });
+
+ return data;
+ }
+
+ private String readCellContent(Cell cell) {
+ String content;
+ switch (cell.getCellTypeEnum()) {
+ case STRING:
+ content = cell.getStringCellValue();
+ break;
+ case NUMERIC:
+ if (DateUtil.isCellDateFormatted(cell)) {
+ content = cell.getDateCellValue() + "";
+ } else {
+ content = cell.getNumericCellValue() + "";
+ }
+ break;
+ case BOOLEAN:
+ content = cell.getBooleanCellValue() + "";
+ break;
+ case FORMULA:
+ content = cell.getCellFormula() + "";
+ break;
+ default:
+ content = "";
+ }
+ return content;
+ }
+
+ private Map> readHSSFWorkbook(FileInputStream fis) throws IOException {
+ Map> data = new HashMap<>();
+ HSSFWorkbook workbook = null;
+ try {
+ workbook = new HSSFWorkbook(fis);
+
+ HSSFSheet sheet = workbook.getSheetAt(0);
+ for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
+ HSSFRow row = sheet.getRow(i);
+ data.put(i, new ArrayList<>());
+ if (row != null) {
+ for (int j = 0; j < row.getLastCellNum(); j++) {
+ HSSFCell cell = row.getCell(j);
+ if (cell != null) {
+ HSSFCellStyle cellStyle = cell.getCellStyle();
+
+ MyCell myCell = new MyCell();
+
+ HSSFColor bgColor = cellStyle.getFillForegroundColorColor();
+ if (bgColor != null) {
+ short[] rgbColor = bgColor.getTriplet();
+ myCell.setBgColor("rgb(" + rgbColor[0] + "," + rgbColor[1] + "," + rgbColor[2] + ")");
+ }
+ HSSFFont font = cell.getCellStyle()
+ .getFont(workbook);
+ myCell.setTextSize(font.getFontHeightInPoints() + "");
+ if (font.getBold()) {
+ myCell.setTextWeight("bold");
+ }
+ HSSFColor textColor = font.getHSSFColor(workbook);
+ if (textColor != null) {
+ short[] rgbColor = textColor.getTriplet();
+ myCell.setTextColor("rgb(" + rgbColor[0] + "," + rgbColor[1] + "," + rgbColor[2] + ")");
+ }
+ myCell.setContent(readCellContent(cell));
+ data.get(i)
+ .add(myCell);
+ } else {
+ data.get(i)
+ .add(new MyCell(""));
+ }
}
- break;
- case BOOLEAN:
- data.get(i)
- .add(cell.getBooleanCellValue() + "");
- break;
- case FORMULA:
- data.get(i)
- .add(cell.getCellFormula() + "");
- break;
- default:
- data.get(i)
- .add(" ");
}
}
- i++;
- }
- if (workbook != null){
- workbook.close();
+ } finally {
+ if (workbook != null) {
+ workbook.close();
+ }
}
return data;
}
- public void writeExcel() throws IOException {
- Workbook workbook = new XSSFWorkbook();
-
+ private Map> readXSSFWorkbook(FileInputStream fis) throws IOException {
+ XSSFWorkbook workbook = null;
+ Map> data = new HashMap<>();
try {
- Sheet sheet = workbook.createSheet("Persons");
- sheet.setColumnWidth(0, 6000);
- sheet.setColumnWidth(1, 4000);
- Row header = sheet.createRow(0);
+ workbook = new XSSFWorkbook(fis);
+ XSSFSheet sheet = workbook.getSheetAt(0);
- CellStyle headerStyle = workbook.createCellStyle();
+ for (int i = sheet.getFirstRowNum(); i <= sheet.getLastRowNum(); i++) {
+ XSSFRow row = sheet.getRow(i);
+ data.put(i, new ArrayList<>());
+ if (row != null) {
+ for (int j = 0; j < row.getLastCellNum(); j++) {
+ XSSFCell cell = row.getCell(j);
+ if (cell != null) {
+ XSSFCellStyle cellStyle = cell.getCellStyle();
- headerStyle.setFillForegroundColor(IndexedColors.LIGHT_BLUE.getIndex());
- headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-
- XSSFFont font = ((XSSFWorkbook) workbook).createFont();
- font.setFontName("Arial");
- font.setFontHeightInPoints((short) 16);
- font.setBold(true);
- headerStyle.setFont(font);
-
- Cell headerCell = header.createCell(0);
- headerCell.setCellValue("Name");
- headerCell.setCellStyle(headerStyle);
-
- headerCell = header.createCell(1);
- headerCell.setCellValue("Age");
- headerCell.setCellStyle(headerStyle);
-
- CellStyle style = workbook.createCellStyle();
- style.setWrapText(true);
-
- Row row = sheet.createRow(2);
- Cell cell = row.createCell(0);
- cell.setCellValue("John Smith");
- cell.setCellStyle(style);
-
- cell = row.createCell(1);
- cell.setCellValue(20);
- cell.setCellStyle(style);
-
- row = sheet.createRow(3);
- cell = row.createCell(0);
- cell.setCellValue("Ana Johnson");
- cell.setCellStyle(style);
-
- cell = row.createCell(1);
- cell.setCellValue(30);
- cell.setCellStyle(style);
-
- File currDir = new File(".");
- String path = currDir.getAbsolutePath();
- String fileLocation = path.substring(0, path.length() - 1) + "temp.xlsx";
-
- FileOutputStream outputStream = new FileOutputStream(fileLocation);
- workbook.write(outputStream);
- } finally {
- if (workbook != null) {
- try {
- workbook.close();
- } catch (IOException e) {
- e.printStackTrace();
+ MyCell myCell = new MyCell();
+ XSSFColor bgColor = cellStyle.getFillForegroundColorColor();
+ if (bgColor != null) {
+ byte[] rgbColor = bgColor.getRGB();
+ myCell.setBgColor("rgb(" + (rgbColor[0] < 0 ? (rgbColor[0] + 0xff) : rgbColor[0]) + "," + (rgbColor[1] < 0 ? (rgbColor[1] + 0xff) : rgbColor[1]) + "," + (rgbColor[2] < 0 ? (rgbColor[2] + 0xff) : rgbColor[2]) + ")");
+ }
+ XSSFFont font = cellStyle.getFont();
+ myCell.setTextSize(font.getFontHeightInPoints() + "");
+ if (font.getBold()) {
+ myCell.setTextWeight("bold");
+ }
+ XSSFColor textColor = font.getXSSFColor();
+ if (textColor != null) {
+ byte[] rgbColor = textColor.getRGB();
+ myCell.setTextColor("rgb(" + (rgbColor[0] < 0 ? (rgbColor[0] + 0xff) : rgbColor[0]) + "," + (rgbColor[1] < 0 ? (rgbColor[1] + 0xff) : rgbColor[1]) + "," + (rgbColor[2] < 0 ? (rgbColor[2] + 0xff) : rgbColor[2]) + ")");
+ }
+ myCell.setContent(readCellContent(cell));
+ data.get(i)
+ .add(myCell);
+ } else {
+ data.get(i)
+ .add(new MyCell(""));
+ }
+ }
}
}
+ } finally {
+ if (workbook != null) {
+ workbook.close();
+ }
}
+ return data;
}
}
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java b/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java
deleted file mode 100644
index d0e33bf471..0000000000
--- a/spring-mvc-java/src/main/java/com/baeldung/excel/JExcelHelper.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.baeldung.excel;
-
-import jxl.Sheet;
-import jxl.Workbook;
-import jxl.format.Colour;
-import jxl.read.biff.BiffException;
-import jxl.write.*;
-import jxl.write.Number;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class JExcelHelper {
-
- public Map> readJExcel(String fileLocation) throws IOException, BiffException {
- Map> data = new HashMap<>();
-
- Workbook workbook = Workbook.getWorkbook(new File(fileLocation));
- Sheet sheet = workbook.getSheet(0);
- int rows = sheet.getRows();
- int columns = sheet.getColumns();
-
- for (int i = 0; i < rows; i++) {
- data.put(i, new ArrayList<>());
- for (int j = 0; j < columns; j++) {
- data.get(i).add(sheet.getCell(j, i).getContents());
- }
- }
- return data;
- }
-
- public void writeJExcel() throws IOException, WriteException {
- WritableWorkbook workbook = null;
- try {
- File currDir = new File(".");
- String path = currDir.getAbsolutePath();
- String fileLocation = path.substring(0, path.length() - 1) + "temp.xls";
-
- workbook = Workbook.createWorkbook(new File(fileLocation));
-
- WritableSheet sheet = workbook.createSheet("Sheet 1", 0);
-
- WritableCellFormat headerFormat = new WritableCellFormat();
- WritableFont font = new WritableFont(WritableFont.ARIAL, 16, WritableFont.BOLD);
- headerFormat.setFont(font);
- headerFormat.setBackground(Colour.LIGHT_BLUE);
- headerFormat.setWrap(true);
- Label headerLabel = new Label(0, 0, "Name", headerFormat);
- sheet.setColumnView(0, 60);
- sheet.addCell(headerLabel);
-
- headerLabel = new Label(1, 0, "Age", headerFormat);
- sheet.setColumnView(0, 40);
- sheet.addCell(headerLabel);
-
- WritableCellFormat cellFormat = new WritableCellFormat();
- cellFormat.setWrap(true);
-
- Label cellLabel = new Label(0, 2, "John Smith", cellFormat);
- sheet.addCell(cellLabel);
- Number cellNumber = new Number(1, 2, 20, cellFormat);
- sheet.addCell(cellNumber);
-
- cellLabel = new Label(0, 3, "Ana Johnson", cellFormat);
- sheet.addCell(cellLabel);
- cellNumber = new Number(1, 3, 30, cellFormat);
- sheet.addCell(cellNumber);
-
- workbook.write();
- } finally {
- if (workbook != null) {
- workbook.close();
- }
- }
-
- }
-}
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/java/com/baeldung/excel/MyCell.java b/spring-mvc-java/src/main/java/com/baeldung/excel/MyCell.java
new file mode 100644
index 0000000000..409829bc35
--- /dev/null
+++ b/spring-mvc-java/src/main/java/com/baeldung/excel/MyCell.java
@@ -0,0 +1,57 @@
+package com.baeldung.excel;
+
+public class MyCell {
+ private String content;
+ private String textColor;
+ private String bgColor;
+ private String textSize;
+ private String textWeight;
+
+ public MyCell() {
+ }
+
+ public MyCell(String content) {
+ this.content = content;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getTextColor() {
+ return textColor;
+ }
+
+ public void setTextColor(String textColor) {
+ this.textColor = textColor;
+ }
+
+ public String getBgColor() {
+ return bgColor;
+ }
+
+ public void setBgColor(String bgColor) {
+ this.bgColor = bgColor;
+ }
+
+ public String getTextSize() {
+ return textSize;
+ }
+
+ public void setTextSize(String textSize) {
+ this.textSize = textSize;
+ }
+
+ public String getTextWeight() {
+ return textWeight;
+ }
+
+ public void setTextWeight(String textWeight) {
+ this.textWeight = textWeight;
+ }
+
+}
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java b/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java
index 9578303554..11be08a79d 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/spring/web/config/WebConfig.java
@@ -108,11 +108,6 @@ public class WebConfig extends WebMvcConfigurerAdapter {
configurer.setUrlPathHelper(urlPathHelper);
}
- @Bean
- public JExcelHelper jExcelHelper() {
- return new JExcelHelper();
- }
-
@Bean
public ExcelPOIHelper excelPOIHelper() {
return new ExcelPOIHelper();
diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ExcelController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/ExcelController.java
index 810282dd65..f76f7441a5 100644
--- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ExcelController.java
+++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/ExcelController.java
@@ -10,20 +10,15 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import com.baeldung.excel.*;
-import jxl.read.biff.BiffException;
import java.util.Map;
-import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Resource;
-import jxl.write.WriteException;
@Controller
public class ExcelController {
private String fileLocation;
- @Resource(name = "jExcelHelper")
- private JExcelHelper jExcelHelper;
-
@Resource(name = "excelPOIHelper")
private ExcelPOIHelper excelPOIHelper;
@@ -45,36 +40,19 @@ public class ExcelController {
}
f.flush();
f.close();
- System.out.println(fileLocation);
model.addAttribute("message", "File: " + file.getOriginalFilename() + " has been uploaded successfully!");
return "excel";
}
- @RequestMapping(method = RequestMethod.GET, value = "/readJExcel")
- public String readJExcel(Model model) throws IOException, BiffException {
-
- if (fileLocation != null) {
- if (fileLocation.endsWith(".xls")) {
- Map> data = jExcelHelper.readJExcel(fileLocation);
- model.addAttribute("data", data);
- } else {
- model.addAttribute("message", "Not a valid .xls file!");
- }
- } else {
- model.addAttribute("message", "File missing! Please upload an excel file.");
- }
- return "excel";
- }
-
@RequestMapping(method = RequestMethod.GET, value = "/readPOI")
public String readPOI(Model model) throws IOException {
if (fileLocation != null) {
- if (fileLocation.endsWith(".xlsx")) {
- Map> data = excelPOIHelper.readExcel(fileLocation);
+ if (fileLocation.endsWith(".xlsx") || fileLocation.endsWith(".xls")) {
+ Map> data = excelPOIHelper.readExcel(fileLocation);
model.addAttribute("data", data);
} else {
- model.addAttribute("message", "Not a valid .xlsx file!");
+ model.addAttribute("message", "Not a valid excel file!");
}
} else {
model.addAttribute("message", "File missing! Please upload an excel file.");
@@ -82,24 +60,4 @@ public class ExcelController {
return "excel";
}
- @RequestMapping(method = RequestMethod.POST, value = "/writeJExcel")
- public String writeJExcel(Model model) throws IOException, BiffException, WriteException {
-
- jExcelHelper.writeJExcel();
-
- model.addAttribute("message", "Write successful!");
-
- return "excel";
- }
-
- @RequestMapping(method = RequestMethod.POST, value = "/writePOI")
- public String writePOI(Model model) throws IOException {
-
- excelPOIHelper.writeExcel();
-
- model.addAttribute("message", "Write successful!");
-
- return "excel";
- }
-
}
\ No newline at end of file
diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/view/excel.jsp b/spring-mvc-java/src/main/webapp/WEB-INF/view/excel.jsp
index b50687df15..bcb5a31371 100644
--- a/spring-mvc-java/src/main/webapp/WEB-INF/view/excel.jsp
+++ b/spring-mvc-java/src/main/webapp/WEB-INF/view/excel.jsp
@@ -1,6 +1,6 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+ pageEncoding="ISO-8859-1"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
@@ -8,49 +8,43 @@
Excel Processing
-
-
-
-
-
-
+
+
+
-
-
-${message }
-