Resolve "add FamilyIDs to details document"

Hirorequested to merge
40051-add-familyids-to-details-document into master

Merge request reports

src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java

+21 −0
Changes for src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -429,6 +429,27 @@ public class DetailsDocument extends Document { 
    return this.indirectFamily;

  }



  private List<String> familyIds;



  public void setFamilyIds(List<String> familyIds) {

    this.familyIds = (familyIds != null && !familyIds.isEmpty())

        ? familyIds : null;

  }



  public List<String> getFamilyIds() {

    return this.familyIds;

  }



  private String familyCert;



  public void setFamilyCert(String familyCert) {

    this.familyCert = familyCert;

  }



  public String getFamilyCert() {

    return this.familyCert;

  }



  private Float consensusWeightFraction;



  /** Sets the consensus weight fraction to the given value, but only if

src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java

+21 −0
Changes for src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -162,6 +162,27 @@ public class DetailsStatus extends Document { 
    return this.indirectFamily;

  }



  private List<String> familyIds;



  public void setFamilyIds(List<String> familyIds) {

    this.familyIds = (familyIds != null && !familyIds.isEmpty())

        ? familyIds : null;

  }



  public List<String> getFamilyIds() {

    return this.familyIds;

  }



  private String familyCert;



  public void setFamilyCert(String familyCert) {

    this.familyCert = familyCert;

  }



  public String getFamilyCert() {

    return this.familyCert;

  }



  private Map<String, List<String>> exitPolicyV6Summary;



  public void setExitPolicyV6Summary(

src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java

+1 −1
Changes for src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ public class DocumentStore { 
        relayFlags, consensusWeight, countryCode, firstSeenMillis,

        asNumber, asName, contact, family, version, operatingSystem,

        verifiedHostNames, unverifiedHostNames,

        recommendedVersion, overloadStatus, transports);

        recommendedVersion, overloadStatus, transports, null, null);

  }



  private <T extends Document> T retrieveDocumentFile(

src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java

+27 −1
Changes for src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java: 27 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -372,6 +372,29 @@ public class SummaryDocument extends Document { 
    return this.transports;

  }



  @JsonProperty("fi")

  private List<String> familyIds;



  public void setFamilyIds(List<String> familyIds) {

    this.familyIds = (familyIds != null && !familyIds.isEmpty())

        ? familyIds : null;

  }



  public List<String> getFamilyIds() {

    return this.familyIds;

  }



  @JsonProperty("fc")

  private String familyCert;



  public void setFamilyCert(String familyCert) {

    this.familyCert = familyCert;

  }



  public String getFamilyCert() {

    return this.familyCert;

  }



  /** Instantiate an empty summary document. */

  public SummaryDocument() {

    /* empty */
@@ -385,7 +408,8 @@ public class SummaryDocument extends Document { 
      String contact, SortedSet<String> effectiveFamily, String version,

      String operatingSystem, SortedSet<String> verifiedHostNames,

      SortedSet<String> unverifiedHostNames, Boolean recommendedVersion,

      Boolean overloadStatus, List<String> transports) {

      Boolean overloadStatus, List<String> transports,

      List<String> familyIds, String familyCert) {

    this.setRelay(isRelay);

    this.setNickname(nickname);

    this.setFingerprint(fingerprint);
@@ -407,5 +431,7 @@ public class SummaryDocument extends Document { 
    this.setRecommendedVersion(recommendedVersion);

    this.setOverloadStatus(overloadStatus);

    this.setTransports(transports);

    this.setFamilyIds(familyIds);

    this.setFamilyCert(familyCert);

  }

}

src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java

+22 −0
Changes for src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -296,4 +296,26 @@ class NodeIndex { 
  public Map<String, Set<String>> getBridgesByTransport() {

    return this.bridgesByTransport;

  }



  private Map<String, Set<String>> relaysByFamilyId = null;



  public void setRelaysByFamilyId(

      Map<String, Set<String>> relaysByFamilyId) {

    this.relaysByFamilyId = relaysByFamilyId;

  }



  public Map<String, Set<String>> getRelaysByFamilyId() {

    return this.relaysByFamilyId;

  }



  private Map<String, Set<String>> relaysByFamilyCertHash = null;



  public void setRelaysByFamilyCertHash(

      Map<String, Set<String>> relaysByFamilyCertHash) {

    this.relaysByFamilyCertHash = relaysByFamilyCertHash;

  }



  public Map<String, Set<String>> getRelaysByFamilyCertHash() {

    return this.relaysByFamilyCertHash;

  }

}