Skip to content

Commit f7cd028

Browse files
dependabot[bot]BrandonArp
dependabot[bot]
and
BrandonArp
authored
Bump com.google.guava:guava from 33.3.0-jre to 33.4.8-jre (#458)
* Bump com.google.guava:guava from 33.3.0-jre to 33.4.8-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.0-jre to 33.4.8-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.4.8-jre dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * update for deps --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brandon Arp <[email protected]>
1 parent 10f8678 commit f7cd028

File tree

15 files changed

+56
-55
lines changed

15 files changed

+56
-55
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<ebean.annotation.version>8.4</ebean.annotation.version>
116116
<jakarta.persistence.api.version>3.0</jakarta.persistence.api.version>
117117
<flyway.version>11.7.2</flyway.version>
118-
<guava.version>33.3.0-jre</guava.version>
118+
<guava.version>33.4.8-jre</guava.version>
119119
<guice.version>7.0.0</guice.version>
120120
<hamcrest.version>3.0</hamcrest.version>
121121
<hikari.version>5.1.0</hikari.version>

‎src/main/java/com/arpnetworking/clusteraggregator/models/PeriodMetrics.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.arpnetworking.metrics.Metrics;
1919
import com.arpnetworking.metrics.MetricsFactory;
2020
import com.arpnetworking.tsdcore.model.AggregatedData;
21-
import com.google.common.base.Charsets;
2221
import com.google.common.collect.Maps;
2322
import com.google.common.hash.BloomFilter;
2423
import com.google.common.hash.Funnels;
2524

25+
import java.nio.charset.StandardCharsets;
2626
import java.time.ZonedDateTime;
2727
import java.util.Map;
2828

@@ -141,21 +141,21 @@ public long getStatisticsLatestPeriod() {
141141

142142
private BloomFilter<CharSequence> createServicesBF() {
143143
return BloomFilter.create(
144-
Funnels.stringFunnel(Charsets.UTF_8),
144+
Funnels.stringFunnel(StandardCharsets.UTF_8),
145145
10_000,
146146
0.001);
147147
}
148148

149149
private BloomFilter<CharSequence> createMetricsBF() {
150150
return BloomFilter.create(
151-
Funnels.stringFunnel(Charsets.UTF_8),
151+
Funnels.stringFunnel(StandardCharsets.UTF_8),
152152
1_000_000,
153153
0.001);
154154
}
155155

156156
private BloomFilter<CharSequence> createStatisticsBF() {
157157
return BloomFilter.create(
158-
Funnels.stringFunnel(Charsets.UTF_8),
158+
Funnels.stringFunnel(StandardCharsets.UTF_8),
159159
10_000_000,
160160
0.005);
161161
}

‎src/main/java/com/arpnetworking/clusteraggregator/models/VersionInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import com.arpnetworking.commons.jackson.databind.ObjectMapperFactory;
2020
import com.arpnetworking.steno.Logger;
2121
import com.arpnetworking.steno.LoggerFactory;
22-
import com.google.common.base.Charsets;
2322
import com.google.common.io.Resources;
2423
import net.sf.oval.constraint.NotEmpty;
2524
import net.sf.oval.constraint.NotNull;
2625

2726
import java.io.IOException;
27+
import java.nio.charset.StandardCharsets;
2828

2929
/**
3030
* Represents the model for the version of the service currently running.
@@ -67,7 +67,7 @@ private VersionInfo(final Builder builder) {
6767
try {
6868
versionInfo =
6969
ObjectMapperFactory.getInstance().readValue(
70-
Resources.toString(Resources.getResource("version.json"), Charsets.UTF_8),
70+
Resources.toString(Resources.getResource("version.json"), StandardCharsets.UTF_8),
7171
VersionInfo.class);
7272
} catch (final IOException e) {
7373
LOGGER.error()

‎src/main/java/com/arpnetworking/tsdcore/sinks/CarbonSink.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import com.arpnetworking.steno.LoggerFactory;
2020
import com.arpnetworking.tsdcore.model.AggregatedData;
2121
import com.arpnetworking.tsdcore.model.PeriodicData;
22-
import com.google.common.base.Charsets;
2322
import org.apache.pekko.util.ByteString;
2423
import org.apache.pekko.util.ByteStringBuilder;
2524

25+
import java.nio.charset.StandardCharsets;
26+
2627
/**
2728
* Publisher to send data to a Carbon server.
2829
*
@@ -46,7 +47,7 @@ protected ByteString serializeData(final PeriodicData periodicData) {
4647
datum.getFQDSN().getStatistic().getName(),
4748
datum.getValue().getValue(),
4849
periodicData.getStart().toEpochSecond())
49-
.getBytes(Charsets.UTF_8));
50+
.getBytes(StandardCharsets.UTF_8));
5051
}
5152
return builder.result();
5253
}

‎src/main/java/com/arpnetworking/tsdcore/sinks/DataDogSink.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.arpnetworking.tsdcore.model.PeriodicData;
2525
import com.fasterxml.jackson.core.JsonProcessingException;
2626
import com.fasterxml.jackson.databind.ObjectMapper;
27-
import com.google.common.base.Charsets;
2827
import com.google.common.collect.Lists;
2928
import net.sf.oval.constraint.NotEmpty;
3029
import net.sf.oval.constraint.NotNull;
@@ -33,6 +32,7 @@
3332
import org.asynchttpclient.Request;
3433
import org.asynchttpclient.RequestBuilder;
3534

35+
import java.nio.charset.StandardCharsets;
3636
import java.util.Arrays;
3737
import java.util.Collection;
3838
import java.util.Collections;
@@ -96,7 +96,7 @@ protected Collection<SerializedDatum> serialize(final PeriodicData periodicData)
9696
return Collections.emptyList();
9797
}
9898
return Collections.singletonList(new SerializedDatum(
99-
dataDogDataAsJson.getBytes(Charsets.UTF_8),
99+
dataDogDataAsJson.getBytes(StandardCharsets.UTF_8),
100100
Optional.empty()));
101101
}
102102

‎src/main/java/com/arpnetworking/tsdcore/sinks/HttpSinkActor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.arpnetworking.steno.LoggerFactory;
2323
import com.arpnetworking.tsdcore.model.PeriodicData;
2424
import com.arpnetworking.tsdcore.model.RequestEntry;
25-
import com.google.common.base.Charsets;
2625
import com.google.common.collect.EvictingQueue;
2726
import com.google.common.collect.ImmutableList;
2827
import com.google.common.collect.ImmutableSet;
@@ -36,6 +35,7 @@
3635
import org.asynchttpclient.Response;
3736
import scala.concurrent.duration.FiniteDuration;
3837

38+
import java.nio.charset.StandardCharsets;
3939
import java.time.Duration;
4040
import java.time.Instant;
4141
import java.util.Collection;
@@ -201,7 +201,7 @@ public Receive createReceive() {
201201
if (_retryableStatusCodes.contains(response.getStatusCode()) && attempt < _sink.getMaximumAttempts()) {
202202
final byte[] requestBodyBytes = rejected.getRequestEntry().getRequest().getByteData();
203203
// CHECKSTYLE.OFF: IllegalInstantiation - This is ok for String from byte[]
204-
final String requestBody = requestBodyBytes == null ? null : new String(requestBodyBytes, Charsets.UTF_8);
204+
final String requestBody = requestBodyBytes == null ? null : new String(requestBodyBytes, StandardCharsets.UTF_8);
205205
// CHECKSTYLE.ON: IllegalInstantiation
206206
POST_RETRY_LOGGER.warn()
207207
.setMessage("Attempt rejected")
@@ -298,7 +298,7 @@ private void processRejectedRequest(final PostRejected rejected) {
298298

299299
final byte[] requestBodyBytes = rejected.getRequestEntry().getRequest().getByteData();
300300
// CHECKSTYLE.OFF: IllegalInstantiation - This is ok for String from byte[]
301-
final String requestBody = requestBodyBytes == null ? null : new String(requestBodyBytes, Charsets.UTF_8);
301+
final String requestBody = requestBodyBytes == null ? null : new String(requestBodyBytes, StandardCharsets.UTF_8);
302302
// CHECKSTYLE.ON: IllegalInstantiation
303303
POST_ERROR_LOGGER.warn()
304304
.setMessage("Post rejected")

‎src/main/java/com/arpnetworking/tsdcore/sinks/RrdSink.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.arpnetworking.steno.LoggerFactory;
2222
import com.arpnetworking.tsdcore.model.AggregatedData;
2323
import com.arpnetworking.tsdcore.model.PeriodicData;
24-
import com.google.common.base.Charsets;
2524
import com.google.common.base.Joiner;
2625
import com.google.common.collect.Maps;
2726
import net.sf.oval.constraint.NotEmpty;
@@ -31,6 +30,7 @@
3130
import java.io.File;
3231
import java.io.IOException;
3332
import java.io.InputStreamReader;
33+
import java.nio.charset.StandardCharsets;
3434
import java.time.Duration;
3535
import java.util.HashMap;
3636
import java.util.concurrent.CompletableFuture;
@@ -208,7 +208,7 @@ private void executeProcess(final String[] args) {
208208
proecssBuilder.redirectErrorStream(true);
209209
final Process process = proecssBuilder.start();
210210
try (BufferedReader processStandardOut = new BufferedReader(
211-
new InputStreamReader(process.getInputStream(), Charsets.UTF_8))) {
211+
new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
212212
String line;
213213
final StringBuilder processOutput = new StringBuilder();
214214
while ((line = processStandardOut.readLine()) != null) {

‎src/main/java/com/arpnetworking/tsdcore/sinks/circonus/CirconusClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.fasterxml.jackson.core.JsonProcessingException;
2727
import com.fasterxml.jackson.core.type.TypeReference;
2828
import com.fasterxml.jackson.databind.ObjectMapper;
29-
import com.google.common.base.Charsets;
3029
import com.typesafe.config.ConfigFactory;
3130
import com.typesafe.sslconfig.ssl.SSLConfigSettings;
3231
import net.sf.oval.constraint.NotNull;
@@ -44,6 +43,7 @@
4443

4544
import java.io.IOException;
4645
import java.net.URI;
46+
import java.nio.charset.StandardCharsets;
4747
import java.util.List;
4848
import java.util.Map;
4949
import java.util.concurrent.CompletionStage;
@@ -279,7 +279,7 @@ private CompletionStage<? extends StandaloneWSResponse> fireRequest(final Standa
279279
}
280280

281281
private InMemoryBodyWritable createBody(final String bodyString) {
282-
return new InMemoryBodyWritable(ByteString.fromString(bodyString, Charsets.UTF_8), "application/json");
282+
return new InMemoryBodyWritable(ByteString.fromString(bodyString, StandardCharsets.UTF_8), "application/json");
283283
}
284284

285285
private CirconusClient(final Builder builder) {

‎src/test/java/com/arpnetworking/configuration/DirectoryTriggerTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
package com.arpnetworking.configuration;
1717

1818
import com.arpnetworking.configuration.triggers.DirectoryTrigger;
19-
import com.google.common.base.Charsets;
2019
import com.google.common.base.MoreObjects;
2120
import org.junit.Assert;
2221
import org.junit.BeforeClass;
2322
import org.junit.Test;
2423

2524
import java.io.File;
2625
import java.io.IOException;
26+
import java.nio.charset.StandardCharsets;
2727
import java.nio.file.Files;
2828
import java.util.regex.Pattern;
2929

@@ -112,7 +112,7 @@ public void testDirectoryChangedFileCreated() throws IOException, InterruptedExc
112112
Assert.assertTrue(trigger.evaluateAndReset());
113113
Assert.assertFalse(trigger.evaluateAndReset());
114114

115-
Files.write(directory.toPath().resolve("foo.txt"), "bar".getBytes(Charsets.UTF_8));
115+
Files.write(directory.toPath().resolve("foo.txt"), "bar".getBytes(StandardCharsets.UTF_8));
116116

117117
Assert.assertTrue(trigger.evaluateAndReset());
118118
}
@@ -134,7 +134,7 @@ public void testDirectoryChangedFileModified() throws IOException, InterruptedEx
134134

135135
// Ensure file system modified time reflects the change
136136
Thread.sleep(1000);
137-
Files.write(file.toPath(), "bar".getBytes(Charsets.UTF_8));
137+
Files.write(file.toPath(), "bar".getBytes(StandardCharsets.UTF_8));
138138

139139
Assert.assertTrue(trigger.evaluateAndReset());
140140
}
@@ -145,7 +145,7 @@ public void testDirectoryChangedFileDeleted() throws IOException, InterruptedExc
145145
deleteDirectory(directory);
146146
Files.createDirectory(directory.toPath());
147147
final File file = directory.toPath().resolve("foo.txt").toFile();
148-
Files.write(file.toPath(), "bar".getBytes(Charsets.UTF_8));
148+
Files.write(file.toPath(), "bar".getBytes(StandardCharsets.UTF_8));
149149

150150
final Trigger trigger = new DirectoryTrigger.Builder()
151151
.setDirectory(directory)
@@ -173,10 +173,10 @@ public void testOnlyMatchedName() throws IOException, InterruptedException {
173173
Assert.assertTrue(trigger.evaluateAndReset());
174174
Assert.assertFalse(trigger.evaluateAndReset());
175175

176-
Files.write(directory.toPath().resolve("foo.txt"), "bar".getBytes(Charsets.UTF_8));
176+
Files.write(directory.toPath().resolve("foo.txt"), "bar".getBytes(StandardCharsets.UTF_8));
177177
Assert.assertFalse(trigger.evaluateAndReset());
178178

179-
Files.write(directory.toPath().resolve("bar.txt"), "bar".getBytes(Charsets.UTF_8));
179+
Files.write(directory.toPath().resolve("bar.txt"), "bar".getBytes(StandardCharsets.UTF_8));
180180
Assert.assertTrue(trigger.evaluateAndReset());
181181
}
182182

@@ -194,10 +194,10 @@ public void testOnlyMatchedNamePattern() throws IOException, InterruptedExceptio
194194
Assert.assertTrue(trigger.evaluateAndReset());
195195
Assert.assertFalse(trigger.evaluateAndReset());
196196

197-
Files.write(directory.toPath().resolve("foo.txt"), "bar".getBytes(Charsets.UTF_8));
197+
Files.write(directory.toPath().resolve("foo.txt"), "bar".getBytes(StandardCharsets.UTF_8));
198198
Assert.assertFalse(trigger.evaluateAndReset());
199199

200-
Files.write(directory.toPath().resolve("foo.json"), "bar".getBytes(Charsets.UTF_8));
200+
Files.write(directory.toPath().resolve("foo.json"), "bar".getBytes(StandardCharsets.UTF_8));
201201
Assert.assertTrue(trigger.evaluateAndReset());
202202
}
203203

‎src/test/java/com/arpnetworking/configuration/FileTriggerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package com.arpnetworking.configuration;
1717

1818
import com.arpnetworking.configuration.triggers.FileTrigger;
19-
import com.google.common.base.Charsets;
2019
import org.junit.Assert;
2120
import org.junit.BeforeClass;
2221
import org.junit.Test;
2322

2423
import java.io.File;
2524
import java.io.IOException;
25+
import java.nio.charset.StandardCharsets;
2626
import java.nio.file.Files;
2727
import java.nio.file.attribute.FileTime;
2828

@@ -116,7 +116,7 @@ public void testFileCreated() throws IOException {
116116
public void testFileChanged() throws IOException, InterruptedException {
117117
final File file = new File("./target/tmp/test/FileTriggerTest/testFileChanged");
118118
Files.deleteIfExists(file.toPath());
119-
Files.write(file.toPath(), "foo".getBytes(Charsets.UTF_8));
119+
Files.write(file.toPath(), "foo".getBytes(StandardCharsets.UTF_8));
120120

121121
final Trigger trigger = new FileTrigger.Builder()
122122
.setFile(file)
@@ -127,7 +127,7 @@ public void testFileChanged() throws IOException, InterruptedException {
127127

128128
// Ensure file system modified time reflects the change
129129
Thread.sleep(1000);
130-
Files.write(file.toPath(), "bar".getBytes(Charsets.UTF_8));
130+
Files.write(file.toPath(), "bar".getBytes(StandardCharsets.UTF_8));
131131

132132
Assert.assertTrue(trigger.evaluateAndReset());
133133
}
@@ -136,7 +136,7 @@ public void testFileChanged() throws IOException, InterruptedException {
136136
public void testFileChangedLastModifiedOnly() throws IOException {
137137
final File file = new File("./target/tmp/test/FileTriggerTest/testFileChangedLastModifiedOnly");
138138
Files.deleteIfExists(file.toPath());
139-
Files.write(file.toPath(), "foo".getBytes(Charsets.UTF_8));
139+
Files.write(file.toPath(), "foo".getBytes(StandardCharsets.UTF_8));
140140
Files.setLastModifiedTime(file.toPath(), FileTime.fromMillis(1418112007000L));
141141

142142
final Trigger trigger = new FileTrigger.Builder()

0 commit comments

Comments
 (0)