August 2018 - tor-commits - lists.torproject.org

[onionoo/master] Remove redundant initializers.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit d9cafd8e6b23f3520be78768272f08b180c2920f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:32:12 2018 +0200 Remove redundant initializers. --- src/main/java/org/torproject/onionoo/docs/ClientsHistory.java | 4 ++-- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 4 ++-- src/main/java/org/torproject/onionoo/docs/NodeStatus.java | 2 +- src/main/java/org/torproject/onionoo/docs/UptimeHistory.java | 2 +- .../org/torproject/onionoo/server/HttpServletResponseWrapper.java | 2 +- src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 4 ++-- .../java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java index 58e86e4..e4800e3 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java @@ -90,7 +90,7 @@ public class ClientsHistory implements Comparable<ClientsHistory> { + "'. Skipping."); return null; } - double totalResponses = 0.0; + double totalResponses; try { totalResponses = Double.parseDouble(parts[4]); } catch (NumberFormatException e) { @@ -125,7 +125,7 @@ public class ClientsHistory implements Comparable<ClientsHistory> { /* Logged by caller */ return null; } - double value = 0.0; + double value; try { value = Double.parseDouble(keyValue[1]); } catch (NumberFormatException e) { diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index af67d91..c5444c5 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -469,7 +469,7 @@ public class DocumentStore { + "directory."); return null; } - String documentString = null; + String documentString; try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); BufferedInputStream bis = new BufferedInputStream( new FileInputStream(documentFile))) { @@ -782,7 +782,7 @@ public class DocumentStore { StringBuilder sb = new StringBuilder(); for (SummaryDocument summaryDocument : this.cachedSummaryDocuments.values()) { - String line = null; + String line; try { line = objectMapper.writeValueAsString(summaryDocument); } catch (JsonProcessingException e) { diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index bef403b..fe55229 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -564,7 +564,7 @@ public class NodeStatus extends Document { SortedSet<String> orAddressesAndPorts = new TreeSet<>(); SortedSet<String> exitAddresses = new TreeSet<>(); String addresses = parts[3]; - String address = null; + String address; if (addresses.contains(";")) { String[] addressParts = addresses.split(";", -1); if (addressParts.length != 3) { diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index ef73a1c..0297b37 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -78,7 +78,7 @@ public class UptimeHistory implements Comparable<UptimeHistory> { + uptimeHistoryString + "'. Skipping."); return null; } - int uptimeHours = -1; + int uptimeHours; try { uptimeHours = Integer.parseInt(parts[2]); } catch (NumberFormatException e) { diff --git a/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java b/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java index f6888a4..4734e63 100644 --- a/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java +++ b/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; public class HttpServletResponseWrapper { - private HttpServletResponse response = null; + private HttpServletResponse response; protected HttpServletResponseWrapper(HttpServletResponse response) { this.response = response; diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 4257348..8f956a6 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -109,7 +109,7 @@ public class ResourceServlet extends HttpServlet { if (uri.startsWith("/onionoo/")) { uri = uri.substring("/onionoo".length()); } - String resourceType = null; + String resourceType; if (uri.startsWith("/summary")) { resourceType = "summary"; } else if (uri.startsWith("/details")) { @@ -388,7 +388,7 @@ public class ResourceServlet extends HttpServlet { rb.setBridgesSkipped(rh.getBridgesSkipped()); rb.setRelaysTruncated(rh.getRelaysTruncated()); rb.setBridgesTruncated(rh.getBridgesTruncated()); - String[] fields = null; + String[] fields; if (parameterMap.containsKey("fields")) { fields = this.parseFieldsParameter(parameterMap.get("fields")); if (fields == null) { diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 054ccf5..7223e5a 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -458,7 +458,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, for (String fingerprint : previouslyKnownNodes) { NodeStatus nodeStatus = this.documentStore.retrieve( NodeStatus.class, true, fingerprint); - NodeStatus updatedNodeStatus = null; + NodeStatus updatedNodeStatus; if (this.knownNodes.containsKey(fingerprint)) { updatedNodeStatus = this.knownNodes.get(fingerprint); String address = nodeStatus.getAddress();

1 0

[onionoo/master] Delete methods that only call their super.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 0e11a8d1382867f119ff8f4d6a32b8178d4f8008 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:16:18 2018 +0200 Delete methods that only call their super. --- .../org/torproject/onionoo/docs/DateTimeHelper.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java b/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java index 7966af8..9162edc 100644 --- a/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java +++ b/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java @@ -73,24 +73,7 @@ public class DateTimeHelper { public static final String DATEHOUR_NOSPACE_FORMAT = "yyyy-MM-dd-HH"; private static ThreadLocal<Map<String, DateFormat>> dateFormats = - new ThreadLocal<Map<String, DateFormat>>() { - - public Map<String, DateFormat> get() { - return super.get(); - } - - protected Map<String, DateFormat> initialValue() { - return new HashMap<>(); - } - - public void remove() { - super.remove(); - } - - public void set(Map<String, DateFormat> value) { - super.set(value); - } - }; + ThreadLocal.withInitial(HashMap::new); private static DateFormat getDateFormat(String format) { Map<String, DateFormat> threadDateFormats = dateFormats.get();

1 0

[onionoo/master] Replace addAll with parameterized constructor call.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit c8c64e8833d1003219a7e396e63ca44fa9ef299e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:24:40 2018 +0200 Replace addAll with parameterized constructor call. --- src/main/java/org/torproject/onionoo/docs/UptimeHistory.java | 3 +-- .../java/org/torproject/onionoo/updater/DummyDescriptorSource.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index 8ddfc2b..ef73a1c 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -88,8 +88,7 @@ public class UptimeHistory implements Comparable<UptimeHistory> { } SortedSet<String> flags = null; if (parts[0].equals("R")) { - flags = new TreeSet<>(); - flags.addAll(Arrays.asList(parts).subList(3, parts.length)); + flags = new TreeSet<>(Arrays.asList(parts).subList(3, parts.length)); } return new UptimeHistory(relay, startMillis, uptimeHours, flags); } diff --git a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java index c985090..22ae477 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java @@ -52,8 +52,8 @@ public class DummyDescriptorSource extends DescriptorSource { @Override public void readDescriptors() { - Set<DescriptorType> descriptorTypes = new HashSet<>(); - descriptorTypes.addAll(this.descriptorListeners.keySet()); + Set<DescriptorType> descriptorTypes = new HashSet<>( + this.descriptorListeners.keySet()); for (DescriptorType descriptorType : descriptorTypes) { boolean relay; switch (descriptorType) {

1 0

[onionoo/master] Remove redundant escape in regular expressions.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 225d504fcf7b36df7fb9f0f36c5dc07c1d4cb6ed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:47:55 2018 +0200 Remove redundant escape in regular expressions. Turns out that characters inside square brackets don't need to be escaped. In fact, "^[0-9\\.]{7,15}$" does not only match valid IPv4 addresses but also strings like "1\2\3\4". --- .../java/org/torproject/onionoo/server/ResourceServlet.java | 10 +++++----- .../java/org/torproject/onionoo/updater/LookupService.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 8f956a6..7567233 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -76,7 +76,7 @@ public class ResourceServlet extends HttpServlet { + "offset,fields").split(","))); private static String ipv6AddressPatternString = - "^\\[?[0-9a-fA-F:\\.]{1,39}\\]?$"; + "^\\[?[0-9a-fA-F:.]{1,39}\\]?$"; private static Pattern ipv6AddressPattern = Pattern.compile(ipv6AddressPatternString); @@ -424,14 +424,14 @@ public class ResourceServlet extends HttpServlet { } private static Pattern searchQueryStringPattern = - Pattern.compile("(?:.*[\\?&])*?" // lazily skip other parameters + Pattern.compile("(?:.*[?&])*?" // lazily skip other parameters + "search=([\\p{Graph} &&[^&]]+)" // capture parameter + "(?:&.*)*"); // skip remaining parameters private static Pattern searchParameterPattern = Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Hex fingerprint. */ + "^[0-9a-zA-Z+/]{1,27}$|" /* Base64 fingerprint. */ - + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ + + "^[0-9a-zA-Z.]{1,19}$|" /* Nickname or IPv4 address. */ + ipv6AddressPatternString + "|" /* IPv6 address. */ + "^[a-zA-Z_]+:\"?[\\p{Graph} ]+\"?$"); /* Qualified search term. */ @@ -630,7 +630,7 @@ public class ResourceServlet extends HttpServlet { } private static Pattern versionParameterPattern = - Pattern.compile("^[0-9a-zA-Z\\.-]+$"); + Pattern.compile("^[0-9a-zA-Z.-]+$"); private String parseVersionParameter(String parameter) { if (!versionParameterPattern.matcher(parameter).matches()) { @@ -651,7 +651,7 @@ public class ResourceServlet extends HttpServlet { } private static Pattern hostNameParameterPattern = - Pattern.compile("^[0-9A-Za-z_\\.\\-]+$"); + Pattern.compile("^[0-9A-Za-z_.\\-]+$"); private String parseHostNameParameter(String parameter) { if (!hostNameParameterPattern.matcher(parameter).matches()) { diff --git a/src/main/java/org/torproject/onionoo/updater/LookupService.java b/src/main/java/org/torproject/onionoo/updater/LookupService.java index 9c07e68..976a9ca 100644 --- a/src/main/java/org/torproject/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/onionoo/updater/LookupService.java @@ -70,7 +70,7 @@ public class LookupService { this.hasAllFiles = true; } - private Pattern ipv4Pattern = Pattern.compile("^[0-9\\.]{7,15}$"); + private Pattern ipv4Pattern = Pattern.compile("^[0-9.]{7,15}$"); private long parseAddressString(String addressString) { long addressNumber = -1L;

1 0

[onionoo/master] Remove unnecessary modifiers.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 76bd01bfeee57e254684b2db38872749a9596b8a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 09:23:01 2018 +0200 Remove unnecessary modifiers. --- src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java | 2 +- src/main/java/org/torproject/onionoo/updater/DescriptorType.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java b/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java index 8fd92ca..0ab2d3d 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorHistory.java @@ -16,7 +16,7 @@ public enum DescriptorHistory { private String fileName; - private DescriptorHistory(String fileName) { + DescriptorHistory(String fileName) { this.fileName = fileName; } diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorType.java b/src/main/java/org/torproject/onionoo/updater/DescriptorType.java index e039254..de318c9 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorType.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorType.java @@ -13,7 +13,7 @@ public enum DescriptorType { BRIDGE_EXTRA_INFOS("bridge-descriptors/extra-infos"); private final String dir; - private DescriptorType(String dir) { + DescriptorType(String dir) { this.dir = dir; }

1 0

[onionoo/master] Bulk-add elements rather than loop over them.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 62e30fc658918a483cf54b4da5e79ee56f692eac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:21:36 2018 +0200 Bulk-add elements rather than loop over them. --- .../onionoo/writer/DetailsDocumentWriter.java | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 6519de5..99b4e5d 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -120,27 +120,18 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setPlatform(detailsStatus.getPlatform()); if (detailsStatus.getAllegedFamily() != null && !detailsStatus.getAllegedFamily().isEmpty()) { - SortedSet<String> allegedFamily = new TreeSet<>(); - for (String familyMember : detailsStatus.getAllegedFamily()) { - allegedFamily.add(familyMember); - } - detailsDocument.setAllegedFamily(allegedFamily); + detailsDocument.setAllegedFamily( + new TreeSet<>(detailsStatus.getAllegedFamily())); } if (detailsStatus.getEffectiveFamily() != null && !detailsStatus.getEffectiveFamily().isEmpty()) { - SortedSet<String> effectiveFamily = new TreeSet<>(); - for (String familyMember : detailsStatus.getEffectiveFamily()) { - effectiveFamily.add(familyMember); - } - detailsDocument.setEffectiveFamily(effectiveFamily); + detailsDocument.setEffectiveFamily( + new TreeSet<>(detailsStatus.getEffectiveFamily())); } if (detailsStatus.getIndirectFamily() != null && !detailsStatus.getIndirectFamily().isEmpty()) { - SortedSet<String> indirectFamily = new TreeSet<>(); - for (String familyMember : detailsStatus.getIndirectFamily()) { - indirectFamily.add(familyMember); - } - detailsDocument.setIndirectFamily(indirectFamily); + detailsDocument.setIndirectFamily( + new TreeSet<>(detailsStatus.getIndirectFamily())); } detailsDocument.setExitPolicyV6Summary( detailsStatus.getExitPolicyV6Summary());

1 0

[onionoo/master] Avoid redundant new String() call.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit d9eee3208c4861ccca9d6b4c1e118c4892f8febe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:28:14 2018 +0200 Avoid redundant new String() call. --- src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java b/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java index 8744696..24e96c4 100644 --- a/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java +++ b/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java @@ -38,6 +38,6 @@ public class FormattingUtilsTest { @Test public void testReplaceUtf() { - assertEquals(out, new String(FormattingUtils.replaceValidUtf(in))); + assertEquals(out, FormattingUtils.replaceValidUtf(in)); } }

1 0

[onionoo/master] Replace if with switch.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 4543dd36b783be51edd7814a9c686817cb606b3f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 12:23:10 2018 +0200 Replace if with switch. --- .../torproject/onionoo/server/ResponseBuilder.java | 260 ++++++++++++--------- 1 file changed, 156 insertions(+), 104 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 3d8a76f..f1f4af9 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -242,110 +242,162 @@ public class ResponseBuilder { if (detailsDocument != null) { DetailsDocument dd = new DetailsDocument(); for (String field : this.fields) { - if (field.equals("nickname")) { - dd.setNickname(detailsDocument.getNickname()); - } else if (field.equals("fingerprint")) { - dd.setFingerprint(detailsDocument.getFingerprint()); - } else if (field.equals("hashed_fingerprint")) { - dd.setHashedFingerprint( - detailsDocument.getHashedFingerprint()); - } else if (field.equals("or_addresses")) { - dd.setOrAddresses(detailsDocument.getOrAddresses()); - } else if (field.equals("exit_addresses")) { - dd.setExitAddresses(detailsDocument.getExitAddresses()); - } else if (field.equals("dir_address")) { - dd.setDirAddress(detailsDocument.getDirAddress()); - } else if (field.equals("last_seen")) { - dd.setLastSeen(detailsDocument.getLastSeen()); - } else if (field.equals("last_changed_address_or_port")) { - dd.setLastChangedAddressOrPort( - detailsDocument.getLastChangedAddressOrPort()); - } else if (field.equals("first_seen")) { - dd.setFirstSeen(detailsDocument.getFirstSeen()); - } else if (field.equals("running")) { - dd.setRunning(detailsDocument.getRunning()); - } else if (field.equals("flags")) { - dd.setFlags(detailsDocument.getFlags()); - } else if (field.equals("country")) { - dd.setCountry(detailsDocument.getCountry()); - } else if (field.equals("country_name")) { - dd.setCountryName(detailsDocument.getCountryName()); - } else if (field.equals("region_name")) { - dd.setRegionName(detailsDocument.getRegionName()); - } else if (field.equals("city_name")) { - dd.setCityName(detailsDocument.getCityName()); - } else if (field.equals("latitude")) { - dd.setLatitude(detailsDocument.getLatitude()); - } else if (field.equals("longitude")) { - dd.setLongitude(detailsDocument.getLongitude()); - } else if (field.equals("as")) { - dd.setAs(detailsDocument.getAs()); - } else if (field.equals("as_number")) { - dd.setAsNumber(detailsDocument.getAsNumber()); - } else if (field.equals("as_name")) { - dd.setAsName(detailsDocument.getAsName()); - } else if (field.equals("consensus_weight")) { - dd.setConsensusWeight(detailsDocument.getConsensusWeight()); - } else if (field.equals("verified_host_names")) { - dd.setVerifiedHostNames(detailsDocument.getVerifiedHostNames()); - } else if (field.equals("unverified_host_names")) { - dd.setUnverifiedHostNames(detailsDocument.getUnverifiedHostNames()); - } else if (field.equals("last_restarted")) { - dd.setLastRestarted(detailsDocument.getLastRestarted()); - } else if (field.equals("bandwidth_rate")) { - dd.setBandwidthRate(detailsDocument.getBandwidthRate()); - } else if (field.equals("bandwidth_burst")) { - dd.setBandwidthBurst(detailsDocument.getBandwidthBurst()); - } else if (field.equals("observed_bandwidth")) { - dd.setObservedBandwidth( - detailsDocument.getObservedBandwidth()); - } else if (field.equals("advertised_bandwidth")) { - dd.setAdvertisedBandwidth( - detailsDocument.getAdvertisedBandwidth()); - } else if (field.equals("exit_policy")) { - dd.setExitPolicy(detailsDocument.getExitPolicy()); - } else if (field.equals("exit_policy_summary")) { - dd.setExitPolicySummary( - detailsDocument.getExitPolicySummary()); - } else if (field.equals("exit_policy_v6_summary")) { - dd.setExitPolicyV6Summary( - detailsDocument.getExitPolicyV6Summary()); - } else if (field.equals("contact")) { - dd.setContact(detailsDocument.getContact()); - } else if (field.equals("platform")) { - dd.setPlatform(detailsDocument.getPlatform()); - } else if (field.equals("consensus_weight_fraction")) { - dd.setConsensusWeightFraction( - detailsDocument.getConsensusWeightFraction()); - } else if (field.equals("guard_probability")) { - dd.setGuardProbability(detailsDocument.getGuardProbability()); - } else if (field.equals("middle_probability")) { - dd.setMiddleProbability( - detailsDocument.getMiddleProbability()); - } else if (field.equals("exit_probability")) { - dd.setExitProbability(detailsDocument.getExitProbability()); - } else if (field.equals("recommended_version")) { - dd.setRecommendedVersion( - detailsDocument.getRecommendedVersion()); - } else if (field.equals("hibernating")) { - dd.setHibernating(detailsDocument.getHibernating()); - } else if (field.equals("transports")) { - dd.setTransports(detailsDocument.getTransports()); - } else if (field.equals("effective_family")) { - dd.setEffectiveFamily(detailsDocument.getEffectiveFamily()); - } else if (field.equals("measured")) { - dd.setMeasured(detailsDocument.getMeasured()); - } else if (field.equals("alleged_family")) { - dd.setAllegedFamily(detailsDocument.getAllegedFamily()); - } else if (field.equals("indirect_family")) { - dd.setIndirectFamily(detailsDocument.getIndirectFamily()); - } else if (field.equals("unreachable_or_addresses")) { - dd.setUnreachableOrAddresses( - detailsDocument.getUnreachableOrAddresses()); - } else if (field.equals("version")) { - dd.setVersion(detailsDocument.getVersion()); - } else if (field.equals("version_status")) { - dd.setVersionStatus(detailsDocument.getVersionStatus()); + switch (field) { + case "nickname": + dd.setNickname(detailsDocument.getNickname()); + break; + case "fingerprint": + dd.setFingerprint(detailsDocument.getFingerprint()); + break; + case "hashed_fingerprint": + dd.setHashedFingerprint( + detailsDocument.getHashedFingerprint()); + break; + case "or_addresses": + dd.setOrAddresses(detailsDocument.getOrAddresses()); + break; + case "exit_addresses": + dd.setExitAddresses(detailsDocument.getExitAddresses()); + break; + case "dir_address": + dd.setDirAddress(detailsDocument.getDirAddress()); + break; + case "last_seen": + dd.setLastSeen(detailsDocument.getLastSeen()); + break; + case "last_changed_address_or_port": + dd.setLastChangedAddressOrPort( + detailsDocument.getLastChangedAddressOrPort()); + break; + case "first_seen": + dd.setFirstSeen(detailsDocument.getFirstSeen()); + break; + case "running": + dd.setRunning(detailsDocument.getRunning()); + break; + case "flags": + dd.setFlags(detailsDocument.getFlags()); + break; + case "country": + dd.setCountry(detailsDocument.getCountry()); + break; + case "country_name": + dd.setCountryName(detailsDocument.getCountryName()); + break; + case "region_name": + dd.setRegionName(detailsDocument.getRegionName()); + break; + case "city_name": + dd.setCityName(detailsDocument.getCityName()); + break; + case "latitude": + dd.setLatitude(detailsDocument.getLatitude()); + break; + case "longitude": + dd.setLongitude(detailsDocument.getLongitude()); + break; + case "as": + dd.setAs(detailsDocument.getAs()); + break; + case "as_number": + dd.setAsNumber(detailsDocument.getAsNumber()); + break; + case "as_name": + dd.setAsName(detailsDocument.getAsName()); + break; + case "consensus_weight": + dd.setConsensusWeight(detailsDocument.getConsensusWeight()); + break; + case "verified_host_names": + dd.setVerifiedHostNames(detailsDocument.getVerifiedHostNames()); + break; + case "unverified_host_names": + dd.setUnverifiedHostNames( + detailsDocument.getUnverifiedHostNames()); + break; + case "last_restarted": + dd.setLastRestarted(detailsDocument.getLastRestarted()); + break; + case "bandwidth_rate": + dd.setBandwidthRate(detailsDocument.getBandwidthRate()); + break; + case "bandwidth_burst": + dd.setBandwidthBurst(detailsDocument.getBandwidthBurst()); + break; + case "observed_bandwidth": + dd.setObservedBandwidth( + detailsDocument.getObservedBandwidth()); + break; + case "advertised_bandwidth": + dd.setAdvertisedBandwidth( + detailsDocument.getAdvertisedBandwidth()); + break; + case "exit_policy": + dd.setExitPolicy(detailsDocument.getExitPolicy()); + break; + case "exit_policy_summary": + dd.setExitPolicySummary( + detailsDocument.getExitPolicySummary()); + break; + case "exit_policy_v6_summary": + dd.setExitPolicyV6Summary( + detailsDocument.getExitPolicyV6Summary()); + break; + case "contact": + dd.setContact(detailsDocument.getContact()); + break; + case "platform": + dd.setPlatform(detailsDocument.getPlatform()); + break; + case "consensus_weight_fraction": + dd.setConsensusWeightFraction( + detailsDocument.getConsensusWeightFraction()); + break; + case "guard_probability": + dd.setGuardProbability(detailsDocument.getGuardProbability()); + break; + case "middle_probability": + dd.setMiddleProbability( + detailsDocument.getMiddleProbability()); + break; + case "exit_probability": + dd.setExitProbability(detailsDocument.getExitProbability()); + break; + case "recommended_version": + dd.setRecommendedVersion( + detailsDocument.getRecommendedVersion()); + break; + case "hibernating": + dd.setHibernating(detailsDocument.getHibernating()); + break; + case "transports": + dd.setTransports(detailsDocument.getTransports()); + break; + case "effective_family": + dd.setEffectiveFamily(detailsDocument.getEffectiveFamily()); + break; + case "measured": + dd.setMeasured(detailsDocument.getMeasured()); + break; + case "alleged_family": + dd.setAllegedFamily(detailsDocument.getAllegedFamily()); + break; + case "indirect_family": + dd.setIndirectFamily(detailsDocument.getIndirectFamily()); + break; + case "unreachable_or_addresses": + dd.setUnreachableOrAddresses( + detailsDocument.getUnreachableOrAddresses()); + break; + case "version": + dd.setVersion(detailsDocument.getVersion()); + break; + case "version_status": + dd.setVersionStatus(detailsDocument.getVersionStatus()); + break; + default: + /* Not a field that we know of. Ignore. */ + break; } } /* Whenever we provide Jackson with a string containing an escaped

1 0

[onionoo/master] Avoid double-initialization of a local variable.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit b756eee63254cbdd72bd5aca6f9d339a7b421014 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 12:01:31 2018 +0200 Avoid double-initialization of a local variable. Note that the previous code was not wrong. It declared a local variable and it read a line (containing headers). But these are two distinct things, and doing them on one line confused the code analyzer. Splitting them is just fine. --- src/main/java/org/torproject/onionoo/updater/LookupService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/LookupService.java b/src/main/java/org/torproject/onionoo/updater/LookupService.java index 495fec7..44c4d84 100644 --- a/src/main/java/org/torproject/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/onionoo/updater/LookupService.java @@ -129,7 +129,8 @@ public class LookupService { this.geoLite2CityBlocksIPv4CsvFile)) { SortedSet<Long> sortedAddressNumbers = new TreeSet<>( addressStringNumbers.values()); - String line = br.readLine(); + String line; + br.readLine(); while ((line = br.readLine()) != null) { String[] parts = line.split(",", -1); if (parts.length < 9) { @@ -187,7 +188,8 @@ public class LookupService { try (BufferedReader br = this.createBufferedReaderFromUtf8File( this.geoLite2CityLocationsEnCsvFile)) { Set<Long> blockNumbers = new HashSet<>(addressNumberBlocks.values()); - String line = br.readLine(); + String line; + br.readLine(); while ((line = br.readLine()) != null) { String[] parts = line.replaceAll("\"", "").split(",", 13); if (parts.length != 13) {

1 0

[onionoo/master] Remove redundant modifiers from interface methods.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 6abd4270eea261d06d6f4619aec1004539539955 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:23:20 2018 +0200 Remove redundant modifiers from interface methods. --- src/main/java/org/torproject/onionoo/updater/DescriptorListener.java | 2 +- src/main/java/org/torproject/onionoo/updater/StatusUpdater.java | 4 ++-- src/main/java/org/torproject/onionoo/writer/DocumentWriter.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java b/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java index 5362ce2..6269772 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java @@ -6,6 +6,6 @@ package org.torproject.onionoo.updater; import org.torproject.descriptor.Descriptor; public interface DescriptorListener { - abstract void processDescriptor(Descriptor descriptor, boolean relay); + void processDescriptor(Descriptor descriptor, boolean relay); } diff --git a/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java index f17d797..9f6328a 100644 --- a/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java @@ -5,8 +5,8 @@ package org.torproject.onionoo.updater; public interface StatusUpdater { - public abstract void updateStatuses(); + void updateStatuses(); - public abstract String getStatsString(); + String getStatsString(); } diff --git a/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java index 9fc893f..bf90d3e 100644 --- a/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java @@ -5,8 +5,8 @@ package org.torproject.onionoo.writer; public interface DocumentWriter { - public abstract void writeDocuments(long mostRecentStatusMillis); + void writeDocuments(long mostRecentStatusMillis); - public abstract String getStatsString(); + String getStatsString(); }

1 0