diff --git a/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java b/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java index d6153032a7..01507ab4d6 100644 --- a/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java +++ b/jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java @@ -3,7 +3,6 @@ package org.baeldung.jackson.annotation; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; - public class BeanWithCreator { public int id; public String name; diff --git a/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java b/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java index 3c7682f7a9..d59be09f12 100644 --- a/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java +++ b/jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java @@ -16,12 +16,8 @@ public class Zoo { this.animal = animal; } - @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.PROPERTY, property = "type") - @JsonSubTypes({ - @JsonSubTypes.Type(value = Dog.class, name = "dog"), - @JsonSubTypes.Type(value = Cat.class, name = "cat") - }) + @JsonSubTypes({ @JsonSubTypes.Type(value = Dog.class, name = "dog"), @JsonSubTypes.Type(value = Cat.class, name = "cat") }) public static class Animal { public String name; diff --git a/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java b/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java index 2bdce9b446..c188e9bce1 100644 --- a/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java +++ b/jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java @@ -49,7 +49,6 @@ import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; - public class JacksonAnnotationTest { @Test diff --git a/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java b/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java index eb62ba9ded..2ecca664a4 100644 --- a/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java +++ b/jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java @@ -66,7 +66,7 @@ public class JacksonDeserializationUnitTest { @Test public final void givenJsonHasUnknownValuesButJacksonIsIgnoringUnknownFields_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString =// @formatter:off + final String jsonAsString = // @formatter:off "{\"stringValue\":\"a\"," + "\"intValue\":1," + "\"booleanValue\":true," + @@ -84,7 +84,7 @@ public class JacksonDeserializationUnitTest { @Test public final void givenJsonHasUnknownValuesButUnknownFieldsAreIgnoredOnClass_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString =// @formatter:off + final String jsonAsString = // @formatter:off "{\"stringValue\":\"a\"," + "\"intValue\":1," + "\"booleanValue\":true," + diff --git a/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java b/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java index 886b43d05d..3bc5715e2a 100644 --- a/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java +++ b/jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java @@ -6,7 +6,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off JacksonCollectionDeserializationUnitTest.class ,JacksonSerializationEnumsUnitTest.class ,JacksonDeserializationUnitTest.class diff --git a/spring-all/.classpath b/spring-all/.classpath index c91caa1b09..6b533711d3 100644 --- a/spring-all/.classpath +++ b/spring-all/.classpath @@ -30,7 +30,7 @@ - + diff --git a/spring-all/pom.xml b/spring-all/pom.xml index bf924d5753..3fb515a0bd 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -69,6 +69,7 @@ hsqldb 2.3.2 + diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java b/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java index 6df8fc31f0..0ed66d3c68 100644 --- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java +++ b/spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java @@ -11,7 +11,6 @@ public class ChildValueHolder { @Value("${child.name:-}") private String childName; - public String getParentName() { return parentName; } diff --git a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java b/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java index fef9a614dc..abfafa8a7d 100644 --- a/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java +++ b/spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java @@ -11,7 +11,6 @@ public class ParentValueHolder { @Value("${child.name:-}") private String childName; - public String getParentName() { return parentName; } diff --git a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java index 9957b19516..86ec917bd6 100644 --- a/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java +++ b/spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java @@ -11,7 +11,7 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({//@formatter:off +@SuiteClasses({ //@formatter:off PropertiesWithXmlIntegrationTest.class, ExternalPropertiesWithJavaIntegrationTest.class, ExternalPropertiesWithMultipleXmlsIntegrationTest.class, diff --git a/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java b/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java index 0b644143c0..510e607dfa 100644 --- a/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java +++ b/spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java @@ -4,14 +4,14 @@ import org.springframework.boot.autoconfigure.web.ErrorController; import org.springframework.web.bind.annotation.RequestMapping; public class MyCustomErrorController implements ErrorController { - + private static final String PATH = "/error"; - + public MyCustomErrorController() { // TODO Auto-generated constructor stub } - - @RequestMapping(value=PATH) + + @RequestMapping(value = PATH) public String error() { return "Error heaven"; } diff --git a/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java b/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java index 14ba885168..ecabde7d9d 100644 --- a/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java +++ b/spring-boot/src/main/java/org/baeldung/common/error/controller/ErrorController.java @@ -8,12 +8,12 @@ public class ErrorController { public ErrorController() { } - + @RequestMapping("/400") String error400() { return "Error Code: 400 occured."; } - + @RequestMapping("/errorHeaven") String errorHeaven() { return "You have reached the heaven of errors!!!"; diff --git a/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java b/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java index b2a776e751..97130bed6a 100644 --- a/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java +++ b/spring-boot/src/main/java/org/baeldung/common/properties/MyServletContainerCustomizationBean.java @@ -17,7 +17,7 @@ public class MyServletContainerCustomizationBean implements EmbeddedServletConta public void customize(ConfigurableEmbeddedServletContainer container) { container.setPort(8084); container.setContextPath("/springbootapp"); - + container.addErrorPages(new ErrorPage(HttpStatus.BAD_REQUEST, "/400")); container.addErrorPages(new ErrorPage("/errorHeaven")); } diff --git a/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java b/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java index 1af0227f81..451abdfc37 100644 --- a/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java +++ b/spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java @@ -6,9 +6,9 @@ import java.util.concurrent.ExecutorService; import org.springframework.boot.ExitCodeGenerator; public class ExecutorServiceExitCodeGenerator implements ExitCodeGenerator { - + private ExecutorService executorService; - + public ExecutorServiceExitCodeGenerator(ExecutorService executorService) { } @@ -20,8 +20,7 @@ public class ExecutorServiceExitCodeGenerator implements ExitCodeGenerator { executorService.shutdownNow(); returnCode = 1; } - } - catch (SecurityException ex) { + } catch (SecurityException ex) { returnCode = 0; } return returnCode; diff --git a/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java b/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java index 0f874f759b..9adaf7fd29 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java +++ b/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java @@ -10,34 +10,32 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class HelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - + private static final long serialVersionUID = 1L; + public HelloWorldServlet() { super(); } - + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { PrintWriter out = null; try { out = response.getWriter(); out.println("HelloWorldServlet: GET METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } - + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { PrintWriter out = null; try { out = response.getWriter(); out.println("HelloWorldServlet: POST METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } diff --git a/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java b/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java index df14b2af4b..9a62bdbbf2 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java +++ b/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java @@ -10,8 +10,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; public class SpringHelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - + private static final long serialVersionUID = 1L; + public SpringHelloWorldServlet() { super(); } @@ -22,9 +22,8 @@ public class SpringHelloWorldServlet extends HttpServlet { out = response.getWriter(); out.println("SpringHelloWorldServlet: GET METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } @@ -35,9 +34,8 @@ public class SpringHelloWorldServlet extends HttpServlet { out = response.getWriter(); out.println("SpringHelloWorldServlet: POST METHOD"); out.flush(); - } - finally { - if (!Objects.isNull(out)) + } finally { + if (!Objects.isNull(out)) out.close(); } } diff --git a/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java b/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java index c71082ba0a..59955cc990 100644 --- a/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java +++ b/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java @@ -19,13 +19,11 @@ import org.springframework.web.bind.annotation.RestController; @RestController @EnableAutoConfiguration -@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", - "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", - "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service"}) +@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service" }) public class SpringBootApplication { - + private static ApplicationContext applicationContext; - + @Autowired private LoginService service; @@ -34,21 +32,21 @@ public class SpringBootApplication { service.login("admin", "admin".toCharArray()); return "TADA!!! You are in Spring Boot Actuator test application."; } - + public static void main(String[] args) { applicationContext = SpringApplication.run(SpringBootApplication.class, args); } - + @Bean public ExecutorService executorService() { - return Executors.newFixedThreadPool(10); + return Executors.newFixedThreadPool(10); } - + @Bean public HelloWorldServlet helloWorldServlet() { return new HelloWorldServlet(); } - + @Bean public SpringHelloServletRegistrationBean servletRegistrationBean() { SpringHelloServletRegistrationBean bean = new SpringHelloServletRegistrationBean(new SpringHelloWorldServlet(), "/springHelloWorld/*"); @@ -56,35 +54,35 @@ public class SpringBootApplication { bean.addInitParameter("message", "SpringHelloWorldServlet special message"); return bean; } - -/* @Bean + + /* @Bean public JettyEmbeddedServletContainerFactory jettyEmbeddedServletContainerFactory() { JettyEmbeddedServletContainerFactory jettyContainer = new JettyEmbeddedServletContainerFactory(); jettyContainer.setPort(9000); jettyContainer.setContextPath("/springbootapp"); return jettyContainer; } - + @Bean public UndertowEmbeddedServletContainerFactory embeddedServletContainerFactory() { UndertowEmbeddedServletContainerFactory factory = new UndertowEmbeddedServletContainerFactory(); factory.addBuilderCustomizers(new UndertowBuilderCustomizer() { - + @Override public void customize(io.undertow.Undertow.Builde builder) { builder.addHttpListener(8080, "0.0.0.0"); } - + }); return factory; }*/ - - @Bean + + @Bean @Autowired public ExecutorServiceExitCodeGenerator executorServiceExitCodeGenerator(ExecutorService executorService) { return new ExecutorServiceExitCodeGenerator(executorService); } - + public void shutDown(ExecutorServiceExitCodeGenerator executorServiceExitCodeGenerator) { SpringApplication.exit(applicationContext, executorServiceExitCodeGenerator); } diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java index e068573c5c..771da435c6 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class ChildDao extends AbstractHibernateDao implements IChildDao { +public class ChildDao extends AbstractHibernateDaoimplements IChildDao { @Autowired private SessionFactory sessionFactory; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java index baf29c9ecd..a5d995cec0 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooDao extends AbstractHibernateDaoimplements IFooDao { @Autowired private SessionFactory sessionFactory; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java index 5634137b63..207e01de58 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class ParentDao extends AbstractHibernateDao implements IParentDao { +public class ParentDao extends AbstractHibernateDaoimplements IParentDao { @Autowired private SessionFactory sessionFactory; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java index 89597313ea..987466643b 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ChildService extends AbstractService implements IChildService { +public class ChildService extends AbstractServiceimplements IChildService { @Autowired private IChildDao dao; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java index f0a4d7a649..382368bbd4 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class FooService extends AbstractService implements IFooService { +public class FooService extends AbstractServiceimplements IFooService { @Autowired private IFooDao dao; diff --git a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java index 97c44f4a2f..e40ccfd2f8 100644 --- a/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java +++ b/spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ParentService extends AbstractService implements IParentService { +public class ParentService extends AbstractServiceimplements IParentService { @Autowired private IParentDao dao; diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java b/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java index ab5b14f787..f88138fec2 100644 --- a/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java +++ b/spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java @@ -4,7 +4,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off Cause1BeanCreationExceptionIntegrationTest.class ,Cause2BeanCreationExceptionIntegrationTest.class ,Cause3BeanCreationExceptionIntegrationTest.class diff --git a/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java index 23de04169e..cb8d7488ea 100644 --- a/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java +++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java @@ -4,7 +4,7 @@ import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooDao extends AbstractHibernateDaoimplements IFooDao { public FooDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java index 47ed130878..018e367209 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java @@ -8,6 +8,6 @@ import org.springframework.stereotype.Repository; @Repository @Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class GenericHibernateDao extends AbstractHibernateDao implements IGenericDao { +public class GenericHibernateDao extends AbstractHibernateDaoimplements IGenericDao { // } \ No newline at end of file diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java index 017362bd14..80a4007633 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java @@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Child; import org.springframework.stereotype.Repository; @Repository -public class ChildDao extends AbstractHibernateDao implements IChildDao { +public class ChildDao extends AbstractHibernateDaoimplements IChildDao { public ChildDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java index b8360160da..eb3a66126c 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java @@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooDao extends AbstractHibernateDaoimplements IFooDao { public FooDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java index a93f1c39d5..fca4c69338 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java @@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Parent; import org.springframework.stereotype.Repository; @Repository -public class ParentDao extends AbstractHibernateDao implements IParentDao { +public class ParentDao extends AbstractHibernateDaoimplements IParentDao { public ParentDao() { super(); diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java index 2ea64285b3..71b1bc697e 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ChildService extends AbstractService implements IChildService { +public class ChildService extends AbstractServiceimplements IChildService { @Autowired private IChildDao dao; diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java index 4b76eba3e5..8a89153dd0 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class FooService extends AbstractService implements IFooService { +public class FooService extends AbstractServiceimplements IFooService { @Autowired private IFooDao dao; diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java index 73239f1d00..1f9b602350 100644 --- a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java +++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service -public class ParentService extends AbstractService implements IParentService { +public class ParentService extends AbstractServiceimplements IParentService { @Autowired private IParentDao dao; diff --git a/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java b/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java index 938e8f359c..42fcc28378 100644 --- a/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java +++ b/spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java @@ -9,7 +9,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off FooServiceBasicPersistenceIntegrationTest.class ,FooPaginationPersistenceIntegrationTest.class ,FooServicePersistenceIntegrationTest.class diff --git a/spring-jpa/.classpath b/spring-jpa/.classpath index 8b7cba482d..fa5dbd4c0e 100644 --- a/spring-jpa/.classpath +++ b/spring-jpa/.classpath @@ -29,7 +29,7 @@ - + diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java b/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java index 77978c5cf2..becd8d5f67 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java @@ -4,7 +4,7 @@ import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractJpaDAO implements IFooDao { +public class FooDao extends AbstractJpaDAOimplements IFooDao { public FooDao() { super(); diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java index 35f648b5a0..f6c41258d4 100644 --- a/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java @@ -4,7 +4,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({// @formatter:off +@Suite.SuiteClasses({ // @formatter:off FooPaginationPersistenceIntegrationTest.class ,FooServicePersistenceIntegrationTest.class ,FooServiceSortingTests.class diff --git a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java index a2589e465f..85c67c094d 100644 --- a/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java +++ b/spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java @@ -1,23 +1,23 @@ package org.baeldung.servlet; -//public class WebApp implements WebApplicationInitializer { +// public class WebApp implements WebApplicationInitializer { // -// public WebApp() { -// super(); -// } +// public WebApp() { +// super(); +// } // -// // API +// // API // -// @Override -// public void onStartup(final ServletContext servletContext) throws ServletException { -// final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); -// root.setServletContext(servletContext); -// root.scan("org.baeldung.spring"); -// root.refresh(); +// @Override +// public void onStartup(final ServletContext servletContext) throws ServletException { +// final AnnotationConfigWebApplicationContext root = new AnnotationConfigWebApplicationContext(); +// root.setServletContext(servletContext); +// root.scan("org.baeldung.spring"); +// root.refresh(); // -// final Dynamic servlet = servletContext.addServlet("mvc", new DispatcherServlet(root)); -// servlet.setLoadOnStartup(1); -// servlet.addMapping("/"); -// } +// final Dynamic servlet = servletContext.addServlet("mvc", new DispatcherServlet(root)); +// servlet.setLoadOnStartup(1); +// servlet.addMapping("/"); +// } // // } diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java index ab2b9f3f87..cafaff7b07 100644 --- a/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java @@ -39,19 +39,19 @@ public class RedirectControllerTest { @Test public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception { mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection()).andExpect(view().name("RedirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithXMLConfig"))) - .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig")); + .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig")); } @Test public void whenRedirectOnUrlWithUsingRedirectPrefix_thenStatusRedirectionAndRedirectedOnUrl() throws Exception { mockMvc.perform(get("/redirectWithRedirectPrefix")).andExpect(status().is3xxRedirection()).andExpect(view().name("redirect:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithRedirectPrefix"))) - .andExpect(redirectedUrl("/redirectedUrl?attribute=redirectWithRedirectPrefix")); + .andExpect(redirectedUrl("/redirectedUrl?attribute=redirectWithRedirectPrefix")); } @Test public void whenRedirectOnUrlWithUsingRedirectAttributes_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope() throws Exception { mockMvc.perform(get("/redirectWithRedirectAttributes")).andExpect(status().is3xxRedirection()).andExpect(flash().attribute("flashAttribute", is("redirectWithRedirectAttributes"))) - .andExpect(model().attribute("attribute", is("redirectWithRedirectAttributes"))).andExpect(model().attribute("flashAttribute", is(nullValue()))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectAttributes")); + .andExpect(model().attribute("attribute", is("redirectWithRedirectAttributes"))).andExpect(model().attribute("flashAttribute", is(nullValue()))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectAttributes")); } @Test diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java index c656f134d9..c7053fc56a 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java @@ -21,7 +21,7 @@ public class Role { private Collection users; @ManyToMany - @JoinTable(name = "roles_privileges", joinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id")) + @JoinTable(name = "roles_privileges", joinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id") ) private Collection privileges; private String name; diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java index 4fc2d57f5b..277ddef1dc 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java @@ -32,7 +32,7 @@ public class User { private boolean tokenExpired; @ManyToMany - @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id")) + @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") ) private Collection roles; public User() { diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java index a8322ad2f3..6a9b906b36 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java @@ -18,7 +18,7 @@ public @interface PasswordMatches { String message() default "Passwords don't match"; - Class[] groups() default {}; + Class[]groups() default {}; - Class[] payload() default {}; + Class[]payload() default {}; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java index fa556c417c..1d5795ce16 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java @@ -18,7 +18,7 @@ public @interface ValidEmail { String message() default "Invalid Email"; - Class[] groups() default {}; + Class[]groups() default {}; - Class[] payload() default {}; + Class[]payload() default {}; } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java index 37b217213a..5b92f4d133 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java @@ -20,8 +20,8 @@ public @interface ValidPassword { String message() default "Invalid Password"; - Class[] groups() default {}; + Class[]groups() default {}; - Class[] payload() default {}; + Class[]payload() default {}; } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java index 769063cbee..7f9ad79f63 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java @@ -4,8 +4,8 @@ import cz.jirutka.rsql.parser.ast.ComparisonOperator; import cz.jirutka.rsql.parser.ast.RSQLOperators; public enum RsqlSearchOperation { - EQUAL(RSQLOperators.EQUAL), NOT_EQUAL(RSQLOperators.NOT_EQUAL), GREATER_THAN(RSQLOperators.GREATER_THAN), GREATER_THAN_OR_EQUAL(RSQLOperators.GREATER_THAN_OR_EQUAL), LESS_THAN(RSQLOperators.LESS_THAN), LESS_THAN_OR_EQUAL(RSQLOperators.LESS_THAN_OR_EQUAL), IN( - RSQLOperators.IN), NOT_IN(RSQLOperators.NOT_IN); + EQUAL(RSQLOperators.EQUAL), NOT_EQUAL(RSQLOperators.NOT_EQUAL), GREATER_THAN(RSQLOperators.GREATER_THAN), GREATER_THAN_OR_EQUAL(RSQLOperators.GREATER_THAN_OR_EQUAL), LESS_THAN(RSQLOperators.LESS_THAN), LESS_THAN_OR_EQUAL( + RSQLOperators.LESS_THAN_OR_EQUAL), IN(RSQLOperators.IN), NOT_IN(RSQLOperators.NOT_IN); private ComparisonOperator operator; diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java index 533c0f5082..c449cde8e2 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -16,7 +16,7 @@ import com.google.common.collect.Lists; @Service @Transactional -public class FooService extends AbstractService implements IFooService { +public class FooService extends AbstractServiceimplements IFooService { @Autowired private IFooDao dao; diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java b/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java index 244b6e2e33..ca882909f0 100644 --- a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java +++ b/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java @@ -55,12 +55,12 @@ public class SecurityJavaConfig extends WebSecurityConfigurerAdapter { } // @formatter:on @Bean - public MySavedRequestAwareAuthenticationSuccessHandler mySuccessHandler(){ + public MySavedRequestAwareAuthenticationSuccessHandler mySuccessHandler() { return new MySavedRequestAwareAuthenticationSuccessHandler(); } @Bean - public SimpleUrlAuthenticationFailureHandler myFailureHandler(){ + public SimpleUrlAuthenticationFailureHandler myFailureHandler() { return new SimpleUrlAuthenticationFailureHandler(); }