From a7e3f592cadebaabdd8dd3454c84672f2c66b81e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 16 Jan 2015 16:58:29 +0000
Subject: [PATCH] OPENDJ-1722: code cleanup
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
index b2bfefe..fabd3f7 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
@@ -369,8 +369,7 @@
// or an open parenthesis followed by one or more values in
// single quotes separated by spaces followed by a close
// parenthesis.
- List<String> extensions = readExtensions(reader);
- atBuilder.extraProperties(tokenName, extensions);
+ atBuilder.extraProperties(tokenName, readExtensions(reader));
} else {
throw new LocalizedIllegalArgumentException(
ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_TOKEN1.get(definition, tokenName));
@@ -1027,21 +1026,6 @@
}
/**
- * Returns an attribute type builder whose fields are initialized to the
- * values of the provided attribute type. This method should be used when
- * duplicating attribute types from external schemas or when modifying
- * existing attribute types.
- *
- * @param attributeType
- * The attribute type source.
- * @return A builder to continue building the AttributeType.
- */
- public AttributeType.Builder buildAttributeType(final AttributeType attributeType) {
- lazyInitBuilder();
- return new AttributeType.Builder(attributeType, this);
- }
-
- /**
* Returns a builder which can be used for incrementally constructing a new
* attribute type before adding it to the schema. Example usage:
*
@@ -1281,6 +1265,21 @@
}
/**
+ * Returns an attribute type builder whose fields are initialized to the
+ * values of the provided attribute type. This method should be used when
+ * duplicating attribute types from external schemas or when modifying
+ * existing attribute types.
+ *
+ * @param attributeType
+ * The attribute type source.
+ * @return A builder to continue building the AttributeType.
+ */
+ public AttributeType.Builder buildAttributeType(final AttributeType attributeType) {
+ lazyInitBuilder();
+ return new AttributeType.Builder(attributeType, this);
+ }
+
+ /**
* Duplicates the matching rule.
*
* @param matchingRule
--
Gitblit v1.10.0