Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-03 19:00:52 +01:00
Code Issues Packages Projects Releases Activity

Fix NPE for repositories without properties

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-21 11:33:48 +02:00
parent f8954846c4
commit 9172892097
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-core/src/main/java/sonia/scm/update/V1Properties.java
View File

@@ -6,9 +6,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import static java.util.Arrays.asList;
import static java.util.Arrays.stream;
import static java.util.stream.Stream.empty;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "properties")
@@ -32,7 +34,7 @@ public class V1Properties {
}
public Optional<String> getOptional(String key) {
return properties.stream().filter(p -> key.equals(p.getKey())).map(V1Property::getValue).findFirst();
return streamProps().filter(p -> key.equals(p.getKey())).map(V1Property::getValue).findFirst();
}
public Optional<Boolean> getBoolean(String key) {
@@ -44,10 +46,14 @@ public class V1Properties {
}
public boolean hasAny(String[] keys) {
return properties.stream().anyMatch(p -> stream(keys).anyMatch(k -> k.equals(p.getKey())));
return streamProps().anyMatch(p -> stream(keys).anyMatch(k -> k.equals(p.getKey())));
}
public boolean hasAll(String[] keys) {
return stream(keys).allMatch(k -> properties.stream().anyMatch(p -> k.equals(p.getKey())));
return stream(keys).allMatch(k -> streamProps().anyMatch(p -> k.equals(p.getKey())));
}
private Stream<V1Property> streamProps() {
return properties == null? empty(): properties.stream();
}
}