From 3bb924b8ea78a0195c2b56c663158b42ab70c546 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Apr 2023 18:56:25 +0200
Subject: [PATCH] Bump hibernate-core from 6.1.7.Final to 6.2.0.Final (#3011)

* Bump hibernate-core from 6.1.7.Final to 6.2.0.Final

Bumps [hibernate-core](https://github.com/hibernate/hibernate-orm) from 6.1.7.Final to 6.2.0.Final.
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/6.2.0/changelog.txt)
- [Commits](https://github.com/hibernate/hibernate-orm/compare/6.1.7...6.2.0)

---
updated-dependencies:
- dependency-name: org.hibernate.orm:hibernate-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix Hibernate API usage

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefano Cordio <stefano_cordio@epam.com>
---
 assertj-core/pom.xml                                      | 2 +-
 .../test/java/org/assertj/core/internal/MapsBaseTest.java | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/assertj-core/pom.xml b/assertj-core/pom.xml
index 13bbedfae7..3fef3b7831 100644
--- a/assertj-core/pom.xml
+++ b/assertj-core/pom.xml
@@ -140,7 +140,7 @@
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>6.1.7.Final</version>
+      <version>6.2.0.Final</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java b/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java
index 9153f75480..07d125fbe0 100644
--- a/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java
+++ b/assertj-core/src/test/java/org/assertj/core/internal/MapsBaseTest.java
@@ -35,6 +35,7 @@
 import org.assertj.core.api.AssertionInfo;
 import org.assertj.core.data.MapEntry;
 import org.assertj.core.test.WithPlayerData;
+import org.hibernate.collection.spi.CollectionSemantics;
 import org.hibernate.collection.spi.PersistentMap;
 import org.hibernate.collection.spi.PersistentSortedMap;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -83,12 +84,17 @@ private static <K, V, T extends PersistentMap<K, V>> T hibernateMap(Function<Sha
     T persistentMap = supplier.apply(session);
 
     CollectionPersister persister = mock(CollectionPersister.class, RETURNS_DEEP_STUBS);
-    when(persister.getCollectionType().instantiate(0)).thenReturn(innerMapSupplier.get());
+    when(getCollectionSemantics(persister).instantiateRaw(0, persister)).thenReturn(innerMapSupplier.get());
 
     persistentMap.initializeEmptyCollection(persister);
     return persistentMap;
   }
 
+  @SuppressWarnings("unchecked")
+  private static CollectionSemantics<Object, ?> getCollectionSemantics(CollectionPersister persister) {
+    return (CollectionSemantics<Object, ?>) persister.getCollectionSemantics();
+  }
+
   protected Map<String, String> actual;
   protected Failures failures;
   protected Maps maps;