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 ec00fd7 PropertyStore refactoring.
ec00fd7 is described below
commit ec00fd7b43087c38b5703a5789207915bfb85828
Author: JamesBognar <[email protected]>
AuthorDate: Sun Feb 7 17:05:30 2021 -0500
PropertyStore refactoring.
---
.../juneau/config/store/ConfigFileStore.java | 2 +-
.../main/java/org/apache/juneau/PropertyStore.java | 28 +++++-----------------
.../java/org/apache/juneau/rest/RestContext.java | 6 ++---
3 files changed, 10 insertions(+), 26 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
index b8c0673..85b852c 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
@@ -242,7 +242,7 @@ public class ConfigFileStore extends ConfigStore {
dir.mkdirs();
charset = ps.get(FILESTORE_charset,
Charset.class).orElse(Charset.defaultCharset());
updateOnWrite =
ps.getBoolean(FILESTORE_enableUpdateOnWrite).orElse(false);
- extensions = ps.getCdl(FILESTORE_extensions, "cfg");
+ extensions = ps.getCdl(FILESTORE_extensions).orElse(new
String[]{"cfg"});
WatcherSensitivity ws =
ps.get(FILESTORE_watcherSensitivity,
WatcherSensitivity.class).orElse(WatcherSensitivity.MEDIUM);
watcher =
ps.getBoolean(FILESTORE_enableWatcher).orElse(false) ? new WatcherThread(dir,
ws) : null;
if (watcher != null)
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 16fb8ff..d0e78fa 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
@@ -315,12 +315,6 @@ public final class PropertyStore {
return Optional.empty();
}
- @Deprecated
- private <T> T get(String key, Class<T> c, T def) {
- Property p = findProperty(key);
- return p == null ? def : p.as(c);
- }
-
private <T> T find(String key, Class<T> c) {
Property p = findProperty(key);
return p == null ? null : p.as(c);
@@ -397,23 +391,13 @@ public final class PropertyStore {
* Returns a property as a parsed comma-delimited list of strings.
*
* @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[] getCdl(String key, String def) {
- return StringUtils.split(StringUtils.emptyIfNull(get(key,
String.class, def)));
- }
-
- /**
- * Same as {@link #getString(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.
+ * @return The property value, never <jk>null</jk>.
*/
- public final String getNoneableString(String key, String def) {
- String s = get(key, String.class, def);
- return "NONE".equalsIgnoreCase(s) ? "" : s;
+ public final Optional<String[]> getCdl(String key) {
+ String s = find(key, String.class);
+ if (s != null)
+ return Optional.of(StringUtils.split(s));
+ return Optional.empty();
}
/**
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 d0cfade..90d8d62 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
@@ -3534,9 +3534,9 @@ public class RestContext extends BeanContext {
uriRelativity = ps.get(REST_uriRelativity,
UriRelativity.class).orElse(UriRelativity.RESOURCE);
allowBodyParam = !
ps.getBoolean(REST_disableAllowBodyParam).orElse(false);
- allowedHeaderParams =
newCaseInsensitiveSet(ps.getNoneableString(REST_allowedHeaderParams,
"Accept,Content-Type"));
- allowedMethodParams =
newCaseInsensitiveSet(ps.getNoneableString(REST_allowedMethodParams,
"HEAD,OPTIONS"));
- allowedMethodHeaders =
newCaseInsensitiveSet(ps.getNoneableString(REST_allowedMethodHeaders, ""));
+ allowedHeaderParams =
newCaseInsensitiveSet(ps.getString(REST_allowedHeaderParams).map(x ->
"NONE".equals(x) ? "" : x).orElse("Accept,Content-Type"));
+ allowedMethodParams =
newCaseInsensitiveSet(ps.getString(REST_allowedMethodParams).map(x ->
"NONE".equals(x) ? "" : x).orElse("HEAD,OPTIONS"));
+ allowedMethodHeaders =
newCaseInsensitiveSet(ps.getString(REST_allowedMethodHeaders).map(x ->
"NONE".equals(x) ? "" : x).orElse(""));
renderResponseStackTraces =
ps.getBoolean(REST_renderResponseStackTraces).orElse(false);
clientVersionHeader =
ps.getString(REST_clientVersionHeader).orElse("X-Client-Version");
