Fix NullPointer when adding static rules

apache · Oct 23, 2023 · 5f54f9a · 5f54f9a
1 parent 4b84368
commit 5f54f9a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/...ect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts b/...ect/components/adapter-configuration/schema-editor/event-schema/event-schema.component.ts
@@ -232,6 +232,7 @@ export class EventSchemaComponent implements OnChanges {
         eventProperty.runtimeType = this.dataTypesService.getStringTypeUrl();
         eventProperty.domainProperties = [];
         eventProperty.propertyScope = 'DIMENSION_PROPERTY';
+        eventProperty.additionalMetadata = {};
 
         this.targetSchema.eventProperties.push(eventProperty);
         this.refreshTree();

diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.ts
@@ -104,16 +104,18 @@ export class EditEventPropertyComponent implements OnInit {
             );
 
             result.measurementUnit = ep.measurementUnit;
-            result.additionalMetadata.correctionValue =
-                ep.additionalMetadata.correctionValue || undefined;
-            result.additionalMetadata.operator =
-                ep.additionalMetadata.operator || undefined;
-
-            result.additionalMetadata.mode = ep.additionalMetadata.mode;
-            result.additionalMetadata.formatString =
-                ep.additionalMetadata.formatString;
-            result.additionalMetadata.multiplier =
-                ep.additionalMetadata.multiplier;
+            if (ep.additionalMetadata) {
+                result.additionalMetadata.correctionValue =
+                    ep.additionalMetadata.correctionValue || undefined;
+                result.additionalMetadata.operator =
+                    ep.additionalMetadata.operator || undefined;
+
+                result.additionalMetadata.mode = ep.additionalMetadata.mode;
+                result.additionalMetadata.formatString =
+                    ep.additionalMetadata.formatString;
+                result.additionalMetadata.multiplier =
+                    ep.additionalMetadata.multiplier;
+            }
 
             (result as any).staticValue = (ep as any).staticValue;
 

diff --git a/ui/src/app/connect/services/transformation-rule.service.ts b/ui/src/app/connect/services/transformation-rule.service.ts
@@ -661,13 +661,18 @@ export class TransformationRuleService {
                     new CorrectionValueTransformationRuleDescription();
                 rule['@class'] =
                     'org.apache.streampipes.model.connect.rules.value.CorrectionValueTransformationRuleDescription';
-                rule.runtimeKey = keyNew;
-                rule.correctionValue =
-                    eventPropertyPrimitive.additionalMetadata.correctionValue;
-                rule.operator =
-                    eventPropertyPrimitive.additionalMetadata.operator;
+                if (
+                    eventPropertyPrimitive.additionalMetadata &&
+                    eventPropertyPrimitive.additionalMetadata.correctionValue
+                ) {
+                    rule.runtimeKey = keyNew;
+                    rule.correctionValue =
+                        eventPropertyPrimitive.additionalMetadata.correctionValue;
+                    rule.operator =
+                        eventPropertyPrimitive.additionalMetadata.operator;
 
-                result.push(rule);
+                    result.push(rule);
+                }
             } else if (eventProperty instanceof EventPropertyNested) {
                 const tmpResults: CorrectionValueTransformationRuleDescription[] =
                     this.getCorrectionValueRules(