diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/WotRequirements.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/WotRequirements.java index b050da1d88bc915af8d5c0ae89e12ea4238faf6a..169cc8e38f3cf0baa95fded94a7e29876211acfb 100644 --- a/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/WotRequirements.java +++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/model/bma/WotRequirements.java @@ -20,6 +20,9 @@ public class WotRequirements implements Serializable { private Boolean isSentry; private Boolean wasMember; + + private Certification[] certifications; + public String getPubkey() { return pubkey; } @@ -92,11 +95,11 @@ public class WotRequirements implements Serializable { this.outdistanced = outdistanced; } - public Boolean getSentry() { + public Boolean getIsSentry() { return isSentry; } - public void setSentry(Boolean sentry) { + public void setIsSentry(Boolean sentry) { isSentry = sentry; } @@ -108,6 +111,15 @@ public class WotRequirements implements Serializable { this.wasMember = wasMember; } + + public Certification[] getCertifications() { + return certifications; + } + + public void setCertifications(Certification[] certifications) { + this.certifications = certifications; + } + public static class Meta implements Serializable { private String timestamp; @@ -119,4 +131,52 @@ public class WotRequirements implements Serializable { this.timestamp = timestamp; } } + + public static class Certification implements Serializable { + private long timestamp; + private String from; + private String to; + private String sig; + private long expiresIn; + + public long getTimestamp() { + return timestamp; + } + + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public String getSig() { + return sig; + } + + public void setSig(String sig) { + this.sig = sig; + } + + public long getExpiresIn() { + return expiresIn; + } + + public void setExpiresIn(long expiresIn) { + this.expiresIn = expiresIn; + } + } } \ No newline at end of file diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/WotRemoteServiceImpl.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/WotRemoteServiceImpl.java index 9fc355c4ebd1ff61b75bf82f5813ce23fea360fa..836fef7cd9eee4da4fa36c48e9b900a6a20bd66a 100644 --- a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/WotRemoteServiceImpl.java +++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/WotRemoteServiceImpl.java @@ -33,6 +33,7 @@ import org.duniter.core.client.model.bma.*; import org.duniter.core.client.model.local.*; import org.duniter.core.client.service.ServiceLocator; import org.duniter.core.client.service.exception.HttpBadRequestException; +import org.duniter.core.client.service.exception.HttpNotFoundException; import org.duniter.core.client.service.local.CurrencyService; import org.duniter.core.exception.TechnicalException; import org.duniter.core.service.CryptoService; @@ -193,7 +194,7 @@ public class WotRemoteServiceImpl extends BaseRemoteServiceImpl implements WotRe try { WotRequirementsResponse response = httpService.executeRequest(peer, String.format(URL_REQUIREMENT, pubKey), WotRequirementsResponse.class); return ImmutableList.copyOf(response.getIdentities()); - } catch (HttpBadRequestException e) { + } catch (HttpBadRequestException | HttpNotFoundException e) { log.debug(String.format("Unable to get memberships for {%.8s}", pubKey)); return null; }