torproject/collector
1
0
Fork 0
mirror of https://github.com/torproject/collector.git synced 2025-02-17 07:47:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add argument check to constructor and removed redundant code.

Browse Source
This commit is contained in:
iwakeh 2016-09-30 11:55:01 +02:00
parent c6e58d9c54
commit afc2eac755
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
View File

@ -22,6 +22,10 @@ public class BridgeDescriptorParser {
/** Initializes a new bridge descriptor parser and links it to a
* sanitized bridges writer to sanitize and store bridge descriptors. */
public BridgeDescriptorParser(SanitizedBridgesWriter sbw) {
if (null == sbw) {
throw new IllegalArgumentException("SanitizedBridgesWriter has to be "
+ "provided, but was null.");
}
this.sbw = sbw;
}
@ -35,22 +39,17 @@ public class BridgeDescriptorParser {
String line = br.readLine();
if (line == null) {
return;
} else if (line.startsWith("router ")) {
if (this.sbw != null) {
this.sbw.sanitizeAndStoreServerDescriptor(allData);
}
}
if (line.startsWith("router ")) {
this.sbw.sanitizeAndStoreServerDescriptor(allData);
} else if (line.startsWith("extra-info ")) {
if (this.sbw != null) {
this.sbw.sanitizeAndStoreExtraInfoDescriptor(allData);
}
this.sbw.sanitizeAndStoreExtraInfoDescriptor(allData);
} else {
if (this.sbw != null) {
this.sbw.sanitizeAndStoreNetworkStatus(allData, dateTime,
authorityFingerprint);
}
this.sbw.sanitizeAndStoreNetworkStatus(allData, dateTime,
authorityFingerprint);
}
} catch (IOException e) {
logger.warn("Could not parse bridge descriptor.", e);
logger.warn("Could not parse or write bridge descriptor.", e);
return;
}
}