Replace non-public ConfigurationImpl with test utility #3381
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package datawave.accumulo.core.util; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Iterator; | ||
| import java.util.Map; | ||
| import java.util.function.Function; | ||
| import java.util.function.Supplier; | ||
|
|
||
| import org.apache.accumulo.core.client.PluginEnvironment; | ||
| import org.apache.accumulo.core.conf.AccumuloConfiguration; | ||
| import org.apache.accumulo.core.conf.Property; | ||
| import org.apache.accumulo.core.conf.PropertyType; | ||
|
|
||
| /** | ||
| * A utility class that wraps an AccumuloConfiguration and implements PluginEnvironment.Configuration. This replaces the non-public | ||
| * org.apache.accumulo.core.util.ConfigurationImpl class. | ||
| */ | ||
| public class AccumuloConfigurationWrapper implements PluginEnvironment.Configuration { | ||
|
|
||
| private final AccumuloConfiguration conf; | ||
|
|
||
| public AccumuloConfigurationWrapper(AccumuloConfiguration conf) { | ||
| this.conf = conf; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isSet(String key) { | ||
| return conf.get(key) != null; | ||
| } | ||
|
|
||
| @Override | ||
| public String get(String key) { | ||
| return conf.get(key); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String,String> getWithPrefix(String prefix) { | ||
|
Collaborator
There was a problem hiding this comment. This method needs to add validation for the property and call The code in AccumuloConfiguration is special since most properties that use a defined accumulo prefix must be returned as a snapshot set. This is handled in |
||
| // For a defined prefix property, defer to AccumuloConfiguration.getAllPropertiesWithPrefix, which returns a | ||
| // consistent snapshot taken under the configuration's lock. Mirrors the non-public ConfigurationImpl behavior. | ||
| Property propertyPrefix = Property.getPropertyByKey(prefix); | ||
| if (propertyPrefix != null && propertyPrefix.getType() == PropertyType.PREFIX) { | ||
| return conf.getAllPropertiesWithPrefix(propertyPrefix); | ||
| } | ||
| Map<String,String> result = new HashMap<>(); | ||
| for (Map.Entry<String,String> entry : conf) { | ||
| if (entry.getKey().startsWith(prefix)) { | ||
| result.put(entry.getKey(), entry.getValue()); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String,String> getCustom() { | ||
| return getWithPrefix("general.custom."); | ||
| } | ||
|
|
||
| @Override | ||
| public String getCustom(String keySuffix) { | ||
| return get("general.custom." + keySuffix); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String,String> getTableCustom() { | ||
| return getWithPrefix("table.custom."); | ||
| } | ||
|
|
||
| @Override | ||
| public String getTableCustom(String keySuffix) { | ||
| return get("table.custom." + keySuffix); | ||
| } | ||
|
|
||
| @Override | ||
| public Iterator<Map.Entry<String,String>> iterator() { | ||
| return conf.iterator(); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> Supplier<T> getDerived(Function<PluginEnvironment.Configuration,T> computeDerivedValue) { | ||
| T value = computeDerivedValue.apply(this); | ||
| return () -> value; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.