This is an automated email from the ASF dual-hosted git repository.
dominikriemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new fc252985e4 fix: Extraction of OneOf static properties in compact
pipeline genera… (#4484)
fc252985e4 is described below
commit fc252985e47c7682a94b65cecb484dd5aefddae8
Author: Dominik Riemer <[email protected]>
AuthorDate: Tue May 19 07:53:24 2026 +0200
fix: Extraction of OneOf static properties in compact pipeline genera…
(#4484)
---
.../manager/template/CompactConfigGenerator.java | 10 ++-
.../template/CompactConfigGeneratorTest.java | 86 ++++++++++++++++++++++
2 files changed, 92 insertions(+), 4 deletions(-)
diff --git
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/CompactConfigGenerator.java
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/CompactConfigGenerator.java
index 3ec54266b7..f32443424d 100644
---
a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/CompactConfigGenerator.java
+++
b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/template/CompactConfigGenerator.java
@@ -129,10 +129,12 @@ public class CompactConfigGenerator implements
StaticPropertyVisitor {
@Override
public void visit(OneOfStaticProperty oneOfStaticProperty) {
- addConfig(
- oneOfStaticProperty,
-
oneOfStaticProperty.getOptions().stream().filter(Option::isSelected).findFirst().map(Option::getName)
- );
+ oneOfStaticProperty.getOptions()
+ .stream()
+ .filter(Option::isSelected)
+ .findFirst()
+ .map(Option::getName)
+ .ifPresent(selectedOption -> addConfig(oneOfStaticProperty,
selectedOption));
}
@Override
diff --git
a/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/template/CompactConfigGeneratorTest.java
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/template/CompactConfigGeneratorTest.java
new file mode 100644
index 0000000000..fc2696a062
--- /dev/null
+++
b/streampipes-pipeline-management/src/test/java/org/apache/streampipes/manager/template/CompactConfigGeneratorTest.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.template;
+
+import org.apache.streampipes.model.staticproperty.OneOfStaticProperty;
+import org.apache.streampipes.model.staticproperty.Option;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class CompactConfigGeneratorTest {
+
+ private static final String PROPERTY_NAME = "propertyName";
+
+ @Test
+ void oneOfStaticPropertyStoresSelectedOptionName() {
+ var property = new OneOfStaticProperty(PROPERTY_NAME, "", "");
+ property.setOptions(List.of(
+ new Option("option1"),
+ new Option("option2", true)
+ ));
+
+ Map<String, Object> config = new
CompactConfigGenerator(property).toTemplateValue();
+
+ assertEquals("option2", config.get(PROPERTY_NAME));
+ assertInstanceOf(String.class, config.get(PROPERTY_NAME));
+ }
+
+ @Test
+ void oneOfStaticPropertyRoundTripsSelectedOption() {
+ var property = new OneOfStaticProperty(PROPERTY_NAME, "", "");
+ property.setOptions(List.of(
+ new Option("option1"),
+ new Option("option2", true)
+ ));
+
+ var config = new CompactConfigGenerator(property).toTemplateValue();
+ var restoredProperty = new OneOfStaticProperty(PROPERTY_NAME, "", "");
+ restoredProperty.setOptions(List.of(
+ new Option("option1"),
+ new Option("option2")
+ ));
+
+ new
PipelineElementTemplateVisitor(List.of(config)).visit(restoredProperty);
+
+ assertFalse(restoredProperty.getOptions().get(0).isSelected());
+ assertTrue(restoredProperty.getOptions().get(1).isSelected());
+ }
+
+ @Test
+ void optionalOneOfStaticPropertyWithoutSelectionOmitsConfig() {
+ var property = new OneOfStaticProperty(PROPERTY_NAME, "", "");
+ property.setOptional(true);
+ property.setOptions(List.of(
+ new Option("option1"),
+ new Option("option2")
+ ));
+
+ Map<String, Object> config = new
CompactConfigGenerator(property).toTemplateValue();
+
+ assertTrue(config.isEmpty());
+ }
+}