mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate CompositeOptionSet class

Browse Source 
This commit changes the access modifier on
bisq.common.config.CompositeOptionSet to make
it visible to bisq.apitest.config.ApiTestConfig,
and the duplicate bisq.apitest.config.ApiTestConfig
was deleted from 'apitest'.
This commit is contained in:
ghubstan 2020-08-24 15:29:32 -03:00
parent d5c81cedd6
commit c4023869bf
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
3 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
View File

@ -17,6 +17,8 @@
package bisq.apitest.config;
import bisq.common.config.CompositeOptionSet;
import joptsimple.AbstractOptionSpec;
import joptsimple.ArgumentAcceptingOptionSpec;
import joptsimple.HelpFormatter;

61
apitest/src/main/java/bisq/apitest/config/CompositeOptionSet.java
View File

@ -1,61 +0,0 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.apitest.config;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import java.util.ArrayList;
import java.util.List;
/**
* Composes multiple JOptSimple {@link OptionSet} instances such that calls to
* {@link #valueOf(OptionSpec)} and co will search all instances in the order they were
* added and return any value explicitly set, otherwise returning the default value for
* the given option or null if no default has been set. The API found here loosely
* emulates the {@link OptionSet} API without going through the unnecessary work of
* actually extending it. In practice, this class is used to compose options provided at
* the command line with those provided via config file, such that those provided at the
* command line take precedence over those provided in the config file.
*/
class CompositeOptionSet {
private final List<OptionSet> optionSets = new ArrayList<>();
public void addOptionSet(OptionSet optionSet) {
optionSets.add(optionSet);
}
public boolean has(OptionSpec<?> option) {
for (OptionSet optionSet : optionSets)
if (optionSet.has(option))
return true;
return false;
}
public <V> V valueOf(OptionSpec<V> option) {
for (OptionSet optionSet : optionSets)
if (optionSet.has(option))
return optionSet.valueOf(option);
// None of the provided option sets specified the given option so fall back to
// the default value (if any) provided by the first specified OptionSet
return optionSets.get(0).valueOf(option);
}
}

2
common/src/main/java/bisq/common/config/CompositeOptionSet.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* the command line with those provided via config file, such that those provided at the
* command line take precedence over those provided in the config file.
*/
class CompositeOptionSet {
public class CompositeOptionSet {
private final List<OptionSet> optionSets = new ArrayList<>();