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 dcd4909 Config API modernization.
dcd4909 is described below
commit dcd4909dbbf36d2d0e1d52716fd098687ec36fb8
Author: JamesBognar <[email protected]>
AuthorDate: Sun Dec 26 14:48:37 2021 -0500
Config API modernization.
---
.../main/java/org/apache/juneau/config/Config.java | 6 ++--
.../main/java/org/apache/juneau/config/Entry.java | 2 +-
.../apache/juneau/config/internal/ConfigMap.java | 38 +++++++++++-----------
.../{ConfigEntry.java => ConfigMapEntry.java} | 8 ++---
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index af9175e..bd5a27b 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -644,7 +644,7 @@ public final class Config extends Context implements
ConfigEventListener {
String sname = sname(key);
String skey = skey(key);
- ConfigEntry ce = configMap.getEntry(sname, skey);
+ ConfigMapEntry ce = configMap.getEntry(sname, skey);
if (ce == null || ce.getValue() == null)
return null;
@@ -697,7 +697,7 @@ public final class Config extends Context implements
ConfigEventListener {
String sname = sname(key);
String skey = skey(key);
- ConfigEntry ce = configMap.getEntry(sname, skey);
+ ConfigMapEntry ce = configMap.getEntry(sname, skey);
if (ce == null && value == null)
return this;
@@ -846,7 +846,7 @@ public final class Config extends Context implements
ConfigEventListener {
checkWrite();
for (String section : configMap.getSections()) {
for (String key : configMap.getKeys(section)) {
- ConfigEntry ce = configMap.getEntry(section,
key);
+ ConfigMapEntry ce = configMap.getEntry(section,
key);
if (ce != null && ce.hasModifier('*') && !
encoder.isEncoded(ce.getValue())) {
configMap.setEntry(section, key,
encoder.encode(section + '/' + key, ce.getValue()), null, null, null);
}
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
index b6eba19..824afcc 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
@@ -33,7 +33,7 @@ import org.apache.juneau.parser.*;
*/
public class Entry {
- private final ConfigEntry configEntry;
+ private final ConfigMapEntry configEntry;
private final Config config;
private final String value;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index 01210f4..ce41755 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -222,13 +222,13 @@ public class ConfigMap implements ConfigStoreListener {
* <br>Must not be <jk>null</jk>.
* @return The entry, or <jk>null</jk> if the entry doesn't exist.
*/
- public ConfigEntry getEntry(String section, String key) {
+ public ConfigMapEntry getEntry(String section, String key) {
checkSectionName(section);
checkKeyName(key);
readLock();
try {
ConfigSection cs = entries.get(section);
- ConfigEntry ce = cs == null ? null :
cs.entries.get(key);
+ ConfigMapEntry ce = cs == null ? null :
cs.entries.get(key);
if (ce == null) {
for (Import i : imports) {
@@ -466,9 +466,9 @@ public class ConfigMap implements ConfigStoreListener {
cs = new ConfigSection(section);
entries.put(section, cs);
}
- ConfigEntry oe = cs.entries.get(ce.getKey());
+ ConfigMapEntry oe = cs.entries.get(ce.getKey());
if (oe == null)
- oe = ConfigEntry.NULL;
+ oe = ConfigMapEntry.NULL;
cs.addEntry(
ce.getKey(),
ce.getValue() == null ? oe.value :
ce.getValue(),
@@ -587,7 +587,7 @@ public class ConfigMap implements ConfigStoreListener {
boolean hasEntry(String section, String key) {
ConfigSection cs = entries.get(section);
- ConfigEntry ce = cs == null ? null : cs.entries.get(key);
+ ConfigMapEntry ce = cs == null ? null : cs.entries.get(key);
return ce != null;
}
@@ -664,7 +664,7 @@ public class ConfigMap implements ConfigStoreListener {
m.putAll(i.getConfigMap().asMap());
for (ConfigSection cs : entries.values()) {
Map<String,String> m2 = new LinkedHashMap<>();
- for (ConfigEntry ce : cs.entries.values())
+ for (ConfigMapEntry ce : cs.entries.values())
m2.put(ce.key, ce.value);
m.put(cs.name, m2);
}
@@ -804,7 +804,7 @@ public class ConfigMap implements ConfigStoreListener {
for (Import i : newMap.imports) {
if (! imports.contains(i)) {
for (ConfigSection s :
i.getConfigMap().entries.values()) {
- for (ConfigEntry e :
s.oentries.values()) {
+ for (ConfigMapEntry e :
s.oentries.values()) {
if (! newMap.hasEntry(s.name,
e.key)) {
changes.add(ConfigEvent.setEntry(name, s.name, e.key, e.value, e.modifiers,
e.comment, e.preLines));
}
@@ -817,7 +817,7 @@ public class ConfigMap implements ConfigStoreListener {
for (Import i : imports) {
if (! newMap.imports.contains(i)) {
for (ConfigSection s :
i.getConfigMap().entries.values()) {
- for (ConfigEntry e :
s.oentries.values()) {
+ for (ConfigMapEntry e :
s.oentries.values()) {
if (! newMap.hasEntry(s.name,
e.key)) {
changes.add(ConfigEvent.removeEntry(name, s.name, e.key));
}
@@ -830,18 +830,18 @@ public class ConfigMap implements ConfigStoreListener {
ConfigSection s = oentries.get(ns.name);
if (s == null) {
//changes.add(ConfigEvent.setSection(ns.name,
ns.preLines));
- for (ConfigEntry ne : ns.entries.values()) {
+ for (ConfigMapEntry ne : ns.entries.values()) {
changes.add(ConfigEvent.setEntry(name,
ns.name, ne.key, ne.value, ne.modifiers, ne.comment, ne.preLines));
}
} else {
- for (ConfigEntry ne : ns.oentries.values()) {
- ConfigEntry e = s.oentries.get(ne.key);
+ for (ConfigMapEntry ne : ns.oentries.values()) {
+ ConfigMapEntry e =
s.oentries.get(ne.key);
if (e == null || ne(e.value, ne.value))
{
changes.add(ConfigEvent.setEntry(name, s.name, ne.key, ne.value, ne.modifiers,
ne.comment, ne.preLines));
}
}
- for (ConfigEntry e : s.oentries.values()) {
- ConfigEntry ne = ns.oentries.get(e.key);
+ for (ConfigMapEntry e : s.oentries.values()) {
+ ConfigMapEntry ne =
ns.oentries.get(e.key);
if (ne == null) {
changes.add(ConfigEvent.removeEntry(name, s.name, e.key));
}
@@ -853,7 +853,7 @@ public class ConfigMap implements ConfigStoreListener {
ConfigSection ns = newMap.oentries.get(s.name);
if (ns == null) {
//changes.add(ConfigEvent.removeSection(s.name));
- for (ConfigEntry e : s.oentries.values())
+ for (ConfigMapEntry e : s.oentries.values())
changes.add(ConfigEvent.removeEntry(name, s.name, e.key));
}
}
@@ -885,8 +885,8 @@ public class ConfigMap implements ConfigStoreListener {
final List<String> preLines = Collections.synchronizedList(new
ArrayList<String>());
private final String rawLine;
- final Map<String,ConfigEntry> oentries =
Collections.synchronizedMap(new LinkedHashMap<String,ConfigEntry>());
- final Map<String,ConfigEntry> entries =
Collections.synchronizedMap(new LinkedHashMap<String,ConfigEntry>());
+ final Map<String,ConfigMapEntry> oentries =
Collections.synchronizedMap(new LinkedHashMap<String,ConfigMapEntry>());
+ final Map<String,ConfigMapEntry> entries =
Collections.synchronizedMap(new LinkedHashMap<String,ConfigMapEntry>());
/**
* Constructor.
@@ -923,7 +923,7 @@ public class ConfigMap implements ConfigStoreListener {
}
} else {
if (c != '#' && l.indexOf('=') != -1) {
- ConfigEntry e = new
ConfigEntry(l, lines.subList(start, i));
+ ConfigMapEntry e = new
ConfigMapEntry(l, lines.subList(start, i));
if (entries.containsKey(e.key))
throw new
ConfigException("Duplicate entry found in section [{0}] of configuration:
{1}", name, e.key);
entries.put(e.key, e);
@@ -938,7 +938,7 @@ public class ConfigMap implements ConfigStoreListener {
}
ConfigSection addEntry(String key, String value, String
modifiers, String comment, List<String> preLines) {
- ConfigEntry e = new ConfigEntry(key, value, modifiers,
comment, preLines);
+ ConfigMapEntry e = new ConfigMapEntry(key, value,
modifiers, comment, preLines);
this.entries.put(e.key, e);
return this;
}
@@ -961,7 +961,7 @@ public class ConfigMap implements ConfigStoreListener {
w.append('\n');
}
- for (ConfigEntry e : entries.values())
+ for (ConfigMapEntry e : entries.values())
e.writeTo(w);
return w;
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
similarity index 94%
rename from
juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java
rename to
juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
index 89de958..32003e7 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigEntry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMapEntry.java
@@ -29,17 +29,17 @@ import org.apache.juneau.internal.*;
* <li class='extlink'>{@source}
* </ul>
*/
-public class ConfigEntry {
+public class ConfigMapEntry {
final String rawLine;
final String key, value, comment;
final String modifiers;
final List<String> preLines;
- static final ConfigEntry NULL = new ConfigEntry(null, null, null, null,
null);
+ static final ConfigMapEntry NULL = new ConfigMapEntry(null, null, null,
null, null);
private final static AsciiSet MOD_CHARS = AsciiSet.create("#$%&*+^@~");
- ConfigEntry(String line, List<String> preLines) {
+ ConfigMapEntry(String line, List<String> preLines) {
this.rawLine = line;
int i = line.indexOf('=');
String key = line.substring(0, i).trim();
@@ -71,7 +71,7 @@ public class ConfigEntry {
this.preLines = AList.unmodifiable(preLines);
}
- ConfigEntry(String key, String value, String modifiers, String comment,
List<String> preLines) {
+ ConfigMapEntry(String key, String value, String modifiers, String
comment, List<String> preLines) {
this.rawLine = null;
this.key = key;
this.value = value;
