This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new c0fe7ff0e54 CAMEL-19446: code cleanups on camel-caffeine (#10645) c0fe7ff0e54 is described below commit c0fe7ff0e5459e26d26b7460c415fc209c1d74f1 Author: LostArtist <93444976+lostart...@users.noreply.github.com> AuthorDate: Tue Jul 11 06:26:30 2023 +0200 CAMEL-19446: code cleanups on camel-caffeine (#10645) - removed unused code - use final where possible - fixed typos Co-authored-by: Nikita Konovalov <nkono...@redhat.com> --- .../caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java | 2 +- .../cache/CaffeineCacheProducerMultiOperationSameCacheTest.java | 3 --- .../camel/component/caffeine/cache/CaffeineCacheTestSupport.java | 2 +- .../CaffeineLoadCacheProducerMultiOperationSameCacheTest.java | 2 -- .../component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java | 2 +- .../processor/idempotent/CaffeineIdempotentRepositoryTest.java | 2 +- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java index d75736ca371..68804361a4e 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheFromScratchStatsCounterTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class CaffeineCacheFromScratchStatsCounterTest extends CamelTestSupport { - private MetricRegistry metricRegistry = new MetricRegistry(); + private final MetricRegistry metricRegistry = new MetricRegistry(); @BindToRegistry("statsCounter") private MetricsStatsCounter msc = new MetricsStatsCounter(metricRegistry); diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java index ec2e54481c8..abcebc693ab 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducerMultiOperationSameCacheTest.java @@ -30,9 +30,6 @@ public class CaffeineCacheProducerMultiOperationSameCacheTest extends CaffeineCa @Test void testSameCachePutAndGet() throws Exception { - final Map<String, String> map = new HashMap<>(); - map.put("1", "1"); - fluentTemplate().withBody("1").to("direct://start").send(); MockEndpoint mock1 = getMockEndpoint("mock:result"); diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java index 0d4391890fb..b8aa87540a5 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java @@ -90,7 +90,7 @@ public class CaffeineCacheTestSupport extends CamelTestSupport { .collect(Collectors.toMap(i -> i + "-" + generateRandomString(), i -> i + "-" + generateRandomString())); } - class DummyRemovalListener implements RemovalListener<Object, Object> { + static class DummyRemovalListener implements RemovalListener<Object, Object> { @Override public void onRemoval(Object key, Object value, RemovalCause cause) { diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java index 1ee61797c68..68eec560449 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheProducerMultiOperationSameCacheTest.java @@ -30,8 +30,6 @@ public class CaffeineLoadCacheProducerMultiOperationSameCacheTest extends Caffei @Test void testSameCachePutAndGet() throws Exception { - final Map<String, String> map = new HashMap<>(); - map.put("1", "1"); fluentTemplate().withBody("1").to("direct://start").send(); diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java index 6eaa313505f..6e66de62bca 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/loadcache/CaffeineLoadCacheTestSupport.java @@ -32,7 +32,7 @@ public class CaffeineLoadCacheTestSupport extends CamelTestSupport { @Override public Integer load(String key) { - return Integer.valueOf(key) + 1; + return Integer.parseInt(key) + 1; } }; return cache = Caffeine.newBuilder().build(cl); diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java index ed839516f07..a44457d0868 100644 --- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java +++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/processor/idempotent/CaffeineIdempotentRepositoryTest.java @@ -54,7 +54,7 @@ public class CaffeineIdempotentRepositoryTest extends CamelTestSupport { // try to add the same key again assertFalse(repo.add(key01)); - // try to add an other one + // try to add another one assertTrue(repo.add(key02)); assertTrue(repo.getCache().asMap().containsKey(key02)); }