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 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}; 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 87% 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..8fe3e96940 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,9 +6,10 @@ 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.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); 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 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