Skip to content

Commit ded36a5

Browse files
ddimensiavjkoskela
authored andcommitted
Cleaned up some deadcode and other warnings caught by vscode. (#127)
* Fixed warnings found by vscode. * More VSCode fixes * Fixed checkstyle errors * Update ProtobufV1ToRecordParserTest.java * Update MaxStatisticTest.java * Update TPStatisticTest.java * Update MinStatisticTest.java
1 parent 7febdb5 commit ded36a5

File tree

16 files changed

+10
-26
lines changed

16 files changed

+10
-26
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ eclipse-bin/
2020

2121
# Mac
2222
.DS_Store
23+
24+
# VSCode
25+
.vscode
26+
.project

src/main/java/com/arpnetworking/configuration/triggers/DirectoryTrigger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private boolean isFileMonitored(final File file) {
138138
*/
139139
@LogValue
140140
public Object toLogValue() {
141-
return LogValueMapFactory.<String, Object>builder()
141+
return LogValueMapFactory.builder(this)
142142
.put("directory", _directory)
143143
.put("exists", _exists)
144144
.put("fileNames", _fileNames)

src/main/java/com/arpnetworking/http/Routes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public CompletionStage<HttpResponse> apply(final HttpRequest request) {
125125
.addData("url", request.getUri())
126126
.addData("headers", request.getHeaders())
127127
.log();
128-
return process(request).<HttpResponse>whenComplete(
128+
return process(request).whenComplete(
129129
(response, failure) -> {
130130
requestTimer.stop();
131131
_metrics.recordTimer(

src/main/java/com/arpnetworking/metrics/common/tailer/FilePositionStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void close() {
8989
*/
9090
@LogValue
9191
public Object toLogValue() {
92-
return LogValueMapFactory.<String, Object>builder()
92+
return LogValueMapFactory.builder(this)
9393
.put("file", _file)
9494
.put("flushInterval", _flushInterval)
9595
.put("flushThreshold", _flushThreshold)

src/main/java/com/arpnetworking/metrics/common/tailer/StatefulTailer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void run() {
8585
*/
8686
@LogValue
8787
public Object toLogValue() {
88-
return LogValueMapFactory.<String, Object>builder()
88+
return LogValueMapFactory.builder(this)
8989
.put("file", _file)
9090
.put("positionStore", _positionStore)
9191
.put("listener", _listener)

src/main/java/com/arpnetworking/metrics/proxy/models/protocol/v2/LogMessagesProcessor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ private ZonedDateTime extractTimestamp(final String line) {
222222
private static final String LOG_LINE_COUNTER = METRICS_PREFIX + "log_line";
223223
private static final String LOGS_LIST_COUNTER = METRICS_PREFIX + "list_log";
224224
private static final String NEW_LOG_COUNTER = METRICS_PREFIX + "new_log";
225-
private static final String LOG_REPORT_COUNTER = METRICS_PREFIX + "log_report";
226225
private static final String SUBSCRIBE_COUNTER = METRICS_PREFIX + "subscribe";
227226
private static final String UNSUBSCRIBE_COUNTER = METRICS_PREFIX + "unsubscribe";
228227
private static final String GET_LOGS_COUNTER = METRICS_PREFIX + "command/get_logs";

src/main/java/com/arpnetworking/tsdcore/sinks/PeriodFilteringSink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void close() {
5353
@LogValue
5454
@Override
5555
public Object toLogValue() {
56-
return LogValueMapFactory.<String, Object>builder()
56+
return LogValueMapFactory.builder(this)
5757
.put("super", super.toLogValue())
5858
.put("include", _include)
5959
.put("exclude", _exclude)

src/main/java/com/arpnetworking/tsdcore/sinks/TelemetrySink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void close() {
4545
@LogValue
4646
@Override
4747
public Object toLogValue() {
48-
return LogValueMapFactory.<String, Object>builder()
48+
return LogValueMapFactory.builder(this)
4949
.put("super", super.toLogValue())
5050
.put("telemetryActor", _telemetryActor)
5151
.build();

src/main/java/com/arpnetworking/tsdcore/sinks/TimeThresholdSink.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ private Filter(
120120
}
121121

122122
public ImmutableMultimap<String, AggregatedData> filter(final PeriodicData periodicData) {
123-
final ImmutableMultimap.Builder<String, AggregatedData> retainedDataBuilder = ImmutableMultimap.builder();
124123
if (!periodicData.getStart().plus(periodicData.getPeriod()).plus(_freshnessThreshold).isAfter(ZonedDateTime.now())
125124
&& !_excludedServices.contains(periodicData.getDimensions().getService())) {
126125
// Exclude all data

src/main/java/com/arpnetworking/utility/Configurator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public synchronized void offerConfiguration(final Configuration configuration) t
5151
_offeredConfiguration = configuration.getAs(_configurationClass);
5252
}
5353

54-
@SuppressWarnings("unchecked")
5554
@Override
5655
public synchronized void applyConfiguration() {
5756
// Shutdown

0 commit comments

Comments
 (0)