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 2013/09/06 14:53:31 UTC
[2/8] ISIS-509: tidy-up of Util classes.
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetFactory.java
index f33d350..db9f189 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetFactory.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -92,7 +92,7 @@ public class ActionParameterAutoCompleteFacetFactory extends MethodPrefixBasedFa
final Class<?> cls = processMethodContext.getCls();
final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
final String name = MethodPrefixConstants.AUTO_COMPLETE_PREFIX + i + capitalizedName;
return MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, name, paramType, new Class[]{String.class});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
index 2a07292..2217227 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/autocomplete/ActionParameterAutoCompleteFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.lang.ArrayUtil;
+import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
@@ -77,7 +77,7 @@ public class ActionParameterAutoCompleteFacetViaMethod extends ActionParameterAu
return new Object[0];
}
if (options.getClass().isArray()) {
- return ArrayUtil.getObjectAsObjectArray(options);
+ return ObjectExtensions.asArray(options);
} else {
final ObjectSpecification specification = getSpecification(choicesType);
return CollectionUtils.getCollectionAsObjectArray(options, specification, getAdapterManager());
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetFactory.java
index 7af3f7b..42b4868 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetFactory.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.progmodel.facets.param.choices.method;
import java.lang.reflect.Method;
import java.util.Collection;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -93,7 +93,7 @@ public class ActionChoicesFacetFactory extends MethodPrefixBasedFacetFactoryAbst
final Method actionMethod = processMethodContext.getMethod();
final MethodScope methodScope = MethodScope.scopeFor(actionMethod);
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
final String name = MethodPrefixConstants.CHOICES_PREFIX + capitalizedName;
choicesMethod = MethodFinderUtils.findMethod(cls, methodScope, name, returnType2, new Class[0]);
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
index 34a6934..569a35b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/method/ActionChoicesFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.lang.ArrayUtil;
+import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
@@ -81,7 +81,7 @@ public class ActionChoicesFacetViaMethod extends ActionChoicesFacetAbstract impl
if (options[i] == null) {
results[i] = null;
} else if (options[i].getClass().isArray()) {
- results[i] = ArrayUtil.getObjectAsObjectArray(options[i]);
+ results[i] = ObjectExtensions.asArray(options[i]);
} else {
final ObjectSpecification specification = getSpecificationLookup().loadSpecification(choicesType);
results[i] = CollectionUtils.getCollectionAsObjectArray(options[i], specification, getAdapterMap());
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetFactory.java
index 5a4e5b5..bc46ce6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetFactory.java
@@ -24,8 +24,8 @@ import java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;
-import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.ListExtensions;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -107,7 +107,7 @@ public class ActionParameterChoicesFacetFactory extends MethodPrefixBasedFacetFa
private static Method findChoicesNumMethodReturning(final ProcessMethodContext processMethodContext, final int n) {
final Method actionMethod = processMethodContext.getMethod();
- final List<Class<?>> paramTypes = ListUtils.mutableCopy(actionMethod.getParameterTypes());
+ final List<Class<?>> paramTypes = ListExtensions.mutableCopy(actionMethod.getParameterTypes());
final Class<?> arrayOfParamType = (Array.newInstance(paramTypes.get(n), 0)).getClass();
@@ -139,7 +139,7 @@ public class ActionParameterChoicesFacetFactory extends MethodPrefixBasedFacetFa
private static Method findChoicesNumMethodReturning(final ProcessMethodContext processMethodContext, final int n, Class<?>[] paramTypes, final Class<?> returnType) {
final Class<?> cls = processMethodContext.getCls();
final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
final String name = MethodPrefixConstants.CHOICES_PREFIX + n + capitalizedName;
return MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, name, returnType, paramTypes);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
index 548f549..068c20f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/choices/methodnum/ActionParameterChoicesFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.lang.ArrayUtil;
+import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
@@ -71,7 +71,7 @@ public class ActionParameterChoicesFacetViaMethod extends ActionParameterChoices
return new Object[0];
}
if (choices.getClass().isArray()) {
- return ArrayUtil.getObjectAsObjectArray(choices);
+ return ObjectExtensions.asArray(choices);
} else {
final ObjectSpecification specification = getSpecification(choicesType);
return CollectionUtils.getCollectionAsObjectArray(choices, specification, getAdapterManager());
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetFactory.java
index 66f10ca..b8efc34 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/defaults/methodnum/ActionParameterDefaultsFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.progmodel.facets.param.defaults.methodnum;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.ListExtensions;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -105,7 +105,7 @@ public class ActionParameterDefaultsFacetFactory extends MethodPrefixBasedFacetF
private static Method findDefaultNumMethod(ProcessMethodContext processMethodContext, int n) {
final Method actionMethod = processMethodContext.getMethod();
- final List<Class<?>> paramTypes = ListUtils.mutableCopy(actionMethod.getParameterTypes());
+ final List<Class<?>> paramTypes = ListExtensions.mutableCopy(actionMethod.getParameterTypes());
final int numParamTypes = paramTypes.size();
@@ -127,7 +127,7 @@ public class ActionParameterDefaultsFacetFactory extends MethodPrefixBasedFacetF
final Class<?> cls = processMethodContext.getCls();
final Method actionMethod = processMethodContext.getMethod();
final Class<?> returnType = actionMethod.getParameterTypes()[n];
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
return MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.DEFAULT_PREFIX + n + capitalizedName, returnType, paramTypes);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/describedas/staticmethod/ActionParameterDescriptionsMethodFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/describedas/staticmethod/ActionParameterDescriptionsMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/describedas/staticmethod/ActionParameterDescriptionsMethodFacetFactory.java
index e32d99f..537d592 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/describedas/staticmethod/ActionParameterDescriptionsMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/describedas/staticmethod/ActionParameterDescriptionsMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.progmodel.facets.param.describedas.staticmethod;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.core.commons.lang.NameUtils;
-import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.commons.lang.MethodExtensions;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -69,7 +69,7 @@ public class ActionParameterDescriptionsMethodFacetFactory extends MethodPrefixB
final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Method descriptionMethod = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.DESCRIPTION_PREFIX + capitalizedName, String[].class, new Class[0]);
@@ -88,7 +88,7 @@ public class ActionParameterDescriptionsMethodFacetFactory extends MethodPrefixB
private static String[] invokeDescriptionsMethod(final Method descriptionMethod, final int numElementsRequired) {
String[] descriptions = null;
try {
- descriptions = (String[]) InvokeUtils.invokeStatic(descriptionMethod, new Object[0]);
+ descriptions = (String[]) MethodExtensions.invokeStatic(descriptionMethod, new Object[0]);
} catch (final ClassCastException ex) {
// ignore
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/mandatory/staticmethod/ActionParameterOptionalViaMethodFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/mandatory/staticmethod/ActionParameterOptionalViaMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/mandatory/staticmethod/ActionParameterOptionalViaMethodFacetFactory.java
index b802639..5c32415 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/mandatory/staticmethod/ActionParameterOptionalViaMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/mandatory/staticmethod/ActionParameterOptionalViaMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.progmodel.facets.param.mandatory.staticmethod;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.core.commons.lang.NameUtils;
-import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.commons.lang.MethodExtensions;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -67,7 +67,7 @@ public class ActionParameterOptionalViaMethodFacetFactory extends MethodPrefixBa
}
final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Method optionalMethod = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.OPTIONAL_PREFIX + capitalizedName, boolean[].class, new Class[0]);
@@ -91,7 +91,7 @@ public class ActionParameterOptionalViaMethodFacetFactory extends MethodPrefixBa
private static boolean[] invokeOptionalsMethod(final Method optionalMethod, final int numElementsRequired) {
boolean[] optionals = null;
try {
- optionals = (boolean[]) InvokeUtils.invokeStatic(optionalMethod, new Object[0]);
+ optionals = (boolean[]) MethodExtensions.invokeStatic(optionalMethod, new Object[0]);
} catch (final ClassCastException ex) {
// ignore, test below
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/named/staticmethod/ActionParameterNamesMethodFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/named/staticmethod/ActionParameterNamesMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/named/staticmethod/ActionParameterNamesMethodFacetFactory.java
index 43f2df7..9f696dd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/named/staticmethod/ActionParameterNamesMethodFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/param/named/staticmethod/ActionParameterNamesMethodFacetFactory.java
@@ -22,8 +22,8 @@ package org.apache.isis.core.progmodel.facets.param.named.staticmethod;
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.isis.core.commons.lang.NameUtils;
-import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.commons.lang.MethodExtensions;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -71,7 +71,7 @@ public class ActionParameterNamesMethodFacetFactory extends MethodPrefixBasedFac
}
final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.capitalizeName(actionMethod.getName());
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Method namesMethod = MethodFinderUtils.findMethod(cls, MethodScope.CLASS, MethodPrefixConstants.NAME_PREFIX + capitalizedName, String[].class, new Class[0]);
@@ -92,7 +92,7 @@ public class ActionParameterNamesMethodFacetFactory extends MethodPrefixBasedFac
private static String[] invokeNamesMethod(final Method namesMethod, final int numElementsRequired) {
String[] names = null;
try {
- names = (String[]) InvokeUtils.invokeStatic(namesMethod, new Object[0]);
+ names = (String[]) MethodExtensions.invokeStatic(namesMethod, new Object[0]);
} catch (final ClassCastException ex) {
// ignore
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetFactory.java
index 2e2b595..a0308ff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.facets.properties.autocomplete;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -51,7 +51,7 @@ public class PropertyAutoCompleteFacetFactory extends MethodPrefixBasedFacetFact
private void attachPropertyAutoCompleteFacetIfChoicesMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Class<?> returnType = getMethod.getReturnType();
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
index 2e98f1f..88116ed 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/autocomplete/PropertyAutoCompleteFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.lang.ArrayUtil;
+import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
@@ -83,7 +83,7 @@ public class PropertyAutoCompleteFacetViaMethod extends PropertyAutoCompleteFace
return null;
}
if (options.getClass().isArray()) {
- return ArrayUtil.getObjectAsObjectArray(options);
+ return ObjectExtensions.asArray(options);
}
final ObjectSpecification specification = specificationLookup.loadSpecification(choicesClass);
return CollectionUtils.getCollectionAsObjectArray(options, specification, getAdapterManager());
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetFactory.java
index aff4fff..352bca8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.facets.properties.choices.method;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -51,7 +51,7 @@ public class PropertyChoicesFacetFactory extends MethodPrefixBasedFacetFactoryAb
private void attachPropertyChoicesFacetIfChoicesMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Class<?> returnType = getMethod.getReturnType();
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
index 60c7122..cb2b694 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/choices/method/PropertyChoicesFacetViaMethod.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.core.commons.lang.ArrayUtil;
+import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.util.AdapterInvokeUtils;
@@ -74,7 +74,7 @@ public class PropertyChoicesFacetViaMethod extends PropertyChoicesFacetAbstract
return null;
}
if (options.getClass().isArray()) {
- return ArrayUtil.getObjectAsObjectArray(options);
+ return ObjectExtensions.asArray(options);
}
final ObjectSpecification specification = specificationLookup.loadSpecification(choicesClass);
return CollectionUtils.getCollectionAsObjectArray(options, specification, getAdapterManager());
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/defaults/method/PropertyDefaultFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/defaults/method/PropertyDefaultFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/defaults/method/PropertyDefaultFacetFactory.java
index 146a21e..ecceb8b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/defaults/method/PropertyDefaultFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/defaults/method/PropertyDefaultFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.facets.properties.defaults.method;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManagerAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -51,7 +51,7 @@ public class PropertyDefaultFacetFactory extends MethodPrefixBasedFacetFactoryAb
private void attachPropertyDefaultFacetIfDefaultMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Class<?> returnType = getMethod.getReturnType();
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/mandatory/staticmethod/PropertyOptionalFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/mandatory/staticmethod/PropertyOptionalFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/mandatory/staticmethod/PropertyOptionalFacetFactory.java
index d77778e..1d0c8e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/mandatory/staticmethod/PropertyOptionalFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/mandatory/staticmethod/PropertyOptionalFacetFactory.java
@@ -21,8 +21,8 @@ package org.apache.isis.core.progmodel.facets.properties.mandatory.staticmethod;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
-import org.apache.isis.core.metamodel.adapter.util.InvokeUtils;
+import org.apache.isis.core.commons.lang.MethodExtensions;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -49,7 +49,7 @@ public class PropertyOptionalFacetFactory extends MethodPrefixBasedFacetFactoryA
private static void attachMandatoryFacetIfOptionalMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method method = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(method.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(method.getName());
final Class<?> returnType = method.getReturnType();
final Class<?> cls = processMethodContext.getCls();
@@ -70,7 +70,7 @@ public class PropertyOptionalFacetFactory extends MethodPrefixBasedFacetFactoryA
if (method != null) {
Boolean optionalMethodReturnValue = null;
try {
- optionalMethodReturnValue = (Boolean) InvokeUtils.invoke(method, new Object[0]);
+ optionalMethodReturnValue = (Boolean) MethodExtensions.invoke(method, new Object[0]);
} catch (final ClassCastException ex) {
// ignore
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertyModifyFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertyModifyFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertyModifyFacetFactory.java
index e952c6e..3ab9cfc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertyModifyFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertyModifyFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.facets.properties.modify;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -47,7 +47,7 @@ public class PropertyModifyFacetFactory extends MethodPrefixBasedFacetFactoryAbs
private void attachPropertyModifyFacetIfModifyMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Class<?> returnType = getMethod.getReturnType();
final Class<?>[] paramTypes = new Class[] { returnType };
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertySetAndClearFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertySetAndClearFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertySetAndClearFacetFactory.java
index 396cbdc..f20cae2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertySetAndClearFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/modify/PropertySetAndClearFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.facets.properties.modify;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -60,7 +60,7 @@ public class PropertySetAndClearFacetFactory extends MethodPrefixBasedFacetFacto
private static Method attachPropertyModifyFacetIfSetterIsFound(final ProcessMethodContext processMethodContext) {
final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Class<?> cls = processMethodContext.getCls();
final Class<?> returnType = getMethod.getReturnType();
@@ -85,7 +85,7 @@ public class PropertySetAndClearFacetFactory extends MethodPrefixBasedFacetFacto
final Method getMethod = processMethodContext.getMethod();
final FacetHolder property = processMethodContext.getFacetHolder();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Method clearMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.CLEAR_PREFIX + capitalizedName, void.class, NO_PARAMETERS_TYPES);
if (clearMethod == null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetFactory.java
index 562edbb..476e446 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/properties/validate/PropertyValidateFacetFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.progmodel.facets.properties.validate;
import java.lang.reflect.Method;
-import org.apache.isis.core.commons.lang.NameUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -47,7 +47,7 @@ public class PropertyValidateFacetFactory extends MethodPrefixBasedFacetFactoryA
private void attachValidateFacetIfValidateMethodIsFound(final ProcessMethodContext processMethodContext) {
final Method getMethod = processMethodContext.getMethod();
- final String capitalizedName = NameUtils.javaBaseName(getMethod.getName());
+ final String capitalizedName = StringExtensions.asJavaBaseName(getMethod.getName());
final Class<?> returnType = getMethod.getReturnType();
final Class<?>[] paramTypes = new Class[] { returnType };
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
index c75dc81..1eb7c9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.lang.ToString;
+import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.RegistrationDetails;
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
index 6e1ae09..da71920 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.commons.cli.CommandLine;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.lang.ListUtils;
+import org.apache.isis.core.commons.lang.ListExtensions;
public abstract class OptionHandlerAbstract implements OptionHandler {
@@ -48,7 +48,7 @@ public abstract class OptionHandlerAbstract implements OptionHandler {
final String[] optionValues = commandLine.getOptionValues(opt);
if (optionValues != null) {
for (final String optionValue : optionValues) {
- ListUtils.appendDelimitedStringToList(optionValue, list);
+ ListExtensions.appendDelimitedStringToList(optionValue, list);
}
}
return list;
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
index 76c6776..3c74e07 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
@@ -30,7 +30,7 @@ import java.util.Properties;
import java.util.TimeZone;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.lang.IoUtils;
+import org.apache.isis.core.commons.lang.CloseableExtensions;
import org.apache.isis.core.runtime.about.AboutIsis;
public class SystemPrinter {
@@ -127,7 +127,7 @@ public class SystemPrinter {
} catch (final Exception e) {
throw new IsisException(e);
} finally {
- IoUtils.closeSafely(fileInputStream);
+ CloseableExtensions.closeSafely(fileInputStream);
}
print("");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/ResourceStreamSourceForWebInf.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/ResourceStreamSourceForWebInf.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/ResourceStreamSourceForWebInf.java
index 3859856..28ccf15 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/ResourceStreamSourceForWebInf.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/ResourceStreamSourceForWebInf.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import javax.servlet.ServletContext;
-import org.apache.isis.core.commons.lang.PathUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.commons.resource.ResourceStreamSourceAbstract;
public class ResourceStreamSourceForWebInf extends ResourceStreamSourceAbstract {
@@ -50,7 +50,7 @@ public class ResourceStreamSourceForWebInf extends ResourceStreamSourceAbstract
@Override
public InputStream doReadResource(final String resourcePath) throws IOException {
- final String fullyQualifiedResourcePath = PathUtils.combine(configurationDirectory, resourcePath);
+ final String fullyQualifiedResourcePath = StringExtensions.combinePath(configurationDirectory, resourcePath);
return servletContext.getResourceAsStream(fullyQualifiedResourcePath);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
index 13d5e7c..43a0a10 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
@@ -32,9 +32,9 @@ import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.lang.IoUtils;
+import org.apache.isis.core.commons.lang.InputStreamExtensions;
import org.apache.isis.core.commons.lang.ResourceUtil;
-import org.apache.isis.core.commons.lang.StringUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
public class ResourceServlet extends HttpServlet {
@@ -52,7 +52,7 @@ public class ResourceServlet extends HttpServlet {
}
private void processRequest(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
- final String servletPath = StringUtils.stripLeadingSlash(request.getServletPath());
+ final String servletPath = StringExtensions.stripLeadingSlash(request.getServletPath());
if (LOG.isInfoEnabled()) {
LOG.info("request: " + servletPath);
}
@@ -64,7 +64,7 @@ public class ResourceServlet extends HttpServlet {
LOG.debug("request: " + servletPath + " loaded from filesystem");
}
writeContentType(request, response);
- IoUtils.copy(is2, response.getOutputStream());
+ InputStreamExtensions.copyTo(is2, response.getOutputStream());
is2.close();
return;
}
@@ -76,7 +76,7 @@ public class ResourceServlet extends HttpServlet {
LOG.debug("request: " + servletPath + " loaded from classpath");
}
writeContentType(request, response);
- IoUtils.copy(is, response.getOutputStream());
+ InputStreamExtensions.copyTo(is, response.getOutputStream());
is.close();
return;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
index 588d5d0..53842b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
@@ -30,7 +30,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.core.commons.lang.PathUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
public class RedirectFilter implements Filter {
@@ -50,7 +50,7 @@ public class RedirectFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
- httpServletResponse.sendRedirect(PathUtils.combine(httpServletRequest.getContextPath(), redirectTo));
+ httpServletResponse.sendRedirect(StringExtensions.combinePath(httpServletRequest.getContextPath(), redirectTo));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
index c3032a5..1baefa5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.core.commons.lang.PathUtils;
+import org.apache.isis.core.commons.lang.StringExtensions;
public class RedirectServlet extends HttpServlet {
@@ -42,7 +42,7 @@ public class RedirectServlet extends HttpServlet {
@Override
protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
- response.sendRedirect(PathUtils.combine(request.getContextPath(), redirectTo));
+ response.sendRedirect(StringExtensions.combinePath(request.getContextPath(), redirectTo));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
index b25f22e..1a1e9e7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/IoUtils_CopyTest.java
@@ -74,7 +74,7 @@ public class IoUtils_CopyTest {
public void handlesNullInputStream() throws Exception {
final ByteArrayInputStream bais = null;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IoUtils.copy(bais, baos);
+ InputStreamExtensions.copyTo(bais, baos);
}
@Test(expected = IllegalArgumentException.class)
@@ -82,7 +82,7 @@ public class IoUtils_CopyTest {
final byte[] bytes = createByteArray(10);
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final ByteArrayOutputStream baos = null;
- IoUtils.copy(bais, baos);
+ InputStreamExtensions.copyTo(bais, baos);
}
@Test
@@ -90,7 +90,7 @@ public class IoUtils_CopyTest {
final byte[] bytes = createByteArray(0);
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IoUtils.copy(bais, baos);
+ InputStreamExtensions.copyTo(bais, baos);
assertThat(baos.toByteArray(), arrayEqualTo(bytes));
}
@@ -99,7 +99,7 @@ public class IoUtils_CopyTest {
final byte[] bytes = createByteArray(BUF_INTERNAL_SIZE - 1);
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IoUtils.copy(bais, baos);
+ InputStreamExtensions.copyTo(bais, baos);
assertThat(baos.toByteArray(), arrayEqualTo(bytes));
}
@@ -108,7 +108,7 @@ public class IoUtils_CopyTest {
final byte[] bytes = createByteArray(BUF_INTERNAL_SIZE + 1);
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IoUtils.copy(bais, baos);
+ InputStreamExtensions.copyTo(bais, baos);
assertThat(baos.toByteArray(), arrayEqualTo(bytes));
}
@@ -117,7 +117,7 @@ public class IoUtils_CopyTest {
final byte[] bytes = createByteArray(BUF_INTERNAL_SIZE);
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IoUtils.copy(bais, baos);
+ InputStreamExtensions.copyTo(bais, baos);
assertThat(baos.toByteArray(), arrayEqualTo(bytes));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java
index 4155fdb..34743c8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/JavaClassUtilsTest_getBuiltIn.java
@@ -27,15 +27,15 @@ public class JavaClassUtilsTest_getBuiltIn {
@Test
public void voidBuiltIns() throws ClassNotFoundException {
- assertEquals(JavaClassUtils.getBuiltIn("void"), void.class);
- assertEquals(JavaClassUtils.getBuiltIn("boolean"), boolean.class);
- assertEquals(JavaClassUtils.getBuiltIn("byte"), byte.class);
- assertEquals(JavaClassUtils.getBuiltIn("short"), short.class);
- assertEquals(JavaClassUtils.getBuiltIn("int"), int.class);
- assertEquals(JavaClassUtils.getBuiltIn("long"), long.class);
- assertEquals(JavaClassUtils.getBuiltIn("char"), char.class);
- assertEquals(JavaClassUtils.getBuiltIn("float"), float.class);
- assertEquals(JavaClassUtils.getBuiltIn("double"), double.class);
+ assertEquals(ClassUtil.getBuiltIn("void"), void.class);
+ assertEquals(ClassUtil.getBuiltIn("boolean"), boolean.class);
+ assertEquals(ClassUtil.getBuiltIn("byte"), byte.class);
+ assertEquals(ClassUtil.getBuiltIn("short"), short.class);
+ assertEquals(ClassUtil.getBuiltIn("int"), int.class);
+ assertEquals(ClassUtil.getBuiltIn("long"), long.class);
+ assertEquals(ClassUtil.getBuiltIn("char"), char.class);
+ assertEquals(ClassUtil.getBuiltIn("float"), float.class);
+ assertEquals(ClassUtil.getBuiltIn("double"), double.class);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
index 08fbe68..d0a6d3b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_adjust.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Lists;
import org.junit.Test;
-import org.apache.isis.core.commons.lang.ListUtils;
+import org.apache.isis.core.commons.lang.ListExtensions;
public class ListUtilsTest_adjust {
@@ -37,7 +37,7 @@ public class ListUtilsTest_adjust {
@Test
public void sameLength() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.adjust(list, 3);
+ ListExtensions.adjust(list, 3);
assertThat(list.size(), is(3));
assertThat(list.get(0), is(Integer.valueOf(0)));
@@ -48,7 +48,7 @@ public class ListUtilsTest_adjust {
@Test
public void ifLonger() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.adjust(list, 4);
+ ListExtensions.adjust(list, 4);
assertThat(list.size(), is(4));
assertThat(list.get(0), is(Integer.valueOf(0)));
@@ -60,7 +60,7 @@ public class ListUtilsTest_adjust {
@Test
public void ifShorter() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.adjust(list, 2);
+ ListExtensions.adjust(list, 2);
assertThat(list.size(), is(2));
assertThat(list.get(0), is(Integer.valueOf(0)));
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java
index 851f527..4f5f105 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_insert.java
@@ -31,7 +31,7 @@ public class ListUtilsTest_insert {
@Test
public void insert_whenInsertionPointAtBeginning() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.insert(list, 0, Integer.valueOf(10));
+ ListExtensions.insert(list, 0, Integer.valueOf(10));
assertThat(list.size(), is(4));
assertThat(list.get(0), is(Integer.valueOf(10)));
@@ -43,7 +43,7 @@ public class ListUtilsTest_insert {
@Test
public void insert_whenInsertionPointInMiddle() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.insert(list, 1, Integer.valueOf(10));
+ ListExtensions.insert(list, 1, Integer.valueOf(10));
assertThat(list.size(), is(4));
assertThat(list.get(0), is(Integer.valueOf(0)));
@@ -55,7 +55,7 @@ public class ListUtilsTest_insert {
@Test
public void insert_whenInsertionPointAtEnd() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.insert(list, 3, Integer.valueOf(10));
+ ListExtensions.insert(list, 3, Integer.valueOf(10));
assertThat(list.size(), is(4));
assertThat(list.get(0), is(Integer.valueOf(0)));
@@ -67,7 +67,7 @@ public class ListUtilsTest_insert {
@Test
public void insert_whenInsertionPointBeyondEnd() throws Exception {
final List<Integer> list = Lists.newArrayList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- ListUtils.insert(list, 4, Integer.valueOf(10));
+ ListExtensions.insert(list, 4, Integer.valueOf(10));
assertThat(list.size(), is(5));
assertThat(list.get(0), is(Integer.valueOf(0)));
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
index 618b685..01df869 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/ListUtilsTest_mutableCopy.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Lists;
import org.junit.Test;
-import org.apache.isis.core.commons.lang.ListUtils;
+import org.apache.isis.core.commons.lang.ListExtensions;
public class ListUtilsTest_mutableCopy {
@@ -37,7 +37,7 @@ public class ListUtilsTest_mutableCopy {
public void mutableCopyOfList_whenNotNull() throws Exception {
List<Integer> input = Arrays.asList(Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE);
- final List<Integer> list = ListUtils.mutableCopy(input);
+ final List<Integer> list = ListExtensions.mutableCopy(input);
assertThat(list.size(), is(3));
assertThat(list.get(0), is(Integer.valueOf(0)));
@@ -52,7 +52,7 @@ public class ListUtilsTest_mutableCopy {
public void mutableCopyOfList_whenNull() throws Exception {
List<Integer> input = null;
- final List<Integer> list = ListUtils.mutableCopy(input);
+ final List<Integer> list = ListExtensions.mutableCopy(input);
assertThat(list, is(not(nullValue())));
assertThat(list.size(), is(0));
@@ -65,7 +65,7 @@ public class ListUtilsTest_mutableCopy {
public void mutableCopyOfArray_whenNotNull() throws Exception {
Integer[] input = {Integer.valueOf(0), Integer.MAX_VALUE, Integer.MIN_VALUE};
- final List<Integer> list = ListUtils.mutableCopy(input);
+ final List<Integer> list = ListExtensions.mutableCopy(input);
assertThat(list.size(), is(3));
assertThat(list.get(0), is(Integer.valueOf(0)));
@@ -80,7 +80,7 @@ public class ListUtilsTest_mutableCopy {
public void mutableCopyOfArray_whenNull() throws Exception {
Integer[] input = null;
- final List<Integer> list = ListUtils.mutableCopy(input);
+ final List<Integer> list = ListExtensions.mutableCopy(input);
assertThat(list, is(not(nullValue())));
assertThat(list.size(), is(0));
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
index dc0b916..cd8777e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/LocaleUtilsTest.java
@@ -30,7 +30,7 @@ public class LocaleUtilsTest {
@Test
public void canFindEnGB() throws Exception {
- assertThat(LocaleUtils.findLocale("en_GB"), is(not(nullValue())));
+ assertThat(LocaleUtil.findLocale("en_GB"), is(not(nullValue())));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
index 5904102..778c665 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/NameUtilTest.java
@@ -24,59 +24,45 @@ import junit.framework.TestCase;
public class NameUtilTest extends TestCase {
public void testNaturalNameAddsSpacesToCamelCaseWords() {
- assertEquals("Camel Case Word", NameUtils.naturalName("CamelCaseWord"));
+ assertEquals("Camel Case Word", StringExtensions.asNaturalName2("CamelCaseWord"));
}
public void testNaturalNameAddsSpacesBeforeNumbers() {
- assertEquals("One 2 One", NameUtils.naturalName("One2One"));
- assertEquals("Type 123", NameUtils.naturalName("Type123"));
- assertEquals("4321 Go", NameUtils.naturalName("4321Go"));
+ assertEquals("One 2 One", StringExtensions.asNaturalName2("One2One"));
+ assertEquals("Type 123", StringExtensions.asNaturalName2("Type123"));
+ assertEquals("4321 Go", StringExtensions.asNaturalName2("4321Go"));
}
public void testNaturalNameRecognisesAcronymns() {
- assertEquals("TNT Power", NameUtils.naturalName("TNTPower"));
- assertEquals("Spam RAM Can", NameUtils.naturalName("SpamRAMCan"));
- assertEquals("DOB", NameUtils.naturalName("DOB"));
+ assertEquals("TNT Power", StringExtensions.asNaturalName2("TNTPower"));
+ assertEquals("Spam RAM Can", StringExtensions.asNaturalName2("SpamRAMCan"));
+ assertEquals("DOB", StringExtensions.asNaturalName2("DOB"));
}
public void testNaturalNameWithShortNames() {
- assertEquals("At", NameUtils.naturalName("At"));
- assertEquals("I", NameUtils.naturalName("I"));
+ assertEquals("At", StringExtensions.asNaturalName2("At"));
+ assertEquals("I", StringExtensions.asNaturalName2("I"));
}
public void testNaturalNameNoChange() {
- assertEquals("Camel Case Word", NameUtils.naturalName("CamelCaseWord"));
- assertEquals("Almost Normal english sentence", NameUtils.naturalName("Almost Normal english sentence"));
+ assertEquals("Camel Case Word", StringExtensions.asNaturalName2("CamelCaseWord"));
+ assertEquals("Almost Normal english sentence", StringExtensions.asNaturalName2("Almost Normal english sentence"));
}
public void testPluralNameAdd_S() {
- assertEquals("Cans", NameUtils.pluralName("Can"));
- assertEquals("Spaces", NameUtils.pluralName("Space"));
- assertEquals("Noses", NameUtils.pluralName("Nose"));
+ assertEquals("Cans", StringExtensions.asPluralName("Can"));
+ assertEquals("Spaces", StringExtensions.asPluralName("Space"));
+ assertEquals("Noses", StringExtensions.asPluralName("Nose"));
}
public void testPluralNameReplace_Y_With_IES() {
- assertEquals("Babies", NameUtils.pluralName("Baby"));
- assertEquals("Cities", NameUtils.pluralName("City"));
+ assertEquals("Babies", StringExtensions.asPluralName("Baby"));
+ assertEquals("Cities", StringExtensions.asPluralName("City"));
}
public void testPluralNameReplaceAdd_ES() {
- assertEquals("Foxes", NameUtils.pluralName("Fox"));
- assertEquals("Bosses", NameUtils.pluralName("Boss"));
- }
-
- public void testSimpleNameAllToLowerCase() {
- assertEquals("abcde", NameUtils.simpleName("ABCDE"));
- assertEquals("camelcaseword", NameUtils.simpleName("CamelCaseWord"));
- }
-
- public void testSimpleNameNoChanges() {
- assertEquals("nochanges", NameUtils.simpleName("nochanges"));
- }
-
- public void testSimpleNameRemoveSpaces() {
- assertEquals("abcde", NameUtils.simpleName("a bc de "));
- assertEquals("twoparts", NameUtils.simpleName("two parts"));
+ assertEquals("Foxes", StringExtensions.asPluralName("Fox"));
+ assertEquals("Bosses", StringExtensions.asPluralName("Boss"));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java
index 4cec9e3..eca82f6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtilsTest_enumTitle.java
@@ -28,14 +28,14 @@ public class StringUtilsTest_enumTitle {
@Test
public void enumTitle() {
- assertThat(StringUtils.enumTitle("FOO"), is("Foo"));
- assertThat(StringUtils.enumTitle("FOO_BAR"), is("Foo Bar"));
+ assertThat(StringExtensions.enumTitle("FOO"), is("Foo"));
+ assertThat(StringExtensions.enumTitle("FOO_BAR"), is("Foo Bar"));
}
@Test
public void enumDeTitle() {
- assertThat(StringUtils.enumDeTitle("Foo"), is("FOO"));
- assertThat(StringUtils.enumDeTitle("Foo Bar"), is("FOO_BAR"));
+ assertThat(StringExtensions.enumDeTitle("Foo"), is("FOO"));
+ assertThat(StringExtensions.enumDeTitle("Foo Bar"), is("FOO_BAR"));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
index 0e3f7ee..333bce8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalNameTest.java
@@ -28,32 +28,32 @@ public class StringUtils_NaturalNameTest {
@Test
public void shouldCreateANaturalNameForABooleanPropertyAccessorName() {
- assertThat(StringUtils.naturalName("isOutOfStock"), is("Out Of Stock"));
+ assertThat(StringExtensions.asNaturalName("isOutOfStock"), is("Out Of Stock"));
}
@Test
public void shouldCreateANaturalNameForABooleanPropertyAccessorNameSingleWord() {
- assertThat(StringUtils.naturalName("isBlacklisted"), is("Blacklisted"));
+ assertThat(StringExtensions.asNaturalName("isBlacklisted"), is("Blacklisted"));
}
@Test
public void shouldCreateANaturalNameForANonBooleanPropertyAccessorName() {
- assertThat(StringUtils.naturalName("getFirstName"), is("First Name"));
+ assertThat(StringExtensions.asNaturalName("getFirstName"), is("First Name"));
}
@Test
public void shouldCreateANaturalNameForANonBooleanPropertyAccessorNameSingleWord() {
- assertThat(StringUtils.naturalName("getAge"), is("Age"));
+ assertThat(StringExtensions.asNaturalName("getAge"), is("Age"));
}
@Test
public void shouldCreateANaturalNameForAPropertyMutatorName() {
- assertThat(StringUtils.naturalName("setFirstName"), is("First Name"));
+ assertThat(StringExtensions.asNaturalName("setFirstName"), is("First Name"));
}
@Test
public void shouldCreateANaturalNameForAPropertyMutatorNameSingleWord() {
- assertThat(StringUtils.naturalName("setAge"), is("Age"));
+ assertThat(StringExtensions.asNaturalName("setAge"), is("Age"));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
index 0c3dd89..837c6ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NaturalizeTest.java
@@ -28,22 +28,22 @@ public class StringUtils_NaturalizeTest {
@Test
public void shouldNaturalizeMultipleCamelCase() {
- assertThat(StringUtils.naturalize("thisIsACamelCasePhrase"), is("This Is A Camel Case Phrase"));
+ assertThat(StringExtensions.asNaturalized("thisIsACamelCasePhrase"), is("This Is A Camel Case Phrase"));
}
@Test
public void shouldNaturalizeMultiplePascalCase() {
- assertThat(StringUtils.naturalize("ThisIsAPascalCasePhrase"), is("This Is A Pascal Case Phrase"));
+ assertThat(StringExtensions.asNaturalized("ThisIsAPascalCasePhrase"), is("This Is A Pascal Case Phrase"));
}
@Test
public void shouldNaturalizeSingleWordStartingWithLowerCase() {
- assertThat(StringUtils.naturalize("foo"), is("Foo"));
+ assertThat(StringExtensions.asNaturalized("foo"), is("Foo"));
}
@Test
public void shouldNaturalizeSingleWordStartingWithUpperCase() {
- assertThat(StringUtils.naturalize("Foo"), is("Foo"));
+ assertThat(StringExtensions.asNaturalized("Foo"), is("Foo"));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
index 027258e..ddfd0ee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedTest.java
@@ -59,7 +59,7 @@ public class StringUtils_NormalizedTest {
@Test
public void normalizesOk() {
- assertThat(StringUtils.normalized(input), is(expected));
+ assertThat(StringExtensions.normalized(input), is(expected));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedVarargsTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedVarargsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedVarargsTest.java
deleted file mode 100644
index 4be6f0d..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_NormalizedVarargsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.commons.lang;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class StringUtils_NormalizedVarargsTest {
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][] { { new String[] { "yada Foobar", "Yada\r \tFoo \n\tbar Baz" }, new String[] { "yada Foobar", "Yada Foo bar Baz" }, }, });
- }
-
- private final String[] input;
- private final String[] expected;
-
- public StringUtils_NormalizedVarargsTest(final String[] input, final String[] expected) {
- this.input = input;
- this.expected = expected;
- }
-
- @Test
- public void normalizesOk() {
- assertThat(StringUtils.normalized(input), is(expected));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
index 7bc3816..5c99d0d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_RemoveLeadingWhiteSpace.java
@@ -26,25 +26,25 @@ public class StringUtils_RemoveLeadingWhiteSpace {
@Test
public void whenHasLeadingWhiteSpace() {
- final String removed = StringUtils.removeLeadingWhiteSpace(" foo");
+ final String removed = StringExtensions.removeLeadingWhiteSpace(" foo");
Assert.assertThat(removed, CoreMatchers.is("foo"));
}
@Test
public void whenNoLeadingWhiteSpace() {
- final String removed = StringUtils.removeLeadingWhiteSpace("foo");
+ final String removed = StringExtensions.removeLeadingWhiteSpace("foo");
Assert.assertThat(removed, CoreMatchers.is("foo"));
}
@Test
public void empty() {
- final String removed = StringUtils.removeLeadingWhiteSpace("");
+ final String removed = StringExtensions.removeLeadingWhiteSpace("");
Assert.assertThat(removed, CoreMatchers.is(""));
}
@Test
public void whenNull() {
- final String removed = StringUtils.removeLeadingWhiteSpace(null);
+ final String removed = StringExtensions.removeLeadingWhiteSpace(null);
Assert.assertThat(removed, CoreMatchers.is(CoreMatchers.nullValue()));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
index a09b30a..d3c472e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_SplitOnCommas.java
@@ -28,52 +28,52 @@ public class StringUtils_SplitOnCommas {
@Test
public void length() {
- final List<String> list = StringUtils.splitOnCommas("foo,bar");
+ final List<String> list = StringExtensions.splitOnCommas("foo,bar");
Assert.assertThat(list.size(), CoreMatchers.is(2));
}
@Test
public void elements() {
- final List<String> list = StringUtils.splitOnCommas("foo,bar");
+ final List<String> list = StringExtensions.splitOnCommas("foo,bar");
Assert.assertThat(list.get(0), CoreMatchers.is("foo"));
Assert.assertThat(list.get(1), CoreMatchers.is("bar"));
}
@Test
public void whenHasWhiteSpaceAfterComma() {
- final List<String> list = StringUtils.splitOnCommas("foo, bar");
+ final List<String> list = StringExtensions.splitOnCommas("foo, bar");
Assert.assertThat(list.get(0), CoreMatchers.is("foo"));
Assert.assertThat(list.get(1), CoreMatchers.is("bar"));
}
@Test
public void whenHasLeadingWhiteSpace() {
- final List<String> list = StringUtils.splitOnCommas(" foo, bar");
+ final List<String> list = StringExtensions.splitOnCommas(" foo, bar");
Assert.assertThat(list.get(0), CoreMatchers.is("foo"));
Assert.assertThat(list.get(1), CoreMatchers.is("bar"));
}
@Test
public void whenNull() {
- final List<String> list = StringUtils.splitOnCommas(null);
+ final List<String> list = StringExtensions.splitOnCommas(null);
Assert.assertThat(list, CoreMatchers.is(CoreMatchers.nullValue()));
}
@Test
public void whenEmpty() {
- final List<String> list = StringUtils.splitOnCommas("");
+ final List<String> list = StringExtensions.splitOnCommas("");
Assert.assertThat(list.size(), CoreMatchers.is(0));
}
@Test
public void whenOnlyWhiteSpace() {
- final List<String> list = StringUtils.splitOnCommas(" ");
+ final List<String> list = StringExtensions.splitOnCommas(" ");
Assert.assertThat(list.size(), CoreMatchers.is(0));
}
@Test
public void whenOnlyWhiteSpaceTabs() {
- final List<String> list = StringUtils.splitOnCommas("\t");
+ final List<String> list = StringExtensions.splitOnCommas("\t");
Assert.assertThat(list.size(), CoreMatchers.is(0));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
index c8698ac..efbe0c8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripLeadingSlashTest.java
@@ -28,22 +28,22 @@ public class StringUtils_StripLeadingSlashTest {
@Test
public void shouldStripIfThereIsOne() {
- assertThat(StringUtils.stripLeadingSlash("/foobar"), is("foobar"));
+ assertThat(StringExtensions.stripLeadingSlash("/foobar"), is("foobar"));
}
@Test
public void shouldLeaveUnchangedIfThereIsNone() {
- assertThat(StringUtils.stripLeadingSlash("foobar"), is("foobar"));
+ assertThat(StringExtensions.stripLeadingSlash("foobar"), is("foobar"));
}
@Test
public void shouldConvertSolitarySlashToEmptyString() {
- assertThat(StringUtils.stripLeadingSlash("/"), is(""));
+ assertThat(StringExtensions.stripLeadingSlash("/"), is(""));
}
@Test(expected = NullPointerException.class)
public void shouldFailOnNull() {
- StringUtils.stripLeadingSlash(null);
+ StringExtensions.stripLeadingSlash(null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
index b020053..4490911 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_StripNewLinesTest.java
@@ -28,32 +28,32 @@ public class StringUtils_StripNewLinesTest {
@Test
public void shouldDoNothingIfNone() {
- assertThat(StringUtils.stripNewLines("abc"), is("abc"));
+ assertThat(StringExtensions.stripNewLines("abc"), is("abc"));
}
@Test
public void shouldStripIfJustBackslashN() {
- assertThat(StringUtils.stripNewLines("abc\n"), is("abc"));
+ assertThat(StringExtensions.stripNewLines("abc\n"), is("abc"));
}
@Test
public void shouldStripIfBackslashRBackslashN() {
- assertThat(StringUtils.stripNewLines("abc\r\n"), is("abc"));
+ assertThat(StringExtensions.stripNewLines("abc\r\n"), is("abc"));
}
@Test
public void shouldStripIfJustBackslashR() {
- assertThat(StringUtils.stripNewLines("abc\r"), is("abc"));
+ assertThat(StringExtensions.stripNewLines("abc\r"), is("abc"));
}
@Test
public void shouldStripIfSeveral() {
- assertThat(StringUtils.stripNewLines("abc\r\ndef\r\n"), is("abcdef"));
+ assertThat(StringExtensions.stripNewLines("abc\r\ndef\r\n"), is("abcdef"));
}
@Test
public void shouldStripIfBackslashRBackslashNBackslashR() {
- assertThat(StringUtils.stripNewLines("abc\n\r\ndef"), is("abcdef"));
+ assertThat(StringExtensions.stripNewLines("abc\n\r\ndef"), is("abcdef"));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java
index 6b75903..45f5793 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_camelLowerFirst.java
@@ -28,11 +28,11 @@ public class StringUtils_camelLowerFirst {
@Test
public void asLowerCase() {
- assertThat(StringUtils.camelLowerFirst("An Upper Case"), is("anUpperCase"));
- assertThat(StringUtils.camelLowerFirst("a Lower Case"), is("aLowerCase"));
- assertThat(StringUtils.camelLowerFirst("AnUpperCase"), is("anUpperCase"));
- assertThat(StringUtils.camelLowerFirst("aLowerCase"), is("aLowerCase"));
- assertThat(StringUtils.camelLowerFirst("a Lower Case"), is("aLowerCase"));
+ assertThat(StringExtensions.asCamelLowerFirst("An Upper Case"), is("anUpperCase"));
+ assertThat(StringExtensions.asCamelLowerFirst("a Lower Case"), is("aLowerCase"));
+ assertThat(StringExtensions.asCamelLowerFirst("AnUpperCase"), is("anUpperCase"));
+ assertThat(StringExtensions.asCamelLowerFirst("aLowerCase"), is("aLowerCase"));
+ assertThat(StringExtensions.asCamelLowerFirst("a Lower Case"), is("aLowerCase"));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/91df9978/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
index eca9b1c..3588391 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/lang/StringUtils_toLineSeparated.java
@@ -30,19 +30,19 @@ public class StringUtils_toLineSeparated {
@Test
public void convertsCarriageReturnToLineSeparator() throws Exception {
- assertThat(StringUtils.lineSeparated("ok\n"), is("ok" + System.getProperty("line.separator")));
+ assertThat(StringExtensions.lineSeparated("ok\n"), is("ok" + System.getProperty("line.separator")));
}
@Test
public void windowsStyleCarriageReturnLeftUnchanged() throws Exception {
assumeThatRunningOnWindows(); // ie windows
- assertThat(StringUtils.lineSeparated("ok\r\n"), is("ok" + System.getProperty("line.separator")));
+ assertThat(StringExtensions.lineSeparated("ok\r\n"), is("ok" + System.getProperty("line.separator")));
}
@Test
public void macStyleCarriageReturnLeftUnchanged() throws Exception {
assumeThatRunningOnWindows(); // ie windows
- assertThat(StringUtils.lineSeparated("ok\r"), is("ok\r"));
+ assertThat(StringExtensions.lineSeparated("ok\r"), is("ok\r"));
}
private static void assumeThatRunningOnWindows() {