refactor: updated static references to internal class and clusters

Author: tglman

core/src/main/java/com/orientechnologies/orient/core/metadata/OMetadataInternal.java

@@ -22,7 +22,10 @@
 import com.orientechnologies.orient.core.metadata.security.OIdentity;
 import com.orientechnologies.orient.core.metadata.security.ORole;
 import com.orientechnologies.orient.core.metadata.security.OSecurity;
+import com.orientechnologies.orient.core.metadata.security.OSecurityPolicy;
 import com.orientechnologies.orient.core.metadata.security.OUser;
+import com.orientechnologies.orient.core.metadata.sequence.OSequence;
+import com.orientechnologies.orient.core.schedule.OScheduledEvent;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -32,18 +35,42 @@
 /** Internal interface to manage metadata snapshots. */
 public interface OMetadataInternal extends OMetadata {
 
+  public static final String IDENTITY = OIdentity.CLASS_NAME.toLowerCase(Locale.ENGLISH);
+  public static final String USER = OUser.CLASS_NAME.toLowerCase(Locale.ENGLISH);
+  public static final String ROLE = ORole.CLASS_NAME.toLowerCase(Locale.ENGLISH);
+  public static final String RESTRICTED =
+      OSecurity.RESTRICTED_CLASSNAME.toLowerCase(Locale.ENGLISH);
+  public static final String FUNCTION = OFunction.CLASS_NAME.toLowerCase(Locale.ENGLISH);
+  public static final String SCHEDULE = OScheduledEvent.CLASS_NAME.toLowerCase(Locale.ENGLISH);
+  public static final String TRIGGER = "OTrigger".toLowerCase(Locale.ENGLISH);
+  public static final String POLICY =
+      OSecurityPolicy.class.getName().toLowerCase().toLowerCase(Locale.ENGLISH);
+  public static final String SEQUENCE =
+      OSequence.CLASS_NAME.toLowerCase().toLowerCase(Locale.ENGLISH);
+  // Used by the importer
+  public static final String ORIDS = "ORIDs".toLowerCase().toLowerCase(Locale.ENGLISH);
+
   Set<String> SYSTEM_CLUSTER =
       Collections.unmodifiableSet(
           new HashSet<String>(
               Arrays.asList(
                   new String[] {
-                    OUser.CLASS_NAME.toLowerCase(Locale.ENGLISH),
-                    ORole.CLASS_NAME.toLowerCase(Locale.ENGLISH),
-                    OIdentity.CLASS_NAME.toLowerCase(Locale.ENGLISH),
-                    OSecurity.RESTRICTED_CLASSNAME.toLowerCase(Locale.ENGLISH),
-                    OFunction.CLASS_NAME.toLowerCase(Locale.ENGLISH),
-                    "internal"
+                    USER, ROLE, RESTRICTED, FUNCTION, OSessionMetadata.CLUSTER_INTERNAL_NAME,
                   })));
+  Set<String> SYSTEM_CLASSES =
+      Collections.unmodifiableSet(
+          new HashSet<String>(
+              Arrays.asList(
+                  IDENTITY,
+                  USER,
+                  ROLE,
+                  RESTRICTED,
+                  FUNCTION,
+                  SCHEDULE,
+                  TRIGGER,
+                  POLICY,
+                  SEQUENCE,
+                  ORIDS)));
 
   void makeThreadLocalSchemaSnapshot();
 

core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OSchemaEmbedded.java

@@ -17,6 +17,7 @@
 import com.orientechnologies.orient.core.index.OIndexManagerAbstract;
 import com.orientechnologies.orient.core.index.OPropertyMapIndexDefinition.INDEX_BY;
 import com.orientechnologies.orient.core.iterator.ORecordIteratorCluster;
+import com.orientechnologies.orient.core.metadata.OMetadataInternal;
 import com.orientechnologies.orient.core.metadata.security.ORole;
 import com.orientechnologies.orient.core.metadata.security.ORule;
 import com.orientechnologies.orient.core.record.impl.ODocument;
@@ -565,7 +566,7 @@ protected int[] createClusters(
 
     int[] clusterIds;
 
-    if (internalClasses.contains(className.toLowerCase(Locale.ENGLISH))) {
+    if (OMetadataInternal.SYSTEM_CLASSES.contains(className.toLowerCase(Locale.ENGLISH))) {
       // INTERNAL CLASS, SET TO 1
       minimumClusters = 1;
     }

core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OSchemaShared.java

@@ -87,20 +87,6 @@ public abstract class OSchemaShared implements OCloseable {
   private volatile ORID identity;
   protected volatile OImmutableSchema snapshot;
 
-  protected static Set<String> internalClasses = new HashSet<String>();
-
-  static {
-    internalClasses.add("ouser");
-    internalClasses.add("orole");
-    internalClasses.add("osecuritypolicy");
-    internalClasses.add("oidentity");
-    internalClasses.add("ofunction");
-    internalClasses.add("osequence");
-    internalClasses.add("otrigger");
-    internalClasses.add("oschedule");
-    internalClasses.add("orids");
-  }
-
   protected static final class ClusterIdsAreEmptyException extends Exception {}
 
   public OSchemaShared() {}

jdbc/src/main/java/com/orientechnologies/orient/jdbc/OrientJdbcDatabaseMetaData.java

@@ -719,7 +719,7 @@ public ResultSet getTables(
       final String className = cls.getName();
       final String type;
 
-      if (OMetadataInternal.SYSTEM_CLUSTER.contains(cls.getName().toLowerCase(Locale.ENGLISH)))
+      if (OMetadataInternal.SYSTEM_CLASSES.contains(cls.getName().toLowerCase(Locale.ENGLISH)))
         type = "SYSTEM TABLE";
       else type = "TABLE";
 

lucene/src/test/java/com/orientechnologies/lucene/tests/OLuceneMetadataFieldsTest.java

@@ -44,7 +44,7 @@ public void shouldFetchOnlyFromACluster() throws Exception {
   @Test
   public void shouldFetchByRid() throws Exception {
 
-    String ridQuery = doubleEscape("#26:4 #26:5");
+    String ridQuery = doubleEscape("#40:4 #40:5");
     OResultSet results =
         db.query("SELECT FROM Song WHERE search_class('RID:(" + ridQuery + ") ')=true ");