From d035014ad8b0d2d4a0465f6c6dfcfa8e03f7ab84 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:25 +0000
Subject: [PATCH] OPENDJ-3089 Remove DirectoryServerContext.getSchemaNG() method and uses in classes
---
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 6 ------
opendj-server-legacy/src/main/java/org/opends/server/util/SchemaUtils.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java | 16 ++++------------
opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java | 12 ++++++------
opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java | 2 --
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 6 +++---
opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java | 2 +-
8 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 9a8ca1d..68fb0d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2831,9 +2831,9 @@
public static SchemaElement updateSchemaElementExtraPropertyMultiplesValues(ServerContext serverContext,
SchemaElement element, String property, List<String> values)
{
- org.forgerock.opendj.ldap.schema.Schema schemaNG = serverContext != null ?
- serverContext.getSchemaNG() : org.forgerock.opendj.ldap.schema.Schema.getDefaultSchema();
- SchemaBuilder schemaBuilder = new SchemaBuilder(schemaNG);
+ org.forgerock.opendj.ldap.schema.Schema schema = serverContext != null ?
+ serverContext.getSchema() : org.forgerock.opendj.ldap.schema.Schema.getDefaultSchema();
+ SchemaBuilder schemaBuilder = new SchemaBuilder(schema);
if (element instanceof AttributeType)
{
AttributeType attr = (AttributeType) element;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
index a848230..af9959c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
@@ -95,7 +95,7 @@
/** Schema used to build the compressed information. */
@GuardedBy("lock")
- private Schema schemaNG;
+ private Schema schema;
@GuardedBy("lock")
private Mappings mappings = new Mappings();
@@ -129,15 +129,15 @@
boolean shared = true;
try
{
- Schema currentSchema = serverContext.getSchemaNG();
- if (schemaNG != currentSchema)
+ Schema currentSchema = serverContext.getSchema();
+ if (schema != currentSchema)
{
sharedLock.unlock();
exclusiveLock.lock();
shared = false;
- currentSchema = serverContext.getSchemaNG();
- if (schemaNG != currentSchema)
+ currentSchema = serverContext.getSchema();
+ if (schema != currentSchema)
{
// build new maps from existing ones
Mappings newMappings = new Mappings(mappings.adEncodeMap.size(), mappings.ocEncodeMap.size());
@@ -145,7 +145,7 @@
reloadObjectClassesMap(mappings, newMappings);
mappings = newMappings;
- schemaNG = currentSchema;
+ schema = currentSchema;
}
}
return mappings;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index 06d9e4c..f2aa50f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -1003,12 +1003,6 @@
}
@Override
- public org.forgerock.opendj.ldap.schema.Schema getSchemaNG()
- {
- return directoryServer.schemaHandler.getSchema();
- }
-
- @Override
public SchemaHandler getSchemaHandler()
{
return directoryServer.schemaHandler;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
index 22a55b2..8702947 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
@@ -43,24 +43,16 @@
/**
* Returns the schema of the server.
+ * <p>
+ * The schema is immutable. Any change on the schema must be done using a {@code SchemaHandler}
+ * which is available through the {@code getSchemaHandler()} method.
*
* @return the schema
*/
Schema getSchema();
/**
- * Returns the new schema of the server (SDK schema).
- * <p>
- * This method will disappear once migration to new schema
- * is finished. Meanwhile, it is necessary to keep both the
- * legacy version and the new version.
- *
- * @return the new version of the schema
- */
- org.forgerock.opendj.ldap.schema.Schema getSchemaNG();
-
- /**
- * Returns the schema handler, which provides schema management.
+ * Returns the schema handler, which provides operations to the schema.
*
* @return the schema handler
*/
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
index c3ddec1..8ebeab7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java
@@ -753,7 +753,7 @@
*/
public DN toDn(ServerContext serverContext)
{
- return DN.valueOf(toString(), serverContext.getSchemaNG());
+ return DN.valueOf(toString(), serverContext.getSchema());
}
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java
index 34d4db7..48ec9f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java
@@ -99,7 +99,7 @@
"no_realm", config.getRequiredScope(), resolver, "u:{" + config.getAuthzidJsonPointer()+"}");
this.delegate = newConditionalFilter(
chainOf(oauth2Filter.getFilter(), new InternalProxyAuthzFilter(getIdentityMapper(config.getIdentityMapperDN()),
- serverContext.getSchemaNG())),
+ serverContext.getSchema())),
oauth2Filter.getCondition());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/SchemaUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SchemaUtils.java
index 6f9740e..5b6c3f7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/SchemaUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/SchemaUtils.java
@@ -187,7 +187,7 @@
String property, String...values)
{
SchemaBuilder schemaBuilder =
- new SchemaBuilder(serverContext != null ? serverContext.getSchemaNG() : Schema.getDefaultSchema());
+ new SchemaBuilder(serverContext != null ? serverContext.getSchema() : Schema.getDefaultSchema());
AttributeType.Builder builder =
schemaBuilder.buildAttributeType(attributeType).removeExtraProperty(property, (String) null);
if (values != null && values.length > 0)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java b/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
index c186053..af1f022 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java
@@ -65,7 +65,6 @@
public ServerContextBuilder schema(Schema schema)
{
when(serverContext.getSchema()).thenReturn(schema);
- when(serverContext.getSchemaNG()).thenReturn(schema);
return this;
}
@@ -73,7 +72,6 @@
{
when(serverContext.getSchemaHandler()).thenReturn(handler);
when(serverContext.getSchema()).thenReturn(handler.getSchema());
- when(serverContext.getSchemaNG()).thenReturn(handler.getSchema());
return this;
}
--
Gitblit v1.10.0