Commit ab719908 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Remove previously deprecated "as_number" field. 

Still related to #23713.
parent 4029f0fc

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
   - Change "3_months" graphs to "6_months" graphs in all documents

     containing history objects.

   - Remove the "fingerprint" parameter.

   - Remove the previously deprecated "as_number" field from details

     documents.





# Changes in version 6.2-1.17.1 - 2018-08-17

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

+0 −19
Original line number Diff line number Diff line
@@ -204,33 +204,14 @@ public class DetailsDocument extends Document { 


  private String as;



  @Deprecated

  private String asNumber;



  public void setAs(String as) {

    this.as = escapeJson(as);

  }



  @Deprecated

  public void setAsNumber(String asNumber) {

    this.asNumber = escapeJson(asNumber);

  }



  @Deprecated

  public void setAsAndAsNumber(String asNumber) {

    this.as = escapeJson(asNumber);

    this.asNumber = escapeJson(asNumber);

  }



  public String getAs() {

    return unescapeJson(this.as);

  }



  @Deprecated

  public String getAsNumber() {

    return unescapeJson(this.asNumber);

  }



  private String asName;



  public void setAsName(String asName) {

src/main/java/org/torproject/onionoo/server/ResponseBuilder.java

+0 −3
Original line number Diff line number Diff line
@@ -299,9 +299,6 @@ public class ResponseBuilder { 
            case "as":

              dd.setAs(detailsDocument.getAs());

              break;

            case "as_number":

              dd.setAsNumber(detailsDocument.getAsNumber());

              break;

            case "as_name":

              dd.setAsName(detailsDocument.getAsName());

              break;

src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class DetailsDocumentWriter implements DocumentWriter { 
    detailsDocument.setCountryName(detailsStatus.getCountryName());

    detailsDocument.setRegionName(detailsStatus.getRegionName());

    detailsDocument.setCityName(detailsStatus.getCityName());

    detailsDocument.setAsAndAsNumber(detailsStatus.getAsNumber());

    detailsDocument.setAs(detailsStatus.getAsNumber());

    detailsDocument.setAsName(detailsStatus.getAsName());

    if (detailsStatus.isRunning()) {

      detailsDocument.setConsensusWeightFraction(