Skip to content

Commit 147ea24

Browse files
committed
Fixing ToolDefaultPropertiesExportIgnoreListTest by cleaning up uninteresting tool installations
1 parent a244175 commit 147ea24

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

plugin/src/main/java/io/jenkins/plugins/casc/impl/configurators/GlobalConfigurationCategoryConfigurator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.jenkins.plugins.casc.model.CNode;
1717
import io.jenkins.plugins.casc.model.Mapping;
1818
import io.jenkins.plugins.casc.model.Scalar;
19+
import io.jenkins.plugins.casc.model.Sequence;
1920
import java.util.List;
2021
import java.util.Set;
2122
import java.util.logging.Logger;
@@ -109,6 +110,11 @@ public CNode describe(GlobalConfigurationCategory instance, ConfigurationContext
109110
Jenkins.get().getExtensionList(Descriptor.class).stream()
110111
.filter(this::filterDescriptors)
111112
.forEach(d -> describe(d, mapping, context));
113+
mapping.entrySet()
114+
.removeIf(e -> e.getValue() instanceof Mapping m
115+
&& m.keySet().equals(Set.of("installations"))
116+
&& m.get("installations") instanceof Sequence s
117+
&& s.isEmpty());
112118
return mapping;
113119
}
114120

0 commit comments

Comments
 (0)