Release 10.6.1

pom.xml

@@ -3,7 +3,7 @@
 
   <groupId>com.contentful.java</groupId>
   <artifactId>java-sdk</artifactId>
-  <version>10.6.0</version>
+  <version>10.6.1</version>
   <packaging>jar</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

src/test/java/com/contentful/java/cda/ContentTypeTest.java

@@ -30,7 +30,7 @@ public void manuallyFetchedContentTypeIsCached() {
 
     CDAContentType fake = client.fetch(CDAContentType.class).one("fake");
     assertThat(client.cache.types()).hasSize(6);
-    assertThat(client.cache.types().get(fake.id())).isSameAs(fake);
+    assertThat(client.cache.types().get(fake.id())).isSameInstanceAs(fake);
   }
 
   @Test

src/test/java/com/contentful/java/cda/EntryTest.java

@@ -227,7 +227,7 @@ private void assertNyanCat(CDAEntry entry) {
 
     Object bestFriend = entry.getField("bestFriend");
     assertThat(bestFriend).isInstanceOf(CDAEntry.class);
-    assertThat(entry).isSameAs(((CDAEntry) bestFriend).getField("bestFriend"));
+    assertThat(entry).isSameInstanceAs(((CDAEntry) bestFriend).getField("bestFriend"));
 
     // Localization
     assertThat(entry.defaultLocale).isEqualTo("en-US");
@@ -246,7 +246,7 @@ public void arrayItemsContainOnlyTopLevelEntries() {
 
     assertThat(array.items()).hasSize(1);
     assertThat(array.entries()).hasSize(2);
-    assertThat(array.entries().values()).containsAllIn(array.items());
+    assertThat(array.entries().values()).containsAtLeastElementsIn(array.items());
 
     CDAEntry parent = array.entries().get("7Avw18DWveMI60a0WWwyCi");
     assertThat(parent).isNotNull();

src/test/java/com/contentful/java/cda/ResourceFactoryUnitTest.java

@@ -45,7 +45,7 @@ public void testPreserveOrderOfElements() {
     final Response<CDAArray> inputArrayResponse = Response.success(inputArray);
     final CDAArray outputArray = ResourceFactory.array(inputArrayResponse, client);
 
-    assertThat(outputArray.entries().values()).containsAllIn(inputArray.items);
+    assertThat(outputArray.entries().values()).containsAtLeastElementsIn(inputArray.items);
   }
 
   private CDAEntry createCdaEntry(String id) {

src/test/java/com/contentful/java/cda/SyncTest.java

@@ -48,7 +48,7 @@ private void assertUpdate(SynchronizedSpace space) {
     assertThat(nyanCat.<String>getField("color")).isEqualTo("red");
     likes = nyanCat.getField("likes");
     assertThat(likes).containsExactly("a", "b", "c");
-    assertThat(nyanCat.<CDAEntry>getField("bestFriend")).isSameAs(superCat);
+    assertThat(nyanCat.<CDAEntry>getField("bestFriend")).isSameInstanceAs(superCat);
   }
 
   private void assertInitial(SynchronizedSpace space) {

src/test/java/com/contentful/java/cda/TransformedEntriesTest.java

@@ -120,7 +120,7 @@ protected void onSuccess(Collection<Cat> result) {
 
     assertThat(catsCaught.size()).isEqualTo(3);
     assertThat(catsCaught.stream().map(it -> it.name).toArray())
-        .asList().containsAllOf("Happy Cat", "Garfield", "Nyan Cat");
+        .asList().containsAtLeast("Happy Cat", "Garfield", "Nyan Cat");
   }
 
   @ContentfulEntryModel("post")

src/test/java/com/contentful/java/cda/integration/Integration.java

@@ -784,7 +784,7 @@ void assertNyanCat(CDAEntry entry) {
 
     Object bestFriend = entry.getField("bestFriend");
     assertThat(bestFriend).isInstanceOf(CDAEntry.class);
-    assertThat(entry).isSameAs(((CDAEntry) bestFriend).getField("bestFriend"));
+    assertThat(entry).isSameInstanceAs(((CDAEntry) bestFriend).getField("bestFriend"));
 
     // Localization
     final LocalizedResource.Localizer localizedCat = entry.localize("tlh");

src/test/java/com/contentful/java/cda/integration/IntegrationWithMasterEnvironment.java

@@ -62,7 +62,7 @@ public class IntegrationWithMasterEnvironment extends Integration {
 
     Object bestFriend = entry.getField("bestFriend");
     assertThat(bestFriend).isInstanceOf(CDAEntry.class);
-    assertThat(entry).isSameAs(((CDAEntry) bestFriend).getField("bestFriend"));
+    assertThat(entry).isSameInstanceAs(((CDAEntry) bestFriend).getField("bestFriend"));
 
     // Localization
     final LocalizedResource.Localizer localized = entry.localize("tlh");