Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Network Health
Metrics
Onionoo
Commits
e4b1c696
Commit
e4b1c696
authored
Oct 12, 2018
by
tordinge
Committed by
Karsten Loesing
Oct 25, 2018
Browse files
renamed all getter methods that return [Bb]oolean to follow isXY() pattern
parent
eb7d1430
Changes
10
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
e4b1c696
...
...
@@ -3,6 +3,8 @@
*
Minor changes
-
Rename root package org.torproject.onionoo to
org.torproject.metrics.onionoo.
-
Rename all [Bb]oolean field getter methods to follow isXY()
pattern.
# Changes in version 7.0-1.18.1 - 2018-09-11
...
...
src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java
View file @
e4b1c696
...
...
@@ -128,7 +128,7 @@ public class DetailsDocument extends Document {
this
.
running
=
running
;
}
public
Boolean
get
Running
()
{
public
Boolean
is
Running
()
{
return
this
.
running
;
}
...
...
@@ -527,7 +527,7 @@ public class DetailsDocument extends Document {
this
.
recommendedVersion
=
recommendedVersion
;
}
public
Boolean
get
RecommendedVersion
()
{
public
Boolean
is
RecommendedVersion
()
{
return
this
.
recommendedVersion
;
}
...
...
@@ -537,7 +537,7 @@ public class DetailsDocument extends Document {
this
.
hibernating
=
hibernating
;
}
public
Boolean
get
Hibernating
()
{
public
Boolean
is
Hibernating
()
{
return
this
.
hibernating
;
}
...
...
@@ -558,7 +558,7 @@ public class DetailsDocument extends Document {
this
.
measured
=
measured
;
}
public
Boolean
get
Measured
()
{
public
Boolean
is
Measured
()
{
return
this
.
measured
;
}
...
...
src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java
View file @
e4b1c696
...
...
@@ -171,7 +171,7 @@ public class DetailsStatus extends Document {
this
.
hibernating
=
hibernating
;
}
public
Boolean
get
Hibernating
()
{
public
Boolean
is
Hibernating
()
{
return
this
.
hibernating
;
}
...
...
@@ -369,7 +369,7 @@ public class DetailsStatus extends Document {
this
.
recommendedVersion
=
recommendedVersion
;
}
public
Boolean
get
RecommendedVersion
()
{
public
Boolean
is
RecommendedVersion
()
{
return
this
.
recommendedVersion
;
}
...
...
@@ -379,7 +379,7 @@ public class DetailsStatus extends Document {
this
.
measured
=
measured
;
}
public
Boolean
get
Measured
()
{
public
Boolean
is
Measured
()
{
return
this
.
measured
;
}
...
...
src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java
View file @
e4b1c696
...
...
@@ -367,7 +367,7 @@ public class NodeStatus extends Document {
this
.
recommendedVersion
=
recommendedVersion
;
}
public
Boolean
get
RecommendedVersion
()
{
public
Boolean
is
RecommendedVersion
()
{
return
this
.
recommendedVersion
;
}
...
...
src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java
View file @
e4b1c696
...
...
@@ -360,7 +360,7 @@ public class SummaryDocument extends Document {
this
.
recommendedVersion
=
recommendedVersion
;
}
public
Boolean
get
RecommendedVersion
()
{
public
Boolean
is
RecommendedVersion
()
{
return
this
.
recommendedVersion
;
}
...
...
src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java
View file @
e4b1c696
...
...
@@ -293,7 +293,7 @@ public class NodeIndexer implements ServletContextListener, Runnable {
newRelaysByHostName
.
get
(
hostNameLowerCase
).
add
(
fingerprint
);
newRelaysByHostName
.
get
(
hostNameLowerCase
).
add
(
hashedFingerprint
);
}
Boolean
recommendedVersion
=
entry
.
get
RecommendedVersion
();
Boolean
recommendedVersion
=
entry
.
is
RecommendedVersion
();
if
(
null
!=
recommendedVersion
)
{
newRelaysByRecommendedVersion
.
get
(
recommendedVersion
).
add
(
fingerprint
);
newRelaysByRecommendedVersion
.
get
(
recommendedVersion
).
add
(
...
...
@@ -362,7 +362,7 @@ public class NodeIndexer implements ServletContextListener, Runnable {
newBridgesByOperatingSystem
.
get
(
operatingSystem
)
.
add
(
hashedHashedFingerprint
);
}
Boolean
recommendedVersion
=
entry
.
get
RecommendedVersion
();
Boolean
recommendedVersion
=
entry
.
is
RecommendedVersion
();
if
(
null
!=
recommendedVersion
)
{
newBridgesByRecommendedVersion
.
get
(
recommendedVersion
).
add
(
hashedFingerprint
);
...
...
src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java
View file @
e4b1c696
...
...
@@ -273,7 +273,7 @@ public class ResponseBuilder {
dd
.
setFirstSeen
(
detailsDocument
.
getFirstSeen
());
break
;
case
"running"
:
dd
.
setRunning
(
detailsDocument
.
get
Running
());
dd
.
setRunning
(
detailsDocument
.
is
Running
());
break
;
case
"flags"
:
dd
.
setFlags
(
detailsDocument
.
getFlags
());
...
...
@@ -362,10 +362,10 @@ public class ResponseBuilder {
break
;
case
"recommended_version"
:
dd
.
setRecommendedVersion
(
detailsDocument
.
get
RecommendedVersion
());
detailsDocument
.
is
RecommendedVersion
());
break
;
case
"hibernating"
:
dd
.
setHibernating
(
detailsDocument
.
get
Hibernating
());
dd
.
setHibernating
(
detailsDocument
.
is
Hibernating
());
break
;
case
"transports"
:
dd
.
setTransports
(
detailsDocument
.
getTransports
());
...
...
@@ -374,7 +374,7 @@ public class ResponseBuilder {
dd
.
setEffectiveFamily
(
detailsDocument
.
getEffectiveFamily
());
break
;
case
"measured"
:
dd
.
setMeasured
(
detailsDocument
.
get
Measured
());
dd
.
setMeasured
(
detailsDocument
.
is
Measured
());
break
;
case
"alleged_family"
:
dd
.
setAllegedFamily
(
detailsDocument
.
getAllegedFamily
());
...
...
src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
View file @
e4b1c696
...
...
@@ -489,7 +489,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener,
updatedNodeStatus
.
setAsNumber
(
nodeStatus
.
getAsNumber
());
updatedNodeStatus
.
setAsName
(
nodeStatus
.
getAsName
());
updatedNodeStatus
.
setRecommendedVersion
(
nodeStatus
.
get
RecommendedVersion
());
nodeStatus
.
is
RecommendedVersion
());
updatedNodeStatus
.
setVersion
(
nodeStatus
.
getVersion
());
}
if
(
nodeStatus
.
getFirstSeenMillis
()
...
...
@@ -935,7 +935,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener,
detailsStatus
.
setDefaultPolicy
(
nodeStatus
.
getDefaultPolicy
());
detailsStatus
.
setPortList
(
nodeStatus
.
getPortList
());
detailsStatus
.
setRecommendedVersion
(
nodeStatus
.
get
RecommendedVersion
());
nodeStatus
.
is
RecommendedVersion
());
detailsStatus
.
setLastChangedOrAddressOrPort
(
nodeStatus
.
getLastChangedOrAddressOrPort
());
detailsStatus
.
setVersion
(
nodeStatus
.
getVersion
());
...
...
src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java
View file @
e4b1c696
...
...
@@ -89,7 +89,7 @@ public class DetailsDocumentWriter implements DocumentWriter {
detailsDocument
.
setExitPolicySummary
(
exitPolicySummary
);
}
detailsDocument
.
setRecommendedVersion
(
detailsStatus
.
get
RecommendedVersion
());
detailsStatus
.
is
RecommendedVersion
());
detailsDocument
.
setCountry
(
detailsStatus
.
getCountryCode
());
detailsDocument
.
setLatitude
(
detailsStatus
.
getLatitude
());
detailsDocument
.
setLongitude
(
detailsStatus
.
getLongitude
());
...
...
@@ -135,13 +135,13 @@ public class DetailsDocumentWriter implements DocumentWriter {
}
detailsDocument
.
setExitPolicyV6Summary
(
detailsStatus
.
getExitPolicyV6Summary
());
detailsDocument
.
setHibernating
(
detailsStatus
.
get
Hibernating
());
detailsDocument
.
setHibernating
(
detailsStatus
.
is
Hibernating
());
if
(
detailsStatus
.
getExitAddresses
()
!=
null
)
{
List
<
String
>
exitAddresses
=
new
ArrayList
<>(
new
TreeSet
<>(
detailsStatus
.
getExitAddresses
().
keySet
()));
detailsDocument
.
setExitAddresses
(
exitAddresses
);
}
detailsDocument
.
setMeasured
(
detailsStatus
.
get
Measured
());
detailsDocument
.
setMeasured
(
detailsStatus
.
is
Measured
());
List
<
String
>
unreachableOrAddresses
=
new
ArrayList
<>();
if
(
null
!=
detailsStatus
.
getAdvertisedOrAddresses
())
{
unreachableOrAddresses
.
addAll
(
detailsStatus
.
getAdvertisedOrAddresses
());
...
...
@@ -178,7 +178,7 @@ public class DetailsDocumentWriter implements DocumentWriter {
detailsDocument
.
setRunning
(
detailsStatus
.
isRunning
());
detailsDocument
.
setFlags
(
detailsStatus
.
getRelayFlags
());
detailsDocument
.
setRecommendedVersion
(
detailsStatus
.
get
RecommendedVersion
());
detailsStatus
.
is
RecommendedVersion
());
detailsDocument
.
setLastRestarted
(
detailsStatus
.
getLastRestarted
());
detailsDocument
.
setAdvertisedBandwidth
(
detailsStatus
.
getAdvertisedBandwidth
());
...
...
src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java
View file @
e4b1c696
...
...
@@ -97,7 +97,7 @@ public class SummaryDocumentWriter implements DocumentWriter {
SortedSet
<
String
>
verifiedHostNames
=
nodeStatus
.
getVerifiedHostNames
();
SortedSet
<
String
>
unverifiedHostNames
=
nodeStatus
.
getUnverifiedHostNames
();
Boolean
recommendedVersion
=
nodeStatus
.
get
RecommendedVersion
();
Boolean
recommendedVersion
=
nodeStatus
.
is
RecommendedVersion
();
SummaryDocument
summaryDocument
=
new
SummaryDocument
(
isRelay
,
nickname
,
fingerprint
,
addresses
,
lastSeenMillis
,
running
,
relayFlags
,
consensusWeight
,
countryCode
,
firstSeenMillis
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment