This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
The following commit(s) were added to refs/heads/master by this push:
new 4190c2b SLING-9404 - language update
4190c2b is described below
commit 4190c2befc6da8277e12ba019b8c41087cb217e1
Author: tmaret <[email protected]>
AuthorDate: Tue Apr 28 17:11:40 2020 +0200
SLING-9404 - language update
---
.../journal/impl/publisher/DiscoveryService.java | 2 +-
.../distribution/journal/impl/queue/impl/PubQueue.java | 4 ++--
.../journal/impl/queue/impl/PubQueueCache.java | 8 ++++----
.../impl/shared/JournalAvailableServiceMarker.java | 2 +-
.../journal/impl/subscriber/BookKeeper.java | 12 ++++--------
.../impl/subscriber/DistributionSubscriber.java | 4 ++--
.../journal/impl/subscriber/PackageHandler.java | 4 ++--
.../journal/impl/subscriber/SubscriberIdle.java | 2 +-
.../journal/impl/subscriber/SubscriberReadyStore.java | 2 +-
.../impl/precondition/PackageStatusWatcherTest.java | 2 +-
.../impl/precondition/StagingPreconditionTest.java | 4 ++--
.../journal/impl/publisher/DiscoveryServiceTest.java | 2 +-
.../journal/impl/publisher/DistPublisherJMXTest.java | 6 +++---
.../impl/publisher/DistributionPackageFactoryTest.java | 4 ++--
.../journal/impl/publisher/PackageRepoTest.java | 4 ++--
.../journal/impl/queue/QueueItemFactoryTest.java | 4 ++--
.../impl/queue/impl/OffsetQueueImplJMXTest.java | 6 +++---
.../journal/impl/queue/impl/OffsetQueueImplTest.java | 4 ++--
.../journal/impl/queue/impl/PubQueueCacheTest.java | 4 ++--
.../journal/impl/queue/impl/PubQueueProviderTest.java | 8 ++++----
.../journal/impl/queue/impl/PubQueueTest.java | 4 ++--
.../journal/impl/queue/impl/RangePollerTest.java | 2 +-
.../journal/impl/shared/LimitPollerTest.java | 2 +-
.../journal/impl/shared/PackageBrowserTest.java | 2 +-
.../journal/impl/shared/PackageViewerPluginTest.java | 18 +++++++++---------
.../journal/impl/subscriber/AnnouncerTest.java | 4 ++--
.../journal/impl/subscriber/BookKeeperTest.java | 6 +++---
.../journal/impl/subscriber/CommandPollerTest.java | 14 +++++++-------
.../impl/subscriber/ContentPackageExtractorTest.java | 4 ++--
.../journal/impl/subscriber/LocalStoreTest.java | 10 +++++-----
.../journal/impl/subscriber/SubscriberTest.java | 2 +-
31 files changed, 76 insertions(+), 80 deletions(-)
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java
b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java
index 6c99368..128d453 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java
@@ -68,7 +68,7 @@ public class DiscoveryService implements Runnable {
private static final long REFRESH_TTL_MS = 30000;
@Reference
- JournalAvailable journalAvailable;
+ private JournalAvailable journalAvailable;
@Reference
private MessagingProvider messagingProvider;
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueue.java
b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueue.java
index 0c1a2c4..23aaf15 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueue.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueue.java
@@ -18,7 +18,6 @@
*/
package org.apache.sling.distribution.journal.impl.queue.impl;
-import static java.lang.Long.compare;
import static java.util.Collections.emptyList;
import static java.util.stream.StreamSupport.stream;
import static
org.apache.sling.distribution.queue.DistributionQueueCapabilities.CLEARABLE;
@@ -29,6 +28,7 @@ import static
org.apache.sling.distribution.queue.DistributionQueueState.IDLE;
import static
org.apache.sling.distribution.queue.DistributionQueueState.RUNNING;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
@@ -166,7 +166,7 @@ public class PubQueue implements DistributionQueue {
*/
log.info("Removing queue entries {}", entryIds);
Optional<String> tailEntryId = entryIds.stream()
- .max((e1, e2) -> compare(EntryUtil.entryOffset(e1),
EntryUtil.entryOffset(e2)));
+ .max(Comparator.comparingLong(EntryUtil::entryOffset));
return tailEntryId.map(this::clear).orElse(emptyList());
}
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java
b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java
index 1b9e14d..438af2e 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCache.java
@@ -114,7 +114,7 @@ public class PubQueueCache {
private final String topic;
- private long seedingDelayMs;
+ private final long seedingDelayMs;
private final DistributionMetricsService distributionMetricsService;
@@ -160,7 +160,7 @@ public class PubQueueCache {
closed = true;
IOUtils.closeQuietly(tailPoller);
- jmxRegs.stream().forEach(IOUtils::closeQuietly);
+ jmxRegs.forEach(IOUtils::closeQuietly);
}
private void seedCache() {
@@ -309,10 +309,10 @@ public class PubQueueCache {
private void mergeByAgent(String pubAgentName,
List<FullMessage<PackageMessage>> messages) {
OffsetQueueImpl<DistributionQueueItem> msgs = new OffsetQueueImpl<>();
- messages.stream()
+ messages
.forEach(message -> msgs.putItem(message.getInfo().getOffset(),
QueueItemFactory.fromPackage(message)));
getOrCreateQueue(pubAgentName).putItems(msgs);
- messages.stream().forEach(this::sendQueuedEvent);
+ messages.forEach(this::sendQueuedEvent);
}
private void sendQueuedEvent(FullMessage<PackageMessage> fMessage) {
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableServiceMarker.java
b/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableServiceMarker.java
index 287f3fa..dd93232 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableServiceMarker.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/shared/JournalAvailableServiceMarker.java
@@ -26,7 +26,7 @@ import org.osgi.framework.ServiceRegistration;
class JournalAvailableServiceMarker implements JournalAvailable {
- private BundleContext context;
+ private final BundleContext context;
private ServiceRegistration<JournalAvailable> reg;
JournalAvailableServiceMarker(BundleContext context) {
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java
index 13b2dfc..2984399 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeper.java
@@ -32,7 +32,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
-import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils;
import org.apache.sling.api.resource.LoginException;
@@ -98,7 +97,7 @@ public class BookKeeper implements Closeable {
private final LocalStore processedOffsets;
private final String subAgentName;
private final String subSlingId;
- private GaugeService<Integer> retriesGauge;
+ private final GaugeService<Integer> retriesGauge;
private int skippedCounter = 0;
public BookKeeper(ResourceResolverFactory resolverFactory,
@@ -171,7 +170,7 @@ public class BookKeeper implements Closeable {
private void addPackageMDC(PackageMessage pkgMsg) {
MDC.put("module", "distribution");
MDC.put("package-id", pkgMsg.getPkgId());
- String paths =
pkgMsg.getPathsList().stream().collect(Collectors.joining(","));
+ String paths = String.join(",", pkgMsg.getPathsList());
MDC.put("paths", paths);
MDC.put("pub-sling-id", pkgMsg.getPubSlingId());
String pubAgentName = pkgMsg.getPubAgentName();
@@ -188,10 +187,7 @@ public class BookKeeper implements Closeable {
* When we use an error queue and the max retries is reached the package
is removed.
* In all other cases a DistributionException is thrown that signals that
we should retry the
* package.
- *
- * @param pkgMsg
- * @param offset
- * @param e
+ *
* @throws DistributionException if the package should be retried
*/
private void failure(PackageMessage pkgMsg, long offset, Exception e)
throws DistributionException {
@@ -340,7 +336,7 @@ public class BookKeeper implements Closeable {
}
}
- class PackageStatus {
+ static class PackageStatus {
final Status status;
final Long offset;
final String pubAgentName;
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
index 641069d..e30ff59 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/DistributionSubscriber.java
@@ -19,7 +19,6 @@
package org.apache.sling.distribution.journal.impl.subscriber;
import static java.lang.String.format;
-import static java.util.Arrays.asList;
import static java.util.Collections.emptyMap;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toSet;
@@ -31,6 +30,7 @@ import static
org.apache.sling.distribution.journal.impl.queue.QueueItemFactory.
import java.io.Closeable;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -234,7 +234,7 @@ public class DistributionSubscriber implements
DistributionAgent {
}
private Set<String> getNotEmpty(String[] agentNames) {
- return
asList(agentNames).stream().filter(StringUtils::isNotBlank).collect(toSet());
+ return
Arrays.stream(agentNames).filter(StringUtils::isNotBlank).collect(toSet());
}
private Dictionary<String, Object>
createServiceProps(SubscriberConfiguration config) {
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageHandler.java
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageHandler.java
index a7148c4..bdfb3dd 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageHandler.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/PackageHandler.java
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
public class PackageHandler {
private static final Logger LOG =
LoggerFactory.getLogger(PackageHandler.class);
- private DistributionPackageBuilder packageBuilder;
+ private final DistributionPackageBuilder packageBuilder;
- private ContentPackageExtractor extractor;
+ private final ContentPackageExtractor extractor;
public PackageHandler(DistributionPackageBuilder packageBuilder,
ContentPackageExtractor extractor) {
this.packageBuilder = packageBuilder;
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberIdle.java
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberIdle.java
index 0719335..c7af419 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberIdle.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberIdle.java
@@ -45,7 +45,7 @@ public class SubscriberIdle implements SystemReadyCheck,
Closeable {
private final ScheduledExecutorService executor;
private ScheduledFuture<?> schedule;
- private ServiceRegistration<SystemReadyCheck> reg;
+ private final ServiceRegistration<SystemReadyCheck> reg;
public SubscriberIdle(BundleContext context, int idleMillis, AtomicBoolean
readyHolder) {
this.idleMillis = idleMillis;
diff --git
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberReadyStore.java
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberReadyStore.java
index 610d9f5..872831d 100644
---
a/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberReadyStore.java
+++
b/src/main/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberReadyStore.java
@@ -27,7 +27,7 @@ import org.osgi.service.component.annotations.Component;
@Component(service = SubscriberReadyStore.class)
public class SubscriberReadyStore {
- Map<String, AtomicBoolean> subscriberReady = new ConcurrentHashMap<>();
+ private final Map<String, AtomicBoolean> subscriberReady = new
ConcurrentHashMap<>();
AtomicBoolean getReadyHolder(String subscriberName) {
return subscriberReady.computeIfAbsent(subscriberName, name -> new
AtomicBoolean(false));
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
index 5783e42..1c5350e 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/PackageStatusWatcherTest.java
@@ -90,7 +90,7 @@ public class PackageStatusWatcherTest {
void generateMessages(int begin, int end) {
MessageHandler<PackageStatusMessage> handler =
adapterCaptor.getValue().getHandler();
for (int i=begin; i<end; i++) {
- handler.handle(new TestMessageInfo(TOPIC_NAME, 0, i, 0l),
+ handler.handle(new TestMessageInfo(TOPIC_NAME, 0, i, 0L),
createStatusMessage(i));
}
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
index 6a9f893..59b1c14 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/precondition/StagingPreconditionTest.java
@@ -56,7 +56,7 @@ public class StagingPreconditionTest {
private static final String SUB1_SLING_ID = "sub1sling";
private static final String GP_SUB1_AGENT_NAME = "gpsub1agent";
private static final String PUB1_AGENT_NAME = "pub1agent";
- private static final Long OFFSET_NOT_PRESENT = 111111l;
+ private static final Long OFFSET_NOT_PRESENT = 111111L;
@Mock
private MessagingProvider clientProvider;
@@ -115,7 +115,7 @@ public class StagingPreconditionTest {
});
th.start();
precondition.deactivate();
- Throwable ex = Awaitility.await().until(() -> exHolder.get(),
notNullValue());
+ Throwable ex = Awaitility.await().until(exHolder::get, notNullValue());
assertThat(ex, instanceOf(IllegalStateException.class));
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryServiceTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryServiceTest.java
index 5e7b76c..02a58c1 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryServiceTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryServiceTest.java
@@ -74,7 +74,7 @@ public class DiscoveryServiceTest {
discoveryHandler.handle(info, message);
discoveryService.run();
- assertThat(discoveryService.getTopologyView().getState(subAgentId,
PUB1_AGENT_NAME).getOffset(), equalTo(10l));
+ assertThat(discoveryService.getTopologyView().getState(subAgentId,
PUB1_AGENT_NAME).getOffset(), equalTo(10L));
}
@After
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistPublisherJMXTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistPublisherJMXTest.java
index 4e5a79b..cb8bcc7 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistPublisherJMXTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistPublisherJMXTest.java
@@ -98,7 +98,7 @@ public class DistPublisherJMXTest {
private DistributionQueueEntry createQueueEntry() {
Map<String, Object> content = new HashMap<>();
- content.put("offset", 10l);
+ content.put("offset", 10L);
DistributionQueueItem item = new DistributionQueueItem("packageid",
content);
DistributionQueueItemStatus status = new
DistributionQueueItemStatus(DistributionQueueItemState.ERROR, "name");
return new DistributionQueueEntry("id", item, status);
@@ -131,13 +131,13 @@ public class DistPublisherJMXTest {
private void checkTable(Map table) {
assertTrue(table.containsKey("sling1_sub1"));
- assertThat(table.get("sling1_sub1"), equalTo(10l));
+ assertThat(table.get("sling1_sub1"), equalTo(10L));
}
private void checkQueueTable(TabularData table) {
CompositeData row1 = (CompositeData)table.values().iterator().next();
assertThat(row1.get("ID"), equalTo("id"));
- assertThat(row1.get("offset"), equalTo(10l));
+ assertThat(row1.get("offset"), equalTo(10L));
}
private Map idToOffset(TabularData table) {
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPackageFactoryTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPackageFactoryTest.java
index 5277e9e..125aa5f 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPackageFactoryTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/DistributionPackageFactoryTest.java
@@ -80,7 +80,7 @@ public class DistributionPackageFactoryTest {
Messages.PackageMessage sent = publisher.create(packageBuilder,
resourceResolver, "pub1agent1", request);
assertThat(sent.getPkgBinary(), notNullValue());
- assertThat(sent.getPkgLength(), equalTo(0l));
+ assertThat(sent.getPkgLength(), equalTo(0L));
assertThat(sent.getReqType(),
equalTo(Messages.PackageMessage.ReqType.ADD));
assertThat(sent.getPkgType(), equalTo("journal"));
assertThat(sent.getPathsList(), contains("/test"));
@@ -94,7 +94,7 @@ public class DistributionPackageFactoryTest {
Messages.PackageMessage sent = publisher.create(packageBuilder,
resourceResolver, "pub1agent1", request);
assertThat(sent.getReqType(),
equalTo(Messages.PackageMessage.ReqType.DELETE));
assertThat(sent.getPkgBinary(), notNullValue());
- assertThat(sent.getPkgLength(), equalTo(0l));
+ assertThat(sent.getPkgLength(), equalTo(0L));
assertThat(sent.getPathsList(), contains("/test"));
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/PackageRepoTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/PackageRepoTest.java
index a8fb467..161f454 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/publisher/PackageRepoTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/publisher/PackageRepoTest.java
@@ -105,9 +105,9 @@ public class PackageRepoTest {
@Test
public void testStoreClean() throws DistributionException, IOException,
LoginException {
when(messagingProvider.retrieveOffset(Mockito.anyString(),
Mockito.eq(Reset.earliest)))
- .thenReturn(100l, 201l, 201l, 203l);
+ .thenReturn(100L, 201L, 201L, 203L);
when(messagingProvider.retrieveOffset(Mockito.anyString(),
Mockito.eq(Reset.latest)))
- .thenReturn(200l, 202l, 202l, 203l);
+ .thenReturn(200L, 202L, 202L, 203L);
when(timer.time())
.thenReturn(context);
when(distributionMetricsService.getCleanupPackageDuration())
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/QueueItemFactoryTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/QueueItemFactoryTest.java
index 6aeb1ba..1bf6fd8 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/QueueItemFactoryTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/QueueItemFactoryTest.java
@@ -60,8 +60,8 @@ public class QueueItemFactoryTest {
assertProp(RECORD_TOPIC, String.class, equalTo("topic"));
assertProp(RECORD_PARTITION, Integer.class, equalTo(0));
- assertProp(RECORD_OFFSET, Long.class, equalTo(1l));
- assertProp(RECORD_TIMESTAMP, Long.class, equalTo(2l));
+ assertProp(RECORD_OFFSET, Long.class, equalTo(1L));
+ assertProp(RECORD_TIMESTAMP, Long.class, equalTo(2L));
assertProp(PROPERTY_PACKAGE_TYPE, String.class,
equalTo("type"));
assertProp(PROPERTY_REQUEST_TYPE,
DistributionRequestType.class, equalTo(DistributionRequestType.ADD));
assertProp(PROPERTY_REQUEST_PATHS, String[].class,
hasItemInArray("/"));
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplJMXTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplJMXTest.java
index 18cc957..1fc24bc 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplJMXTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplJMXTest.java
@@ -41,9 +41,9 @@ public class OffsetQueueImplJMXTest {
@Test
public void testJMX() throws MalformedObjectNameException,
InstanceNotFoundException, AttributeNotFoundException, ReflectionException,
MBeanException {
- OffsetQueue<Long> queue = new OffsetQueueImpl<Long>();
- queue.putItem(100, 100l);
- queue.putItem(105, 105l);
+ OffsetQueue<Long> queue = new OffsetQueueImpl<>();
+ queue.putItem(100, 100L);
+ queue.putItem(105, 105L);
MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplTest.java
index 657f29e..4656e51 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/OffsetQueueImplTest.java
@@ -41,7 +41,7 @@ public class OffsetQueueImplTest {
@Test
public void testPutGetItem() throws Exception {
long offset = 100;
- long value = 42l;
+ long value = 42L;
queue.putItem(offset, value);
assertThat(queue.getItem(offset), equalTo(value));
}
@@ -50,7 +50,7 @@ public class OffsetQueueImplTest {
public void testGetHeadItem() throws Exception {
Assert.assertNull(queue.getHeadItem());
populateQueue();
- assertThat(queue.getHeadItem(), equalTo(100l));
+ assertThat(queue.getHeadItem(), equalTo(100L));
}
@Test
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java
index 1113319..c6245b8 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheTest.java
@@ -195,10 +195,10 @@ public class PubQueueCacheTest {
consumers.add(executor.submit(new Consumer(PUB_AGENT_NAME_2, 0)));
consumers.add(executor.submit(new Consumer(PUB_AGENT_NAME_3, 0)));
// All consumers are blocked until the cache is seeded
- consumers.stream().forEach(future -> assertFalse(future.isDone()));
+ consumers.forEach(future -> assertFalse(future.isDone()));
// sending any package message seeds the cache
simulateMessage(tailHandler, 0);
- consumers.stream().forEach(future -> assertNotNull(get(future)));
+ consumers.forEach(future -> assertNotNull(get(future)));
}
@Test
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java
index 61c1389..7edfb05 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderTest.java
@@ -143,9 +143,9 @@ public class PubQueueProviderTest {
@Test
public void test() throws Exception {
- handler.handle(info(0l), packageMessage("packageid1",
PUB1_AGENT_NAME));
- handler.handle(info(1l), packageMessage("packageid2",
PUB2_AGENT_NAME));
- handler.handle(info(2l), packageMessage("packageid3",
PUB1_AGENT_NAME));
+ handler.handle(info(0L), packageMessage("packageid1",
PUB1_AGENT_NAME));
+ handler.handle(info(1L), packageMessage("packageid2",
PUB2_AGENT_NAME));
+ handler.handle(info(2L), packageMessage("packageid3",
PUB1_AGENT_NAME));
// Full pub1 queue contains all packages from pub1
DistributionQueue queue = queueProvider.getQueue(PUB1_AGENT_NAME,
SUB_SLING_ID, SUB_AGENT_NAME, SUB_AGENT_ID, 0, -1, false);
@@ -179,7 +179,7 @@ public class PubQueueProviderTest {
// Simulate receive of package message and status message
PackageMessage pkgMsg1 = packageMessage("packageid1", PUB1_AGENT_NAME);
- MessageInfo info = info(1l);
+ MessageInfo info = info(1L);
handler.handle(info, pkgMsg1);
PackageStatusMessage statusMsg1 = statusMessage(info.getOffset(),
pkgMsg1);
statHandler.handle(info, statusMsg1);
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueTest.java
index 0fd0c7a..28b5320 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueTest.java
@@ -52,8 +52,8 @@ public class PubQueueTest {
private static final String QUEUE_NAME = "queueName";
private static final String PACKAGE_ID_PREFIX = "package-";
private final Logger log = LoggerFactory.getLogger(this.getClass());
- private Semaphore invoked = new Semaphore(0);
- private long lastClearOffset = 0l;
+ private final Semaphore invoked = new Semaphore(0);
+ private long lastClearOffset = 0L;
private OffsetQueue<DistributionQueueItem> offsetQueue;
private PubQueue queue;
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/RangePollerTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/RangePollerTest.java
index 7a4aab0..9a597f8 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/RangePollerTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/queue/impl/RangePollerTest.java
@@ -117,7 +117,7 @@ public class RangePollerTest {
.setPkgType("journal")
.addPaths("path")
.build();
- return new FullMessage<Messages.PackageMessage>(info, message);
+ return new FullMessage<>(info, message);
}
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
index fed9fef..5546b50 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/shared/LimitPollerTest.java
@@ -122,7 +122,7 @@ public class LimitPollerTest {
.setPkgType("journal")
.addPaths("path")
.build();
- return new FullMessage<Messages.PackageMessage>(info, message);
+ return new FullMessage<>(info, message);
}
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowserTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowserTest.java
index 49d7eab..659f69e 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowserTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageBrowserTest.java
@@ -77,7 +77,7 @@ public class PackageBrowserTest {
when(value.getBinary()).thenReturn(binary);
ByteArrayInputStream is = new
ByteArrayInputStream(DATA.getBytes(StandardCharsets.UTF_8));
when(binary.getStream()).thenReturn(is);
- PackageMessage pkgMsg = createPackageMsg(0l);
+ PackageMessage pkgMsg = createPackageMsg(0L);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
packageBrowser.writeTo(pkgMsg, bao);
String resultSt = bao.toString("utf-8");
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageViewerPluginTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageViewerPluginTest.java
index 3e07df8..1a46360 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageViewerPluginTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/shared/PackageViewerPluginTest.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.charset.Charset;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import javax.servlet.ServletException;
@@ -82,11 +82,11 @@ public class PackageViewerPluginTest {
@Before
public void before() throws IOException {
- FullMessage<PackageMessage> msg1 = createPackageMsg(1l);
- List<FullMessage<PackageMessage>> messages = Arrays.asList(msg1);
- doReturn(messages).when(packageBrowser).getMessages(Mockito.eq(1l),
Mockito.anyLong(), Mockito.any());
- doReturn(messages).when(packageBrowser).getMessages(Mockito.eq(0l),
Mockito.anyLong(), Mockito.any());
- doReturn(emptyList()).when(packageBrowser).getMessages(Mockito.eq(2l),
Mockito.anyLong(), Mockito.any());
+ FullMessage<PackageMessage> msg1 = createPackageMsg(1L);
+ List<FullMessage<PackageMessage>> messages =
Collections.singletonList(msg1);
+ doReturn(messages).when(packageBrowser).getMessages(Mockito.eq(1L),
Mockito.anyLong(), Mockito.any());
+ doReturn(messages).when(packageBrowser).getMessages(Mockito.eq(0L),
Mockito.anyLong(), Mockito.any());
+ doReturn(emptyList()).when(packageBrowser).getMessages(Mockito.eq(2L),
Mockito.anyLong(), Mockito.any());
outWriter = new StringWriter();
when(res.getWriter()).thenReturn(new PrintWriter(outWriter));
@@ -118,7 +118,7 @@ public class PackageViewerPluginTest {
viewer.renderContent(req, res);
- verify(packageBrowser).getMessages(Mockito.eq(1l), Mockito.eq(1l),
Mockito.any());
+ verify(packageBrowser).getMessages(Mockito.eq(1L), Mockito.eq(1L),
Mockito.any());
}
@Test
@@ -128,7 +128,7 @@ public class PackageViewerPluginTest {
viewer.renderContent(req, res);
verify(res).setStatus(Mockito.eq(404));
- verify(packageBrowser).getMessages(Mockito.eq(2l), Mockito.eq(1l),
Mockito.any());
+ verify(packageBrowser).getMessages(Mockito.eq(2L), Mockito.eq(1L),
Mockito.any());
}
@Test
@@ -146,7 +146,7 @@ public class PackageViewerPluginTest {
}
private FullMessage<PackageMessage> createPackageMsg(long offset) {
- MessageInfo info = new TestMessageInfo("topic", 0 , offset, 0l);
+ MessageInfo info = new TestMessageInfo("topic", 0 , offset, 0L);
PackageMessage message = PackageMessage.newBuilder()
.setPubSlingId("")
.setReqType(ReqType.ADD)
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/AnnouncerTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/AnnouncerTest.java
index 05f8a88..5746dc7 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/AnnouncerTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/AnnouncerTest.java
@@ -43,7 +43,7 @@ public class AnnouncerTest {
public void testDiscoveryMessage() throws InterruptedException {
Consumer<Messages.DiscoveryMessage> sender =
Mockito.mock(Consumer.class);
BookKeeper bookKeeper = Mockito.mock(BookKeeper.class);
- when(bookKeeper.loadOffset()).thenReturn(1l);
+ when(bookKeeper.loadOffset()).thenReturn(1L);
Announcer announcer = new Announcer(SUB1_SLING_ID, SUB1_AGENT_NAME,
Collections.singleton(PUB1_AGENT_NAME), sender, bookKeeper, -1, false, 10000);
Thread.sleep(200);
ArgumentCaptor<Messages.DiscoveryMessage> msg =
forClass(Messages.DiscoveryMessage.class);
@@ -52,7 +52,7 @@ public class AnnouncerTest {
Messages.SubscriberState offset =
message.getSubscriberStateList().iterator().next();
assertThat(message.getSubSlingId(), equalTo(SUB1_SLING_ID));
assertThat(offset.getPubAgentName(), equalTo(PUB1_AGENT_NAME));
- assertThat(offset.getOffset(), equalTo(1l));
+ assertThat(offset.getOffset(), equalTo(1L));
announcer.close();
}
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeperTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeperTest.java
index fd4c761..1345895 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeperTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/BookKeeperTest.java
@@ -67,15 +67,15 @@ public class BookKeeperTest {
public void testOnlyEveryTenthSkippedPackageOffsetStored() throws
InterruptedException, PersistenceException, LoginException {
for (int c = 0; c < COMMIT_AFTER_NUM_SKIPPED; c++) {
bookKeeper.skipPackage(c);
- assertThat(bookKeeper.loadOffset(), equalTo(-1l));
+ assertThat(bookKeeper.loadOffset(), equalTo(-1L));
}
for (int c = COMMIT_AFTER_NUM_SKIPPED; c < COMMIT_AFTER_NUM_SKIPPED *
2; c++) {
bookKeeper.skipPackage(c);
- assertThat(bookKeeper.loadOffset(), equalTo(10l));
+ assertThat(bookKeeper.loadOffset(), equalTo(10L));
}
for (int c = COMMIT_AFTER_NUM_SKIPPED * 2; c <
COMMIT_AFTER_NUM_SKIPPED * 3; c++) {
bookKeeper.skipPackage(c);
- assertThat(bookKeeper.loadOffset(), equalTo(20l));
+ assertThat(bookKeeper.loadOffset(), equalTo(20L));
}
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/CommandPollerTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/CommandPollerTest.java
index d6c774e..72d0257 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/CommandPollerTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/CommandPollerTest.java
@@ -86,13 +86,13 @@ public class CommandPollerTest {
public void testSkipped() throws DistributionException,
InterruptedException, IOException {
createCommandPoller(true);
- commandHandler.handle(info, commandMessage(SUBSLING_ID_OTHER,
SUB_AGENT_OTHER, 1l));
+ commandHandler.handle(info, commandMessage(SUBSLING_ID_OTHER,
SUB_AGENT_OTHER, 1L));
assertSkipped();
- commandHandler.handle(info, commandMessage(SUBSLING_ID_OTHER,
SUB_AGENT_NAME, 1l));
+ commandHandler.handle(info, commandMessage(SUBSLING_ID_OTHER,
SUB_AGENT_NAME, 1L));
assertSkipped();
- commandHandler.handle(info, commandMessage(SUB_SLING_ID,
SUB_AGENT_OTHER, 1l));
+ commandHandler.handle(info, commandMessage(SUB_SLING_ID,
SUB_AGENT_OTHER, 1L));
assertSkipped();
}
@@ -100,14 +100,14 @@ public class CommandPollerTest {
public void testClearOffsets() throws DistributionException,
InterruptedException, IOException {
createCommandPoller(true);
- commandHandler.handle(info, commandMessage(10l));
+ commandHandler.handle(info, commandMessage(10L));
assertClearedUpTo(10);
- commandHandler.handle(info, commandMessage(11l));
+ commandHandler.handle(info, commandMessage(11L));
assertClearedUpTo(11);
// Clearing lower offset should not change cleared offset
- commandHandler.handle(info, commandMessage(1l));
+ commandHandler.handle(info, commandMessage(1L));
assertClearedUpTo(11);
}
@@ -123,7 +123,7 @@ public class CommandPollerTest {
public void testIgnoreInvalidCommand() throws DistributionException,
InterruptedException, IOException {
createCommandPoller(true);
- CommandMessage message =
CommandMessage.newBuilder(commandMessage(10l)).clearClearCommand().build();
+ CommandMessage message =
CommandMessage.newBuilder(commandMessage(10L)).clearClearCommand().build();
commandHandler.handle(info, message);
assertClearedUpTo(-1);
}
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractorTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractorTest.java
index e36b214..d107e00 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractorTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/ContentPackageExtractorTest.java
@@ -143,13 +143,13 @@ public class ContentPackageExtractorTest {
}
private Resource createNode(Resource parent, String name, String nodeType)
throws PersistenceException {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
props.put("jcr:primaryType", nodeType);
return resourceResolver.create(parent, name, props);
}
private Resource createEtcPackages() throws PersistenceException {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
Resource root = resourceResolver.getResource("/");
Resource etc = resourceResolver.create(root, "etc", props);
return resourceResolver.create(etc, "packages", props);
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java
index 11b346a..4bc8761 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/LocalStoreTest.java
@@ -39,13 +39,13 @@ public class LocalStoreTest {
MockResourceResolverFactory resolverFactory = new
MockResourceResolverFactory();
ResourceResolver resourceResolver =
resolverFactory.getServiceResourceResolver(null);
LocalStore offsetStore = new LocalStore(resolverFactory, "packages",
"store1");
- assertThat(offsetStore.load("offset", -1L), equalTo(-1l));
- offsetStore.store(resourceResolver, "offset", 2l);
+ assertThat(offsetStore.load("offset", -1L), equalTo(-1L));
+ offsetStore.store(resourceResolver, "offset", 2L);
resourceResolver.commit();
- assertThat(offsetStore.load("offset", -1L), equalTo(2l));
- offsetStore.store(resourceResolver, "offset", 3l);
+ assertThat(offsetStore.load("offset", -1L), equalTo(2L));
+ offsetStore.store(resourceResolver, "offset", 3L);
resourceResolver.commit();
- assertThat(offsetStore.load("offset", -1L), equalTo(3l));
+ assertThat(offsetStore.load("offset", -1L), equalTo(3L));
}
@Test
diff --git
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
index 745bd4c..6ee55f8 100644
---
a/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
+++
b/src/test/java/org/apache/sling/distribution/journal/impl/subscriber/SubscriberTest.java
@@ -425,7 +425,7 @@ public class SubscriberTest {
}
}
- private final class WaitFor implements Answer<DistributionPackageInfo> {
+ private static final class WaitFor implements
Answer<DistributionPackageInfo> {
private final Semaphore sem;
private WaitFor(Semaphore sem) {
