Merge branch 'eugenp:master' into master

apache-libraries/pom.xml

@@ -191,7 +191,7 @@
         <bval.version>2.0.6</bval.version>
         <javax.validation.validation-api.version>2.0.1.Final</javax.validation.validation-api.version>
         <meecrowave-junit.version>1.2.15</meecrowave-junit.version>
-        <okhttp.version>3.10.0</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
         <meecrowave-jpa.version>1.2.15</meecrowave-jpa.version>
         <meecrowave-core.version>1.2.15</meecrowave-core.version>
         <meecrowave-maven-plugin.version>1.2.15</meecrowave-maven-plugin.version>

core-java-modules/core-java-lang-oop-types-2/src/test/java/com/baeldung/enums/classcheck/CheckClassIsEnumUnitTest.java

@@ -0,0 +1,75 @@
+package com.baeldung.enums.classcheck;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+enum Device {
+    Keyboard, Monitor, Mouse, Printer
+}
+
+enum Weekday {
+    Monday, Tuesday, Wednesday, Thursday, Friday,
+    Saturday {
+        @Override
+        boolean isWeekend() {
+            return true;
+        }
+    },
+    Sunday {
+        @Override
+        boolean isWeekend() {
+            return true;
+        }
+    };
+
+    boolean isWeekend() {
+        return false;
+    }
+}
+
+public class CheckClassIsEnumUnitTest {
+
+    @Test
+    void whenUsingInstanceOf_thenGetExpectedResult() {
+        Object obj = Device.Keyboard;
+        assertTrue(obj instanceof Enum);
+    }
+
+    @Test
+    void whenUsingisInstance_thenGetExpectedResult() {
+        Object obj = Device.Keyboard;
+        assertTrue(Enum.class.isInstance(obj));
+    }
+
+    @Test
+    void whenUsingEnumClassisAssignableFrom_thenGetExpectedResult() {
+        Object obj = Device.Keyboard;
+        assertTrue(Enum.class.isAssignableFrom(obj.getClass()));
+    }
+
+    @Test
+    void whenUsingGetClassIsEnum_thenGetExpectedResult() {
+        assertTrue(Device.class.isEnum());
+
+        Object obj = Device.Keyboard;
+        assertTrue(obj.getClass().isEnum());
+    }
+
+
+    @Test
+    void whenEnum_thenGetExpectedResult() {
+        Object monday = Weekday.Monday;
+        assertTrue(monday instanceof Enum);
+        assertTrue(Enum.class.isInstance(monday));
+        assertTrue(Enum.class.isAssignableFrom(monday.getClass()));
+        assertTrue(monday.getClass().isEnum());
+
+        Object sunday = Weekday.Sunday;
+        assertTrue(sunday instanceof Enum);
+        assertTrue(Enum.class.isInstance(sunday));
+        assertTrue(Enum.class.isAssignableFrom(sunday.getClass()));
+        assertFalse(sunday.getClass().isEnum()); // <-- isEnum() check failed when Enum values with body
+    }
+}

java-spi/exchange-rate-impl/pom.xml

@@ -65,7 +65,7 @@
 
     <properties>
         <exchange-rate-api.version>1.0.0-SNAPSHOT</exchange-rate-api.version>
-        <okhttp.version>3.10.0</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
         <javax.json.bind-api.version>1.0</javax.json.bind-api.version>
         <yasson.version>1.0.1</yasson.version>
         <javax.json.version>1.1.2</javax.json.version>

javaxval-2/pom.xml

@@ -9,26 +9,24 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
-            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.databind.version}</version>
         </dependency>
     </dependencies>
 
@@ -42,9 +40,16 @@
     <!--<version>${hibernate-validator.ap.version}</version> </path> </annotationProcessorPaths> </configuration> -->
     <!--</plugin> </plugins> </build> -->
 
-    <properties>
-        <spring.boot.version>3.0.4</spring.boot.version>
-        <jackson.databind.version>2.14.0</jackson.databind.version>
-    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

javaxval-2/src/test/java/com/baeldung/javaxval/afterdeserialization/StudentDeserializerWithValidationUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.javaxval;
+package com.baeldung.javaxval.afterdeserialization;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

javaxval/pom.xml

@@ -8,20 +8,19 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
-            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -38,7 +37,6 @@
 
     <properties>
         <hibernate-validator.ap.version>8.0.1.Final</hibernate-validator.ap.version>
-        <spring.boot.version>3.0.4</spring.boot.version>
     </properties>
 
 </project>

libraries-http-2/pom.xml

@@ -109,7 +109,7 @@
     </build>
 
     <properties>
-        <okhttp.version>4.9.1</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
         <gson.version>2.10.1</gson.version>
         <mockwebserver.version>4.9.1</mockwebserver.version>
         <jetty.httpclient.version>1.0.3</jetty.httpclient.version>

libraries-http/pom.xml

@@ -105,7 +105,7 @@
     <properties>
         <gson.version>2.10.1</gson.version>
         <httpclient.version>4.5.3</httpclient.version>
-        <com.squareup.okhttp3.version>4.9.1</com.squareup.okhttp3.version>
+        <com.squareup.okhttp3.version>4.12.0</com.squareup.okhttp3.version>
         <googleclient.version>1.23.0</googleclient.version>
         <async.http.client.version>2.2.0</async.http.client.version>
         <retrofit.version>2.3.0</retrofit.version>

osgi/pom.xml

@@ -91,7 +91,7 @@
     </build>
 
     <properties>
-        <okhttp.version>3.9.0</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
         <javax.json.version>1.1</javax.json.version>
         <osgi.version>6.0.0</osgi.version>
         <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>

persistence-modules/spring-data-jpa-enterprise-2/README.md

@@ -4,8 +4,7 @@ This module contains articles about Spring Data JPA used in enterprise applicati
 
 ### Relevant Articles: 
 
-- [Spring JPA – Multiple Databases](https://www.baeldung.com/spring-data-jpa-multiple-databases)
-- [Pagination and Sorting using Spring Data JPA](https://www.baeldung.com/spring-data-jpa-pagination-sorting)
+
 
 ### Eclipse Config 
 After importing the project into Eclipse, you may see the following error:  

persistence-modules/spring-data-jpa-enterprise/README.md

@@ -11,6 +11,8 @@ This module contains articles about Spring Data JPA used in enterprise applicati
 - [Custom Naming Convention with Spring Data JPA](https://www.baeldung.com/spring-data-jpa-custom-naming)
 - [Partial Data Update With Spring Data](https://www.baeldung.com/spring-data-partial-update)
 - [Spring Data JPA @Modifying Annotation](https://www.baeldung.com/spring-data-jpa-modifying-annotation)
+- [Spring JPA – Multiple Databases](https://www.baeldung.com/spring-data-jpa-multiple-databases)
+- [Pagination and Sorting using Spring Data JPA](https://www.baeldung.com/spring-data-jpa-pagination-sorting)
 
 ### Eclipse Config 
 After importing the project into Eclipse, you may see the following error:  

persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/multipledb/PersistenceProductConfiguration.java

@@ -1,6 +1,9 @@
 package com.baeldung.multipledb;
 
-import com.google.common.base.Preconditions;
+import java.util.HashMap;
+
+import javax.sql.DataSource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,8 +17,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import javax.sql.DataSource;
-import java.util.HashMap;
+import com.google.common.base.Preconditions;
 
 @Configuration
 @PropertySource({"classpath:persistence-multiple-db.properties"})

persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/multipledb/PersistenceUserConfiguration.java

@@ -1,8 +1,15 @@
 package com.baeldung.multipledb;
 
-import com.google.common.base.Preconditions;
+import java.util.HashMap;
+
+import javax.sql.DataSource;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.*;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
@@ -11,8 +18,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import javax.sql.DataSource;
-import java.util.HashMap;
+import com.google.common.base.Preconditions;
 
 @Configuration
 @PropertySource({"classpath:persistence-multiple-db.properties"})

persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/multipledb/model/user/Possession.java

@@ -1,6 +1,10 @@
 package com.baeldung.multipledb.model.user;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 @Entity
 @Table

persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/multipledb/model/user/User.java

@@ -1,9 +1,15 @@
 package com.baeldung.multipledb.model.user;
 
-import javax.persistence.*;
-
 import java.util.List;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
 @Entity
 @Table(name = "users")
 public class User {

spring-reactive-modules/spring-reactive-client/pom.xml

@@ -179,7 +179,7 @@
         <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>
         <jetty-reactive-httpclient.version>1.1.6</jetty-reactive-httpclient.version>
-        <okhttp.version>4.0.1</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
         <reactor-test.version>3.5.3</reactor-test.version>
         <wiremock-standalone.version>2.26.0</wiremock-standalone.version>
         <spring-cloud-starter-openfeign.version>3.1.4</spring-cloud-starter-openfeign.version>

spring-web-modules/pom.xml

@@ -44,6 +44,7 @@
         <module>spring-rest-simple</module>
         <module>spring-rest-testing</module>
         <module>spring-resttemplate</module>
+        <module>spring-resttemplate-1</module>
         <module>spring-resttemplate-2</module>
         <module>spring-resttemplate-3</module>
         <module>spring-session</module>

spring-web-modules/spring-mvc-java-2/README.md

@@ -1,9 +1,7 @@
 ### Relevant Articles:
 
 - [Cache Headers in Spring MVC](https://www.baeldung.com/spring-mvc-cache-headers)
-- [Working with Date Parameters in Spring](https://www.baeldung.com/spring-date-parameters)
 - [Spring MVC @PathVariable with a dot (.) gets truncated](https://www.baeldung.com/spring-mvc-pathvariable-dot)
 - [A Quick Guide to Spring MVC Matrix Variables](https://www.baeldung.com/spring-mvc-matrix-variables)
 - [Converting a Spring MultipartFile to a File](https://www.baeldung.com/spring-multipartfile-to-file)
 - [Testing a Spring Multipart POST Request](https://www.baeldung.com/spring-multipart-post-request-test)
-- [Spring @PathVariable Annotation](https://www.baeldung.com/spring-pathvariable)

spring-web-modules/spring-mvc-java/README.md

@@ -14,3 +14,6 @@ The "REST With Spring" Classes: https://bit.ly/restwithspring
 - [web.xml vs Initializer with Spring](https://www.baeldung.com/spring-xml-vs-java-config)
 - [A Java Web Application Without a web.xml](https://www.baeldung.com/java-web-app-without-web-xml)
 - [Accessing Spring MVC Model Objects in JavaScript](https://www.baeldung.com/spring-mvc-model-objects-js)
+- [Spring @PathVariable Annotation](https://www.baeldung.com/spring-pathvariable)
+- [Working with Date Parameters in Spring](https://www.baeldung.com/spring-date-parameters)
+