JCR-2925

Various inner classes maintain references to owning class for no reason

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1084477 13f79535-47bb-0310-9956-ffa450edef68

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java

@@ -1141,7 +1141,7 @@ public void stateDiscarded(ItemState discarded) {
      * Cache of shareable nodes. For performance reasons, methods are not
      * synchronized and thread-safety must be guaranteed by caller.
      */
-    class ShareableNodesCache {
+    static class ShareableNodesCache {
 
         /**
          * This cache is based on a reference map, that maps an item id to a map,

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java

@@ -2447,7 +2447,7 @@ public void lockEventsReady(String workspace) throws RepositoryException {
     /**
      * Represents a Repository Descriptor Value (either Value or Value[])
      */
-    protected final class DescriptorValue {
+    protected static final class DescriptorValue {
 
         private Value val;
         private Value[] vals;

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/MemoryJournal.java

@@ -228,7 +228,7 @@ private void checkState() throws JournalException {
     /**
      * Memory record.
      */
-    public class MemoryRecord {
+    public static class MemoryRecord {
 
         /**
          * Journal id.

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java

@@ -1030,7 +1030,7 @@ protected void removeLockProperties(NodeImpl node) throws RepositoryException {
     /**
      * Internal event class that holds old and new paths for moved nodes
      */
-    private class HierarchyEvent {
+    private static class HierarchyEvent {
 
         /**
          * ID recorded in event

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java

@@ -1186,7 +1186,7 @@ protected void initPreparedStatements() throws SQLException {
 
     //--------------------------------------------------------< inner classes >
 
-    class SizedInputStream extends FilterInputStream {
+    static class SizedInputStream extends FilterInputStream {
         private final long size;
         private boolean consumed = false;
 

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java

@@ -296,7 +296,7 @@ public void repair() throws IOException {
     /**
      * The parent of a node is not available through the ItemStateManager.
      */
-    private class UnknownParent extends ConsistencyCheckError {
+    private static class UnknownParent extends ConsistencyCheckError {
 
         private UnknownParent(NodeId id, NodeId parentId) {
             super("Node " + id + " has unknown parent: " + parentId, id);

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java

@@ -862,7 +862,7 @@ private float getNodeBoost(Node config) {
     /**
      * Simple class that holds boost and nodeScopeIndex flag.
      */
-    private class PropertyConfig {
+    private static class PropertyConfig {
 
         /**
          * The boost value for a property.

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java

@@ -712,7 +712,7 @@ protected String getValueString(Value value, int type)
         }
     }
 
-    protected class QueryPair {
+    protected static class QueryPair {
         Query mainQuery;
         BooleanQuery subQuery;
 

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/CachingEntryCollector.java

@@ -228,7 +228,7 @@ public void notifyListeners(AccessControlModifications modifications) {
     /**
      *
      */
-    private class CacheEntry {
+    private static class CacheEntry {
 
         private final List<AccessControlEntry> entries;
         private NodeId nextAcNodeId;

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/IndexNodeResolver.java

@@ -257,7 +257,7 @@ private static String escapeForQuery(String value) {
     /**
      * 
      */
-    private class ResultFilteringNodeIterator extends FilteringNodeIterator {
+    private static class ResultFilteringNodeIterator extends FilteringNodeIterator {
 
         private Set<String> authorizableIDs;
 

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/NodeResolver.java

@@ -213,7 +213,7 @@ AuthorizableTypePredicate getAuthorizableTypePredicate(int authorizableType, boo
     /**
      *
      */
-    class AuthorizableTypePredicate implements Predicate {
+    static class AuthorizableTypePredicate implements Predicate {
 
         private final int authorizableType;
         private final boolean exact;

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java

@@ -594,7 +594,7 @@ public void setImportBehavior(String importBehaviorStr) {
      *
      * @see ImportBehavior For additional configuration options.
      */
-    private final class Membership {
+    private static final class Membership {
         private final String groupId;
         private final List<Member> members = new LinkedList<Member>();
 
@@ -630,7 +630,7 @@ public Member(String name, NodeId id) {
      *
      * @see ImportBehavior For additional configuration options.
      */
-    private final class Impersonators {
+    private static final class Impersonators {
 
         private final String userId;
         private final Value[] values;

jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java

@@ -321,7 +321,7 @@ public void endElement(String namespaceURI, String localName, String qName)
     /**
      * The state of parsing the XML stream.
      */
-    class ImportState {
+    static class ImportState {
         /**
          * name of current node
          */

jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/GQL.java

@@ -889,7 +889,7 @@ private class PrimaryTypeComparision extends ValueComparison {
     /**
      * A name expression.
      */
-    private class NameExpression implements Expression {
+    private static class NameExpression implements Expression {
 
         private final String value;
 

jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/TransientFileFactory.java

@@ -217,7 +217,7 @@ public void stopWorking() {
     /**
      * Tracker object for a file pending deletion.
      */
-    private class MoribundFileReference extends PhantomReference<File> {
+    private static class MoribundFileReference extends PhantomReference<File> {
 
         /**
          * The full path to the file being tracked.

jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ZipHandler.java

@@ -314,7 +314,7 @@ public long getContentLength() {
      * Inner class used to create subcontexts for the export of the individual
      * zip file entries.
      */
-    private class ZipEntryExportContext extends AbstractExportContext {
+    private static class ZipEntryExportContext extends AbstractExportContext {
 
         private ZipEntry entry;
         private OutputStream out;

jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionManagerImpl.java

@@ -271,7 +271,7 @@ public void afterCommit(TransactionResource resource, String lockToken, boolean
      * present in the internal map. This allows to hide the subscription Id
      * from other sessions, that did create the subscription.
      */
-    private class WrappedSubscription implements Subscription {
+    private static class WrappedSubscription implements Subscription {
 
         private final Subscription delegatee;
 

jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/LocatorFactoryImpl.java

@@ -69,7 +69,7 @@ public DavResourceLocator createResourceLocator(String prefix, String workspaceP
     }
 
     //--------------------------------------------------------------------------
-    private class Locator implements DavResourceLocator {
+    private static class Locator implements DavResourceLocator {
 
         private final String prefix;
         private final String resourcePath;