From 75593037fcd0c14ff41ab4d04ae999da9794e9e5 Mon Sep 17 00:00:00 2001 From: Andrew Tobilko Date: Mon, 26 Sep 2016 17:24:09 +0300 Subject: [PATCH 1/8] filter hierarchy --- .../security/filter/CustomHttpFilter.java | 32 +++++++++++++++++++ .../security/filter/FilterConfiguration.java | 28 ++++++++++++++++ .../security/filter/GenericCustomFilter.java | 16 ++++++++++ .../filter/GenericCustomHttpFilter.java | 22 +++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java create mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java create mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java create mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java new file mode 100644 index 0000000000..00a17fbb39 --- /dev/null +++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java @@ -0,0 +1,32 @@ +package org.baeldung.security.filter; + +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Component +@Order(Ordered.LOWEST_PRECEDENCE) +public class CustomHttpFilter extends GenericCustomHttpFilter { + + @Override + public void init(FilterConfig config) throws ServletException { + System.out.println(config.getInitParameter("first-init-param") + + config.getInitParameter("second-init-param")); + } + + @Override + public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain + chain) throws IOException, ServletException { + System.out.println("CustomHttpFilter is in action [the request is going to the server]."); + chain.doFilter(request, response); + System.out.println("CustomHttpFilter is in action [the request has come from the server]."); + } + +} \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java new file mode 100644 index 0000000000..12447a29af --- /dev/null +++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java @@ -0,0 +1,28 @@ +package org.baeldung.security.filter; + +import org.springframework.boot.context.embedded.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.HashMap; + +import static java.util.Collections.singletonList; + +@Configuration +public class FilterConfiguration { + + @Bean + public FilterRegistrationBean getCustomFilterRegistrationBean() { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new CustomHttpFilter()); + + registration.setInitParameters(new HashMap() {{ + put("first-init-param", "Hello from "); + put("second-init-param", "Filter!"); + }}); + registration.setUrlPatterns(singletonList("/user/registration")); + + return registration; + } + +} \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java new file mode 100644 index 0000000000..e808b1aa0c --- /dev/null +++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java @@ -0,0 +1,16 @@ +package org.baeldung.security.filter; + + +import javax.servlet.Filter; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; + +public abstract class GenericCustomFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) throws ServletException {} + + @Override + public void destroy() {} + +} \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java new file mode 100644 index 0000000000..6fb024c377 --- /dev/null +++ b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java @@ -0,0 +1,22 @@ +package org.baeldung.security.filter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +public abstract class GenericCustomHttpFilter extends GenericCustomFilter { + + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + doFilter((HttpServletRequest) request, (HttpServletResponse) response, chain); + } + + public abstract void doFilter(HttpServletRequest request, HttpServletResponse response, + FilterChain chain) throws IOException, ServletException; + +} From 31d72d7cfa41ee51b0d5995892eb4fcbdf9ab523 Mon Sep 17 00:00:00 2001 From: Andrew Tobilko Date: Mon, 26 Sep 2016 17:26:45 +0300 Subject: [PATCH 2/8] README --- spring-security-rest-basic-auth/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-security-rest-basic-auth/README.md b/spring-security-rest-basic-auth/README.md index 3bd46bdd2a..f3afa116f0 100644 --- a/spring-security-rest-basic-auth/README.md +++ b/spring-security-rest-basic-auth/README.md @@ -8,4 +8,5 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com ### Relevant Articles: - [RestTemplate with Basic Authentication in Spring](http://www.baeldung.com/2012/04/16/how-to-use-resttemplate-with-basic-authentication-in-spring-3-1) - [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout) +- [Writing a Custom Filter in Spring Security](http://www.baeldung.com/writing-custom-filter-spring-security) - [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl) From 05ba4f173e364de476f6d3067586b31accee795b Mon Sep 17 00:00:00 2001 From: Andrew Tobilko Date: Tue, 25 Oct 2016 02:06:22 +0300 Subject: [PATCH 3/8] Spring Security filter --samples [xml and java configurations] --- .../baeldung/security/filter/CustomFilter.java | 18 ++++++++++++++++++ .../CustomWebSecurityConfigurerAdapter.java | 17 +++++++++++++++++ .../src/main/resources/webSecurityConfig.xml | 3 +++ 3 files changed, 38 insertions(+) create mode 100644 spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java create mode 100644 spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java diff --git a/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java b/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java new file mode 100644 index 0000000000..8d2b919cb0 --- /dev/null +++ b/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/CustomFilter.java @@ -0,0 +1,18 @@ +package org.baeldung.security.filter; + +import org.springframework.web.filter.GenericFilterBean; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; + +public class CustomFilter extends GenericFilterBean { + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + chain.doFilter(request, response); + } + +} diff --git a/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java b/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java new file mode 100644 index 0000000000..468c99cb2a --- /dev/null +++ b/spring-security-basic-auth/src/main/java/org/baeldung/security/filter/configuration/CustomWebSecurityConfigurerAdapter.java @@ -0,0 +1,17 @@ +package org.baeldung.security.filter.configuration; + +import org.baeldung.security.filter.CustomFilter; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; + +@Configuration +public class CustomWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.addFilterAfter(new CustomFilter(), BasicAuthenticationFilter.class); + } + +} diff --git a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml index 48302e8e93..f840d3014e 100644 --- a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml @@ -12,6 +12,7 @@ + @@ -22,4 +23,6 @@ + + \ No newline at end of file From be290bf9b876e7512f3ca4cbd4bb8d6d8f78308a Mon Sep 17 00:00:00 2001 From: Andrew Tobilko Date: Tue, 25 Oct 2016 02:16:14 +0300 Subject: [PATCH 4/8] removed the previous version --- spring-security-rest-basic-auth/README.md | 1 - .../security/filter/CustomHttpFilter.java | 32 ------------------- .../security/filter/FilterConfiguration.java | 28 ---------------- .../security/filter/GenericCustomFilter.java | 16 ---------- .../filter/GenericCustomHttpFilter.java | 22 ------------- 5 files changed, 99 deletions(-) delete mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java delete mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java delete mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java delete mode 100644 spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java diff --git a/spring-security-rest-basic-auth/README.md b/spring-security-rest-basic-auth/README.md index f3afa116f0..3bd46bdd2a 100644 --- a/spring-security-rest-basic-auth/README.md +++ b/spring-security-rest-basic-auth/README.md @@ -8,5 +8,4 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com ### Relevant Articles: - [RestTemplate with Basic Authentication in Spring](http://www.baeldung.com/2012/04/16/how-to-use-resttemplate-with-basic-authentication-in-spring-3-1) - [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout) -- [Writing a Custom Filter in Spring Security](http://www.baeldung.com/writing-custom-filter-spring-security) - [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl) diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java deleted file mode 100644 index 00a17fbb39..0000000000 --- a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/CustomHttpFilter.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.baeldung.security.filter; - -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -@Component -@Order(Ordered.LOWEST_PRECEDENCE) -public class CustomHttpFilter extends GenericCustomHttpFilter { - - @Override - public void init(FilterConfig config) throws ServletException { - System.out.println(config.getInitParameter("first-init-param") + - config.getInitParameter("second-init-param")); - } - - @Override - public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain - chain) throws IOException, ServletException { - System.out.println("CustomHttpFilter is in action [the request is going to the server]."); - chain.doFilter(request, response); - System.out.println("CustomHttpFilter is in action [the request has come from the server]."); - } - -} \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java deleted file mode 100644 index 12447a29af..0000000000 --- a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/FilterConfiguration.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.baeldung.security.filter; - -import org.springframework.boot.context.embedded.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.util.HashMap; - -import static java.util.Collections.singletonList; - -@Configuration -public class FilterConfiguration { - - @Bean - public FilterRegistrationBean getCustomFilterRegistrationBean() { - FilterRegistrationBean registration = new FilterRegistrationBean(); - registration.setFilter(new CustomHttpFilter()); - - registration.setInitParameters(new HashMap() {{ - put("first-init-param", "Hello from "); - put("second-init-param", "Filter!"); - }}); - registration.setUrlPatterns(singletonList("/user/registration")); - - return registration; - } - -} \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java deleted file mode 100644 index e808b1aa0c..0000000000 --- a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomFilter.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung.security.filter; - - -import javax.servlet.Filter; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; - -public abstract class GenericCustomFilter implements Filter { - - @Override - public void init(FilterConfig filterConfig) throws ServletException {} - - @Override - public void destroy() {} - -} \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java b/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java deleted file mode 100644 index 6fb024c377..0000000000 --- a/spring-security-rest-basic-auth/src/main/java/org/baeldung/security/filter/GenericCustomHttpFilter.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.baeldung.security.filter; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -public abstract class GenericCustomHttpFilter extends GenericCustomFilter { - - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - doFilter((HttpServletRequest) request, (HttpServletResponse) response, chain); - } - - public abstract void doFilter(HttpServletRequest request, HttpServletResponse response, - FilterChain chain) throws IOException, ServletException; - -} From 8dd8cab6643dde3c713e4d8e3c1acb3c3269dab3 Mon Sep 17 00:00:00 2001 From: Chris Anatalio Date: Wed, 26 Oct 2016 17:18:23 -0700 Subject: [PATCH 5/8] BAEL-223: Updated package name and project directory --- .../.gitignore | 0 .../README.MD | 0 {spring-boot-data-dynamodb => spring-data-dynamodb}/pom.xml | 0 .../src/main/java/com/baeldung/Application.java | 0 .../spring/data/dynamodb}/config/DynamoDBConfig.java | 4 ++-- .../baeldung/spring/data/dynamodb}/model/ProductInfo.java | 2 +- .../data/dynamodb}/repositories/ProductInfoRepository.java | 4 ++-- .../src/main/resources/application.properties | 0 .../src/main/resources/demo.properties | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/index.html | 0 .../repository/ProductInfoRepositoryIntegrationTest.java | 6 +++--- .../src/test/resources/application.properties | 0 .../src/test/resources/exception-hibernate.properties | 0 .../src/test/resources/exception.properties | 0 15 files changed, 8 insertions(+), 8 deletions(-) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/.gitignore (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/README.MD (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/pom.xml (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/main/java/com/baeldung/Application.java (100%) rename {spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es => spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb}/config/DynamoDBConfig.java (94%) rename {spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es => spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb}/model/ProductInfo.java (95%) rename {spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es => spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb}/repositories/ProductInfoRepository.java (71%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/main/resources/application.properties (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/main/resources/demo.properties (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/main/resources/logback.xml (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/main/resources/templates/index.html (100%) rename {spring-boot-data-dynamodb/src/test/java/com/baeldung/spring/data/es => spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb}/repository/ProductInfoRepositoryIntegrationTest.java (93%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/test/resources/application.properties (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/test/resources/exception-hibernate.properties (100%) rename {spring-boot-data-dynamodb => spring-data-dynamodb}/src/test/resources/exception.properties (100%) diff --git a/spring-boot-data-dynamodb/.gitignore b/spring-data-dynamodb/.gitignore similarity index 100% rename from spring-boot-data-dynamodb/.gitignore rename to spring-data-dynamodb/.gitignore diff --git a/spring-boot-data-dynamodb/README.MD b/spring-data-dynamodb/README.MD similarity index 100% rename from spring-boot-data-dynamodb/README.MD rename to spring-data-dynamodb/README.MD diff --git a/spring-boot-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml similarity index 100% rename from spring-boot-data-dynamodb/pom.xml rename to spring-data-dynamodb/pom.xml diff --git a/spring-boot-data-dynamodb/src/main/java/com/baeldung/Application.java b/spring-data-dynamodb/src/main/java/com/baeldung/Application.java similarity index 100% rename from spring-boot-data-dynamodb/src/main/java/com/baeldung/Application.java rename to spring-data-dynamodb/src/main/java/com/baeldung/Application.java diff --git a/spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/config/DynamoDBConfig.java b/spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/config/DynamoDBConfig.java similarity index 94% rename from spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/config/DynamoDBConfig.java rename to spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/config/DynamoDBConfig.java index 4bc8a128bc..271c1e29ab 100644 --- a/spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/config/DynamoDBConfig.java +++ b/spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/config/DynamoDBConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.data.es.config; +package com.baeldung.spring.data.dynamodb.config; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.BasicAWSCredentials; @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; @Configuration -@EnableDynamoDBRepositories(basePackages = "com.baeldung.spring.data.es.repositories") +@EnableDynamoDBRepositories(basePackages = "com.baeldung.spring.data.dynamodb.repositories") public class DynamoDBConfig { @Value("${amazon.dynamodb.endpoint}") diff --git a/spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/model/ProductInfo.java b/spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/model/ProductInfo.java similarity index 95% rename from spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/model/ProductInfo.java rename to spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/model/ProductInfo.java index 3e75c9e6f2..3b9b0628dd 100644 --- a/spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/model/ProductInfo.java +++ b/spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/model/ProductInfo.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.data.es.model; +package com.baeldung.spring.data.dynamodb.model; import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; diff --git a/spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/repositories/ProductInfoRepository.java b/spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/repositories/ProductInfoRepository.java similarity index 71% rename from spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/repositories/ProductInfoRepository.java rename to spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/repositories/ProductInfoRepository.java index c5eee49634..da47f033b6 100644 --- a/spring-boot-data-dynamodb/src/main/java/com/baeldung/spring/data/es/repositories/ProductInfoRepository.java +++ b/spring-data-dynamodb/src/main/java/com/baeldung/spring/data/dynamodb/repositories/ProductInfoRepository.java @@ -1,6 +1,6 @@ -package com.baeldung.spring.data.es.repositories; +package com.baeldung.spring.data.dynamodb.repositories; -import com.baeldung.spring.data.es.model.ProductInfo; +import com.baeldung.spring.data.dynamodb.model.ProductInfo; import org.socialsignin.spring.data.dynamodb.repository.EnableScan; import org.springframework.data.repository.CrudRepository; diff --git a/spring-boot-data-dynamodb/src/main/resources/application.properties b/spring-data-dynamodb/src/main/resources/application.properties similarity index 100% rename from spring-boot-data-dynamodb/src/main/resources/application.properties rename to spring-data-dynamodb/src/main/resources/application.properties diff --git a/spring-boot-data-dynamodb/src/main/resources/demo.properties b/spring-data-dynamodb/src/main/resources/demo.properties similarity index 100% rename from spring-boot-data-dynamodb/src/main/resources/demo.properties rename to spring-data-dynamodb/src/main/resources/demo.properties diff --git a/spring-boot-data-dynamodb/src/main/resources/logback.xml b/spring-data-dynamodb/src/main/resources/logback.xml similarity index 100% rename from spring-boot-data-dynamodb/src/main/resources/logback.xml rename to spring-data-dynamodb/src/main/resources/logback.xml diff --git a/spring-boot-data-dynamodb/src/main/resources/templates/index.html b/spring-data-dynamodb/src/main/resources/templates/index.html similarity index 100% rename from spring-boot-data-dynamodb/src/main/resources/templates/index.html rename to spring-data-dynamodb/src/main/resources/templates/index.html diff --git a/spring-boot-data-dynamodb/src/test/java/com/baeldung/spring/data/es/repository/ProductInfoRepositoryIntegrationTest.java b/spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java similarity index 93% rename from spring-boot-data-dynamodb/src/test/java/com/baeldung/spring/data/es/repository/ProductInfoRepositoryIntegrationTest.java rename to spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java index df727cf727..e384f7dff4 100644 --- a/spring-boot-data-dynamodb/src/test/java/com/baeldung/spring/data/es/repository/ProductInfoRepositoryIntegrationTest.java +++ b/spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.data.es.repository; +package com.baeldung.spring.data.dynamodb.repository; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; @@ -6,8 +6,8 @@ import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; import com.amazonaws.services.dynamodbv2.model.ResourceInUseException; import com.baeldung.Application; -import com.baeldung.spring.data.es.model.ProductInfo; -import com.baeldung.spring.data.es.repositories.ProductInfoRepository; +import com.baeldung.spring.data.dynamodb.model.ProductInfo; +import com.baeldung.spring.data.dynamodb.repositories.ProductInfoRepository; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot-data-dynamodb/src/test/resources/application.properties b/spring-data-dynamodb/src/test/resources/application.properties similarity index 100% rename from spring-boot-data-dynamodb/src/test/resources/application.properties rename to spring-data-dynamodb/src/test/resources/application.properties diff --git a/spring-boot-data-dynamodb/src/test/resources/exception-hibernate.properties b/spring-data-dynamodb/src/test/resources/exception-hibernate.properties similarity index 100% rename from spring-boot-data-dynamodb/src/test/resources/exception-hibernate.properties rename to spring-data-dynamodb/src/test/resources/exception-hibernate.properties diff --git a/spring-boot-data-dynamodb/src/test/resources/exception.properties b/spring-data-dynamodb/src/test/resources/exception.properties similarity index 100% rename from spring-boot-data-dynamodb/src/test/resources/exception.properties rename to spring-data-dynamodb/src/test/resources/exception.properties From 9d735eb663f5f687bdb2ace39795ec74ffc9790f Mon Sep 17 00:00:00 2001 From: Chris Anatalio Date: Wed, 26 Oct 2016 17:33:36 -0700 Subject: [PATCH 6/8] BAEL-223: Add Ignore annotation to tests since there is not local dynamoDB instance in cloud environment --- .../repository/ProductInfoRepositoryIntegrationTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java b/spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java index e384f7dff4..8fe3e96940 100644 --- a/spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java +++ b/spring-data-dynamodb/src/test/java/com/baeldung/spring/data/dynamodb/repository/ProductInfoRepositoryIntegrationTest.java @@ -9,6 +9,7 @@ import com.baeldung.Application; import com.baeldung.spring.data.dynamodb.model.ProductInfo; import com.baeldung.spring.data.dynamodb.repositories.ProductInfoRepository; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -43,6 +44,7 @@ public class ProductInfoRepositoryIntegrationTest { private static final String EXPECTED_PRICE = "50"; @Before + @Ignore //TODO Remove Ignore annotations when running locally with Local DynamoDB instance public void setup() throws Exception { try { @@ -62,6 +64,7 @@ public class ProductInfoRepositoryIntegrationTest { } @Test + @Ignore //TODO Remove Ignore annotations when running locally with Local DynamoDB instance public void givenItemWithExpectedCost_whenRunFindAll_thenItemIsFound() { ProductInfo productInfo = new ProductInfo(EXPECTED_COST, EXPECTED_PRICE); From 5a6ab35333582ebf0017bab20141e5105712bf10 Mon Sep 17 00:00:00 2001 From: DOHA Date: Sat, 29 Oct 2016 16:56:13 +0200 Subject: [PATCH 7/8] minor fix --- .../test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java | 4 ++-- .../src/test/java/org/baeldung/java/io/JavaFileUnitTest.java | 1 + core-java/src/test/resources/testFolder/sample_file_1.in | 1 + core-java/src/test/resources/testFolder/sample_file_2.in | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 core-java/src/test/resources/testFolder/sample_file_1.in create mode 100644 core-java/src/test/resources/testFolder/sample_file_2.in diff --git a/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java b/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java index 68b736096e..1f3b380772 100644 --- a/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java +++ b/core-java/src/test/java/com/baeldung/java8/JavaFolderSizeUnitTest.java @@ -19,13 +19,13 @@ import org.junit.Before; import org.junit.Test; public class JavaFolderSizeUnitTest { - private final long EXPECTED_SIZE = 381; + private final long EXPECTED_SIZE = 24; private String path; @Before public void init() { final String separator = File.separator; - path = String.format("src%stest%sresources", separator, separator); + path = String.format("src%stest%sresources%stestFolder", separator, separator, separator); } @Test diff --git a/core-java/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java b/core-java/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java index f4c52f3c65..4b56a97325 100644 --- a/core-java/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java +++ b/core-java/src/test/java/org/baeldung/java/io/JavaFileUnitTest.java @@ -76,6 +76,7 @@ public class JavaFileUnitTest { @Test public final void givenUsingApache_whenMovingFile_thenCorrect() throws IOException { + FileUtils.touch(new File("src/test/resources/fileToMove_apache.txt")); FileUtils.moveFile(FileUtils.getFile("src/test/resources/fileToMove_apache.txt"), FileUtils.getFile("src/test/resources/fileMoved_apache2.txt")); } diff --git a/core-java/src/test/resources/testFolder/sample_file_1.in b/core-java/src/test/resources/testFolder/sample_file_1.in new file mode 100644 index 0000000000..70c379b63f --- /dev/null +++ b/core-java/src/test/resources/testFolder/sample_file_1.in @@ -0,0 +1 @@ +Hello world \ No newline at end of file diff --git a/core-java/src/test/resources/testFolder/sample_file_2.in b/core-java/src/test/resources/testFolder/sample_file_2.in new file mode 100644 index 0000000000..93b493a513 --- /dev/null +++ b/core-java/src/test/resources/testFolder/sample_file_2.in @@ -0,0 +1 @@ +Hello world ! \ No newline at end of file From bd179cdcc12f42363ff67f016b3afe6e5b8a059c Mon Sep 17 00:00:00 2001 From: DOHA Date: Sat, 29 Oct 2016 19:23:17 +0200 Subject: [PATCH 8/8] minor fix --- junit5/src/test/java/com/baeldung/FirstTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/junit5/src/test/java/com/baeldung/FirstTest.java b/junit5/src/test/java/com/baeldung/FirstTest.java index 4fc6037174..3306dc01f9 100644 --- a/junit5/src/test/java/com/baeldung/FirstTest.java +++ b/junit5/src/test/java/com/baeldung/FirstTest.java @@ -19,6 +19,7 @@ class FirstTest { .sum() > 5, "Sum should be greater than 5"); } + @Disabled("test to show MultipleFailuresError") @Test void groupAssertions() { int[] numbers = {0, 1, 2, 3, 4};