You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/04/25 11:19:32 UTC
svn commit: r1096439 [6/7] - in /incubator/isis/trunk/core/commons/src:
main/java/org/apache/isis/core/commons/authentication/
main/java/org/apache/isis/core/commons/components/
main/java/org/apache/isis/core/commons/config/ main/java/org/apache/isis/c...
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MapUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MapUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MapUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MapUtils.java Mon Apr 25 09:19:29 2011
@@ -17,39 +17,37 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class MapUtils {
-
- private MapUtils() {}
-
- /**
- * Converts a list of objects [a, 1, b, 2] into a map {a -> 1; b -> 2}
- */
- public static Map<String, String> asMap(String... paramArgs) {
- HashMap<String, String> map = new HashMap<String, String>();
- boolean param = true;
- String paramStr = null;
- for (String paramArg : paramArgs) {
- if (param) {
- paramStr = (String) paramArg;
- } else {
- String arg = paramArg;
- map.put(paramStr, arg);
- paramStr = null;
- }
- param = !param;
- }
- if (paramStr != null) {
- throw new IllegalArgumentException(
- "Must have equal number of parameters and arguments");
- }
- return map;
- }
-
-
-}
+import java.util.HashMap;
+import java.util.Map;
+
+public final class MapUtils {
+
+ private MapUtils() {
+ }
+
+ /**
+ * Converts a list of objects [a, 1, b, 2] into a map {a -> 1; b -> 2}
+ */
+ public static Map<String, String> asMap(final String... paramArgs) {
+ final HashMap<String, String> map = new HashMap<String, String>();
+ boolean param = true;
+ String paramStr = null;
+ for (final String paramArg : paramArgs) {
+ if (param) {
+ paramStr = paramArg;
+ } else {
+ final String arg = paramArg;
+ map.put(paramStr, arg);
+ paramStr = null;
+ }
+ param = !param;
+ }
+ if (paramStr != null) {
+ throw new IllegalArgumentException("Must have equal number of parameters and arguments");
+ }
+ return map;
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MethodUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MethodUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MethodUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/MethodUtils.java Mon Apr 25 09:19:29 2011
@@ -17,49 +17,47 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-import java.lang.reflect.Method;
-
-
-public class MethodUtils {
-
- private MethodUtils() {}
-
- public static Method getMethod(final Object object, final String methodName, final Class<?>... parameterClass)
- throws NoSuchMethodException {
- return getMethod(object.getClass(), methodName, parameterClass);
- }
-
- public static Method getMethod(final Object object, final String methodName) throws NoSuchMethodException {
- return getMethod(object.getClass(), methodName, new Class[0]);
- }
-
- public static Method getMethod(final Class<?> clazz, final String methodName, final Class<?>... parameterClass)
- throws NoSuchMethodException {
- return clazz.getMethod(methodName, parameterClass);
- }
-
- public static Method findMethodElseNull(final Class<?> clazz, final String methodName, final Class<?>... parameterClass) {
- try {
- return clazz.getMethod(methodName, parameterClass);
- } catch (final NoSuchMethodException e) {
- return null;
- }
- }
-
- public static Method findMethodElseNull(
- final Class<?> clazz,
- final String[] candidateMethodNames,
- final Class<?>... parameterClass) {
- for (final String candidateMethodName : candidateMethodNames) {
- final Method method = findMethodElseNull(clazz, candidateMethodName, parameterClass);
- if (method != null) {
- return method;
- }
- }
- return null;
- }
-
-}
+import java.lang.reflect.Method;
+
+public class MethodUtils {
+
+ private MethodUtils() {
+ }
+
+ public static Method getMethod(final Object object, final String methodName, final Class<?>... parameterClass)
+ throws NoSuchMethodException {
+ return getMethod(object.getClass(), methodName, parameterClass);
+ }
+
+ public static Method getMethod(final Object object, final String methodName) throws NoSuchMethodException {
+ return getMethod(object.getClass(), methodName, new Class[0]);
+ }
+
+ public static Method getMethod(final Class<?> clazz, final String methodName, final Class<?>... parameterClass)
+ throws NoSuchMethodException {
+ return clazz.getMethod(methodName, parameterClass);
+ }
+
+ public static Method findMethodElseNull(final Class<?> clazz, final String methodName,
+ final Class<?>... parameterClass) {
+ try {
+ return clazz.getMethod(methodName, parameterClass);
+ } catch (final NoSuchMethodException e) {
+ return null;
+ }
+ }
+
+ public static Method findMethodElseNull(final Class<?> clazz, final String[] candidateMethodNames,
+ final Class<?>... parameterClass) {
+ for (final String candidateMethodName : candidateMethodNames) {
+ final Method method = findMethodElseNull(clazz, candidateMethodName, parameterClass);
+ if (method != null) {
+ return method;
+ }
+ }
+ return null;
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/NameUtils.java Mon Apr 25 09:19:29 2011
@@ -17,151 +17,151 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-public final class NameUtils {
-
- private static final char SPACE = ' ';
-
- private NameUtils() {}
-
- /**
- * Returns the name of a Java entity without any prefix. A prefix is defined as the first set of lowercase
- * letters and the name is characters from, and including, the first upper case letter. If no upper case
- * letter is found then an empty string is returned.
- *
- * <p>
- * Calling this method with the following Java names will produce these results:
- *
- * <pre>
+public final class NameUtils {
+
+ private static final char SPACE = ' ';
+
+ private NameUtils() {
+ }
+
+ /**
+ * Returns the name of a Java entity without any prefix. A prefix is defined as the first set of lowercase letters
+ * and the name is characters from, and including, the first upper case letter. If no upper case letter is found
+ * then an empty string is returned.
+ *
+ * <p>
+ * Calling this method with the following Java names will produce these results:
+ *
+ * <pre>
* getCarRegistration -> CarRegistration
* CityMayor -> CityMayor
- * isReady -> Ready
- * </pre>
- *
- */
- public static String javaBaseName(final String javaName) {
- int pos = 0;
-
- // find first upper case character
- final int len = javaName.length();
-
- while ((pos < len) && (javaName.charAt(pos) != '_') && Character.isLowerCase(javaName.charAt(pos))) {
- pos++;
- }
-
- if (pos >= len) {
- return "";
- }
-
- if (javaName.charAt(pos) == '_') {
- pos++;
- }
-
- if (pos >= len) {
- return "";
- }
-
- final String baseName = javaName.substring(pos);
- final char firstChar = baseName.charAt(0);
-
- if (Character.isLowerCase(firstChar)) {
- return Character.toUpperCase(firstChar) + baseName.substring(1);
- } else {
- return baseName;
- }
- }
+ * isReady -> Ready
+ * </pre>
+ *
+ */
+ public static String javaBaseName(final String javaName) {
+ int pos = 0;
+
+ // find first upper case character
+ final int len = javaName.length();
+
+ while ((pos < len) && (javaName.charAt(pos) != '_') && Character.isLowerCase(javaName.charAt(pos))) {
+ pos++;
+ }
+
+ if (pos >= len) {
+ return "";
+ }
+
+ if (javaName.charAt(pos) == '_') {
+ pos++;
+ }
+
+ if (pos >= len) {
+ return "";
+ }
+
+ final String baseName = javaName.substring(pos);
+ final char firstChar = baseName.charAt(0);
+
+ if (Character.isLowerCase(firstChar)) {
+ return Character.toUpperCase(firstChar) + baseName.substring(1);
+ } else {
+ return baseName;
+ }
+ }
public static String javaBaseNameStripAccessorPrefixIfRequired(final String javaName) {
- if(javaName.startsWith("is") || javaName.startsWith("get")) {
+ if (javaName.startsWith("is") || javaName.startsWith("get")) {
return javaBaseName(javaName);
} else {
return capitalizeName(javaName);
}
}
-
- public static String capitalizeName(final String name) {
- return Character.toUpperCase(name.charAt(0)) + name.substring(1);
- }
-
- public static boolean startsWith(final String fullMethodName, final String prefix) {
- final int length = prefix.length();
- if (length >= fullMethodName.length()) {
- return false;
- } else {
- final char startingCharacter = fullMethodName.charAt(length);
- return fullMethodName.startsWith(prefix) && Character.isUpperCase(startingCharacter);
- }
- }
-
- /**
- * Return a lower case, non-spaced version of the specified name.
- */
- public static String simpleName(final String name) {
- final int len = name.length();
- final StringBuffer sb = new StringBuffer(len);
- for (int pos = 0; pos < len; pos++) {
- final char ch = name.charAt(pos);
- if (ch == ' ') {
- continue;
- }
- sb.append(Character.toLowerCase(ch));
- }
- return sb.toString();
- }
-
- /**
- * Returns a word spaced version of the specified name, so there are spaces between the words, where each
- * word starts with a capital letter. E.g., "NextAvailableDate" is returned as "Next Available Date".
- */
- public static String naturalName(final String name) {
-
- final int length = name.length();
-
- if (length <= 1) {
- return name.toUpperCase();// ensure first character is upper case
- }
-
- final StringBuffer naturalName = new StringBuffer(length);
-
- char previousCharacter;
- char character = Character.toUpperCase(name.charAt(0));// ensure first character is upper case
- naturalName.append(character);
- char nextCharacter = name.charAt(1);
-
- for (int pos = 2; pos < length; pos++) {
- previousCharacter = character;
- character = nextCharacter;
- nextCharacter = name.charAt(pos);
-
- if (previousCharacter != NameUtils.SPACE) {
- if (Character.isUpperCase(character) && !Character.isUpperCase(previousCharacter)) {
- naturalName.append(NameUtils.SPACE);
- }
- if (Character.isUpperCase(character) && Character.isLowerCase(nextCharacter)
- && Character.isUpperCase(previousCharacter)) {
- naturalName.append(NameUtils.SPACE);
- }
- if (Character.isDigit(character) && !Character.isDigit(previousCharacter)) {
- naturalName.append(NameUtils.SPACE);
- }
- }
- naturalName.append(character);
- }
- naturalName.append(nextCharacter);
- return naturalName.toString();
- }
-
- public static String pluralName(final String name) {
- String pluralName;
- if (name.endsWith("y")) {
- pluralName = name.substring(0, name.length() - 1) + "ies";
- } else if (name.endsWith("s") || name.endsWith("x")) {
- pluralName = name + "es";
- } else {
- pluralName = name + 's';
- }
- return pluralName;
- }
-}
+
+ public static String capitalizeName(final String name) {
+ return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+ }
+
+ public static boolean startsWith(final String fullMethodName, final String prefix) {
+ final int length = prefix.length();
+ if (length >= fullMethodName.length()) {
+ return false;
+ } else {
+ final char startingCharacter = fullMethodName.charAt(length);
+ return fullMethodName.startsWith(prefix) && Character.isUpperCase(startingCharacter);
+ }
+ }
+
+ /**
+ * Return a lower case, non-spaced version of the specified name.
+ */
+ public static String simpleName(final String name) {
+ final int len = name.length();
+ final StringBuffer sb = new StringBuffer(len);
+ for (int pos = 0; pos < len; pos++) {
+ final char ch = name.charAt(pos);
+ if (ch == ' ') {
+ continue;
+ }
+ sb.append(Character.toLowerCase(ch));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Returns a word spaced version of the specified name, so there are spaces between the words, where each word
+ * starts with a capital letter. E.g., "NextAvailableDate" is returned as "Next Available Date".
+ */
+ public static String naturalName(final String name) {
+
+ final int length = name.length();
+
+ if (length <= 1) {
+ return name.toUpperCase();// ensure first character is upper case
+ }
+
+ final StringBuffer naturalName = new StringBuffer(length);
+
+ char previousCharacter;
+ char character = Character.toUpperCase(name.charAt(0));// ensure first character is upper case
+ naturalName.append(character);
+ char nextCharacter = name.charAt(1);
+
+ for (int pos = 2; pos < length; pos++) {
+ previousCharacter = character;
+ character = nextCharacter;
+ nextCharacter = name.charAt(pos);
+
+ if (previousCharacter != NameUtils.SPACE) {
+ if (Character.isUpperCase(character) && !Character.isUpperCase(previousCharacter)) {
+ naturalName.append(NameUtils.SPACE);
+ }
+ if (Character.isUpperCase(character) && Character.isLowerCase(nextCharacter)
+ && Character.isUpperCase(previousCharacter)) {
+ naturalName.append(NameUtils.SPACE);
+ }
+ if (Character.isDigit(character) && !Character.isDigit(previousCharacter)) {
+ naturalName.append(NameUtils.SPACE);
+ }
+ }
+ naturalName.append(character);
+ }
+ naturalName.append(nextCharacter);
+ return naturalName.toString();
+ }
+
+ public static String pluralName(final String name) {
+ String pluralName;
+ if (name.endsWith("y")) {
+ pluralName = name.substring(0, name.length() - 1) + "ies";
+ } else if (name.endsWith("s") || name.endsWith("x")) {
+ pluralName = name + "es";
+ } else {
+ pluralName = name + 's';
+ }
+ return pluralName;
+ }
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/PathUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/PathUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/PathUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/PathUtils.java Mon Apr 25 09:19:29 2011
@@ -17,29 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-public final class PathUtils {
-
- private PathUtils() {}
-
- public static String combine(final String path, final String suffix) {
- if (isEmpty(path) && isEmpty(suffix)) {
- return "";
- }
- if (isEmpty(path)) {
- return suffix;
- }
- if (isEmpty(suffix)) {
- return path;
- }
- return path + "/" + suffix;
- }
-
-
- private static boolean isEmpty(final String str) {
- return str == null || str.length() == 0;
- }
-
-}
+public final class PathUtils {
+
+ private PathUtils() {
+ }
+
+ public static String combine(final String path, final String suffix) {
+ if (isEmpty(path) && isEmpty(suffix)) {
+ return "";
+ }
+ if (isEmpty(path)) {
+ return suffix;
+ }
+ if (isEmpty(suffix)) {
+ return path;
+ }
+ return path + "/" + suffix;
+ }
+
+ private static boolean isEmpty(final String str) {
+ return str == null || str.length() == 0;
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Resources.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Resources.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Resources.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Resources.java Mon Apr 25 09:19:29 2011
@@ -17,106 +17,103 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-
-/**
- * Adapted from Ibatis Common.
- */
-public class Resources {
-
- /**
- * Returns the URL, or null if not available.
- */
- public static URL getResourceURL(final String resource) {
-
- // try thread's classloader
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- URL url = classLoader.getResource(resource);
- if (url != null) {
- return url;
- }
-
- // try this class' classloader
- classLoader = Resources.class.getClassLoader();
- url = classLoader.getResource(resource);
- if (url != null) {
- return url;
- }
-
- // try system class loader (could return null)
- // wrapping in a try...catch because when running tests by Maven for a non-existing
- // resource, seems to bomb out. Is okay when run from Eclipse. A bit of a puzzle.
- try {
- return ClassLoader.getSystemResource(resource);
- } catch (final NullPointerException ignore) {
- return null;
- }
- }
-
- public static InputStream getResourceAsStream(final String resource) {
-
- // try thread's classloader
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- InputStream is = classLoader.getResourceAsStream(resource);
- if (is != null) {
- return is;
- }
-
- // try this class' classloader
- classLoader = Resources.class.getClassLoader();
- is = classLoader.getResourceAsStream(resource);
- if (is != null) {
- return is;
- }
-
- // try system class loader (could return null)
- // have wrapped in a try...catch because for same reason as getResourceURL
- try {
- return ClassLoader.getSystemResourceAsStream(resource);
- } catch (final NullPointerException ignore) {
- return null;
- }
- }
-
- public static File getResourceAsFile(final String resource) {
- final URL url = getResourceURL(resource);
- if (url == null) {
- return null;
- }
-
- return new File(url.getFile());
- }
-
- public static Properties getResourceAsProperties(final String resource) {
-
- final InputStream is = getResourceAsStream(resource);
- if (is == null) {
- return null;
- }
-
- final Properties props = new Properties();
- try {
- props.load(is);
- } catch (final IOException ex) {
- throw new RuntimeException(ex);
- } finally {
- try {
- is.close();
- } catch (final IOException ignore) {
- // ignore
- }
- }
-
- return props;
- }
-
-}
-
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+
+/**
+ * Adapted from Ibatis Common.
+ */
+public class Resources {
+
+ /**
+ * Returns the URL, or null if not available.
+ */
+ public static URL getResourceURL(final String resource) {
+
+ // try thread's classloader
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ URL url = classLoader.getResource(resource);
+ if (url != null) {
+ return url;
+ }
+
+ // try this class' classloader
+ classLoader = Resources.class.getClassLoader();
+ url = classLoader.getResource(resource);
+ if (url != null) {
+ return url;
+ }
+
+ // try system class loader (could return null)
+ // wrapping in a try...catch because when running tests by Maven for a non-existing
+ // resource, seems to bomb out. Is okay when run from Eclipse. A bit of a puzzle.
+ try {
+ return ClassLoader.getSystemResource(resource);
+ } catch (final NullPointerException ignore) {
+ return null;
+ }
+ }
+
+ public static InputStream getResourceAsStream(final String resource) {
+
+ // try thread's classloader
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ InputStream is = classLoader.getResourceAsStream(resource);
+ if (is != null) {
+ return is;
+ }
+
+ // try this class' classloader
+ classLoader = Resources.class.getClassLoader();
+ is = classLoader.getResourceAsStream(resource);
+ if (is != null) {
+ return is;
+ }
+
+ // try system class loader (could return null)
+ // have wrapped in a try...catch because for same reason as getResourceURL
+ try {
+ return ClassLoader.getSystemResourceAsStream(resource);
+ } catch (final NullPointerException ignore) {
+ return null;
+ }
+ }
+
+ public static File getResourceAsFile(final String resource) {
+ final URL url = getResourceURL(resource);
+ if (url == null) {
+ return null;
+ }
+
+ return new File(url.getFile());
+ }
+
+ public static Properties getResourceAsProperties(final String resource) {
+
+ final InputStream is = getResourceAsStream(resource);
+ if (is == null) {
+ return null;
+ }
+
+ final Properties props = new Properties();
+ try {
+ props.load(is);
+ } catch (final IOException ex) {
+ throw new RuntimeException(ex);
+ } finally {
+ try {
+ is.close();
+ } catch (final IOException ignore) {
+ // ignore
+ }
+ }
+
+ return props;
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringBuilderUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringBuilderUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringBuilderUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringBuilderUtils.java Mon Apr 25 09:19:29 2011
@@ -17,21 +17,20 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-public class StringBuilderUtils {
-
- public static void appendBuf(final StringBuilder buf, final String formatString, final Object... args) {
- buf.append(String.format(formatString, args));
- }
-
- /**
- * @deprecated - use a {@link StringBuilder} instead!
- */
- @Deprecated
- public static void appendBuf(final StringBuffer buf, final String formatString, final Object... args) {
- buf.append(String.format(formatString, args));
- }
-
-}
+public class StringBuilderUtils {
+
+ public static void appendBuf(final StringBuilder buf, final String formatString, final Object... args) {
+ buf.append(String.format(formatString, args));
+ }
+
+ /**
+ * @deprecated - use a {@link StringBuilder} instead!
+ */
+ @Deprecated
+ public static void appendBuf(final StringBuffer buf, final String formatString, final Object... args) {
+ buf.append(String.format(formatString, args));
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/StringUtils.java Mon Apr 25 09:19:29 2011
@@ -17,66 +17,64 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.StringTokenizer;
-
-
-public final class StringUtils {
- private StringUtils() {}
- //////////////////////////////////////////////////////////////
+public final class StringUtils {
+ private StringUtils() {
+ }
+
+ // ////////////////////////////////////////////////////////////
// naturalName, naturalize, simpleName, camel, memberIdFor
- //////////////////////////////////////////////////////////////
-
- public static String naturalName(final String name) {
-
- int pos = 0;
-
- // find first upper case character
- while ((pos < name.length()) && Character.isLowerCase(name.charAt(pos))) {
- pos++;
- }
-
- if (pos == name.length()) {
- return "invalid name";
- }
- return naturalize(name, pos);
- }
-
- public static String naturalize(final String name) {
- return naturalize(name, 0);
- }
-
- private static String naturalize(final String name, final int startingPosition) {
- if (name.length() <= startingPosition) {
- throw new IllegalArgumentException("string shorter than starting position provided");
- }
- final StringBuffer s = new StringBuffer(name.length() - startingPosition);
- for (int j = startingPosition; j < name.length(); j++) { // process english name - add spaces
- if ((j > startingPosition) && isStartOfNewWord(name.charAt(j), name.charAt(j - 1))) {
- s.append(' ');
- }
- if (j == startingPosition) {
- s.append(Character.toUpperCase(name.charAt(j)));
- } else {
- s.append(name.charAt(j));
- }
- }
- final String str = s.toString();
- return str;
- }
-
- private static boolean isStartOfNewWord(final char c, final char previousChar) {
- return Character.isUpperCase(c) || Character.isDigit(c) && !Character.isDigit(previousChar);
- }
+ // ////////////////////////////////////////////////////////////
+ public static String naturalName(final String name) {
+
+ int pos = 0;
+
+ // find first upper case character
+ while ((pos < name.length()) && Character.isLowerCase(name.charAt(pos))) {
+ pos++;
+ }
+
+ if (pos == name.length()) {
+ return "invalid name";
+ }
+ return naturalize(name, pos);
+ }
+
+ public static String naturalize(final String name) {
+ return naturalize(name, 0);
+ }
+
+ private static String naturalize(final String name, final int startingPosition) {
+ if (name.length() <= startingPosition) {
+ throw new IllegalArgumentException("string shorter than starting position provided");
+ }
+ final StringBuffer s = new StringBuffer(name.length() - startingPosition);
+ for (int j = startingPosition; j < name.length(); j++) { // process english name - add spaces
+ if ((j > startingPosition) && isStartOfNewWord(name.charAt(j), name.charAt(j - 1))) {
+ s.append(' ');
+ }
+ if (j == startingPosition) {
+ s.append(Character.toUpperCase(name.charAt(j)));
+ } else {
+ s.append(name.charAt(j));
+ }
+ }
+ final String str = s.toString();
+ return str;
+ }
+
+ private static boolean isStartOfNewWord(final char c, final char previousChar) {
+ return Character.isUpperCase(c) || Character.isDigit(c) && !Character.isDigit(previousChar);
+ }
public static String simpleName(final String str) {
final int lastDot = str.lastIndexOf('.');
@@ -89,12 +87,12 @@ public final class StringUtils {
return str.substring(lastDot + 1);
}
- public static String camel(String name) {
- StringBuffer b = new StringBuffer(name.length());
- StringTokenizer t = new StringTokenizer(name);
+ public static String camel(final String name) {
+ final StringBuffer b = new StringBuffer(name.length());
+ final StringTokenizer t = new StringTokenizer(name);
b.append(t.nextToken());
while (t.hasMoreTokens()) {
- String token = t.nextToken();
+ final String token = t.nextToken();
b.append(token.substring(0, 1).toUpperCase()); // replace spaces with
// camelCase
b.append(token.substring(1));
@@ -102,7 +100,7 @@ public final class StringUtils {
return b.toString();
}
- public static String pascal(String name) {
+ public static String pascal(final String name) {
return capitalize(camel(name));
}
@@ -110,22 +108,20 @@ public final class StringUtils {
return lowerLeading(camel(member));
}
-
- //////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////
// capitalize, lowerFirst, firstWord
- //////////////////////////////////////////////////////////////
-
- public static String capitalize(final String str) {
- if (str == null || str.length() == 0) {
- return str;
- }
- if (str.length() == 1) {
- return str.toUpperCase();
- }
- return Character.toUpperCase(str.charAt(0)) + str.substring(1);
- }
+ // ////////////////////////////////////////////////////////////
+
+ public static String capitalize(final String str) {
+ if (str == null || str.length() == 0) {
+ return str;
+ }
+ if (str.length() == 1) {
+ return str.toUpperCase();
+ }
+ return Character.toUpperCase(str.charAt(0)) + str.substring(1);
+ }
-
/**
* Simply forces first char to be lower case.
*/
@@ -143,20 +139,19 @@ public final class StringUtils {
return lowerFirst(str);
}
- public static String firstWord(String line) {
- String[] split = line.split(" ");
+ public static String firstWord(final String line) {
+ final String[] split = line.split(" ");
return split[0];
}
-
- //////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////
// isNullOrEmpty, nullSafeEquals
- //////////////////////////////////////////////////////////////
-
- public static boolean isNullOrEmpty(final String str) {
- return str == null || str.isEmpty();
- }
-
+ // ////////////////////////////////////////////////////////////
+
+ public static boolean isNullOrEmpty(final String str) {
+ return str == null || str.isEmpty();
+ }
+
public static boolean nullSafeEquals(final String str1, final String str2) {
if (str1 == null || str2 == null) {
return false;
@@ -164,24 +159,22 @@ public final class StringUtils {
return str1.equals(str2);
}
+ // ////////////////////////////////////////////////////////////
+ // in, combine, combinePaths, splitOnCommas
+ // ////////////////////////////////////////////////////////////
+
+ public static boolean in(final String str, final String[] strings) {
+ for (final String strCandidate : strings) {
+ if (strCandidate.equals(str)) {
+ return true;
+ }
+ }
+ return false;
+ }
-
- //////////////////////////////////////////////////////////////
- // in, combine, combinePaths, splitOnCommas
- //////////////////////////////////////////////////////////////
-
- public static boolean in(final String str, final String[] strings) {
- for (final String strCandidate : strings) {
- if (strCandidate.equals(str)) {
- return true;
- }
- }
- return false;
- }
-
- public static String combine(List<String> list) {
+ public static String combine(final List<String> list) {
final StringBuffer buf = new StringBuffer();
- for (String message: list) {
+ for (final String message : list) {
if (list.size() > 1) {
buf.append("; ");
}
@@ -190,9 +183,9 @@ public final class StringUtils {
return buf.toString();
}
- public static String combinePaths(String path, String... furtherPaths) {
- StringBuilder buf = new StringBuilder(path);
- for (String furtherPath : furtherPaths) {
+ public static String combinePaths(final String path, final String... furtherPaths) {
+ final StringBuilder buf = new StringBuilder(path);
+ for (final String furtherPath : furtherPaths) {
if (buf.charAt(buf.length() - 1) != File.separatorChar) {
buf.append(File.separatorChar);
}
@@ -210,70 +203,66 @@ public final class StringUtils {
if (removeLeadingWhiteSpace.length() == 0) {
return Collections.emptyList();
}
- String[] splitAsArray = removeLeadingWhiteSpace.split("\\W*,\\W*");
+ final String[] splitAsArray = removeLeadingWhiteSpace.split("\\W*,\\W*");
return Arrays.asList(splitAsArray);
}
-
- //////////////////////////////////////////////////////////////
+
+ // ////////////////////////////////////////////////////////////
// commaSeparatedClassNames
- //////////////////////////////////////////////////////////////
-
- public static String commaSeparatedClassNames(final List<Object> objects) {
- final StringBuilder buf = new StringBuilder();
- int i = 0;
- for (final Object object : objects) {
- if (i++ > 0) {
- buf.append(',');
- }
- buf.append(object.getClass().getName());
- }
- return buf.toString();
- }
+ // ////////////////////////////////////////////////////////////
+
+ public static String commaSeparatedClassNames(final List<Object> objects) {
+ final StringBuilder buf = new StringBuilder();
+ int i = 0;
+ for (final Object object : objects) {
+ if (i++ > 0) {
+ buf.append(',');
+ }
+ buf.append(object.getClass().getName());
+ }
+ return buf.toString();
+ }
-
-
private static final char CARRIAGE_RETURN = '\n';
private static final char LINE_FEED = '\r';
-
/**
* Converts any <tt>\n</tt> to <tt>line.separator</tt>
+ *
* @param string
* @return
*/
- public static String lineSeparated(String string) {
- StringBuilder buf = new StringBuilder();
- String lineSeparator = System.getProperty("line.separator");
+ public static String lineSeparated(final String string) {
+ final StringBuilder buf = new StringBuilder();
+ final String lineSeparator = System.getProperty("line.separator");
boolean lastWasLineFeed = false;
- for(char c: string.toCharArray()) {
- boolean isLineFeed = c == LINE_FEED;
- boolean isCarriageReturn = c == CARRIAGE_RETURN;
+ for (final char c : string.toCharArray()) {
+ final boolean isLineFeed = c == LINE_FEED;
+ final boolean isCarriageReturn = c == CARRIAGE_RETURN;
if (isCarriageReturn) {
buf.append(lineSeparator);
lastWasLineFeed = false;
} else {
- if(lastWasLineFeed) {
+ if (lastWasLineFeed) {
buf.append(LINE_FEED);
}
- if(isLineFeed) {
+ if (isLineFeed) {
lastWasLineFeed = true;
} else {
buf.append(c);
- lastWasLineFeed = false;
+ lastWasLineFeed = false;
}
}
}
- if(lastWasLineFeed) {
+ if (lastWasLineFeed) {
buf.append(LINE_FEED);
}
return buf.toString();
}
-
-
- //////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////
// removeTabs, removeLeadingWhiteSpace, stripLeadingSlash, stripNewLines, normalize
- //////////////////////////////////////////////////////////////
+ // ////////////////////////////////////////////////////////////
public static String removeTabs(final String text) {
// quick return - jvm java should always return here
@@ -297,12 +286,11 @@ public final class StringUtils {
return str.replaceAll("^\\W*", "");
}
-
public static String stripNewLines(final String str) {
return str.replaceAll("[\r\n]", "");
}
- public static String stripLeadingSlash(String path) {
+ public static String stripLeadingSlash(final String path) {
if (!path.startsWith("/")) {
return path;
}
@@ -312,24 +300,25 @@ public final class StringUtils {
return path.substring(1);
}
-
/**
* Condenses any whitespace to a single character
+ *
* @param str
* @return
*/
- public static String normalized(String str) {
- if(str==null)
+ public static String normalized(final String str) {
+ if (str == null) {
return null;
+ }
return str.replaceAll("\\s+", " ");
}
- public static String[] normalized(String... strings) {
- ArrayList<String> stringList = new ArrayList<String>();
- for (String string : strings) {
+ public static String[] normalized(final String... strings) {
+ final ArrayList<String> stringList = new ArrayList<String>();
+ for (final String string : strings) {
stringList.add(normalized(string));
}
- return stringList.toArray(new String[]{});
+ return stringList.toArray(new String[] {});
}
public static String removePrefix(final String name, final String prefix) {
@@ -340,6 +329,4 @@ public final class StringUtils {
}
}
-
-
-}
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Threads.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Threads.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Threads.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/Threads.java Mon Apr 25 09:19:29 2011
@@ -17,18 +17,17 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-
-public class Threads {
-
- private Threads() {}
-
- public static Thread startThread(Runnable target, String name) {
- final Thread thread = new Thread(target, name);
- thread.start();
- return thread;
- }
-
-}
+public class Threads {
+
+ private Threads() {
+ }
+
+ public static Thread startThread(final Runnable target, final String name) {
+ final Thread thread = new Thread(target, name);
+ thread.start();
+ return thread;
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ThrowableUtils.java Mon Apr 25 09:19:29 2011
@@ -17,14 +17,12 @@
* under the License.
*/
-
package org.apache.isis.core.commons.lang;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
-
public final class ThrowableUtils {
public static String stackTraceFor(final Throwable exception) {
@@ -37,7 +35,8 @@ public final class ThrowableUtils {
if (baos != null) {
try {
baos.close();
- } catch (final IOException ignore) {}
+ } catch (final IOException ignore) {
+ }
}
}
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/ToString.java Mon Apr 25 09:19:29 2011
@@ -17,13 +17,11 @@
* under the License.
*/
-
package org.apache.isis.core.commons.lang;
import java.text.SimpleDateFormat;
import java.util.Date;
-
public final class ToString {
public static String createName(final Object forObject) {
@@ -44,7 +42,7 @@ public final class ToString {
}
public static String timestamp(final Date date) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd-hhmmssSSS");
+ final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd-hhmmssSSS");
return date == null ? "" : simpleDateFormat.format(date);
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/WrapperUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/WrapperUtils.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/WrapperUtils.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/lang/WrapperUtils.java Mon Apr 25 09:19:29 2011
@@ -17,49 +17,45 @@
* under the License.
*/
+package org.apache.isis.core.commons.lang;
-package org.apache.isis.core.commons.lang;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-
-public final class WrapperUtils {
-
- private WrapperUtils() {}
-
- private static Map<Class<?>, Class<?>> wrapperClasses = new HashMap<Class<?>, Class<?>>();
-
- static {
- wrapperClasses.put(boolean.class, Boolean.class);
- wrapperClasses.put(byte.class, Byte.class);
- wrapperClasses.put(char.class, Character.class);
- wrapperClasses.put(short.class, Short.class);
- wrapperClasses.put(int.class, Integer.class);
- wrapperClasses.put(long.class, Long.class);
- wrapperClasses.put(float.class, Float.class);
- wrapperClasses.put(double.class, Double.class);
- }
-
-
- public static Class<?> wrap(final Class<?> primitiveClass) {
- return wrapperClasses.get(primitiveClass);
- }
-
-
- public static Class<?>[] wrapAsNecessary(final Class<?>[] classes) {
- final List<Class<?>> wrappedClasses = new ArrayList<Class<?>>();
- for (final Class<?> cls : classes) {
- if (cls.isPrimitive()) {
- wrappedClasses.add((Class<?>) wrap(cls));
- } else {
- wrappedClasses.add(cls);
- }
- }
- return wrappedClasses.toArray(new Class[] {});
- }
-
-}
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class WrapperUtils {
+
+ private WrapperUtils() {
+ }
+
+ private static Map<Class<?>, Class<?>> wrapperClasses = new HashMap<Class<?>, Class<?>>();
+
+ static {
+ wrapperClasses.put(boolean.class, Boolean.class);
+ wrapperClasses.put(byte.class, Byte.class);
+ wrapperClasses.put(char.class, Character.class);
+ wrapperClasses.put(short.class, Short.class);
+ wrapperClasses.put(int.class, Integer.class);
+ wrapperClasses.put(long.class, Long.class);
+ wrapperClasses.put(float.class, Float.class);
+ wrapperClasses.put(double.class, Double.class);
+ }
+
+ public static Class<?> wrap(final Class<?> primitiveClass) {
+ return wrapperClasses.get(primitiveClass);
+ }
+
+ public static Class<?>[] wrapAsNecessary(final Class<?>[] classes) {
+ final List<Class<?>> wrappedClasses = new ArrayList<Class<?>>();
+ for (final Class<?> cls : classes) {
+ if (cls.isPrimitive()) {
+ wrappedClasses.add(wrap(cls));
+ } else {
+ wrappedClasses.add(cls);
+ }
+ }
+ return wrappedClasses.toArray(new Class[] {});
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/matchers/IsisMatchers.java Mon Apr 25 09:19:29 2011
@@ -17,195 +17,197 @@
* under the License.
*/
+package org.apache.isis.core.commons.matchers;
+
+import static org.hamcrest.CoreMatchers.nullValue;
-package org.apache.isis.core.commons.matchers;
-
-import static org.hamcrest.CoreMatchers.nullValue;
-
import java.io.File;
-import java.util.List;
-
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.Description;
-import org.hamcrest.Factory;
-import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.hamcrest.core.IsEqual;
-import org.hamcrest.number.IsGreaterThan;
-import org.hamcrest.text.StringContains;
-import org.hamcrest.text.StringEndsWith;
-import org.hamcrest.text.StringStartsWith;
+import java.util.List;
+
import org.apache.isis.core.commons.lang.StringUtils;
-
-
-/**
- * Hamcrest {@link Matcher} implementations.
- *
- */
-public final class IsisMatchers {
-
- private IsisMatchers() {}
-
- @Factory
- public static Matcher<String> containsStripNewLines(final String expected) {
- final String strippedExpected = StringUtils.stripNewLines(expected);
- return new StringContains(strippedExpected) {
- @Override
- public boolean matchesSafely(final String actual) {
- return super.matchesSafely(StringUtils.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) containing").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> equalToStripNewLines(final String expected) {
- final String strippedExpected = StringUtils.stripNewLines(expected);
- return new IsEqual<String>(strippedExpected) {
- @Override
- public boolean matches(final Object actualObj) {
- final String actual = (String) actualObj;
- return super.matches(StringUtils.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) equal to").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> startsWithStripNewLines(final String expected) {
- final String strippedExpected = StringUtils.stripNewLines(expected);
- return new StringStartsWith(strippedExpected) {
- @Override
- public boolean matchesSafely(final String actual) {
- return super.matchesSafely(StringUtils.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) starting with").appendValue(strippedExpected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> endsWithStripNewLines(final String expected) {
- final String strippedExpected = StringUtils.stripNewLines(expected);
- return new StringEndsWith(strippedExpected) {
- @Override
- public boolean matchesSafely(final String actual) {
- return super.matchesSafely(StringUtils.stripNewLines(actual));
- }
-
- @Override
- public void describeTo(final Description description) {
- description.appendText("a string (ignoring new lines) ending with").appendValue(strippedExpected);
- }
- };
- }
-
- public static <T> Matcher<T> anInstanceOf(final Class<T> expected) {
- return new TypeSafeMatcher<T>() {
- @Override
- public boolean matchesSafely(final T actual) {
- return expected.isAssignableFrom(actual.getClass());
- }
-
- public void describeTo(final Description description) {
- description.appendText("an instance of ").appendValue(expected);
- }
- };
- }
-
- @Factory
- public static Matcher<String> nonEmptyString() {
- return new TypeSafeMatcher<String>() {
- @Override
- public boolean matchesSafely(String str) {
- return str != null && str.length() > 0;
- }
-
- public void describeTo(Description description) {
- description.appendText("a non empty string");
- }
-
- };
- }
-
- @Factory
- @SuppressWarnings("unchecked")
- public static Matcher<String> nonEmptyStringOrNull() {
- return CoreMatchers.anyOf(nullValue(String.class), nonEmptyString());
- }
-
-
- public static Matcher<List<?>> containsElementThat(final Matcher<?> elementMatcher) {
- return new TypeSafeMatcher<List<?>>() {
- public boolean matchesSafely(List<?> list) {
- for(Object o: list) {
- if (elementMatcher.matches(o)) {
- return true;
- }
- }
- return false;
- }
-
- public void describeTo(Description description) {
- description.appendText("contains element that ").appendDescriptionOf(elementMatcher);
- }
- };
- }
-
-
- @Factory
- public static <T extends Comparable<T>> Matcher<T> greaterThan(T c) {
- return new IsGreaterThan<T>(c);
- }
-
-
- @Factory
- public static Matcher<Class<?>> classEqualTo(final Class<?> operand) {
-
- class ClassEqualsMatcher extends TypeSafeMatcher<Class<?>> {
- private final Class<?> clazz;
- public ClassEqualsMatcher(final Class<?> clazz) {
- this.clazz = clazz;
- }
-
- @Override
- public boolean matchesSafely(final Class<?> arg) {
- return clazz == arg;
- }
-
- public void describeTo(final Description description) {
- description.appendValue(clazz);
- }
- }
-
- return new ClassEqualsMatcher(operand);
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+import org.hamcrest.core.IsEqual;
+import org.hamcrest.number.IsGreaterThan;
+import org.hamcrest.text.StringContains;
+import org.hamcrest.text.StringEndsWith;
+import org.hamcrest.text.StringStartsWith;
+
+/**
+ * Hamcrest {@link Matcher} implementations.
+ *
+ */
+public final class IsisMatchers {
+
+ private IsisMatchers() {
+ }
+
+ @Factory
+ public static Matcher<String> containsStripNewLines(final String expected) {
+ final String strippedExpected = StringUtils.stripNewLines(expected);
+ return new StringContains(strippedExpected) {
+ @Override
+ public boolean matchesSafely(final String actual) {
+ return super.matchesSafely(StringUtils.stripNewLines(actual));
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("a string (ignoring new lines) containing").appendValue(strippedExpected);
+ }
+ };
+ }
+
+ @Factory
+ public static Matcher<String> equalToStripNewLines(final String expected) {
+ final String strippedExpected = StringUtils.stripNewLines(expected);
+ return new IsEqual<String>(strippedExpected) {
+ @Override
+ public boolean matches(final Object actualObj) {
+ final String actual = (String) actualObj;
+ return super.matches(StringUtils.stripNewLines(actual));
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("a string (ignoring new lines) equal to").appendValue(strippedExpected);
+ }
+ };
+ }
+
+ @Factory
+ public static Matcher<String> startsWithStripNewLines(final String expected) {
+ final String strippedExpected = StringUtils.stripNewLines(expected);
+ return new StringStartsWith(strippedExpected) {
+ @Override
+ public boolean matchesSafely(final String actual) {
+ return super.matchesSafely(StringUtils.stripNewLines(actual));
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("a string (ignoring new lines) starting with").appendValue(strippedExpected);
+ }
+ };
+ }
+
+ @Factory
+ public static Matcher<String> endsWithStripNewLines(final String expected) {
+ final String strippedExpected = StringUtils.stripNewLines(expected);
+ return new StringEndsWith(strippedExpected) {
+ @Override
+ public boolean matchesSafely(final String actual) {
+ return super.matchesSafely(StringUtils.stripNewLines(actual));
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("a string (ignoring new lines) ending with").appendValue(strippedExpected);
+ }
+ };
+ }
+
+ public static <T> Matcher<T> anInstanceOf(final Class<T> expected) {
+ return new TypeSafeMatcher<T>() {
+ @Override
+ public boolean matchesSafely(final T actual) {
+ return expected.isAssignableFrom(actual.getClass());
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("an instance of ").appendValue(expected);
+ }
+ };
+ }
+
+ @Factory
+ public static Matcher<String> nonEmptyString() {
+ return new TypeSafeMatcher<String>() {
+ @Override
+ public boolean matchesSafely(final String str) {
+ return str != null && str.length() > 0;
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("a non empty string");
+ }
+
+ };
+ }
+
+ @Factory
+ @SuppressWarnings("unchecked")
+ public static Matcher<String> nonEmptyStringOrNull() {
+ return CoreMatchers.anyOf(nullValue(String.class), nonEmptyString());
+ }
+
+ public static Matcher<List<?>> containsElementThat(final Matcher<?> elementMatcher) {
+ return new TypeSafeMatcher<List<?>>() {
+ @Override
+ public boolean matchesSafely(final List<?> list) {
+ for (final Object o : list) {
+ if (elementMatcher.matches(o)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendText("contains element that ").appendDescriptionOf(elementMatcher);
+ }
+ };
+ }
+
+ @Factory
+ public static <T extends Comparable<T>> Matcher<T> greaterThan(final T c) {
+ return new IsGreaterThan<T>(c);
+ }
+
+ @Factory
+ public static Matcher<Class<?>> classEqualTo(final Class<?> operand) {
+
+ class ClassEqualsMatcher extends TypeSafeMatcher<Class<?>> {
+ private final Class<?> clazz;
+
+ public ClassEqualsMatcher(final Class<?> clazz) {
+ this.clazz = clazz;
+ }
+
+ @Override
+ public boolean matchesSafely(final Class<?> arg) {
+ return clazz == arg;
+ }
+
+ @Override
+ public void describeTo(final Description description) {
+ description.appendValue(clazz);
+ }
+ }
+
+ return new ClassEqualsMatcher(operand);
}
public static Matcher<File> existsAndNotEmpty() {
-
+
return new TypeSafeMatcher<File>() {
-
+
@Override
- public void describeTo(Description arg0) {
+ public void describeTo(final Description arg0) {
arg0.appendText("exists and is not empty");
}
-
+
@Override
- public boolean matchesSafely(File f) {
+ public boolean matchesSafely(final File f) {
return f.exists() && f.length() > 0;
}
};
- }
-
-}
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSource.java Mon Apr 25 09:19:29 2011
@@ -17,26 +17,23 @@
* under the License.
*/
+package org.apache.isis.core.commons.resource;
-package org.apache.isis.core.commons.resource;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public interface ResourceStreamSource {
-
- /**
- * Returns an {@link InputStream} opened for the resource path, or
- * <tt>null</tt> otherwise.
- */
- public InputStream readResource(String resourcePath);
-
- /**
- * Returns an {@link OutputStream} opened to write to the resource,
- * or <tt>null</tt> otherwise.
- */
- public OutputStream writeResource(String resourcePath);
-
- public String getName();
-
-}
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public interface ResourceStreamSource {
+
+ /**
+ * Returns an {@link InputStream} opened for the resource path, or <tt>null</tt> otherwise.
+ */
+ public InputStream readResource(String resourcePath);
+
+ /**
+ * Returns an {@link OutputStream} opened to write to the resource, or <tt>null</tt> otherwise.
+ */
+ public OutputStream writeResource(String resourcePath);
+
+ public String getName();
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java Mon Apr 25 09:19:29 2011
@@ -30,17 +30,17 @@ public abstract class ResourceStreamSour
private static Logger LOG = Logger.getLogger(ResourceStreamSourceAbstract.class);
@Override
- public final InputStream readResource(String resourcePath) {
+ public final InputStream readResource(final String resourcePath) {
try {
- InputStream resourceStream = doReadResource(resourcePath);
+ final InputStream resourceStream = doReadResource(resourcePath);
if (resourceStream != null) {
return resourceStream;
}
if (LOG.isDebugEnabled()) {
LOG.debug("could not load resource path '" + resourcePath + "' from " + getName());
}
- } catch (IOException e) {
+ } catch (final IOException e) {
if (LOG.isDebugEnabled()) {
LOG.debug("could not load resource path '" + resourcePath + "' from " + getName() + ", exception: "
+ e.getMessage());
@@ -59,7 +59,7 @@ public abstract class ResourceStreamSour
* Default implementation returns <tt>null</tt> (that is, not supported).
*/
@Override
- public OutputStream writeResource(String resourcePath) {
+ public OutputStream writeResource(final String resourcePath) {
return null;
}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java Mon Apr 25 09:19:29 2011
@@ -17,75 +17,73 @@
* under the License.
*/
+package org.apache.isis.core.commons.resource;
-package org.apache.isis.core.commons.resource;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-public class ResourceStreamSourceComposite extends ResourceStreamSourceAbstract {
-
- private static Logger LOG = Logger.getLogger(ResourceStreamSourceComposite.class);
-
- private List<ResourceStreamSource> resourceStreamSources = new ArrayList<ResourceStreamSource>();
-
- public ResourceStreamSourceComposite(ResourceStreamSource... resourceStreamSources) {
- for(ResourceStreamSource rss: resourceStreamSources) {
- addResourceStreamSource(rss);
- }
- }
-
-
- public void addResourceStreamSource(ResourceStreamSource rss) {
- this.resourceStreamSources.add(rss);
- }
-
- protected InputStream doReadResource(String resourcePath) {
- for(ResourceStreamSource rss: resourceStreamSources) {
- InputStream resourceStream = rss.readResource(resourcePath);
- if (resourceStream != null) {
- return resourceStream;
- }
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("could not load resource path '" + resourcePath + "' from " + getName() );
- }
- return null;
- }
-
- @Override
- public OutputStream writeResource(String resourcePath) {
- for(ResourceStreamSource rss: resourceStreamSources) {
- OutputStream os = rss.writeResource(resourcePath);
- if (os != null) {
- return os;
- }
- }
- return null;
- }
-
- public String getName() {
- return "[" + resourceStreamNames() + "]";
- }
-
- private String resourceStreamNames() {
- StringBuilder buf = new StringBuilder();
- boolean first = true;
- for (ResourceStreamSource rss : resourceStreamSources) {
- if (first) {
- first = false;
- } else {
- buf.append(", ");
- }
- buf.append(rss.getName());
- }
- return buf.toString();
- }
-
-
-
-}
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+public class ResourceStreamSourceComposite extends ResourceStreamSourceAbstract {
+
+ private static Logger LOG = Logger.getLogger(ResourceStreamSourceComposite.class);
+
+ private final List<ResourceStreamSource> resourceStreamSources = new ArrayList<ResourceStreamSource>();
+
+ public ResourceStreamSourceComposite(final ResourceStreamSource... resourceStreamSources) {
+ for (final ResourceStreamSource rss : resourceStreamSources) {
+ addResourceStreamSource(rss);
+ }
+ }
+
+ public void addResourceStreamSource(final ResourceStreamSource rss) {
+ this.resourceStreamSources.add(rss);
+ }
+
+ @Override
+ protected InputStream doReadResource(final String resourcePath) {
+ for (final ResourceStreamSource rss : resourceStreamSources) {
+ final InputStream resourceStream = rss.readResource(resourcePath);
+ if (resourceStream != null) {
+ return resourceStream;
+ }
+ }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("could not load resource path '" + resourcePath + "' from " + getName());
+ }
+ return null;
+ }
+
+ @Override
+ public OutputStream writeResource(final String resourcePath) {
+ for (final ResourceStreamSource rss : resourceStreamSources) {
+ final OutputStream os = rss.writeResource(resourcePath);
+ if (os != null) {
+ return os;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getName() {
+ return "[" + resourceStreamNames() + "]";
+ }
+
+ private String resourceStreamNames() {
+ final StringBuilder buf = new StringBuilder();
+ boolean first = true;
+ for (final ResourceStreamSource rss : resourceStreamSources) {
+ if (first) {
+ first = false;
+ } else {
+ buf.append(", ");
+ }
+ buf.append(rss.getName());
+ }
+ return buf.toString();
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceContextLoaderClassPath.java Mon Apr 25 09:19:29 2011
@@ -17,28 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.commons.resource;
-package org.apache.isis.core.commons.resource;
-
-import java.io.InputStream;
-
-
-/**
- * Loads the properties from the ContextClassLoader.
- *
- * <p>
- * If this class is on the system class path, then the class loader obtained from this.getClassLoader() won't
- * be able to load resources from the application class path.
- */
-public class ResourceStreamSourceContextLoaderClassPath extends ResourceStreamSourceAbstract {
-
- protected InputStream doReadResource(String resourcePath) {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- return classLoader.getResourceAsStream(resourcePath);
- }
-
- public String getName() {
- return "context loader classpath";
- }
-
-}
+import java.io.InputStream;
+
+/**
+ * Loads the properties from the ContextClassLoader.
+ *
+ * <p>
+ * If this class is on the system class path, then the class loader obtained from this.getClassLoader() won't be able to
+ * load resources from the application class path.
+ */
+public class ResourceStreamSourceContextLoaderClassPath extends ResourceStreamSourceAbstract {
+
+ @Override
+ protected InputStream doReadResource(final String resourcePath) {
+ final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ return classLoader.getResourceAsStream(resourcePath);
+ }
+
+ @Override
+ public String getName() {
+ return "context loader classpath";
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceCurrentClassClassPath.java Mon Apr 25 09:19:29 2011
@@ -17,30 +17,28 @@
* under the License.
*/
+package org.apache.isis.core.commons.resource;
-package org.apache.isis.core.commons.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Load from this class' ClassLoader.
- *
- *<p>
- * This is useful if (a) the contextClassLoader is not available and (b) the
- * contextClassLoader does not load from this classes ClassLoader (for example
- * when running under Ant while running unit tests as part of an automated
- * build).
- */
-public class ResourceStreamSourceCurrentClassClassPath extends
- ResourceStreamSourceAbstract {
-
- protected InputStream doReadResource(String resourcePath) throws IOException {
- return getClass().getClassLoader().getResourceAsStream(resourcePath);
- }
-
- public String getName() {
- return "current class' classpath";
- }
-
-}
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Load from this class' ClassLoader.
+ *
+ * <p>
+ * This is useful if (a) the contextClassLoader is not available and (b) the contextClassLoader does not load from this
+ * classes ClassLoader (for example when running under Ant while running unit tests as part of an automated build).
+ */
+public class ResourceStreamSourceCurrentClassClassPath extends ResourceStreamSourceAbstract {
+
+ @Override
+ protected InputStream doReadResource(final String resourcePath) throws IOException {
+ return getClass().getClassLoader().getResourceAsStream(resourcePath);
+ }
+
+ @Override
+ public String getName() {
+ return "current class' classpath";
+ }
+
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceFileSystem.java Mon Apr 25 09:19:29 2011
@@ -17,51 +17,49 @@
* under the License.
*/
+package org.apache.isis.core.commons.resource;
-package org.apache.isis.core.commons.resource;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-
-public class ResourceStreamSourceFileSystem extends ResourceStreamSourceAbstract {
+
+public class ResourceStreamSourceFileSystem extends ResourceStreamSourceAbstract {
/**
* Factory method to guard against nulls
*/
- public static ResourceStreamSource create(String directory2) {
- return directory2!=null?new ResourceStreamSourceFileSystem(directory2):null;
+ public static ResourceStreamSource create(final String directory2) {
+ return directory2 != null ? new ResourceStreamSourceFileSystem(directory2) : null;
+ }
+
+ private final String directory;
+
+ public ResourceStreamSourceFileSystem(final String directory) {
+ this.directory = directory;
+ }
+
+ @Override
+ protected InputStream doReadResource(final String resourcePath) throws FileNotFoundException {
+ final File file = new File(directory, resourcePath);
+ return new FileInputStream(file);
+ }
+
+ @Override
+ public OutputStream writeResource(final String resourcePath) {
+ final File file = new File(directory, resourcePath);
+ try {
+ return new FileOutputStream(file);
+ } catch (final FileNotFoundException e) {
+ return null;
+ }
+ }
+
+ @Override
+ public String getName() {
+ return "file system (directory '" + directory + "')";
}
-
- private String directory;
-
- public ResourceStreamSourceFileSystem(String directory) {
- this.directory = directory;
- }
-
- @Override
- protected InputStream doReadResource(String resourcePath) throws FileNotFoundException {
- File file = new File(directory, resourcePath);
- return new FileInputStream(file);
- }
-
- @Override
- public OutputStream writeResource(String resourcePath) {
- File file = new File(directory, resourcePath);
- try {
- return new FileOutputStream(file);
- } catch (FileNotFoundException e) {
- return null;
- }
- }
-
- @Override
- public String getName() {
- return "file system (directory '" + directory + "')";
- }
-
-}
+}
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/ContentWriter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/ContentWriter.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/ContentWriter.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/ContentWriter.java Mon Apr 25 09:19:29 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.commons.xml;
import java.io.IOException;
@@ -28,5 +27,3 @@ public interface ContentWriter {
void write(Writer writer) throws IOException;
}
-
-
Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/XmlFile.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/XmlFile.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/XmlFile.java (original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/xml/XmlFile.java Mon Apr 25 09:19:29 2011
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -37,8 +38,6 @@ import org.xml.sax.helpers.XMLReaderFact
import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-import org.apache.isis.core.commons.exceptions.IsisException;
-
public class XmlFile {
private static final String[] ESCAPE_STRING = { "&", "<", ">", """, "'" };
private static final String[] SPECIAL_CHARACTERS = { "&", "<", ">", "\"", "'" };
@@ -143,7 +142,7 @@ public class XmlFile {
public boolean isFixturesInstalled() {
final String[] list = directory.list(new FilenameFilter() {
@Override
- public boolean accept(File dir, String name) {
+ public boolean accept(final File dir, final String name) {
return name.toLowerCase().endsWith(".xml");
}
});
Modified: incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java (original)
+++ incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java Mon Apr 25 09:19:29 2011
@@ -17,20 +17,14 @@
* under the License.
*/
-
package org.apache.isis.core.commons.config;
import junit.framework.TestCase;
+import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderFileSystem;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-import org.apache.isis.core.commons.exceptions.IsisException;
-
-
public class ConfigurationBuilderFileSystemTest extends TestCase {
IsisConfigurationBuilderFileSystem loader;
@@ -67,7 +61,8 @@ public class ConfigurationBuilderFileSys
loader.addConfigurationResource("unfound.properties", NotFoundPolicy.FAIL_FAST);
loader.getConfiguration();
fail();
- } catch (final IsisException expected) {}
+ } catch (final IsisException expected) {
+ }
}
public void testAddedConfigurationIgnoreUnfoundFile() {
@@ -87,4 +82,3 @@ public class ConfigurationBuilderFileSys
assertEquals(System.getProperty("os.name"), configuration.getString("os.name"));
}
}
-
Modified: incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java (original)
+++ incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest.java Mon Apr 25 09:19:29 2011
@@ -24,28 +24,25 @@ import static org.junit.Assert.assertTha
import org.junit.Test;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-
public class ConfigurationBuilderResourceStreamsConfigResourceAndPolicyTest {
@Test
public void toStringWhenNull() throws Exception {
- IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy configurationResourceAndPolicy =
+ final IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy configurationResourceAndPolicy =
new IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy(null, null);
assertThat(configurationResourceAndPolicy.toString(), is("null{null}"));
}
@Test
public void toStringWhenConfigResourceNotNull() throws Exception {
- IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy configurationResourceAndPolicy =
+ final IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy configurationResourceAndPolicy =
new IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy("foo.properties", null);
assertThat(configurationResourceAndPolicy.toString(), is("foo.properties{null}"));
}
@Test
public void toStringWhenAllSpecified() throws Exception {
- IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy configurationResourceAndPolicy =
+ final IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy configurationResourceAndPolicy =
new IsisConfigurationBuilderResourceStreams.ConfigurationResourceAndPolicy("foo.properties",
NotFoundPolicy.CONTINUE);
assertThat(configurationResourceAndPolicy.toString(), is("foo.properties{CONTINUE}"));
Modified: incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java (original)
+++ incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java Mon Apr 25 09:19:29 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.commons.config;
import junit.framework.TestCase;
@@ -25,11 +24,6 @@ import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderFileSystem;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.NotFoundPolicy;
-
-
public class ConfigurationBuilderTwoDirectoriesTest extends TestCase {
IsisConfigurationBuilderFileSystem builder;
@@ -45,4 +39,3 @@ public class ConfigurationBuilderTwoDire
assertEquals("version 3", configuration.getString("different.property"));
}
}
-
Modified: incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java?rev=1096439&r1=1096438&r2=1096439&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java (original)
+++ incubator/isis/trunk/core/commons/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java Mon Apr 25 09:19:29 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.commons.config;
import java.util.Properties;
@@ -28,9 +27,6 @@ import org.apache.log4j.BasicConfigurato
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-
-
public class IsisConfigurationDefault_PropertNamesTest extends TestCase {
private IsisConfigurationDefault configuration;