Author: mduerig
Date: Wed Dec 14 13:20:25 2016
New Revision: 1774229
URL: http://svn.apache.org/viewvc?rev=1774229&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Typos
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordType.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.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/server/StandbyServer.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.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/CacheWeights.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CacheWeights.java
Wed Dec 14 13:20:25 2016
@@ -70,7 +70,7 @@ public class CacheWeights {
@Override
public int weigh(@Nonnull SegmentId id, @Nonnull Segment segment) {
int size = SEGMENT_CACHE_OVERHEAD;
- // segmentid weight estimation is included in segment
+ // segmentId weight estimation is included in segment
size += segment.estimateMemoryUsage();
return size;
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordType.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordType.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordType.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordType.java
Wed Dec 14 13:20:25 2016
@@ -70,7 +70,7 @@ public enum RecordType {
* is no reference. If the size is 1, then reference points to the value of
* the list. If the size is larger, then a record id follows, which points
* to a bucket with the actual record ids. If there are more than 255
- * entries in the list, then the list is partitioned into sublists of 255
+ * entries in the list, then the list is partitioned into sub-lists of 255
* entries each, which are stored kind of recursively.
*/
LIST,
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
Wed Dec 14 13:20:25 2016
@@ -735,7 +735,7 @@ public class Segment {
size += StringUtils.estimateMemoryUsage(info);
}
if (!data.isDirect()) {
- // seems to overreport by 100+ bytes
+ // seems to over report by 100+ bytes
size += size();
}
size += id.estimateMemoryUsage();
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDiscoveryLiteDescriptors.java
Wed Dec 14 13:20:25 2016
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.spi.sta
class SegmentDiscoveryLiteDescriptors implements Descriptors {
/**
- * Name of the repository descriptor via which the clusterView is
published - which is the raison d'etre of the
+ * Name of the repository descriptor via which the clusterView is
published - which is the reason d'etre of the
* DocumentDiscoveryLiteService TODO: move this constant to a generic
place for both segment and document
**/
private static final String OAK_DISCOVERYLITE_CLUSTERVIEW =
"oak.discoverylite.clusterview";
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
Wed Dec 14 13:20:25 2016
@@ -108,12 +108,12 @@ public class SegmentNodeBuilder extends
public SegmentNodeState getNodeState() {
try {
NodeState state = super.getNodeState();
- SegmentNodeState sstate = writer.writeNode(state);
- if (state != sstate) {
- set(sstate);
+ SegmentNodeState sState = writer.writeNode(state);
+ if (state != sState) {
+ set(sState);
updateCount = 0;
}
- return sstate;
+ return sState;
} catch (IOException e) {
LOG.error("Error flushing changes", e);
throw new IllegalStateException("Unexpected IOException", e);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
Wed Dec 14 13:20:25 2016
@@ -42,9 +42,9 @@ public class SegmentStream extends Input
public static RecordId getRecordIdIfAvailable(
InputStream stream, SegmentStore store) {
if (stream instanceof SegmentStream) {
- SegmentStream sstream = (SegmentStream) stream;
- RecordId id = sstream.recordId;
- if (sstream.position == 0 && id.getSegmentId().sameStore(store)) {
+ SegmentStream sStream = (SegmentStream) stream;
+ RecordId id = sStream.recordId;
+ if (sStream.position == 0 && id.getSegmentId().sameStore(store)) {
return id;
}
}
@@ -115,7 +115,7 @@ public class SegmentStream extends Input
}
@Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(int readLimit) {
mark = position;
}
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=1774229&r1=1774228&r2=1774229&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:20:25 2016
@@ -801,7 +801,7 @@ class TarReader implements Closeable {
TarEntry[] entries = getEntries();
for (int i = 0; i < entries.length; i++) {
TarEntry entry = entries[i];
- beforeSize += getEntrySize(entry.size());;
+ beforeSize += getEntrySize(entry.size());
UUID id = new UUID(entry.msb(), entry.lsb());
if (reclaim.contains(id)) {
cleaned.add(id);
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/server/StandbyServer.java
Wed Dec 14 13:20:25 2016
@@ -94,8 +94,8 @@ class StandbyServer implements AutoClose
return this;
}
- Builder allowIPRanges(String[] alloallowedClientIPRanges) {
- this.allowedClientIPRanges = alloallowedClientIPRanges;
+ Builder allowIPRanges(String[] allowedClientIPRanges) {
+ this.allowedClientIPRanges = allowedClientIPRanges;
return this;
}
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java?rev=1774229&r1=1774228&r2=1774229&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/DebugTars.java
Wed Dec 14 13:20:25 2016
@@ -152,16 +152,16 @@ public class DebugTars implements Runnab
System.out.println("Debug file " + tar + "(" + tar.length() + ")");
Set<UUID> uuids = new HashSet<UUID>();
- boolean hasrefs = false;
+ boolean hasRefs = false;
for (Map.Entry<String, Set<UUID>> e :
store.getTarReaderIndex().entrySet()) {
if (e.getKey().endsWith(t)) {
- hasrefs = true;
+ hasRefs = true;
uuids = e.getValue();
}
}
- if (hasrefs) {
+ if (hasRefs) {
System.out.println("SegmentNodeState references to " + t);
List<String> paths = new ArrayList<String>();
filterNodeStates(uuids, paths, store.getHead(), "/");
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=1774229&r1=1774228&r2=1774229&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:20:25 2016
@@ -141,7 +141,7 @@ public class Diff implements Runnable {
/**
* Whether to ignore exceptions caused by missing segments in the
- * segment store. This paramter is not mandatory and defaults to {@code
+ * segment store. This parameter is not mandatory and defaults to
{@code
* false}.
*
* @param ignoreMissingSegments {@code true} to ignore exceptions
caused
