Commit a63f87d0 authored by Hiro's avatar Hiro 🏄
Browse files

Resolve "add FamilyIDs to details document"

parent 75dc68b2

build.xml

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  <property name="onionoo.protocol.version" value="8.3"/>

  <property name="release.version"

            value="${onionoo.protocol.version}-1.30.0-dev"/>

  <property name="metricslibversion" value="2.19.0"/>

  <property name="metricslibversion" value="2.28.0"/>

  <property name="jetty.version" value="-9.4.52.v20230823" />

  <property name="warfile"

            value="onionoo-${release.version}.war"/>
@@ -48,9 +48,9 @@ 
    <include name="commons-codec-1.15.jar"/>

    <include name="commons-compress-1.13.jar"/>

    <include name="commons-lang3-3.5.jar"/>

    <include name="jackson-annotations-2.8.6.jar"/>

    <include name="jackson-core-2.8.6.jar"/>

    <include name="jackson-databind-2.8.6.jar"/>

    <include name="jackson-annotations-2.15.3.jar"/>

    <include name="jackson-core-2.15.3.jar"/>

    <include name="jackson-databind-2.15.3.jar"/>

    <include name="logback-classic-1.1.9.jar"/>

    <include name="logback-core-1.1.9.jar"/>

    <include name="slf4j-api-1.7.22.jar"/>

build @ 665ab024

Compare 467f5e13 to 665ab024
Original line number Diff line number Diff line 
Subproject commit 467f5e132c71b9dbbcdc2513927a742f6b1e43a1
 
Subproject commit 665ab024daba01df34cdf6ada5f1c5666102c351

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

+21 −0
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
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
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(