Skip to content
Snippets Groups Projects

Iss #8 - Add distinct filter by name to the trademark output

Merged Iss #8 - Add distinct filter by name to the trademark output
Merged Martin Lowe requested to merge malowe/main/8 into main
2 files
+ 4
2
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -20,6 +20,7 @@ import org.eclipsefoundation.info.namespaces.InfoUrlParameterNames;
@@ -20,6 +20,7 @@ import org.eclipsefoundation.info.namespaces.InfoUrlParameterNames;
import org.eclipsefoundation.persistence.dao.PersistenceDao;
import org.eclipsefoundation.persistence.dao.PersistenceDao;
import org.eclipsefoundation.persistence.model.RDBMSQuery;
import org.eclipsefoundation.persistence.model.RDBMSQuery;
import org.eclipsefoundation.persistence.service.FilterService;
import org.eclipsefoundation.persistence.service.FilterService;
 
import org.eclipsefoundation.utils.helper.StreamHelper;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.NotFoundException;
@@ -88,6 +89,7 @@ public class TrademarkResources {
@@ -88,6 +89,7 @@ public class TrademarkResources {
private List<TrademarkData> mapTrademarkData(List<Trademark> trademarks) {
private List<TrademarkData> mapTrademarkData(List<Trademark> trademarks) {
return trademarks
return trademarks
.stream()
.stream()
 
.filter(StreamHelper.distinctByKey(Trademark::getName))
.map(t -> new TrademarkData(t.getCompositeId().getId(), t.getCompositeId().getCategory(), t.getName(), t.getDemarcation(),
.map(t -> new TrademarkData(t.getCompositeId().getId(), t.getCompositeId().getCategory(), t.getName(), t.getDemarcation(),
t.getType()))
t.getType()))
.toList();
.toList();
Loading