Merge pull request #1002 from commercetools/DEVX-657-Issue-retrieving-category-by-slug-in-Commercetools-SDK-v2-version-19.5.0

DEVX-657: overriding equals and hashCode for LocalizedStringEntry

Author: ShipilA

.git-blame-ignore-revs

@@ -15,3 +15,5 @@ af9205fa592e4ae32ceca951c560a48b512b7744
 6154ba1d1461d9279a305b52d8dd4b842e848545
 0b5dd8bee320456962d94cb845e9d27469a34091
 f58dd73747791edcd45722a4903da44da1b9b2d3
+fcdaa3d6735d2382a44d066a6ce051a2c5e6469f
+9bbe16b7d1600fc96100f54cb25869cbdf425521

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/category/CategoryTreeFactory.java

@@ -68,7 +68,7 @@ private Map<LocalizedStringEntry, Category> getLocalizedStringEntryCategoryMap(
                     .collect(Collectors.toSet());
             localesForTheCategory.forEach(locale -> {
                 final LocalizedStringEntry stringsEntry = LocalizedStringEntry.of(locale,
-                    category.getSlug().values().get(locale));
+                    category.getSlug().get(locale));
                 categoriesByLocaleAndSlug.put(stringsEntry, category);
             });
         });

commercetools/commercetools-sdk-java-api/src/main/java/com/commercetools/api/models/common/LocalizedStringEntry.java

@@ -33,6 +33,20 @@ public static LocalizedStringEntry of(final String languageTag, final String val
         return of(locale, value);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof LocalizedStringEntry) {
+            var e = (LocalizedStringEntry) o;
+            return locale.equals(e.locale) && value.equals(e.value);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return locale.hashCode() + value.hashCode();
+    }
+
     public Locale getLocale() {
         return locale;
     }

commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/CategoriesTest.java

@@ -2,8 +2,15 @@
 package com.commercetools;
 
 import java.net.URI;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Locale;
 
 import com.commercetools.api.client.ByProjectKeyCategoriesPost;
+import com.commercetools.api.models.category.Category;
+import com.commercetools.api.models.category.CategoryTreeFactory;
+import com.commercetools.api.models.common.LocalizedString;
+import com.commercetools.api.models.common.LocalizedStringEntry;
 
 import io.vrap.rmf.base.client.ApiHttpRequest;
 import io.vrap.rmf.base.client.SerializerOnlyApiHttpClient;
@@ -32,4 +39,31 @@ public void testImmutableUriWithHost() {
         Assertions.assertThat(newRequest.getUri().toString()).isEqualTo("https://example.com/test/categories");
         Assertions.assertThat(newRequest).isNotEqualTo(request);
     }
+
+    @Test
+    public void testLocalizedStringEntryEqualsOverride() {
+        var entry = LocalizedStringEntry.of("en", "women");
+        var entry2 = LocalizedStringEntry.of("en", "women");
+        var entry3 = LocalizedStringEntry.of("en", "woman");
+        Assertions.assertThat(entry).isEqualTo(entry2);
+        Assertions.assertThat(entry).isNotEqualTo(entry3);
+    }
+
+    @Test
+    public void testCategoryTree() {
+        List<Category> allCategoriesAsFlatList = List.of(Category.builder()
+                .name(LocalizedString.of(Locale.ENGLISH, "Women"))
+                .slug(LocalizedString.of(Locale.ENGLISH, "women"))
+                .id("1")
+                .version(1L)
+                .createdAt(ZonedDateTime.now())
+                .lastModifiedAt(ZonedDateTime.now())
+                .ancestors()
+                .orderHint("c2")
+                .build());
+        CategoryTreeFactory factory = CategoryTreeFactory.of();
+        var tree = factory.create(allCategoriesAsFlatList);
+        var result = tree.findBySlug(Locale.ENGLISH, "women");
+        Assertions.assertThat(result).isNotEmpty();
+    }
 }