joerg/net
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

relax parameter domain check for sub-parameters

Browse source
This commit is contained in:
Jörg Prante 2023-08-01 11:13:02 +02:00
parent a34c444aec
commit ebfbba6758
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/src/main/java/org/xbib/net/Parameter.java
View file

@ -200,12 +200,12 @@ public class Parameter implements Iterable<Pair<String, Object>>, Comparable<Par
}
public Parameter get(Domain domain) throws ParameterException {
if (getDomain() == Domain.UNDEFINED) {
throw new ParameterException("undefined domain");
}
if (builder.parameterMap.containsKey(domain)) {
return builder.parameterMap.get(domain);
}
if (getDomain() == Domain.UNDEFINED) {
throw new ParameterException("undefined domain");
}
if (getDomain().equals(domain)) {
return this;
}
@ -213,9 +213,6 @@ public class Parameter implements Iterable<Pair<String, Object>>, Comparable<Par
}
public List<Object> getAll(String key, Domain domain) throws Exception {
if (getDomain() == Domain.UNDEFINED) {
throw new ParameterException("undefined domain");
}
Parameter parameter = null;
if (builder.parameterMap.containsKey(domain)) {
parameter = builder.parameterMap.get(domain);
@ -223,6 +220,9 @@ public class Parameter implements Iterable<Pair<String, Object>>, Comparable<Par
if (parameter != null) {
return parameter.getAll(key, domain);
}
if (getDomain() == Domain.UNDEFINED) {
throw new ParameterException("undefined domain");
}
if (getDomain().equals(domain)) {
return list.stream()
.filter(p -> p.getKey().equals(key))
@ -248,9 +248,6 @@ public class Parameter implements Iterable<Pair<String, Object>>, Comparable<Par
}
public Object get(String key, Domain domain) throws ParameterException {
if (getDomain() == Domain.UNDEFINED) {
throw new ParameterException("undefined domain");
}
Parameter parameter = null;
if (builder.parameterMap.containsKey(domain)) {
parameter = builder.parameterMap.get(domain);
@ -258,6 +255,9 @@ public class Parameter implements Iterable<Pair<String, Object>>, Comparable<Par
if (parameter != null) {
return parameter.get(key, domain);
}
if (getDomain() == Domain.UNDEFINED) {
throw new ParameterException("undefined domain, please specify domain for parameter " + this);
}
if (getDomain().equals(domain)) {
Optional<Object> optional = list.stream()
.filter(p -> key.equals(p.getKey()))