You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2020/04/28 14:28:09 UTC
[sling-org-apache-sling-distribution-journal] branch master
updated: SLING-9404 - Static analysis fixes
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 5a6fd59 SLING-9404 - Static analysis fixes
5a6fd59 is described below
commit 5a6fd59587f2d7d103be87792140aba9d74a7d0b
Author: tmaret <tm...@adobe.com>
AuthorDate: Tue Apr 28 16:13:22 2020 +0200
SLING-9404 - Static analysis fixes
* remove unused imports
* remove redundant type cast
* remove dead code
* use functional style
* use standard charset
---
.../apache/sling/distribution/journal/impl/queue/impl/PubQueue.java | 4 +---
.../distribution/journal/impl/queue/impl/PubQueueCacheService.java | 1 -
.../distribution/journal/impl/queue/impl/PubQueueProviderImpl.java | 1 -
.../sling/distribution/journal/impl/subscriber/SubscriberIdle.java | 4 ----
.../journal/impl/precondition/PackageStatusWatcherTest.java | 4 +---
.../distribution/journal/impl/publisher/DistPublisherJMXTest.java | 3 +--
.../sling/distribution/journal/impl/queue/impl/PubQueueTest.java | 2 +-
.../sling/distribution/journal/impl/shared/PackageBrowserTest.java | 4 ++--
.../distribution/journal/impl/shared/PackageViewerPluginTest.java | 3 +--
.../journal/impl/subscriber/ContentPackageExtractorTest.java | 3 +--
.../sling/distribution/journal/impl/subscriber/SubscriberTest.java | 2 +-
11 files changed, 9 insertions(+), 22 deletions(-)
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 9bfd4fd..0c1a2c4 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
@@ -167,9 +167,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)));
- return (tailEntryId.isPresent())
- ? clear(tailEntryId.get())
- : emptyList();
+ return tailEntryId.map(this::clear).orElse(emptyList());
}
@Nonnull
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java
index c5eeb8c..8f49687 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueCacheService.java
@@ -18,7 +18,6 @@
*/
package org.apache.sling.distribution.journal.impl.queue.impl;
-import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderImpl.java b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderImpl.java
index cc9e839..3b7feab 100644
--- a/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderImpl.java
+++ b/src/main/java/org/apache/sling/distribution/journal/impl/queue/impl/PubQueueProviderImpl.java
@@ -25,7 +25,6 @@ import java.io.Closeable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
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 93b73c4..0719335 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
@@ -72,10 +72,6 @@ public class SubscriberIdle implements SystemReadyCheck, Closeable {
public synchronized void busy() {
cancelSchedule();
}
-
- public boolean isReady() {
- return isReady.get();
- }
/**
* Called when processing of a message has finished
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 571d98a..5783e42 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
@@ -96,7 +96,7 @@ public class PackageStatusWatcherTest {
}
PackageStatusMessage createStatusMessage(int i) {
- PackageStatusMessage pkgStatMsg = PackageStatusMessage.newBuilder()
+ return PackageStatusMessage.newBuilder()
.setSubSlingId(SUB1_SLING_ID)
.setSubAgentName(SUB1_AGENT_NAME)
.setPubAgentName(PUB1_AGENT_NAME)
@@ -104,8 +104,6 @@ public class PackageStatusWatcherTest {
.setStatus(PackageStatusMessage.Status.REMOVED_FAILED)
.build();
- return pkgStatMsg;
-
}
void assertPackageStatus(long pkgOffset, Status status) {
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 2a41a2f..4e5a79b 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
@@ -101,8 +101,7 @@ public class DistPublisherJMXTest {
content.put("offset", 10l);
DistributionQueueItem item = new DistributionQueueItem("packageid", content);
DistributionQueueItemStatus status = new DistributionQueueItemStatus(DistributionQueueItemState.ERROR, "name");
- DistributionQueueEntry entry1 = new DistributionQueueEntry("id", item, status);
- return entry1;
+ return new DistributionQueueEntry("id", item, status);
}
@After
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 20dccea..0fd0c7a 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
@@ -204,7 +204,7 @@ public class PubQueueTest {
private long offset(int nr) {
return nr * 100;
- };
+ }
private static String packageId(int nr) {
return PACKAGE_ID_PREFIX + new Integer(nr).toString();
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 14dcc19..49d7eab 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
@@ -24,7 +24,7 @@ import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.jcr.Binary;
import javax.jcr.Session;
@@ -75,7 +75,7 @@ public class PackageBrowserTest {
when(session.getValueFactory()).thenReturn(valueFactory);
when(valueFactory.createValue(Mockito.any(SimpleReferenceBinary.class))).thenReturn(value);
when(value.getBinary()).thenReturn(binary);
- ByteArrayInputStream is = new ByteArrayInputStream(DATA.getBytes(Charset.forName("utf-8")));
+ ByteArrayInputStream is = new ByteArrayInputStream(DATA.getBytes(StandardCharsets.UTF_8));
when(binary.getStream()).thenReturn(is);
PackageMessage pkgMsg = createPackageMsg(0l);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
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 aa2947a..3e07df8 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
@@ -155,8 +155,7 @@ public class PackageViewerPluginTest {
.setPkgType("some_type")
.setPkgBinary(ByteString.copyFrom("package content", Charset.defaultCharset()))
.build();
- FullMessage<PackageMessage> msg = new FullMessage<PackageMessage>(info, message);
- return msg;
+ return new FullMessage<>(info, message);
}
}
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 0868cc8..e36b214 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
@@ -139,8 +139,7 @@ public class ContentPackageExtractorTest {
private Resource createImportedPackage() throws PersistenceException {
Resource packages = createEtcPackages();
Resource node1 = createNode(packages, "my_packages", NodeType.NT_UNSTRUCTURED);
- Resource node = createNode(node1, "test-1.zip", NodeType.NT_FILE);
- return node;
+ return createNode(node1, "test-1.zip", NodeType.NT_FILE);
}
private Resource createNode(Resource parent, String name, String nodeType) throws PersistenceException {
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 467509f..745bd4c 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
@@ -214,7 +214,7 @@ public class SubscriberTest {
Mockito.anyString(),
packageCaptor.capture()))
.thenReturn(poller);
- when(context.registerService(Mockito.any(Class.class), (DistributionAgent) eq(subscriber), Mockito.any(Dictionary.class))).thenReturn(reg);
+ when(context.registerService(Mockito.any(Class.class), eq(subscriber), Mockito.any(Dictionary.class))).thenReturn(reg);
// you should call initSubscriber in each test method
}