diff --git a/core-java-modules/core-java-concurrency-advanced-3/pom.xml b/core-java-modules/core-java-concurrency-advanced-3/pom.xml index cd3e9ed170..d09b0d55e8 100644 --- a/core-java-modules/core-java-concurrency-advanced-3/pom.xml +++ b/core-java-modules/core-java-concurrency-advanced-3/pom.xml @@ -86,7 +86,7 @@ 1.8 0.22.6 1.9.20.1 - 0.43 + 0.55.0 1.2.3 0.14.1 1.9.20.1 diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml index 33650b4f7f..d0589ac59b 100644 --- a/libraries-3/pom.xml +++ b/libraries-3/pom.xml @@ -168,7 +168,7 @@ - 0.22.6 + 0.26.0 1.9.20.1 0.14.1 1.9.20.1 diff --git a/libraries-data-3/pom.xml b/libraries-data-3/pom.xml index 35da822e7c..b32e5b5bf5 100644 --- a/libraries-data-3/pom.xml +++ b/libraries-data-3/pom.xml @@ -100,7 +100,7 @@ 1.2 0.7.0 3.24ea1 - 0.43 + 0.55.0 1.2.3.Final 2.1.2 8.2.0 diff --git a/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosCollectionUtils.java b/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosCollectionUtils.java index 717c63ae63..e3664e6b18 100644 --- a/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosCollectionUtils.java +++ b/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosCollectionUtils.java @@ -3,10 +3,13 @@ package com.baeldung.cactoos; import java.util.Collection; import java.util.List; -import org.cactoos.collection.Filtered; +import org.cactoos.func.FuncOf; +import org.cactoos.iterable.Filtered; import org.cactoos.iterable.IterableOf; +import org.cactoos.iterable.Mapped; import org.cactoos.list.ListOf; import org.cactoos.scalar.And; +import org.cactoos.scalar.True; import org.cactoos.text.FormattedText; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,13 +19,24 @@ public class CactoosCollectionUtils { final Logger LOGGER = LoggerFactory.getLogger(CactoosCollectionUtils.class); public void iterateCollection(List strings) throws Exception { - new And((String input) -> LOGGER.info(new FormattedText("%s\n", input).asString()), strings).value(); + new And( + new Mapped<>( + new FuncOf<>( + input -> System.out.printf("Item: %s\n", input), + new True() + ), + strings + ) + ).value(); } public Collection getFilteredList(List strings) { - Collection filteredStrings = new ListOf<>( - new Filtered<>(string -> string.length() == 5, new IterableOf<>(strings))); - return filteredStrings; + return new ListOf<>( + new Filtered<>( + s -> s.length() == 5, + strings + ) + ); } } diff --git a/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosStringUtils.java b/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosStringUtils.java index 3e2903ebf4..af82ad1ca4 100644 --- a/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosStringUtils.java +++ b/libraries-data-3/src/main/java/com/baeldung/cactoos/CactoosStringUtils.java @@ -10,17 +10,17 @@ import org.cactoos.text.Upper; public class CactoosStringUtils { - public String createString() throws IOException { + public String createString() throws Exception { String testString = new TextOf("Test String").asString(); return testString; } - public String createdFormattedString(String stringToFormat) throws IOException { + public String createdFormattedString(String stringToFormat) throws Exception { String formattedString = new FormattedText("Hello %s", stringToFormat).asString(); return formattedString; } - public String toLowerCase(String testString) throws IOException { + public String toLowerCase(String testString) throws Exception { String lowerCaseString = new Lowered(new TextOf(testString)).asString(); return lowerCaseString; } diff --git a/libraries-data-3/src/test/java/com/baeldung/cactoos/CactoosStringUtilsUnitTest.java b/libraries-data-3/src/test/java/com/baeldung/cactoos/CactoosStringUtilsUnitTest.java index 67dd6d91e4..00762e1ce6 100644 --- a/libraries-data-3/src/test/java/com/baeldung/cactoos/CactoosStringUtilsUnitTest.java +++ b/libraries-data-3/src/test/java/com/baeldung/cactoos/CactoosStringUtilsUnitTest.java @@ -9,7 +9,7 @@ import org.junit.Test; public class CactoosStringUtilsUnitTest { @Test - public void whenFormattedTextIsPassedWithArgs_thenFormattedStringIsReturned() throws IOException { + public void whenFormattedTextIsPassedWithArgs_thenFormattedStringIsReturned() throws Exception { CactoosStringUtils obj = new CactoosStringUtils(); diff --git a/spring-swagger-codegen/spring-openapi-generator-api-client/build.gradle b/spring-swagger-codegen/spring-openapi-generator-api-client/build.gradle index 595676158b..dba5c91e4e 100644 --- a/spring-swagger-codegen/spring-openapi-generator-api-client/build.gradle +++ b/spring-swagger-codegen/spring-openapi-generator-api-client/build.gradle @@ -100,9 +100,8 @@ ext { jackson_databind_version = "2.10.1" jackson_databind_nullable_version = "0.2.1" spring_web_version = "4.3.9.RELEASE" - jodatime_version = "2.9.9" junit_version = "4.13" - jackson_threeten_version = "2.9.10" + jackson_threeten_version = "2.15.2" } dependencies { diff --git a/spring-swagger-codegen/spring-openapi-generator-api-client/pom.xml b/spring-swagger-codegen/spring-openapi-generator-api-client/pom.xml index 91c8561652..1d99f0d439 100644 --- a/spring-swagger-codegen/spring-openapi-generator-api-client/pom.xml +++ b/spring-swagger-codegen/spring-openapi-generator-api-client/pom.xml @@ -266,7 +266,7 @@ 2.11.1 0.2.1 - 2.9.10 + 2.15.2 1.0.0 5.8.1 1.3.2 diff --git a/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/CustomInstantDeserializer.java b/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/CustomInstantDeserializer.java index 6957818fb4..01627bfb45 100644 --- a/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/CustomInstantDeserializer.java +++ b/spring-swagger-codegen/spring-openapi-generator-api-client/src/main/java/com/baeldung/petstore/client/invoker/CustomInstantDeserializer.java @@ -1,5 +1,6 @@ package com.baeldung.petstore.client.invoker; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonTokenId; import com.fasterxml.jackson.databind.DeserializationContext; @@ -148,11 +149,18 @@ public class CustomInstantDeserializer } @Override - protected JsonDeserializer withDateFormat(DateTimeFormatter dtf) { - if (dtf == _formatter) { - return this; - } - return new CustomInstantDeserializer(this, dtf); + protected ThreeTenDateTimeDeserializerBase withDateFormat(DateTimeFormatter dateTimeFormatter) { + return null; + } + + @Override + protected ThreeTenDateTimeDeserializerBase withLeniency(Boolean aBoolean) { + return null; + } + + @Override + protected ThreeTenDateTimeDeserializerBase withShape(JsonFormat.Shape shape) { + return null; } @Override diff --git a/spring-swagger-codegen/spring-swagger-codegen-api-client/build.gradle b/spring-swagger-codegen/spring-swagger-codegen-api-client/build.gradle index d1818ba78b..41ba18da76 100644 --- a/spring-swagger-codegen/spring-swagger-codegen-api-client/build.gradle +++ b/spring-swagger-codegen/spring-swagger-codegen-api-client/build.gradle @@ -97,7 +97,7 @@ ext { swagger_annotations_version = "1.5.15" jackson_version = "2.13.3" spring_web_version = "4.3.9.RELEASE" - jodatime_version = "2.9.9" + jodatime_version = "2.12.7" junit_version = "4.12" } diff --git a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml index 5ad15f6851..7a6165cd97 100644 --- a/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml +++ b/spring-swagger-codegen/spring-swagger-codegen-api-client/pom.xml @@ -190,7 +190,7 @@ 1.5.15 4.3.9.RELEASE - 2.9.9 + 2.12.7 1.3.2 2.2 1.5