From 78bc84dc2333240d8559debaaf191f5ecf0e3b47 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 07:31:25 +0000
Subject: [PATCH] SchemaBuilder.java: code cleanup
---
opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java | 21 ++++++---------------
opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java | 33 +++++++++++++--------------------
2 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
index aa375a1..ad3335c 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
@@ -136,7 +136,7 @@
}
throw new CertificateException(ERR_CERT_NO_MATCH_SUBJECT.get(principal, hostName).toString());
} catch (final CertificateException e) {
- logger.warn(LocalizableMessage.raw("Certificate verification problem for: " + principal), e);
+ logger.warn(LocalizableMessage.raw("Certificate verification problem for: %s", principal), e);
throw e;
}
}
@@ -349,12 +349,12 @@
} catch (final CertificateExpiredException e) {
logger.warn(LocalizableMessage.raw(
"Refusing to trust security certificate \'%s\' because it expired on %s",
- c.getSubjectDN().getName(), String.valueOf(c.getNotAfter())));
+ c.getSubjectDN().getName(), c.getNotAfter()));
throw e;
} catch (final CertificateNotYetValidException e) {
logger.warn(LocalizableMessage.raw(
"Refusing to trust security certificate \'%s\' because it is not valid until %s",
- c.getSubjectDN().getName(), String.valueOf(c.getNotBefore())));
+ c.getSubjectDN().getName(), c.getNotBefore()));
throw e;
}
}
@@ -391,7 +391,6 @@
/** An X509TrustManager which trusts all certificates. */
private static final class TrustAll implements X509TrustManager {
-
/** Single instance. */
private static final TrustAll INSTANCE = new TrustAll();
@@ -510,19 +509,12 @@
TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(keyStore);
- X509TrustManager x509tm = null;
for (final TrustManager tm : tmf.getTrustManagers()) {
if (tm instanceof X509TrustManager) {
- x509tm = (X509TrustManager) tm;
- break;
+ return (X509TrustManager) tm;
}
}
-
- if (x509tm == null) {
- throw new NoSuchAlgorithmException();
- }
-
- return x509tm;
+ throw new NoSuchAlgorithmException();
}
/**
@@ -561,9 +553,8 @@
return TrustAll.INSTANCE;
}
- /** Prevent insantiation. */
+ /** Prevent instantiation. */
private TrustManagers() {
// Nothing to do.
}
-
}
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 8b18e82..a311091 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
@@ -105,7 +105,7 @@
if (subentryAttr == null || subentryAttr.isEmpty()) {
// Did not get the subschema sub-entry attribute.
throw newLdapException(ResultCode.CLIENT_SIDE_NO_RESULTS_RETURNED,
- ERR_NO_SUBSCHEMA_SUBENTRY_ATTR.get(name.toString()).toString());
+ ERR_NO_SUBSCHEMA_SUBENTRY_ATTR.get(name).toString());
}
final String dnString = subentryAttr.iterator().next().toString();
@@ -114,8 +114,7 @@
subschemaDN = DN.valueOf(dnString);
} catch (final LocalizedIllegalArgumentException e) {
throw newLdapException(ResultCode.CLIENT_SIDE_NO_RESULTS_RETURNED,
- ERR_INVALID_SUBSCHEMA_SUBENTRY_ATTR.get(name.toString(), dnString,
- e.getMessageObject()).toString());
+ ERR_INVALID_SUBSCHEMA_SUBENTRY_ATTR.get(name, dnString, e.getMessageObject()).toString());
}
return subschemaDN;
}
@@ -798,8 +797,7 @@
// or an open parenthesis followed by one or more values in
// single quotes separated by spaces followed by a close
// parenthesis.
- final List<String> extensions = readExtensions(reader);
- matchingRuleBuilder.extraProperties(tokenName, extensions.toArray(new String[extensions.size()]));
+ matchingRuleBuilder.extraProperties(tokenName, readExtensions(reader));
} else {
throw new LocalizedIllegalArgumentException(
ERR_ATTR_SYNTAX_MR_ILLEGAL_TOKEN1.get(definition, tokenName));
@@ -1112,8 +1110,7 @@
// or an open parenthesis followed by one or more values in
// single quotes separated by spaces followed by a close
// parenthesis.
- final List<String> extensions = readExtensions(reader);
- nameFormBuilder.extraProperties(tokenName, extensions.toArray(new String[extensions.size()]));
+ nameFormBuilder.extraProperties(tokenName, readExtensions(reader));
} else {
throw new LocalizedIllegalArgumentException(
ERR_ATTR_SYNTAX_NAME_FORM_ILLEGAL_TOKEN1.get(definition, tokenName));
@@ -1439,8 +1436,7 @@
// or an open parenthesis followed by one or more values in
// single quotes separated by spaces followed by a close
// parenthesis.
- final List<String> extensions = readExtensions(reader);
- ocBuilder.extraProperties(tokenName, extensions.toArray(new String[extensions.size()]));
+ ocBuilder.extraProperties(tokenName, readExtensions(reader));
} else {
throw new LocalizedIllegalArgumentException(
ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_TOKEN1.get(definition, tokenName));
@@ -1915,8 +1911,7 @@
// or an open parenthesis followed by one or more values in
// single quotes separated by spaces followed by a close
// parenthesis.
- final List<String> extensions = readExtensions(reader);
- syntaxBuilder.extraProperties(tokenName, extensions.toArray(new String[extensions.size()]));
+ syntaxBuilder.extraProperties(tokenName, readExtensions(reader));
} else {
throw new LocalizedIllegalArgumentException(
ERR_ATTR_SYNTAX_ATTRSYNTAX_ILLEGAL_TOKEN1.get(definition, tokenName));
@@ -2491,8 +2486,8 @@
if (numericOID2Syntaxes.containsKey(syntax.getOID())) {
conflictingSyntax = numericOID2Syntaxes.get(syntax.getOID());
if (!overwrite) {
- final LocalizableMessage message = ERR_SCHEMA_CONFLICTING_SYNTAX_OID.get(syntax.toString(),
- syntax.getOID(), conflictingSyntax.getOID());
+ final LocalizableMessage message = ERR_SCHEMA_CONFLICTING_SYNTAX_OID.get(
+ syntax, syntax.getOID(), conflictingSyntax.getOID());
throw new ConflictingSchemaElementException(message);
}
removeSyntax(conflictingSyntax, null);
@@ -2711,8 +2706,7 @@
syntax.validate(schema, warnings);
} catch (final SchemaException e) {
removeSyntax(syntax, names);
- warnings.add(ERR_SYNTAX_VALIDATION_FAIL
- .get(syntax.toString(), e.getMessageObject()));
+ warnings.add(ERR_SYNTAX_VALIDATION_FAIL.get(syntax, e.getMessageObject()));
}
}
@@ -2722,7 +2716,7 @@
rule.validate(schema, warnings);
} catch (final SchemaException e) {
removeMatchingRule(rule, names);
- warnings.add(ERR_MR_VALIDATION_FAIL.get(rule.toString(), e.getMessageObject()));
+ warnings.add(ERR_MR_VALIDATION_FAIL.get(rule, e.getMessageObject()));
}
}
@@ -2754,7 +2748,7 @@
use.validate(schema, warnings);
} catch (final SchemaException e) {
removeMatchingRuleUse(use, names);
- warnings.add(ERR_MRU_VALIDATION_FAIL.get(use.toString(), e.getMessageObject()));
+ warnings.add(ERR_MRU_VALIDATION_FAIL.get(use, e.getMessageObject()));
}
}
@@ -2777,8 +2771,7 @@
}
} catch (final SchemaException e) {
removeNameForm(form, names);
- warnings.add(ERR_NAMEFORM_VALIDATION_FAIL
- .get(form.toString(), e.getMessageObject()));
+ warnings.add(ERR_NAMEFORM_VALIDATION_FAIL.get(form, e.getMessageObject()));
}
}
@@ -2788,7 +2781,7 @@
rule.validate(schema, warnings);
} catch (final SchemaException e) {
removeDITContentRule(rule, names);
- warnings.add(ERR_DCR_VALIDATION_FAIL.get(rule.toString(), e.getMessageObject()));
+ warnings.add(ERR_DCR_VALIDATION_FAIL.get(rule, e.getMessageObject()));
}
}
--
Gitblit v1.10.0