Author: mduerig
Date: Wed Dec 14 13:20:30 2016
New Revision: 1774230
URL: http://svn.apache.org/viewvc?rev=1774230&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Remove inferable type declarations
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java?rev=1774230&r1=1774229&r2=1774230&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
Wed Dec 14 13:20:30 2016
@@ -36,13 +36,12 @@ import java.io.IOException;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import com.google.common.base.Predicate;
import org.apache.jackrabbit.oak.segment.CacheWeights.NodeCacheWeigher;
import org.apache.jackrabbit.oak.segment.CacheWeights.StringCacheWeigher;
import org.apache.jackrabbit.oak.segment.CacheWeights.TemplateCacheWeigher;
import org.apache.jackrabbit.oak.segment.RecordCache;
-import org.apache.jackrabbit.oak.segment.RecordId;
import org.apache.jackrabbit.oak.segment.SegmentNotFoundExceptionListener;
-import org.apache.jackrabbit.oak.segment.Template;
import org.apache.jackrabbit.oak.segment.WriterCacheManager;
import org.apache.jackrabbit.oak.segment.compaction.LoggingGCMonitor;
import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions;
@@ -52,8 +51,6 @@ import org.apache.jackrabbit.oak.stats.S
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Predicate;
-
/**
* Builder for creating {@link FileStore} instances.
*/
@@ -415,9 +412,9 @@ public class FileStoreBuilder {
private static class EvictingWriteCacheManager extends
WriterCacheManager.Default {
public EvictingWriteCacheManager(int stringCacheSize, int
templateCacheSize, int nodeCacheSize) {
- super(RecordCache.<String>factory(stringCacheSize, new
StringCacheWeigher()),
- RecordCache.<Template>factory(templateCacheSize, new
TemplateCacheWeigher()),
- PriorityCache.<String, RecordId>factory(nodeCacheSize, new
NodeCacheWeigher()));
+ super(RecordCache.factory(stringCacheSize, new
StringCacheWeigher()),
+ RecordCache.factory(templateCacheSize, new
TemplateCacheWeigher()),
+ PriorityCache.factory(nodeCacheSize, new NodeCacheWeigher()));
}
void evictOldGeneration(final int newGeneration) {
