Skip to content

Commit a234264

Browse files
author
Ravi Nadahar
committed
Address review comments
Signed-off-by: Ravi Nadahar <nadahar@rediffmail.com>
1 parent 9ec0d57 commit a234264

4 files changed

Lines changed: 7 additions & 13 deletions

File tree

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/CommunityMarketplaceAddonService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ protected List<Addon> getRemoteAddons() {
187187
}
188188

189189
List<DiscourseUser> users = pages.stream().flatMap(p -> Stream.of(p.users)).toList();
190-
pages.stream().flatMap(p -> Stream.of(p.topicList.topics))
191-
.filter(t -> showUnpublished || List.of(t.tags).contains(PUBLISHED_TAG))
190+
pages.stream().flatMap(p -> Stream.of(p.topicList.topics)).filter(t -> showUnpublished
191+
|| (t.tags != null && Arrays.stream(t.tags).anyMatch(tag -> PUBLISHED_TAG.equals(tag.name))))
192192
.map(t -> Optional.ofNullable(convertTopicItemToAddon(t, users)))
193193
.forEach(a -> a.ifPresent(addons::add));
194194
} catch (Exception e) {

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/model/DiscourseCategoryResponseDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
import java.util.Date;
1616

17-
import org.openhab.core.addon.marketplace.internal.community.model.TagDTO.Tag;
18-
1917
import com.google.gson.annotations.SerializedName;
2018

2119
/**
@@ -55,7 +53,7 @@ public static class DiscourseTopicItem {
5553
public Integer id;
5654
public String title;
5755
public String slug;
58-
public Tag[] tags;
56+
public TagDTO[] tags;
5957
@SerializedName("posts_count")
6058
public Integer postsCount;
6159
@SerializedName("image_url")

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/model/DiscourseTopicResponseDTO.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
import java.util.Date;
1616

17-
import org.openhab.core.addon.marketplace.internal.community.model.TagDTO.Tag;
18-
1917
import com.google.gson.annotations.SerializedName;
2018

2119
/**
@@ -46,7 +44,7 @@ public class DiscourseTopicResponseDTO {
4644
public Integer likeCount;
4745
public Integer views;
4846

49-
public Tag[] tags;
47+
public TagDTO[] tags;
5048
@SerializedName("category_id")
5149
public Integer categoryId;
5250

bundles/org.openhab.core.addon.marketplace/src/main/java/org/openhab/core/addon/marketplace/internal/community/model/TagDTO.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
* @author Ravi Nadahar - Initial contribution
1919
*/
2020
public class TagDTO {
21-
public static class Tag {
22-
public Integer id;
23-
public String name;
24-
public String slug;
25-
}
21+
public Integer id;
22+
public String name;
23+
public String slug;
2624
}

0 commit comments

Comments
 (0)