This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 21cd3b7 PropertyStore refactoring.
21cd3b7 is described below
commit 21cd3b70eccbd13ff2c3c4a0935b7ec0e3909db2
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Sun Feb 7 13:01:46 2021 -0500
PropertyStore refactoring.
---
.../java/org/apache/juneau/jena/RdfParser.java | 2 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 2 +-
.../main/java/org/apache/juneau/BeanContext.java | 2 +-
.../src/main/java/org/apache/juneau/Context.java | 72 +++----
.../main/java/org/apache/juneau/PropertyStore.java | 106 +++++------
.../juneau/jsonschema/JsonSchemaGenerator.java | 2 +-
.../apache/juneau/rest/mock/MockRestClient.java | 8 +-
.../java/org/apache/juneau/rest/RestContext.java | 92 ++++-----
.../org/apache/juneau/rest/RestContextBuilder.java | 2 +-
.../juneau/rest/RestOperationContextBuilder.java | 2 +-
.../java/org/apache/juneau/PropertyStoreTest.java | 210 ++++++++++-----------
11 files changed, 250 insertions(+), 250 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 02a6c05..6e02d64 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -152,7 +152,7 @@ public class RdfParser extends ReaderParser implements
RdfCommon, RdfMetaProvide
}
private static String getConsumes(PropertyStore ps) {
- String rdfLanguage = ps.getProperty(RDF_language, String.class,
"RDF/XML-ABBREV");
+ String rdfLanguage = ps.get(RDF_language, String.class,
"RDF/XML-ABBREV");
switch(rdfLanguage) {
case "RDF/XML":
case "RDF/XML-ABBREV": return "text/xml+rdf";
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 2c795e8..4b6265d 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -320,7 +320,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfCommon, RdfMet
}
private static String getProduces(PropertyStore ps) {
- String rdfLanguage = ps.getProperty(RDF_language, String.class,
"RDF/XML-ABBREV");
+ String rdfLanguage = ps.get(RDF_language, String.class,
"RDF/XML-ABBREV");
switch(rdfLanguage) {
case "RDF/XML": return "text/xml+rdf+abbrev";
case "RDF/XML-ABBREV": return "text/xml+rdf";
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 1888ef7..7bfcc3d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -2084,7 +2084,7 @@ public class BeanContext extends Context implements
MetaProvider {
ps = ps.subset(new String[]{"Context","BeanContext"});
ReflectionMapBuilder<Annotation> rmb =
ReflectionMap.create(Annotation.class);
- for (Annotation a : ps.getListProperty(BEAN_annotations,
Annotation.class)) {
+ for (Annotation a : ps.getList(BEAN_annotations,
Annotation.class)) {
try {
ClassInfo ci = ClassInfo.of(a.getClass());
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index f1208bb..2cfec6c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -355,7 +355,7 @@ public abstract class Context {
* @return The property value, or <jk>null</jk> if it doesn't exist.
*/
public Object getProperty(String key) {
- return propertyStore.getProperty(key);
+ return propertyStore.get(key);
}
/**
@@ -367,7 +367,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final <T> T getProperty(String key, Class<T> c, T def) {
- return propertyStore.getProperty(key, c, def);
+ return propertyStore.get(key, c, def);
}
/**
@@ -378,7 +378,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final Boolean getBooleanProperty(String key, Boolean def) {
- return propertyStore.getBooleanProperty(key, def);
+ return propertyStore.getBoolean(key, def);
}
/**
@@ -388,7 +388,7 @@ public abstract class Context {
* @return The property value, or <jk>false</jk> if it doesn't exist.
*/
public final boolean getBooleanProperty(String key) {
- return propertyStore.getBooleanProperty(key);
+ return propertyStore.getBoolean(key);
}
/**
@@ -399,7 +399,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final Integer getIntegerProperty(String key, Integer def) {
- return propertyStore.getIntegerProperty(key, def);
+ return propertyStore.getInteger(key, def);
}
/**
@@ -409,7 +409,7 @@ public abstract class Context {
* @return The property value, or <c>-1</c> if it doesn't exist.
*/
public final int getIntegerProperty(String key) {
- return propertyStore.getIntegerProperty(key);
+ return propertyStore.getInteger(key);
}
/**
@@ -420,7 +420,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final Long getLongProperty(String key, Long def) {
- return propertyStore.getLongProperty(key, def);
+ return propertyStore.getLong(key, def);
}
/**
@@ -430,7 +430,7 @@ public abstract class Context {
* @return The property value, or <c>-1</c> if it doesn't exist.
*/
public final long getLongProperty(String key) {
- return propertyStore.getLongProperty(key);
+ return propertyStore.getLong(key);
}
/**
@@ -441,7 +441,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final String getStringProperty(String key, String def) {
- return propertyStore.getStringProperty(key, def);
+ return propertyStore.getString(key, def);
}
/**
@@ -451,7 +451,7 @@ public abstract class Context {
* @return The property value, or the <jk>null</jk> if it doesn't exist.
*/
public final String getStringProperty(String key) {
- return propertyStore.getStringProperty(key);
+ return propertyStore.getString(key);
}
/**
@@ -462,7 +462,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final String[] getCdlProperty(String key, String def) {
- return propertyStore.getCdlProperty(key, def);
+ return propertyStore.getCdl(key, def);
}
/**
@@ -473,7 +473,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final String getStringPropertyWithNone(String key, String def) {
- return propertyStore.getStringPropertyWithNone(key, def);
+ return propertyStore.getNoneableString(key, def);
}
/**
@@ -485,7 +485,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final <T> Class<? extends T> getClassProperty(String key,
Class<T> type, Class<? extends T> def) {
- return propertyStore.getClassProperty(key, type, def);
+ return propertyStore.getClass(key, type, def);
}
/**
@@ -496,7 +496,7 @@ public abstract class Context {
* @return The property value, or <jk>null</jk> if it doesn't exist.
*/
public final <T> Class<? extends T> getClassProperty(String key,
Class<T> type) {
- return propertyStore.getClassProperty(key, type);
+ return propertyStore.getClass(key, type);
}
/**
@@ -507,7 +507,7 @@ public abstract class Context {
* @return The property value, or an empty array if it doesn't exist.
*/
public final <T> T[] getArrayProperty(String key, Class<T> eType) {
- return propertyStore.getArrayProperty(key, eType);
+ return propertyStore.getArray(key, eType);
}
/**
@@ -519,7 +519,7 @@ public abstract class Context {
* @return The property value, or the default value if it doesn't exist.
*/
public final <T> T[] getArrayProperty(String key, Class<T> eType, T[]
def) {
- return propertyStore.getArrayProperty(key, eType, def);
+ return propertyStore.getArray(key, eType, def);
}
/**
@@ -529,7 +529,7 @@ public abstract class Context {
* @return The property value, or an empty array if it doesn't exist.
*/
public final Class<?>[] getClassArrayProperty(String key) {
- return propertyStore.getClassArrayProperty(key);
+ return propertyStore.getClass(key);
}
/**
@@ -540,7 +540,7 @@ public abstract class Context {
* @return The property value, or an empty array if it doesn't exist.
*/
public final Class<?>[] getClassArrayProperty(String key, Class<?>[]
def) {
- return propertyStore.getClassArrayProperty(key, def);
+ return propertyStore.getClassArray(key, def);
}
/**
@@ -551,7 +551,7 @@ public abstract class Context {
* @return The property value, or an empty array if it doesn't exist.
*/
public final <T> Class<T>[] getClassArrayProperty(String key, Class<T>
eType) {
- return propertyStore.getClassArrayProperty(key, eType);
+ return propertyStore.getClassArray(key, eType);
}
/**
@@ -562,7 +562,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or an empty set if it doesn't exist.
*/
public final <T> Set<T> getSetProperty(String key, Class<T> eType) {
- return propertyStore.getSetProperty(key, eType);
+ return propertyStore.getSet(key, eType);
}
/**
@@ -574,7 +574,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or the default value if it doesn't exist or is empty.
*/
public final <T> Set<T> getSetProperty(String key, Class<T> eType,
Set<T> def) {
- return propertyStore.getSetProperty(key, eType, def);
+ return propertyStore.getSet(key, eType, def);
}
/**
@@ -584,7 +584,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or an empty set if it doesn't exist.
*/
public final Set<Class<?>> getClassSetProperty(String key) {
- return propertyStore.getClassSetProperty(key);
+ return propertyStore.getClassSet(key);
}
/**
@@ -595,7 +595,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or an empty set if it doesn't exist.
*/
public final <T> Set<Class<T>> getClassSetProperty(String key, Class<T>
eType) {
- return propertyStore.getClassSetProperty(key, eType);
+ return propertyStore.getClassSet(key, eType);
}
/**
@@ -606,7 +606,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>ArrayList</c>, or
an empty list if it doesn't exist.
*/
public final <T> List<T> getListProperty(String key, Class<T> eType) {
- return propertyStore.getListProperty(key, eType);
+ return propertyStore.getList(key, eType);
}
/**
@@ -618,7 +618,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>ArrayList</c>, or
the default value if it doesn't exist or is empty.
*/
public final <T> List<T> getListProperty(String key, Class<T> eType,
List<T> def) {
- return propertyStore.getListProperty(key, eType, def);
+ return propertyStore.getList(key, eType, def);
}
/**
@@ -628,7 +628,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>ArrayList</c>, or
an empty list if it doesn't exist.
*/
public final List<Class<?>> getClassListProperty(String key) {
- return propertyStore.getClassListProperty(key);
+ return propertyStore.getClassList(key);
}
/**
@@ -639,7 +639,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>ArrayList</c>, or
an empty list if it doesn't exist.
*/
public final <T> List<Class<T>> getClassListProperty(String key,
Class<T> eType) {
- return propertyStore.getClassListProperty(key, eType);
+ return propertyStore.getClassList(key, eType);
}
/**
@@ -650,7 +650,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashMap</c>,
or an empty map if it doesn't exist.
*/
public final <T> Map<String,T> getMapProperty(String key, Class<T>
eType) {
- return propertyStore.getMapProperty(key, eType);
+ return propertyStore.getMap(key, eType);
}
/**
@@ -660,7 +660,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashMap</c>,
or an empty map if it doesn't exist.
*/
public final Map<String,Class<?>> getClassMapProperty(String key) {
- return propertyStore.getClassMapProperty(key);
+ return propertyStore.getClassMap(key);
}
/**
@@ -671,7 +671,7 @@ public abstract class Context {
* @return The property value as an unmodifiable <c>LinkedHashMap</c>,
or an empty map if it doesn't exist.
*/
public final <T> Map<String,Class<T>> getClassMapProperty(String key,
Class<T> eType) {
- return propertyStore.getClassMapProperty(key, eType);
+ return propertyStore.getClassMap(key, eType);
}
/**
@@ -689,7 +689,7 @@ public abstract class Context {
* @return A new property instance.
*/
public <T> T getInstanceProperty(String key, Class<T> type, Object def)
{
- return propertyStore.getInstanceProperty(key, type, def);
+ return propertyStore.getInstance(key, type, def);
}
/**
@@ -719,7 +719,7 @@ public abstract class Context {
* @return A new property instance.
*/
public <T> T getInstanceProperty(String key, Class<T> type, Object def,
BeanFactory beanFactory) {
- return propertyStore.getInstanceProperty(key, type, def,
beanFactory);
+ return propertyStore.getInstance(key, type, def, beanFactory);
}
/**
@@ -731,7 +731,7 @@ public abstract class Context {
* @return A new property instance.
*/
public <T> T[] getInstanceArrayProperty(String key, Class<T> type, T[]
def) {
- return propertyStore.getInstanceArrayProperty(key, type, def);
+ return propertyStore.getInstanceArray(key, type, def);
}
/**
@@ -743,7 +743,7 @@ public abstract class Context {
*/
@SuppressWarnings("unchecked")
public <T> T[] getInstanceArrayProperty(String key, Class<T> type) {
- return propertyStore.getInstanceArrayProperty(key, type,
(T[])Array.newInstance(type, 0));
+ return propertyStore.getInstanceArray(key, type,
(T[])Array.newInstance(type, 0));
}
/**
@@ -756,7 +756,7 @@ public abstract class Context {
* @return A new property instance.
*/
public <T> T[] getInstanceArrayProperty(String key, Class<T> type, T[]
def, BeanFactory beanFactory) {
- return propertyStore.getInstanceArrayProperty(key, type, def,
beanFactory);
+ return propertyStore.getInstanceArray(key, type, def,
beanFactory);
}
/**
@@ -769,7 +769,7 @@ public abstract class Context {
* @return The set of property keys, or an empty set if the group was
not found.
*/
public Set<String> getPropertyKeys(String group) {
- return propertyStore.getPropertyKeys(group);
+ return propertyStore.getKeys(group);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
index b763157..c9202e7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
@@ -276,7 +276,7 @@ public final class PropertyStore {
* @param key The property name.
* @return The property value, or <jk>null</jk> if it doesn't exist.
*/
- public Object getProperty(String key) {
+ public Object get(String key) {
Property p = findProperty(key);
return p == null ? null : p.value;
}
@@ -289,7 +289,7 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public <T> T getProperty(String key, Class<T> c, T def) {
+ public <T> T get(String key, Class<T> c, T def) {
Property p = findProperty(key);
return p == null ? def : p.as(c);
}
@@ -301,8 +301,8 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public final Boolean getBooleanProperty(String key, Boolean def) {
- return getProperty(key, Boolean.class, def);
+ public final Boolean getBoolean(String key, Boolean def) {
+ return get(key, Boolean.class, def);
}
/**
@@ -311,8 +311,8 @@ public final class PropertyStore {
* @param key The property name.
* @return The property value, or <jk>false</jk> if it doesn't exist.
*/
- public final boolean getBooleanProperty(String key) {
- return getBooleanProperty(key, false);
+ public final boolean getBoolean(String key) {
+ return getBoolean(key, false);
}
/**
@@ -322,8 +322,8 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public final Integer getIntegerProperty(String key, Integer def) {
- return getProperty(key, Integer.class, def);
+ public final Integer getInteger(String key, Integer def) {
+ return get(key, Integer.class, def);
}
/**
@@ -332,8 +332,8 @@ public final class PropertyStore {
* @param key The property name.
* @return The property value, or <c>-1</c> if it doesn't exist.
*/
- public final int getIntegerProperty(String key) {
- return getIntegerProperty(key, -1);
+ public final int getInteger(String key) {
+ return getInteger(key, -1);
}
/**
@@ -343,8 +343,8 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public final Long getLongProperty(String key, Long def) {
- return getProperty(key, Long.class, def);
+ public final Long getLong(String key, Long def) {
+ return get(key, Long.class, def);
}
/**
@@ -353,8 +353,8 @@ public final class PropertyStore {
* @param key The property name.
* @return The property value, or <c>-1</c> if it doesn't exist.
*/
- public final long getLongProperty(String key) {
- return getLongProperty(key, -1l);
+ public final long getLong(String key) {
+ return getLong(key, -1l);
}
/**
@@ -364,8 +364,8 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public final String getStringProperty(String key, String def) {
- return getProperty(key, String.class, def);
+ public final String getString(String key, String def) {
+ return get(key, String.class, def);
}
/**
@@ -374,8 +374,8 @@ public final class PropertyStore {
* @param key The property name.
* @return The property value, or the <jk>null</jk> if it doesn't exist.
*/
- public final String getStringProperty(String key) {
- return getStringProperty(key, null);
+ public final String getString(String key) {
+ return getString(key, null);
}
/**
@@ -385,19 +385,19 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public final String[] getCdlProperty(String key, String def) {
- return
StringUtils.split(StringUtils.emptyIfNull(getProperty(key, String.class, def)));
+ public final String[] getCdl(String key, String def) {
+ return StringUtils.split(StringUtils.emptyIfNull(get(key,
String.class, def)));
}
/**
- * Same as {@link #getStringProperty(String, String)} but returns a
blank instead of the default value if it resolves to <js>"NONE"</js>.
+ * Same as {@link #getString(String, String)} but returns a blank
instead of the default value if it resolves to <js>"NONE"</js>.
*
* @param key The property name.
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public final String getStringPropertyWithNone(String key, String def) {
- String s = getProperty(key, String.class, def);
+ public final String getNoneableString(String key, String def) {
+ String s = get(key, String.class, def);
return "NONE".equalsIgnoreCase(s) ? "" : s;
}
@@ -409,7 +409,7 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or the default value if it doesn't exist.
*/
- public <T> Class<? extends T> getClassProperty(String key, Class<T>
type, Class<? extends T> def) {
+ public <T> Class<? extends T> getClass(String key, Class<T> type,
Class<? extends T> def) {
Property p = findProperty(key);
return p == null ? def : (Class<T>)p.as(Class.class);
}
@@ -421,8 +421,8 @@ public final class PropertyStore {
* @param type The class type of the property.
* @return The property value, or <jk>null</jk> if it doesn't exist.
*/
- public final <T> Class<? extends T> getClassProperty(String key,
Class<T> type) {
- return getClassProperty(key, type, null);
+ public final <T> Class<? extends T> getClass(String key, Class<T> type)
{
+ return getClass(key, type, null);
}
/**
@@ -432,7 +432,7 @@ public final class PropertyStore {
* @param eType The class type of the elements in the property.
* @return The property value, or an empty array if it doesn't exist.
*/
- public <T> T[] getArrayProperty(String key, Class<T> eType) {
+ public <T> T[] getArray(String key, Class<T> eType) {
Property p = findProperty(key);
return (T[]) (p == null ? Array.newInstance(eType, 0) :
p.asArray(eType));
}
@@ -445,7 +445,7 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or an empty array if it doesn't exist.
*/
- public <T> T[] getArrayProperty(String key, Class<T> eType, T[] def) {
+ public <T> T[] getArray(String key, Class<T> eType, T[] def) {
Property p = findProperty(key);
return p == null ? def : p.asArray(eType);
}
@@ -456,7 +456,7 @@ public final class PropertyStore {
* @param key The property name.
* @return The property value, or an empty array if it doesn't exist.
*/
- public Class<?>[] getClassArrayProperty(String key) {
+ public Class<?>[] getClass(String key) {
Property p = findProperty(key);
return p == null ? new Class[0] : p.as(Class[].class);
}
@@ -468,7 +468,7 @@ public final class PropertyStore {
* @param def The default value.
* @return The property value, or an empty array if it doesn't exist.
*/
- public Class<?>[] getClassArrayProperty(String key, Class<?>[] def) {
+ public Class<?>[] getClassArray(String key, Class<?>[] def) {
Property p = findProperty(key);
return p == null ? def : p.as(Class[].class);
}
@@ -480,7 +480,7 @@ public final class PropertyStore {
* @param eType The class type of the elements in the property.
* @return The property value, or an empty array if it doesn't exist.
*/
- public <T> Class<T>[] getClassArrayProperty(String key, Class<T> eType)
{
+ public <T> Class<T>[] getClassArray(String key, Class<T> eType) {
Property p = findProperty(key);
return p == null ? new Class[0] : p.as(Class[].class);
}
@@ -492,7 +492,7 @@ public final class PropertyStore {
* @param eType The class type of the elements in the property.
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or an empty set if it doesn't exist.
*/
- public <T> Set<T> getSetProperty(String key, Class<T> eType) {
+ public <T> Set<T> getSet(String key, Class<T> eType) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_SET : p.asSet(eType);
}
@@ -505,8 +505,8 @@ public final class PropertyStore {
* @param def The default value if the property doesn't exist or is
empty.
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or the default value if it doesn't exist or is empty.
*/
- public <T> Set<T> getSetProperty(String key, Class<T> eType, Set<T>
def) {
- Set<T> l = getSetProperty(key, eType);
+ public <T> Set<T> getSet(String key, Class<T> eType, Set<T> def) {
+ Set<T> l = getSet(key, eType);
return (l.isEmpty() ? def : l);
}
@@ -517,7 +517,7 @@ public final class PropertyStore {
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or an empty set if it doesn't exist.
*/
@SuppressWarnings("rawtypes")
- public Set<Class<?>> getClassSetProperty(String key) {
+ public Set<Class<?>> getClassSet(String key) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_SET :
(Set)p.asSet(Class.class);
}
@@ -530,7 +530,7 @@ public final class PropertyStore {
* @return The property value as an unmodifiable <c>LinkedHashSet</c>,
or an empty set if it doesn't exist.
*/
@SuppressWarnings("rawtypes")
- public <T> Set<Class<T>> getClassSetProperty(String key, Class<T>
eType) {
+ public <T> Set<Class<T>> getClassSet(String key, Class<T> eType) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_SET :
(Set)p.asSet(Class.class);
}
@@ -542,7 +542,7 @@ public final class PropertyStore {
* @param eType The class type of the elements in the property.
* @return The property value as an unmodifiable <c>ArrayList</c>, or
an empty list if it doesn't exist.
*/
- public <T> List<T> getListProperty(String key, Class<T> eType) {
+ public <T> List<T> getList(String key, Class<T> eType) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_LIST : p.asList(eType);
}
@@ -555,8 +555,8 @@ public final class PropertyStore {
* @param def The default value if the property doesn't exist or is
empty.
* @return The property value as an unmodifiable <c>ArrayList</c>, or
the default value if it doesn't exist or is empty.
*/
- public <T> List<T> getListProperty(String key, Class<T> eType, List<T>
def) {
- List<T> l = getListProperty(key, eType);
+ public <T> List<T> getList(String key, Class<T> eType, List<T> def) {
+ List<T> l = getList(key, eType);
return (l.isEmpty() ? def : l);
}
@@ -567,7 +567,7 @@ public final class PropertyStore {
* @return The property value as an unmodifiable <c>ArrayList</c>, or
an empty list if it doesn't exist.
*/
@SuppressWarnings("rawtypes")
- public List<Class<?>> getClassListProperty(String key) {
+ public List<Class<?>> getClassList(String key) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_LIST :
(List)p.asList(Class.class);
}
@@ -580,7 +580,7 @@ public final class PropertyStore {
* @return The property value as an unmodifiable <c>ArrayList</c>, or
an empty list if it doesn't exist.
*/
@SuppressWarnings("rawtypes")
- public <T> List<Class<T>> getClassListProperty(String key, Class<T>
eType) {
+ public <T> List<Class<T>> getClassList(String key, Class<T> eType) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_LIST :
(List)p.asList(Class.class);
}
@@ -592,7 +592,7 @@ public final class PropertyStore {
* @param eType The class type of the elements in the property.
* @return The property value as an unmodifiable <c>LinkedHashMap</c>,
or an empty map if it doesn't exist.
*/
- public <T> Map<String,T> getMapProperty(String key, Class<T> eType) {
+ public <T> Map<String,T> getMap(String key, Class<T> eType) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_MAP : p.asMap(eType);
}
@@ -604,7 +604,7 @@ public final class PropertyStore {
* @return The property value as an unmodifiable <c>LinkedHashMap</c>,
or an empty map if it doesn't exist.
*/
@SuppressWarnings("rawtypes")
- public Map<String,Class<?>> getClassMapProperty(String key) {
+ public Map<String,Class<?>> getClassMap(String key) {
Property p = findProperty(key);
return p == null ? Collections.EMPTY_MAP :
(Map)p.asMap(Class.class);
}
@@ -617,7 +617,7 @@ public final class PropertyStore {
* @return The property value as an unmodifiable <c>LinkedHashMap</c>,
or an empty map if it doesn't exist.
*/
@SuppressWarnings("rawtypes")
- public <T> Map<String,Class<T>> getClassMapProperty(String key,
Class<T> eType) {
+ public <T> Map<String,Class<T>> getClassMap(String key, Class<T> eType)
{
Property p = findProperty(key);
return p == null ? Collections.EMPTY_MAP :
(Map)p.asMap(Class.class);
}
@@ -636,8 +636,8 @@ public final class PropertyStore {
* <br>Can either be an instance of <c>T</c>, or a
<code>Class<? <jk>extends</jk> T></code>, or <jk>null</jk>.
* @return A new property instance.
*/
- public <T> T getInstanceProperty(String key, Class<T> type, Object def)
{
- return getInstanceProperty(key, type, def, new BeanFactory());
+ public <T> T getInstance(String key, Class<T> type, Object def) {
+ return getInstance(key, type, def, new BeanFactory());
}
/**
@@ -651,7 +651,7 @@ public final class PropertyStore {
* @param beanFactory The bean factory to use for instantiating the
bean.
* @return A new property instance.
*/
- public <T> T getInstanceProperty(String key, Class<T> type, Object def,
BeanFactory beanFactory) {
+ public <T> T getInstance(String key, Class<T> type, Object def,
BeanFactory beanFactory) {
Assertions.assertArgNotNull("type", type);
Property p = findProperty(key);
if (p != null)
@@ -677,8 +677,8 @@ public final class PropertyStore {
* @param type The class type of the property.
* @return A new property instance, or an empty array if it doesn't
exist.
*/
- public <T> T[] getInstanceArrayProperty(String key, Class<T> type) {
- return getInstanceArrayProperty(key, type,
(T[])Array.newInstance(type, 0));
+ public <T> T[] getInstanceArray(String key, Class<T> type) {
+ return getInstanceArray(key, type, (T[])Array.newInstance(type,
0));
}
/**
@@ -689,8 +689,8 @@ public final class PropertyStore {
* @param def The default object to return if the property doesn't
exist.
* @return A new property instance.
*/
- public <T> T[] getInstanceArrayProperty(String key, Class<T> type, T[]
def) {
- return getInstanceArrayProperty(key, type, def, new
BeanFactory());
+ public <T> T[] getInstanceArray(String key, Class<T> type, T[] def) {
+ return getInstanceArray(key, type, def, new BeanFactory());
}
/**
@@ -702,7 +702,7 @@ public final class PropertyStore {
* @param beanFactory The bean factory to use for instantiating beans.
* @return A new property instance.
*/
- public <T> T[] getInstanceArrayProperty(String key, Class<T> type, T[]
def, BeanFactory beanFactory) {
+ public <T> T[] getInstanceArray(String key, Class<T> type, T[] def,
BeanFactory beanFactory) {
Property p = findProperty(key);
return p == null ? def : p.asInstanceArray(type, beanFactory);
}
@@ -716,7 +716,7 @@ public final class PropertyStore {
* @param group The group name.
* @return The set of property keys, or an empty set if the group was
not found.
*/
- public Set<String> getPropertyKeys(String group) {
+ public Set<String> getKeys(String group) {
if (group == null)
return Collections.EMPTY_SET;
PropertyGroup g = groups.get(group);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index 65e652f..2a85f7c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -326,7 +326,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
addDescriptionsTo =
TypeCategory.parse(getStringProperty(JSONSCHEMA_addDescriptionsTo));
Set<Pattern> ignoreTypes = new LinkedHashSet<>();
- for (String s : split(ps.getProperty(JSONSCHEMA_ignoreTypes,
String.class, "")))
+ for (String s : split(ps.get(JSONSCHEMA_ignoreTypes,
String.class, "")))
ignoreTypes.add(Pattern.compile(s.replace(".",
"\\.").replace("*", ".*")));
this.ignoreTypes = ignoreTypes;
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
index 90c41e1..db43665 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockRestClient.java
@@ -268,10 +268,10 @@ public class MockRestClient extends RestClient implements
HttpClientConnection {
private static PropertyStore preInit(PropertyStore ps) {
try {
PropertyStoreBuilder psb = ps.builder();
- Object restBean =
ps.getInstanceProperty(MOCKRESTCLIENT_restBean, Object.class, null);
- String contextPath =
ps.getProperty(MOCKRESTCLIENT_contextPath, String.class, null);
- String servletPath =
ps.getProperty(MOCKRESTCLIENT_servletPath, String.class, null);
- String rootUrl = ps.getProperty(RESTCLIENT_rootUri,
String.class, "http://localhost";);
+ Object restBean =
ps.getInstance(MOCKRESTCLIENT_restBean, Object.class, null);
+ String contextPath = ps.get(MOCKRESTCLIENT_contextPath,
String.class, null);
+ String servletPath = ps.get(MOCKRESTCLIENT_servletPath,
String.class, null);
+ String rootUrl = ps.get(RESTCLIENT_rootUri,
String.class, "http://localhost";);
Class<?> c = restBean instanceof Class ?
(Class<?>)restBean : restBean.getClass();
if (! REST_CONTEXTS.containsKey(c)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 8d2fffb..c77d8e5 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -3528,22 +3528,22 @@ public class RestContext extends BeanContext {
opParams = createRestOperationParams(r, ps,
bf).asArray();
hookMethodParams = createHookMethodParams(r, ps,
bf).asArray();
- uriContext =
nullIfEmpty(ps.getStringProperty(REST_uriContext));
- uriAuthority =
nullIfEmpty(ps.getStringProperty(REST_uriAuthority));
- uriResolution = ps.getProperty(REST_uriResolution,
UriResolution.class, UriResolution.ROOT_RELATIVE);
- uriRelativity = ps.getProperty(REST_uriRelativity,
UriRelativity.class, UriRelativity.RESOURCE);
-
- allowBodyParam = !
ps.getBooleanProperty(REST_disableAllowBodyParam);
- allowedHeaderParams =
newCaseInsensitiveSet(ps.getStringPropertyWithNone(REST_allowedHeaderParams,
"Accept,Content-Type"));
- allowedMethodParams =
newCaseInsensitiveSet(ps.getStringPropertyWithNone(REST_allowedMethodParams,
"HEAD,OPTIONS"));
- allowedMethodHeaders =
newCaseInsensitiveSet(ps.getStringPropertyWithNone(REST_allowedMethodHeaders,
""));
- renderResponseStackTraces =
ps.getBooleanProperty(REST_renderResponseStackTraces);
- clientVersionHeader =
ps.getStringProperty(REST_clientVersionHeader, "X-Client-Version");
+ uriContext = nullIfEmpty(ps.getString(REST_uriContext));
+ uriAuthority =
nullIfEmpty(ps.getString(REST_uriAuthority));
+ uriResolution = ps.get(REST_uriResolution,
UriResolution.class, UriResolution.ROOT_RELATIVE);
+ uriRelativity = ps.get(REST_uriRelativity,
UriRelativity.class, UriRelativity.RESOURCE);
+
+ allowBodyParam = !
ps.getBoolean(REST_disableAllowBodyParam);
+ allowedHeaderParams =
newCaseInsensitiveSet(ps.getNoneableString(REST_allowedHeaderParams,
"Accept,Content-Type"));
+ allowedMethodParams =
newCaseInsensitiveSet(ps.getNoneableString(REST_allowedMethodParams,
"HEAD,OPTIONS"));
+ allowedMethodHeaders =
newCaseInsensitiveSet(ps.getNoneableString(REST_allowedMethodHeaders, ""));
+ renderResponseStackTraces =
ps.getBoolean(REST_renderResponseStackTraces);
+ clientVersionHeader =
ps.getString(REST_clientVersionHeader, "X-Client-Version");
debugEnablement = createDebugEnablement(r, ps, bf);
- consumes = ps.getListProperty(REST_consumes,
MediaType.class, parsers.getSupportedMediaTypes());
- produces = ps.getListProperty(REST_produces,
MediaType.class, serializers.getSupportedMediaTypes());
+ consumes = ps.getList(REST_consumes, MediaType.class,
parsers.getSupportedMediaTypes());
+ produces = ps.getList(REST_produces, MediaType.class,
serializers.getSupportedMediaTypes());
fullPath = (builder.parentContext == null ? "" :
(builder.parentContext.fullPath + '/')) + builder.getPath();
path = builder.getPath();
@@ -3662,7 +3662,7 @@ public class RestContext extends BeanContext {
if (resource instanceof BeanFactory)
x = (BeanFactory)resource;
- Object o = properties.getProperty(REST_beanFactory);
+ Object o = properties.get(REST_beanFactory);
if (o instanceof BeanFactory)
x = (BeanFactory)o;
@@ -3699,7 +3699,7 @@ public class RestContext extends BeanContext {
Class<? extends BeanFactory> c = null;
- Object o = properties.getProperty(REST_beanFactory);
+ Object o = properties.get(REST_beanFactory);
if (o instanceof Class)
c = (Class<? extends BeanFactory>)o;
@@ -3792,7 +3792,7 @@ public class RestContext extends BeanContext {
if (resource instanceof FileFinder)
x = (FileFinder)resource;
- Object o = properties.getProperty(REST_fileFinder);
+ Object o = properties.get(REST_fileFinder);
if (o instanceof FileFinder)
x = (FileFinder)o;
@@ -3800,7 +3800,7 @@ public class RestContext extends BeanContext {
x = beanFactory.getBean(FileFinder.class).orElse(null);
if (x == null) {
- o = properties.getProperty(REST_fileFinderDefault);
+ o = properties.get(REST_fileFinderDefault);
if (o instanceof FileFinder)
x = (FileFinder)o;
}
@@ -3841,12 +3841,12 @@ public class RestContext extends BeanContext {
Class<? extends FileFinder> c = null;
- Object o = properties.getProperty(REST_fileFinder);
+ Object o = properties.get(REST_fileFinder);
if (o instanceof Class)
c = (Class<? extends FileFinder>)o;
if (c == null) {
- o = properties.getProperty(REST_fileFinderDefault);
+ o = properties.get(REST_fileFinderDefault);
if (o instanceof Class)
c = (Class<? extends FileFinder>)o;
}
@@ -3923,14 +3923,14 @@ public class RestContext extends BeanContext {
if (resource instanceof StaticFiles)
x = (StaticFiles)resource;
- Object o = properties.getProperty(REST_staticFiles);
+ Object o = properties.get(REST_staticFiles);
if (o instanceof StaticFiles)
x = (StaticFiles)o;
if (x == null)
x = beanFactory.getBean(StaticFiles.class).orElse(null);
- o = properties.getProperty(REST_staticFilesDefault);
+ o = properties.get(REST_staticFilesDefault);
if (o instanceof StaticFiles)
x = (StaticFiles)o;
@@ -3970,12 +3970,12 @@ public class RestContext extends BeanContext {
Class<? extends StaticFiles> c = null;
- Object o = properties.getProperty(REST_staticFiles);
+ Object o = properties.get(REST_staticFiles);
if (o instanceof Class)
c = (Class<? extends StaticFiles>)o;
if (c == null) {
- o = properties.getProperty(REST_staticFilesDefault);
+ o = properties.get(REST_staticFilesDefault);
if (o instanceof Class)
c = (Class<? extends StaticFiles>)o;
}
@@ -4056,7 +4056,7 @@ public class RestContext extends BeanContext {
if (resource instanceof RestLogger)
x = (RestLogger)resource;
- Object o = properties.getProperty(REST_callLogger);
+ Object o = properties.get(REST_callLogger);
if (o instanceof RestLogger)
x = (RestLogger)o;
@@ -4064,7 +4064,7 @@ public class RestContext extends BeanContext {
x = beanFactory.getBean(RestLogger.class).orElse(null);
if (x == null) {
- o = properties.getProperty(REST_callLoggerDefault);
+ o = properties.get(REST_callLoggerDefault);
if (o instanceof RestLogger)
x = (RestLogger)o;
}
@@ -4111,12 +4111,12 @@ public class RestContext extends BeanContext {
Class<? extends RestLogger> c = null;
- Object o = properties.getProperty(REST_callLogger);
+ Object o = properties.get(REST_callLogger);
if (o instanceof Class)
c = (Class<? extends RestLogger>)o;
if (c == null) {
- o = properties.getProperty(REST_callLoggerDefault);
+ o = properties.get(REST_callLoggerDefault);
if (o instanceof Class)
c = (Class<? extends RestLogger>)o;
}
@@ -4204,7 +4204,7 @@ public class RestContext extends BeanContext {
ResponseHandlerList x = ResponseHandlerList.create();
-
x.append(properties.getInstanceArrayProperty(REST_responseHandlers,
ResponseHandler.class, new ResponseHandler[0], beanFactory));
+ x.append(properties.getInstanceArray(REST_responseHandlers,
ResponseHandler.class, new ResponseHandler[0], beanFactory));
if (x.isEmpty())
x.append(beanFactory.getBean(ResponseHandlerList.class).orElse(null));
@@ -4291,7 +4291,7 @@ public class RestContext extends BeanContext {
*/
protected SerializerGroupBuilder createSerializerGroupBuilder(Object
resource, PropertyStore properties, BeanFactory beanFactory) throws Exception {
- Object[] x = properties.getArrayProperty(REST_serializers,
Object.class);
+ Object[] x = properties.getArray(REST_serializers,
Object.class);
if (x == null)
x =
beanFactory.getBean(Serializer[].class).orElse(null);
@@ -4386,7 +4386,7 @@ public class RestContext extends BeanContext {
*/
protected ParserGroupBuilder createParserGroupBuilder(Object resource,
PropertyStore properties, BeanFactory beanFactory) throws Exception {
- Object[] x = properties.getArrayProperty(REST_parsers,
Object.class);
+ Object[] x = properties.getArray(REST_parsers, Object.class);
if (x == null)
x = beanFactory.getBean(Parser[].class).orElse(null);
@@ -4456,7 +4456,7 @@ public class RestContext extends BeanContext {
x = (HttpPartSerializer)resource;
if (x == null)
- x = properties.getInstanceProperty(REST_partSerializer,
HttpPartSerializer.class, null, beanFactory);
+ x = properties.getInstance(REST_partSerializer,
HttpPartSerializer.class, null, beanFactory);
if (x == null)
x =
beanFactory.getBean(HttpPartSerializer.class).orElse(null);
@@ -4521,7 +4521,7 @@ public class RestContext extends BeanContext {
x = (HttpPartParser)resource;
if (x == null)
- x = properties.getInstanceProperty(REST_partParser,
HttpPartParser.class, null, beanFactory);
+ x = properties.getInstance(REST_partParser,
HttpPartParser.class, null, beanFactory);
if (x == null)
x =
beanFactory.getBean(HttpPartParser.class).orElse(null);
@@ -4572,7 +4572,7 @@ public class RestContext extends BeanContext {
RestOperationParamList x = RestOperationParamList.create();
- for (Class<?> c :
properties.getListProperty(REST_restOperationParams, Class.class,
AList.create()))
+ for (Class<?> c : properties.getList(REST_restOperationParams,
Class.class, AList.create()))
x.append((Class<? extends RestOperationParam>)c);
x.append(
@@ -4856,7 +4856,7 @@ public class RestContext extends BeanContext {
if (x == null)
x =
beanFactory.getBean(SwaggerProvider.class).orElse(null);
- Object o = properties.getProperty(REST_swaggerProvider);
+ Object o = properties.get(REST_swaggerProvider);
if (o instanceof SwaggerProvider)
x = (SwaggerProvider)o;
@@ -4898,7 +4898,7 @@ public class RestContext extends BeanContext {
protected SwaggerProviderBuilder createSwaggerProviderBuilder(Object
resource, PropertyStore properties, BeanFactory beanFactory, FileFinder
fileFinder, Messages messages, VarResolver varResolver) throws Exception {
Class<? extends SwaggerProvider> c = null;
- Object o = properties.getProperty(REST_swaggerProvider);
+ Object o = properties.get(REST_swaggerProvider);
if (o instanceof Class)
c = (Class<? extends SwaggerProvider>)o;
@@ -5210,7 +5210,7 @@ public class RestContext extends BeanContext {
HeaderList x = HeaderList.create();
-
x.appendUnique(properties.getInstanceArrayProperty(REST_defaultRequestHeaders,
org.apache.http.Header.class, new org.apache.http.Header[0], beanFactory));
+
x.appendUnique(properties.getInstanceArray(REST_defaultRequestHeaders,
org.apache.http.Header.class, new org.apache.http.Header[0], beanFactory));
x = BeanFactory
.of(beanFactory, resource)
@@ -5241,7 +5241,7 @@ public class RestContext extends BeanContext {
HeaderList x = HeaderList.create();
-
x.appendUnique(properties.getInstanceArrayProperty(REST_defaultResponseHeaders,
org.apache.http.Header.class, new org.apache.http.Header[0], beanFactory));
+
x.appendUnique(properties.getInstanceArray(REST_defaultResponseHeaders,
org.apache.http.Header.class, new org.apache.http.Header[0], beanFactory));
x = BeanFactory
.of(beanFactory, resource)
@@ -5272,7 +5272,7 @@ public class RestContext extends BeanContext {
NamedAttributeList x = NamedAttributeList.create();
-
x.appendUnique(properties.getInstanceArrayProperty(REST_defaultRequestAttributes,
NamedAttribute.class, new NamedAttribute[0], beanFactory));
+
x.appendUnique(properties.getInstanceArray(REST_defaultRequestAttributes,
NamedAttribute.class, new NamedAttribute[0], beanFactory));
x = BeanFactory
.of(beanFactory, resource)
@@ -5305,7 +5305,7 @@ public class RestContext extends BeanContext {
if (resource instanceof DebugEnablement)
x = (DebugEnablement)resource;
- Object o = properties.getProperty(REST_debugEnablement);
+ Object o = properties.get(REST_debugEnablement);
if (o instanceof DebugEnablement)
x = (DebugEnablement)o;
@@ -5345,7 +5345,7 @@ public class RestContext extends BeanContext {
Class<? extends DebugEnablement> c = null;
- Object o = properties.getProperty(REST_debugEnablement);
+ Object o = properties.get(REST_debugEnablement);
if (o instanceof Class)
c = (Class<? extends DebugEnablement>)o;
@@ -5365,12 +5365,12 @@ public class RestContext extends BeanContext {
.withDefault(x)
.run();
- Enablement defaultDebug =
properties.getInstanceProperty(REST_debug, Enablement.class,
properties.getInstanceProperty(REST_debugDefault, Enablement.class, null));
+ Enablement defaultDebug = properties.getInstance(REST_debug,
Enablement.class, properties.getInstance(REST_debugDefault, Enablement.class,
null));
if (defaultDebug == null)
defaultDebug = isDebug() ? Enablement.ALWAYS :
Enablement.NEVER;
x.defaultEnable(defaultDebug);
- for (Map.Entry<String,String> e :
splitMap(properties.getStringProperty(REST_debugOn, ""), true).entrySet()) {
+ for (Map.Entry<String,String> e :
splitMap(properties.getString(REST_debugOn, ""), true).entrySet()) {
String k = e.getKey(), v = e.getValue();
if (v.isEmpty())
v = "ALWAYS";
@@ -5428,7 +5428,7 @@ public class RestContext extends BeanContext {
*/
protected MessagesBuilder createMessagesBuilder(Object resource,
PropertyStore properties) throws Exception {
- Tuple2<Class<?>,String>[] mbl =
properties.getInstanceArrayProperty(REST_messages, Tuple2.class);
+ Tuple2<Class<?>,String>[] mbl =
properties.getInstanceArray(REST_messages, Tuple2.class);
MessagesBuilder x = null;
for (int i = mbl.length-1; i >= 0; i--) {
@@ -5513,7 +5513,7 @@ public class RestContext extends BeanContext {
RestOperationsBuilder x = RestOperations
.create()
.beanFactory(beanFactory)
-
.implClass(properties.getClassProperty(REST_restOperationsClass, null));
+
.implClass(properties.getClass(REST_restOperationsClass, null));
ClassInfo rci = ClassInfo.of(resource);
@@ -5537,7 +5537,7 @@ public class RestContext extends BeanContext {
RestOperationContext roc =
RestOperationContext
.create(mi.inner(), this)
.beanFactory(beanFactory)
-
.implClass(properties.getClassProperty(REST_restOperationContextClass,
RestOperationContext.class))
+
.implClass(properties.getClass(REST_restOperationContextClass,
RestOperationContext.class))
.build();
String httpMethod = roc.getHttpMethod();
@@ -5632,7 +5632,7 @@ public class RestContext extends BeanContext {
RestChildrenBuilder x = RestChildren
.create()
.beanFactory(beanFactory)
-
.implClass(properties.getClassProperty(REST_restChildrenClass,
RestChildren.class));
+ .implClass(properties.getClass(REST_restChildrenClass,
RestChildren.class));
// Initialize our child resources.
for (Object o : getArrayProperty(REST_children, Object.class)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
index c0eb34a..6e1fa3b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContextBuilder.java
@@ -183,7 +183,7 @@ public class RestContextBuilder extends BeanContextBuilder
implements ServletCon
@Override /* BeanContextBuilder */
public RestContext build() {
try {
- Class<? extends RestContext> c =
getPropertyStore().getClassProperty(REST_contextClass, RestContext.class,
getDefaultImplClass());
+ Class<? extends RestContext> c =
getPropertyStore().getClass(REST_contextClass, RestContext.class,
getDefaultImplClass());
return BeanFactory.of(beanFactory,
resource.get()).addBeans(RestContextBuilder.class, this).createBean(c);
} catch (Exception e) {
throw toHttpException(e, InternalServerError.class);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
index 407d27b..3515511 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperationContextBuilder.java
@@ -49,7 +49,7 @@ public class RestOperationContextBuilder extends
BeanContextBuilder {
Class<? extends RestOperationContext> ic = implClass;
if (ic == null)
- ic = ps.getClassProperty(RESTOP_contextClass,
RestOperationContext.class, getDefaultImplClass());
+ ic = ps.getClass(RESTOP_contextClass,
RestOperationContext.class, getDefaultImplClass());
return
BeanFactory.of(beanFactory).addBean(RestOperationContextBuilder.class,
this).createBean(ic);
} catch (Exception e) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
b/juneau-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
index da95f72..5dd21a7 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/PropertyStoreTest.java
@@ -78,11 +78,11 @@ public class PropertyStoreTest {
b.set("A.f6.s", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.s':'1','f2.s':'2','f3.s':'true','f4.s':'{foo:\\'bar\\'}','f5.s':'[1,2]'}}");
- assertObject(ps.getProperty("A.f1.s")).isType(String.class);
- assertObject(ps.getProperty("A.f2.s")).isType(String.class);
- assertObject(ps.getProperty("A.f3.s")).isType(String.class);
- assertObject(ps.getProperty("A.f4.s")).isType(String.class);
- assertObject(ps.getProperty("A.f5.s")).isType(String.class);
+ assertObject(ps.get("A.f1.s")).isType(String.class);
+ assertObject(ps.get("A.f2.s")).isType(String.class);
+ assertObject(ps.get("A.f3.s")).isType(String.class);
+ assertObject(ps.get("A.f4.s")).isType(String.class);
+ assertObject(ps.get("A.f5.s")).isType(String.class);
b.clear();
b.set("A.f1", "1");
@@ -93,11 +93,11 @@ public class PropertyStoreTest {
b.set("A.f6", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{f1:'1',f2:'2',f3:'true',f4:'{foo:\\'bar\\'}',f5:'[1,2]'}}");
- assertObject(ps.getProperty("A.f1")).isType(String.class);
- assertObject(ps.getProperty("A.f2")).isType(String.class);
- assertObject(ps.getProperty("A.f3")).isType(String.class);
- assertObject(ps.getProperty("A.f4")).isType(String.class);
- assertObject(ps.getProperty("A.f5")).isType(String.class);
+ assertObject(ps.get("A.f1")).isType(String.class);
+ assertObject(ps.get("A.f2")).isType(String.class);
+ assertObject(ps.get("A.f3")).isType(String.class);
+ assertObject(ps.get("A.f4")).isType(String.class);
+ assertObject(ps.get("A.f5")).isType(String.class);
b.set("A.f1", "x1");
b.set("A.f2", null);
@@ -123,10 +123,10 @@ public class PropertyStoreTest {
b.set("A.f5.b", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.b':true,'f2.b':false,'f3.b':true,'f4.b':false}}");
- assertObject(ps.getProperty("A.f1.b")).isType(Boolean.class);
- assertObject(ps.getProperty("A.f2.b")).isType(Boolean.class);
- assertObject(ps.getProperty("A.f3.b")).isType(Boolean.class);
- assertObject(ps.getProperty("A.f4.b")).isType(Boolean.class);
+ assertObject(ps.get("A.f1.b")).isType(Boolean.class);
+ assertObject(ps.get("A.f2.b")).isType(Boolean.class);
+ assertObject(ps.get("A.f3.b")).isType(Boolean.class);
+ assertObject(ps.get("A.f4.b")).isType(Boolean.class);
// Test nulls
b.set("A.f2.b", null);
@@ -151,10 +151,10 @@ public class PropertyStoreTest {
b.set("A.f5.i", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.i':123,'f2.i':123,'f3.i':123,'f4.i':-1}}");
- assertObject(ps.getProperty("A.f1.i")).isType(Integer.class);
- assertObject(ps.getProperty("A.f2.i")).isType(Integer.class);
- assertObject(ps.getProperty("A.f3.i")).isType(Integer.class);
- assertObject(ps.getProperty("A.f4.i")).isType(Integer.class);
+ assertObject(ps.get("A.f1.i")).isType(Integer.class);
+ assertObject(ps.get("A.f2.i")).isType(Integer.class);
+ assertObject(ps.get("A.f3.i")).isType(Integer.class);
+ assertObject(ps.get("A.f4.i")).isType(Integer.class);
// Test nulls
b.set("A.f2.i", null);
@@ -178,7 +178,7 @@ public class PropertyStoreTest {
b.set("A.f3.c", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.c':'java.lang.String','f2.c':'java.lang.Integer'}}");
- assertObject(ps.getProperty("A.f1.c")).isType(Class.class);
+ assertObject(ps.get("A.f1.c")).isType(Class.class);
// Test nulls
b.set("A.f2.c", null);
@@ -203,10 +203,10 @@ public class PropertyStoreTest {
b.set("A.f5.o", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.o':123,'f2.o':true,'f3.o':'123','f4.o':'java.lang.StringBuilder'}}");
- assertObject(ps.getProperty("A.f1.o")).isType(Integer.class);
- assertObject(ps.getProperty("A.f2.o")).isType(Boolean.class);
-
assertObject(ps.getProperty("A.f3.o")).isType(StringBuilder.class);
- assertObject(ps.getProperty("A.f4.o")).isType(Class.class);
+ assertObject(ps.get("A.f1.o")).isType(Integer.class);
+ assertObject(ps.get("A.f2.o")).isType(Boolean.class);
+ assertObject(ps.get("A.f3.o")).isType(StringBuilder.class);
+ assertObject(ps.get("A.f4.o")).isType(Class.class);
// Test nulls
b.set("A.f2.o", null);
@@ -231,10 +231,10 @@ public class PropertyStoreTest {
b.set("A.f5.ss", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.ss':['bar','foo'],'f2.ss':['123','ONE','true'],'f3.ss':['foo'],'f4.ss':['123','foo','true']}}");
- assertObject(ps.getProperty("A.f1.ss")).isType(Set.class);
- assertObject(ps.getProperty("A.f2.ss")).isType(Set.class);
- assertObject(ps.getProperty("A.f3.ss")).isType(Set.class);
- assertObject(ps.getProperty("A.f4.ss")).isType(Set.class);
+ assertObject(ps.get("A.f1.ss")).isType(Set.class);
+ assertObject(ps.get("A.f2.ss")).isType(Set.class);
+ assertObject(ps.get("A.f3.ss")).isType(Set.class);
+ assertObject(ps.get("A.f4.ss")).isType(Set.class);
b.clear();
b.set("A.f1.ss/add", "foo");
@@ -293,10 +293,10 @@ public class PropertyStoreTest {
b.set("A.f5.si", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.si':[1,2,3],'f2.si':[123,456],'f3.si':[123],'f4.si':[1,2,3]}}");
- assertObject(ps.getProperty("A.f1.si")).isType(Set.class);
- assertObject(ps.getProperty("A.f2.si")).isType(Set.class);
- assertObject(ps.getProperty("A.f3.si")).isType(Set.class);
- assertObject(ps.getProperty("A.f4.si")).isType(Set.class);
+ assertObject(ps.get("A.f1.si")).isType(Set.class);
+ assertObject(ps.get("A.f2.si")).isType(Set.class);
+ assertObject(ps.get("A.f3.si")).isType(Set.class);
+ assertObject(ps.get("A.f4.si")).isType(Set.class);
b.clear();
b.set("A.f1.si/add", "123");
@@ -377,9 +377,9 @@ public class PropertyStoreTest {
b.set("A.f3.sc", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.sc':['java.lang.Integer','java.lang.String'],'f2.sc':['java.lang.Integer','java.lang.String']}}");
- assertObject(ps.getProperty("A.f1.sc")).isType(Set.class);
- assertObject(ps.getProperty("A.f2.sc")).isType(Set.class);
-
assertObject(((Set<?>)ps.getProperty("A.f1.sc")).iterator().next()).isType(Class.class);
+ assertObject(ps.get("A.f1.sc")).isType(Set.class);
+ assertObject(ps.get("A.f2.sc")).isType(Set.class);
+
assertObject(((Set<?>)ps.get("A.f1.sc")).iterator().next()).isType(Class.class);
b.clear();
b.set("A.f1.sc/add", Integer.class);
@@ -437,10 +437,10 @@ public class PropertyStoreTest {
b.set("A.f5.ls", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.ls':['foo','bar'],'f2.ls':['123','true','ONE'],'f3.ls':['foo'],'f4.ls':['foo','123','true']}}");
- assertObject(ps.getProperty("A.f1.ls")).isType(List.class);
- assertObject(ps.getProperty("A.f2.ls")).isType(List.class);
- assertObject(ps.getProperty("A.f3.ls")).isType(List.class);
- assertObject(ps.getProperty("A.f4.ls")).isType(List.class);
+ assertObject(ps.get("A.f1.ls")).isType(List.class);
+ assertObject(ps.get("A.f2.ls")).isType(List.class);
+ assertObject(ps.get("A.f3.ls")).isType(List.class);
+ assertObject(ps.get("A.f4.ls")).isType(List.class);
b.clear();
b.set("A.f1.ls/prepend", "foo");
@@ -501,10 +501,10 @@ public class PropertyStoreTest {
b.set("A.f5.li", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.li':[1,2,3],'f2.li':[123,456],'f3.li':[123],'f4.li':[1,2,3]}}");
- assertObject(ps.getProperty("A.f1.li")).isType(List.class);
- assertObject(ps.getProperty("A.f2.li")).isType(List.class);
- assertObject(ps.getProperty("A.f3.li")).isType(List.class);
- assertObject(ps.getProperty("A.f4.li")).isType(List.class);
+ assertObject(ps.get("A.f1.li")).isType(List.class);
+ assertObject(ps.get("A.f2.li")).isType(List.class);
+ assertObject(ps.get("A.f3.li")).isType(List.class);
+ assertObject(ps.get("A.f4.li")).isType(List.class);
b.clear();
b.set("A.f1.li/prepend", "123");
@@ -603,8 +603,8 @@ public class PropertyStoreTest {
b.set("A.f3.lc", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.lc':['java.lang.String','java.lang.Integer'],'f2.lc':['java.lang.String','java.lang.Integer']}}");
- assertObject(ps.getProperty("A.f1.lc")).isType(List.class);
- assertObject(ps.getProperty("A.f2.lc")).isType(List.class);
+ assertObject(ps.get("A.f1.lc")).isType(List.class);
+ assertObject(ps.get("A.f2.lc")).isType(List.class);
b.clear();
b.set("A.f1.lc/prepend", Integer.class);
@@ -676,13 +676,13 @@ public class PropertyStoreTest {
b.set("A.f3.lo", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.lo':['java.lang.StringBuilder'],'f2.lo':[123,true,'','java.lang.StringBuilder']}}");
- assertObject(ps.getProperty("A.f1.lo")).isType(List.class);
- assertObject(ps.getProperty("A.f2.lo")).isType(List.class);
-
assertObject(((List<?>)ps.getProperty("A.f1.lo")).get(0)).isType(Class.class);
-
assertObject(((List<?>)ps.getProperty("A.f2.lo")).get(0)).isType(Integer.class);
-
assertObject(((List<?>)ps.getProperty("A.f2.lo")).get(1)).isType(Boolean.class);
-
assertObject(((List<?>)ps.getProperty("A.f2.lo")).get(2)).isType(StringBuilder.class);
-
assertObject(((List<?>)ps.getProperty("A.f2.lo")).get(3)).isType(Class.class);
+ assertObject(ps.get("A.f1.lo")).isType(List.class);
+ assertObject(ps.get("A.f2.lo")).isType(List.class);
+
assertObject(((List<?>)ps.get("A.f1.lo")).get(0)).isType(Class.class);
+
assertObject(((List<?>)ps.get("A.f2.lo")).get(0)).isType(Integer.class);
+
assertObject(((List<?>)ps.get("A.f2.lo")).get(1)).isType(Boolean.class);
+
assertObject(((List<?>)ps.get("A.f2.lo")).get(2)).isType(StringBuilder.class);
+
assertObject(((List<?>)ps.get("A.f2.lo")).get(3)).isType(Class.class);
b.clear();
b.set("A.f1.lo/prepend", 1);
@@ -751,10 +751,10 @@ public class PropertyStoreTest {
b.set("A.f5.sms", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.sms':{baz:'qux',foo:'bar'},'f2.sms':{bar:'true',baz:'ONE',foo:'123'},'f3.sms':{foo:'bar'},'f4.sms':{baz:'123',foo:'bar',qux:'true'}}}");
- assertObject(ps.getProperty("A.f1.sms")).isType(Map.class);
- assertObject(ps.getProperty("A.f2.sms")).isType(Map.class);
- assertObject(ps.getProperty("A.f3.sms")).isType(Map.class);
- assertObject(ps.getProperty("A.f4.sms")).isType(Map.class);
+ assertObject(ps.get("A.f1.sms")).isType(Map.class);
+ assertObject(ps.get("A.f2.sms")).isType(Map.class);
+ assertObject(ps.get("A.f3.sms")).isType(Map.class);
+ assertObject(ps.get("A.f4.sms")).isType(Map.class);
b.clear();
b.set("A.f1.sms/put", "{foo:'bar'}");
@@ -787,10 +787,10 @@ public class PropertyStoreTest {
b.set("A.f5.smi", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.smi':{baz:2,foo:1},'f2.smi':{bar:456,foo:123},'f3.smi':{foo:123},'f4.smi':{baz:456,foo:123}}}");
- assertObject(ps.getProperty("A.f1.smi")).isType(Map.class);
- assertObject(ps.getProperty("A.f2.smi")).isType(Map.class);
- assertObject(ps.getProperty("A.f3.smi")).isType(Map.class);
- assertObject(ps.getProperty("A.f4.smi")).isType(Map.class);
+ assertObject(ps.get("A.f1.smi")).isType(Map.class);
+ assertObject(ps.get("A.f2.smi")).isType(Map.class);
+ assertObject(ps.get("A.f3.smi")).isType(Map.class);
+ assertObject(ps.get("A.f4.smi")).isType(Map.class);
b.clear();
b.set("A.f1.smi/put", "{foo:'123'}");
@@ -821,10 +821,10 @@ public class PropertyStoreTest {
b.set("A.f3.smc", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.smc':{baz:'java.lang.Integer',foo:'java.lang.String'},'f2.smc':{bar:'java.lang.Integer',foo:'java.lang.String'}}}");
- assertObject(ps.getProperty("A.f1.smc")).isType(Map.class);
- assertObject(ps.getProperty("A.f2.smc")).isType(Map.class);
-
assertObject(((Map<?,?>)ps.getProperty("A.f1.smc")).values().iterator().next()).isType(Class.class);
-
assertObject(((Map<?,?>)ps.getProperty("A.f2.smc")).values().iterator().next()).isType(Class.class);
+ assertObject(ps.get("A.f1.smc")).isType(Map.class);
+ assertObject(ps.get("A.f2.smc")).isType(Map.class);
+
assertObject(((Map<?,?>)ps.get("A.f1.smc")).values().iterator().next()).isType(Class.class);
+
assertObject(((Map<?,?>)ps.get("A.f2.smc")).values().iterator().next()).isType(Class.class);
b.clear();
b.set("A.f1.smc/put.foo", String.class);
@@ -854,10 +854,10 @@ public class PropertyStoreTest {
b.set("A.f5.smo", null);
ps = b.build();
assertObject(ps).asJson().is("{A:{'f1.smo':{baz:'2',foo:'1'},'f2.smo':{bar:'java.lang.StringBuilder',foo:123},'f3.smo':{foo:'123'},'f4.smo':{baz:456,foo:'123'}}}");
- assertObject(ps.getProperty("A.f1.smo")).isType(Map.class);
- assertObject(ps.getProperty("A.f2.smo")).isType(Map.class);
- assertObject(ps.getProperty("A.f3.smo")).isType(Map.class);
- assertObject(ps.getProperty("A.f4.smo")).isType(Map.class);
+ assertObject(ps.get("A.f1.smo")).isType(Map.class);
+ assertObject(ps.get("A.f2.smo")).isType(Map.class);
+ assertObject(ps.get("A.f3.smo")).isType(Map.class);
+ assertObject(ps.get("A.f4.smo")).isType(Map.class);
b.clear();
b.set("A.f1.smo/put", "{foo:'123'}");
@@ -1392,11 +1392,11 @@ public class PropertyStoreTest {
System.setProperty("A.f1", "foo");
PropertyStore ps = PropertyStore.create().build();
- assertEquals("foo", ps.getProperty("A.f1"));
+ assertEquals("foo", ps.get("A.f1"));
System.clearProperty("A.f1");
ps = PropertyStore.create().build();
- assertNull(ps.getProperty("A.f1"));
+ assertNull(ps.get("A.f1"));
}
@Test
@@ -1404,17 +1404,17 @@ public class PropertyStoreTest {
System.setProperty("A.f1.i", "1");
PropertyStore ps = PropertyStore.create().build();
- assertEquals(1, ps.getProperty("A.f1.i"));
- assertObject(ps.getProperty("A.f1.i")).isType(Integer.class);
+ assertEquals(1, ps.get("A.f1.i"));
+ assertObject(ps.get("A.f1.i")).isType(Integer.class);
System.clearProperty("A.f1.i");
System.setProperty("A.f1", "1");
ps = PropertyStore.create().build();
- assertEquals(1, ps.getProperty("A.f1.i"));
- assertObject(ps.getProperty("A.f1.i")).isType(Integer.class);
+ assertEquals(1, ps.get("A.f1.i"));
+ assertObject(ps.get("A.f1.i")).isType(Integer.class);
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.i"));
+ assertNull(ps.get("A.f1.i"));
}
@Test
@@ -1422,16 +1422,16 @@ public class PropertyStoreTest {
System.setProperty("A.f1.o", "123");
PropertyStore ps = PropertyStore.create().build();
- assertEquals("123", ps.getProperty("A.f1.o"));
- assertObject(ps.getProperty("A.f1.o")).isType(String.class);
+ assertEquals("123", ps.get("A.f1.o"));
+ assertObject(ps.get("A.f1.o")).isType(String.class);
System.clearProperty("A.f1.o");
System.setProperty("A.f1", "123");
- assertEquals("123", ps.getProperty("A.f1.o"));
- assertObject(ps.getProperty("A.f1.o")).isType(String.class);
+ assertEquals("123", ps.get("A.f1.o"));
+ assertObject(ps.get("A.f1.o")).isType(String.class);
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.o"));
+ assertNull(ps.get("A.f1.o"));
}
@Test
@@ -1439,15 +1439,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.ss", "['foo','bar']");
PropertyStore ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.ss")).asJson().is("['bar','foo']");
+ assertObject(ps.get("A.f1.ss")).asJson().is("['bar','foo']");
System.clearProperty("A.f1.ss");
System.setProperty("A.f1", "['foo','bar']");
ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.ss")).asJson().is("['bar','foo']");
+ assertObject(ps.get("A.f1.ss")).asJson().is("['bar','foo']");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.ss"));
+ assertNull(ps.get("A.f1.ss"));
}
@Test
@@ -1455,15 +1455,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.si", "['2','1']");
PropertyStore ps = PropertyStore.create().build();
- assertObject(ps.getProperty("A.f1.si")).asJson().is("[1,2]");
+ assertObject(ps.get("A.f1.si")).asJson().is("[1,2]");
System.clearProperty("A.f1.si");
System.setProperty("A.f1", "['2','1']");
ps = PropertyStore.create().build();
- assertObject(ps.getProperty("A.f1.si")).asJson().is("[1,2]");
+ assertObject(ps.get("A.f1.si")).asJson().is("[1,2]");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.si"));
+ assertNull(ps.get("A.f1.si"));
}
@Test
@@ -1471,15 +1471,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.ls", "['foo','bar']");
PropertyStore ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.ls")).asJson().is("['foo','bar']");
+ assertObject(ps.get("A.f1.ls")).asJson().is("['foo','bar']");
System.clearProperty("A.f1.ls");
System.setProperty("A.f1", "['foo','bar']");
ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.ls")).asJson().is("['foo','bar']");
+ assertObject(ps.get("A.f1.ls")).asJson().is("['foo','bar']");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.ls"));
+ assertNull(ps.get("A.f1.ls"));
}
@Test
@@ -1487,15 +1487,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.li", "['2','1']");
PropertyStore ps = PropertyStore.create().build();
- assertObject(ps.getProperty("A.f1.li")).asJson().is("[2,1]");
+ assertObject(ps.get("A.f1.li")).asJson().is("[2,1]");
System.clearProperty("A.f1.li");
System.setProperty("A.f1", "['2','1']");
ps = PropertyStore.create().build();
- assertObject(ps.getProperty("A.f1.li")).asJson().is("[2,1]");
+ assertObject(ps.get("A.f1.li")).asJson().is("[2,1]");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.li"));
+ assertNull(ps.get("A.f1.li"));
}
@Test
@@ -1503,15 +1503,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.sms", "{foo:'bar',baz:null}");
PropertyStore ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.sms")).asJson().is("{foo:'bar'}");
+ assertObject(ps.get("A.f1.sms")).asJson().is("{foo:'bar'}");
System.clearProperty("A.f1.sms");
System.setProperty("A.f1", "{foo:'bar',baz:null}");
ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.sms")).asJson().is("{foo:'bar'}");
+ assertObject(ps.get("A.f1.sms")).asJson().is("{foo:'bar'}");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.sms"));
+ assertNull(ps.get("A.f1.sms"));
}
@Test
@@ -1519,15 +1519,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.smi", "{foo:'123',baz:null}");
PropertyStore ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.smi")).asJson().is("{foo:123}");
+ assertObject(ps.get("A.f1.smi")).asJson().is("{foo:123}");
System.clearProperty("A.f1.smi");
System.setProperty("A.f1", "{foo:'123',baz:null}");
ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.smi")).asJson().is("{foo:123}");
+ assertObject(ps.get("A.f1.smi")).asJson().is("{foo:123}");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.smi"));
+ assertNull(ps.get("A.f1.smi"));
}
@Test
@@ -1535,15 +1535,15 @@ public class PropertyStoreTest {
System.setProperty("A.f1.smo",
"{foo:123,bar:'baz',qux:true,quux:null}");
PropertyStore ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.smo")).asJson().is("{bar:'baz',foo:123,qux:true}");
+
assertObject(ps.get("A.f1.smo")).asJson().is("{bar:'baz',foo:123,qux:true}");
System.clearProperty("A.f1.smo");
System.setProperty("A.f1",
"{foo:123,bar:'baz',qux:true,quux:null}");
ps = PropertyStore.create().build();
-
assertObject(ps.getProperty("A.f1.smo")).asJson().is("{bar:'baz',foo:123,qux:true}");
+
assertObject(ps.get("A.f1.smo")).asJson().is("{bar:'baz',foo:123,qux:true}");
System.clearProperty("A.f1");
- assertNull(ps.getProperty("A.f1.smo"));
+ assertNull(ps.get("A.f1.smo"));
}
//-------------------------------------------------------------------------------------------------------------------
@@ -1622,8 +1622,8 @@ public class PropertyStoreTest {
@Test
public void testGetNonExistent() {
PropertyStore b = PropertyStore.create().set("A.foo",
"bar").build();
- assertNull(b.getProperty("A.baz"));
- assertNull(b.getProperty("B.foo"));
+ assertNull(b.get("A.baz"));
+ assertNull(b.get("B.foo"));
}
@Test
@@ -1670,9 +1670,9 @@ public class PropertyStoreTest {
b.set("A.foo", "bar").set("B.foo", "bar").set("D.foo", "bar");
PropertyStore ps = b.build();
- assertObject(ps.getPropertyKeys(null)).asJson().is("[]");
- assertObject(ps.getPropertyKeys("A")).asJson().is("['foo']");
- assertObject(ps.getPropertyKeys("C")).asJson().is("[]");
+ assertObject(ps.getKeys(null)).asJson().is("[]");
+ assertObject(ps.getKeys("A")).asJson().is("['foo']");
+ assertObject(ps.getKeys("C")).asJson().is("[]");
}
@Test
