Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-03-26 23:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicates in GET /arbitrary/hosted/resources response

Browse Source
This commit is contained in:
CalDescent 2022-01-20 22:34:41 +00:00
parent fcdcc939e6
commit 54af36fb85
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -400,7 +400,9 @@ public class ArbitraryResource {
arbitraryResourceInfo.name = transactionData.getName(); arbitraryResourceInfo.name = transactionData.getName();
arbitraryResourceInfo.service = transactionData.getService(); arbitraryResourceInfo.service = transactionData.getService();
arbitraryResourceInfo.identifier = transactionData.getIdentifier(); arbitraryResourceInfo.identifier = transactionData.getIdentifier();
resources.add(arbitraryResourceInfo); if (!resources.contains(arbitraryResourceInfo)) {
resources.add(arbitraryResourceInfo);
}
} }
if (includeStatus != null && includeStatus == true) { if (includeStatus != null && includeStatus == true) {

16
src/main/java/org/qortal/data/arbitrary/ArbitraryResourceInfo.java
View File

@ -4,6 +4,7 @@ import org.qortal.arbitrary.misc.Service;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import java.util.Objects;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ArbitraryResourceInfo { public class ArbitraryResourceInfo {
@ -16,4 +17,19 @@ public class ArbitraryResourceInfo {
public ArbitraryResourceInfo() { public ArbitraryResourceInfo() {
} }
@Override
public boolean equals(Object o) {
if (o == this)
return true;
if (!(o instanceof ArbitraryResourceInfo))
return false;
ArbitraryResourceInfo other = (ArbitraryResourceInfo) o;
return Objects.equals(this.name, other.name) &&
Objects.equals(this.service, other.service) &&
Objects.equals(this.identifier, other.identifier);
}
} }