You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/12/14 13:19:17 UTC
svn commit: r1774216 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
file/ standby/client/ standby/codec/ standby/store/ tool/
Author: mduerig
Date: Wed Dec 14 13:19:16 2016
New Revision: 1774216
URL: http://svn.apache.org/viewvc?rev=1774216&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Remove redundant exception declarations
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java Wed Dec 14 13:19:16 2016
@@ -120,7 +120,7 @@ public abstract class AbstractFileStore
};
- AbstractFileStore(final FileStoreBuilder builder) throws InvalidFileStoreVersionException, IOException {
+ AbstractFileStore(final FileStoreBuilder builder) {
this.directory = builder.getDirectory();
this.tracker = new SegmentTracker();
this.blobStore = builder.getBlobStore();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Wed Dec 14 13:19:16 2016
@@ -393,7 +393,7 @@ public class FileStore extends AbstractF
* reference to them).
* @return {@code true} on success, {@code false} otherwise.
*/
- public boolean compact() throws IOException {
+ public boolean compact() {
return garbageCollector.compact() > 0;
}
@@ -805,7 +805,7 @@ public class FileStore extends AbstractF
}
}
- synchronized int compact() throws IOException {
+ synchronized int compact() {
final int newGeneration = getGcGeneration() + 1;
try {
Stopwatch watch = Stopwatch.createStarted();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java Wed Dec 14 13:19:16 2016
@@ -650,7 +650,7 @@ class TarReader implements Closeable {
}
@Nonnull
- private List<UUID> getReferences(TarEntry entry, UUID id, Map<UUID, List<UUID>> graph) throws IOException {
+ private List<UUID> getReferences(TarEntry entry, UUID id, Map<UUID, List<UUID>> graph) {
List<UUID> references = graph.get(id);
if (references == null) {
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyClientSync.java Wed Dec 14 13:19:16 2016
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.Atomi
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
-import javax.net.ssl.SSLException;
import com.google.common.base.Supplier;
import io.netty.channel.nio.NioEventLoopGroup;
@@ -78,7 +77,7 @@ public final class StandbyClientSync imp
private final NioEventLoopGroup group;
- public StandbyClientSync(String host, int port, FileStore store, boolean secure, int readTimeoutMs, boolean autoClean) throws SSLException {
+ public StandbyClientSync(String host, int port, FileStore store, boolean secure, int readTimeoutMs, boolean autoClean) {
this.state = STATUS_INITIALIZING;
this.lastSuccessfulRequest = -1;
this.syncStartTimestamp = -1;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetBlobResponseEncoder.java Wed Dec 14 13:19:16 2016
@@ -37,7 +37,7 @@ public class GetBlobResponseEncoder exte
encode(msg.getBlobId(), msg.getBlobData(), out);
}
- private void encode(String blobId, byte[] data, ByteBuf out) throws Exception {
+ private void encode(String blobId, byte[] data, ByteBuf out) {
byte[] blobIdBytes = blobId.getBytes(Charset.forName("UTF-8"));
Hasher hasher = Hashing.murmur3_32().newHasher();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/codec/GetSegmentResponseEncoder.java Wed Dec 14 13:19:16 2016
@@ -44,7 +44,7 @@ public class GetSegmentResponseEncoder e
encode(msg.getSegmentId(), msg.getSegmentData(), out);
}
- private void encode(String segmentId, byte[] data, ByteBuf out) throws Exception {
+ private void encode(String segmentId, byte[] data, ByteBuf out) {
UUID id = UUID.fromString(segmentId);
Hasher hasher = Hashing.murmur3_32().newHasher();
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/store/StandbyStoreService.java Wed Dec 14 13:19:16 2016
@@ -20,13 +20,9 @@ import static java.lang.String.valueOf;
import static org.apache.felix.scr.annotations.ReferencePolicy.STATIC;
import static org.apache.felix.scr.annotations.ReferencePolicyOption.GREEDY;
-import java.io.IOException;
-import java.security.cert.CertificateException;
import java.util.Dictionary;
import java.util.Hashtable;
-import javax.net.ssl.SSLException;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -101,7 +97,7 @@ public class StandbyStoreService {
private ServiceRegistration syncReg = null;
@Activate
- private void activate(ComponentContext context) throws IOException, CertificateException {
+ private void activate(ComponentContext context) {
if (storeProvider == null) {
throw new IllegalArgumentException("Missing SegmentStoreProvider service");
}
@@ -141,7 +137,7 @@ public class StandbyStoreService {
}
}
- private void bootstrapMaster(ComponentContext context) throws CertificateException, SSLException {
+ private void bootstrapMaster(ComponentContext context) {
Dictionary<?, ?> props = context.getProperties();
int port = PropertiesUtil.toInteger(props.get(PORT), PORT_DEFAULT);
String[] ranges = PropertiesUtil.toStringArray(props.get(ALLOWED_CLIENT_IP_RANGES), ALLOWED_CLIENT_IP_RANGES_DEFAULT);
@@ -151,7 +147,7 @@ public class StandbyStoreService {
log.info("started primary on port {} with allowed ip ranges {}.", port, ranges);
}
- private void bootstrapSlave(ComponentContext context) throws SSLException {
+ private void bootstrapSlave(ComponentContext context) {
Dictionary<?, ?> props = context.getProperties();
int port = PropertiesUtil.toInteger(props.get(PORT), PORT_DEFAULT);
long interval = PropertiesUtil.toInteger(props.get(INTERVAL), INTERVAL_DEFAULT);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java?rev=1774216&r1=1774215&r2=1774216&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Diff.java Wed Dec 14 13:19:16 2016
@@ -26,7 +26,6 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.segment.tool.Utils.readRevisions;
import java.io.File;
-import java.io.IOException;
import java.io.PrintWriter;
import java.util.Iterator;
import java.util.List;
@@ -281,7 +280,7 @@ public class Diff implements Runnable {
}
}
- private boolean diff(ReadOnlyFileStore store, RecordId idL, RecordId idR, PrintWriter pw) throws IOException {
+ private boolean diff(ReadOnlyFileStore store, RecordId idL, RecordId idR, PrintWriter pw) {
pw.println("rev " + idL + ".." + idR);
try {
NodeState before = store.getReader().readNode(idL).getChildNode("root");