From a08c81f677247ec9eb7721a86250c663065e9930 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 22 Jun 2016 22:12:03 +0000
Subject: [PATCH] OPENDJ-2871 Add support for sub-resources and inheritance
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
index a3038c0..5ace36c 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Utils.java
@@ -27,11 +27,6 @@
import static org.forgerock.opendj.ldap.schema.CoreSchema.getIntegerSyntax;
import static org.forgerock.opendj.rest2ldap.Rest2ldapMessages.ERR_UNRECOGNIZED_JSON_VALUE;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
@@ -73,12 +68,6 @@
}
};
- static String readPasswordFromFile(String fileName) throws IOException {
- try (final BufferedReader reader = new BufferedReader(new FileReader(new File(fileName)))) {
- return reader.readLine();
- }
- }
-
static Function<Object, ByteString, NeverThrowsException> base64ToByteString() {
return BASE64_TO_BYTESTRING;
}
@@ -106,19 +95,6 @@
};
}
- /**
- * Stub formatter for i18n strings.
- *
- * @param format
- * The format string.
- * @param args
- * The string arguments.
- * @return The formatted string.
- */
- static String i18n(final String format, final Object... args) {
- return String.format(format, args);
- }
-
private static boolean isJsonPrimitive(final Object value) {
return value instanceof String || value instanceof Boolean || value instanceof Number;
}
@@ -138,7 +114,7 @@
}
return a;
} else {
- throw newLocalizedIllegalArgumentException(ERR_UNRECOGNIZED_JSON_VALUE.get(value.getClass().getName()));
+ throw new LocalizedIllegalArgumentException(ERR_UNRECOGNIZED_JSON_VALUE.get(value.getClass().getName()));
}
}
@@ -154,8 +130,8 @@
return ByteString.valueOfObject(value);
}
} else {
- throw newLocalizedIllegalArgumentException(
- ERR_UNRECOGNIZED_JSON_VALUE.get(value.getClass().getName()));
+ throw new LocalizedIllegalArgumentException(ERR_UNRECOGNIZED_JSON_VALUE.get(value.getClass()
+ .getName()));
}
}
};
@@ -201,10 +177,6 @@
return new JsonValueException(value, message.toString());
}
- static LocalizedIllegalArgumentException newLocalizedIllegalArgumentException(final LocalizableMessage message) {
- return new LocalizedIllegalArgumentException(message);
- }
-
static BadRequestException newBadRequestException(final LocalizableMessage message) {
return newBadRequestException(message, null);
}
--
Gitblit v1.10.0