From 985d9c3cd0e6fb4ef1576fed331b5944143b5838 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 21 Aug 2014 08:58:34 +0000
Subject: [PATCH] Minor code cleanup.
---
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java | 4 ++--
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java | 2 +-
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java | 2 ++
opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
index cb86ec6..fc095bc 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2014 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -736,8 +736,8 @@
private int parseHostPort(final String urlString, final String hostAndPort,
final StringBuilder host) {
+ Reject.ifNull(urlString);
Reject.ifNull(hostAndPort);
- Reject.ifNull((Object) port);
Reject.ifNull(host);
int urlPort = isSecured ? DEFAULT_SSL_PORT : DEFAULT_PORT;
if (hostAndPort.length() == 0) {
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
index a12d365..300de7e 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java
@@ -119,7 +119,7 @@
return hostMatch;
}
- private void verifyHostName(final X509Certificate[] chain) throws CertificateException {
+ private void verifyHostName(final X509Certificate[] chain) {
try {
// TODO: NPE if root DN.
final DN dn =
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
index c90936e..dd24274 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
@@ -20,7 +20,7 @@
*
* CDDL HEADER END
*
- * Copyright 2011-2013 ForgeRock AS
+ * Copyright 2011-2014 ForgeRock AS
*/
package org.forgerock.opendj.ldif;
@@ -231,7 +231,7 @@
}
}
- private Entry nextEntry(final Iterator<byte[][]> i) throws IOException {
+ private Entry nextEntry(final Iterator<byte[][]> i) {
if (i.hasNext()) {
return decodeEntry(i.next()[1]);
}
diff --git a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
index 87d0eb6..288a9ae 100644
--- a/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
+++ b/opendj-sdk/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java
@@ -83,6 +83,8 @@
* @param warnings
* A list into which any appropriate warning messages may be
* placed.
+ * @throws DecodeException
+ * If tag cannot be initialized.
*/
void initializeForBranch(Schema schema, TemplateFile templateFile, Branch branch, String[] arguments,
int lineNumber, List<LocalizableMessage> warnings) throws DecodeException {
--
Gitblit v1.10.0