This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch 3153-remove-create-nested-rule-functionality
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to
refs/heads/3153-remove-create-nested-rule-functionality by this push:
new fb645c944c refactor(#3153): Remove CreateNestedRuleDescription
references from various classes
fb645c944c is described below
commit fb645c944cd79d9b3eda576994de80cd80d3f874
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed May 7 10:46:55 2025 +0200
refactor(#3153): Remove CreateNestedRuleDescription references from various
classes
---
.../convert/ToOriginalSchemaConverter.java | 6 --
.../convert/ToTransformedSchemaConverter.java | 8 ---
...StatefulTransformationRuleGeneratorVisitor.java | 6 --
...tatelessTransformationRuleGeneratorVisitor.java | 8 ---
.../schema/CreateNestedTransformationRule.java | 49 ---------------
.../schema/CreateNestedTransformationRuleTest.java | 71 ----------------------
.../schema/SchemaEventTransformerTest.java | 7 +--
.../connect/TransformationRuleUpdateVisitor.java | 6 --
.../connect/rules/ITransformationRuleVisitor.java | 3 -
.../rules/TransformationRuleDescription.java | 2 -
.../rules/schema/CreateNestedRuleDescription.java | 64 -------------------
.../connect/adapter/AdapterDescriptionTest.java | 19 ++----
.../storage/couchdb/serializer/GsonSerializer.java | 2 -
13 files changed, 9 insertions(+), 242 deletions(-)
diff --git
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToOriginalSchemaConverter.java
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToOriginalSchemaConverter.java
index 100029741a..c5676a2e72 100644
---
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToOriginalSchemaConverter.java
+++
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToOriginalSchemaConverter.java
@@ -20,7 +20,6 @@ package
org.apache.streampipes.connect.shared.preprocessing.convert;
import org.apache.streampipes.connect.shared.preprocessing.utils.Utils;
import org.apache.streampipes.model.connect.rules.ITransformationRuleVisitor;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -56,11 +55,6 @@ public class ToOriginalSchemaConverter implements
ITransformationRuleVisitor, Pr
this.properties = new Cloner().properties(properties);
}
- @Override
- public void visit(CreateNestedRuleDescription rule) {
- properties.removeIf(p -> p.getRuntimeName().equals(rule.getRuntimeKey()));
- }
-
@Override
public void visit(DeleteRuleDescription rule) {
// this can't be fully restored since we don't know the characteristics of
the deleted field
diff --git
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToTransformedSchemaConverter.java
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToTransformedSchemaConverter.java
index 2a677fb89f..c70b59879d 100644
---
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToTransformedSchemaConverter.java
+++
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/convert/ToTransformedSchemaConverter.java
@@ -21,7 +21,6 @@ package
org.apache.streampipes.connect.shared.preprocessing.convert;
import org.apache.streampipes.commons.random.UUIDGenerator;
import org.apache.streampipes.connect.shared.preprocessing.utils.Utils;
import org.apache.streampipes.model.connect.rules.ITransformationRuleVisitor;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -61,13 +60,6 @@ public class ToTransformedSchemaConverter implements
ITransformationRuleVisitor,
this.properties = new Cloner().properties(properties);
}
- @Override
- public void visit(CreateNestedRuleDescription rule) {
- var nested = new EventPropertyNested();
- nested.setRuntimeName(rule.getRuntimeKey());
- this.properties.add(nested);
- }
-
@Override
public void visit(DeleteRuleDescription rule) {
var keyArray = Utils.toKeyArray(rule.getRuntimeKey());
diff --git
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatefulTransformationRuleGeneratorVisitor.java
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatefulTransformationRuleGeneratorVisitor.java
index b1d9c0956c..3b0424427d 100644
---
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatefulTransformationRuleGeneratorVisitor.java
+++
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatefulTransformationRuleGeneratorVisitor.java
@@ -20,7 +20,6 @@ package
org.apache.streampipes.connect.shared.preprocessing.generator;
import
org.apache.streampipes.connect.shared.preprocessing.transform.stream.DuplicateFilterPipelineElement;
import
org.apache.streampipes.connect.shared.preprocessing.transform.stream.EventRateTransformationRule;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -36,11 +35,6 @@ import
org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescrip
public class StatefulTransformationRuleGeneratorVisitor extends
TransformationRuleGeneratorVisitor {
- @Override
- public void visit(CreateNestedRuleDescription rule) {
- // skip (not a stateful transformation)
- }
-
@Override
public void visit(DeleteRuleDescription rule) {
// skip (not a stateful transformation)
diff --git
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatelessTransformationRuleGeneratorVisitor.java
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatelessTransformationRuleGeneratorVisitor.java
index 1ca7d68dbd..006ec22664 100644
---
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatelessTransformationRuleGeneratorVisitor.java
+++
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/generator/StatelessTransformationRuleGeneratorVisitor.java
@@ -19,7 +19,6 @@
package org.apache.streampipes.connect.shared.preprocessing.generator;
import
org.apache.streampipes.connect.shared.preprocessing.transform.schema.AddValueTransformationRule;
-import
org.apache.streampipes.connect.shared.preprocessing.transform.schema.CreateNestedTransformationRule;
import
org.apache.streampipes.connect.shared.preprocessing.transform.schema.DeleteTransformationRule;
import
org.apache.streampipes.connect.shared.preprocessing.transform.schema.MoveTransformationRule;
import
org.apache.streampipes.connect.shared.preprocessing.transform.schema.RenameTransformationRule;
@@ -31,7 +30,6 @@ import
org.apache.streampipes.connect.shared.preprocessing.transform.value.Times
import
org.apache.streampipes.connect.shared.preprocessing.transform.value.TimestampTransformationRule;
import
org.apache.streampipes.connect.shared.preprocessing.transform.value.UnitTransformationRule;
import org.apache.streampipes.connect.shared.preprocessing.utils.Utils;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -47,12 +45,6 @@ import
org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescrip
public class StatelessTransformationRuleGeneratorVisitor extends
TransformationRuleGeneratorVisitor {
- @Override
- public void visit(CreateNestedRuleDescription ruleDesc) {
- rules.add(new CreateNestedTransformationRule(
- Utils.toKeyArray(ruleDesc.getRuntimeKey())));
- }
-
@Override
public void visit(DeleteRuleDescription ruleDesc) {
rules.add(new DeleteTransformationRule(
diff --git
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/CreateNestedTransformationRule.java
b/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/CreateNestedTransformationRule.java
deleted file mode 100644
index 358c32130e..0000000000
---
a/streampipes-connect-shared/src/main/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/CreateNestedTransformationRule.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.connect.shared.preprocessing.transform.schema;
-
-import
org.apache.streampipes.connect.shared.preprocessing.SupportsNestedTransformationRule;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @deprecated The functionlality to add nested rules was removed in version
0.97.0 form the UI
- * For the next release we can also remove the functionality from the backend
- */
-@Deprecated(since = "0.97.0", forRemoval = true)
-public class CreateNestedTransformationRule extends
SupportsNestedTransformationRule {
-
- private final List<String> key;
-
- public CreateNestedTransformationRule(List<String> key) {
- this.key = key;
- }
-
- @Override
- protected List<String> getEventKeys() {
- return key;
- }
-
- @Override
- protected void applyTransformation(Map<String, Object> event, List<String>
eventKeys) {
- event.put(eventKeys.get(0), new HashMap<>());
- }
-}
diff --git
a/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/CreateNestedTransformationRuleTest.java
b/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/CreateNestedTransformationRuleTest.java
deleted file mode 100644
index b66d8f6225..0000000000
---
a/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/CreateNestedTransformationRuleTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.connect.shared.preprocessing.transform.schema;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings("unchecked")
-public class CreateNestedTransformationRuleTest {
-
- @Test
- public void transformSimple() {
- Map<String, Object> event = new HashMap<>();
-
-
- List<String> key = new ArrayList<>();
- key.add("key");
- CreateNestedTransformationRule createNested = new
CreateNestedTransformationRule(key);
-
- Map<String, Object> result = createNested.apply(event);
-
- Assertions.assertEquals(1,
- result.keySet().size());
- Assertions.assertEquals(0,
- ((Map<String, Object>)
result.get("key")).keySet().size());
- }
-
-
- @Test
- public void transformNested() {
- Map<String, Object> event = new HashMap<>();
- event.put("parent", new HashMap<>());
-
-
- List<String> key = new ArrayList<>();
- key.add("parent");
- key.add("child");
-
- CreateNestedTransformationRule createNested = new
CreateNestedTransformationRule(key);
-
- Map<String, Object> result = createNested.apply(event);
-
- Assertions.assertEquals(1,
- result.keySet().size());
- Assertions.assertEquals(1,
- ((Map<String, Object>)
result.get("parent")).keySet().size());
- Assertions.assertEquals(0,
- (((Map<String, Object>) ((Map<String, Object>)
result.get("parent")).get("child")).keySet().size()));
- }
-}
diff --git
a/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/SchemaEventTransformerTest.java
b/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/SchemaEventTransformerTest.java
index 56400a8066..ebf35e22da 100644
---
a/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/SchemaEventTransformerTest.java
+++
b/streampipes-connect-shared/src/test/java/org/apache/streampipes/connect/shared/preprocessing/transform/schema/SchemaEventTransformerTest.java
@@ -40,7 +40,6 @@ public class SchemaEventTransformerTest {
rules.add(new RenameTransformationRule(List.of("b"), "b1"));
rules.add(new RenameTransformationRule(List.of("c"), "c1"));
rules.add(new RenameTransformationRule(List.of("c1", "d"), "d1"));
- rules.add(new CreateNestedTransformationRule(List.of("c1", "f")));
rules.add(new MoveTransformationRule(List.of("b1"), List.of("c1", "f")));
rules.add(new DeleteTransformationRule(List.of("e")));
@@ -49,19 +48,19 @@ public class SchemaEventTransformerTest {
}
Assertions.assertEquals(2,
- result.keySet().size());
+ result.size());
Assertions.assertTrue(result.containsKey("a1"));
Assertions.assertTrue(result.containsKey("c1"));
Map<String, Object> nested = ((Map<String, Object>) result.get("c1"));
Assertions.assertEquals(2,
- nested.keySet().size());
+ nested.size());
Assertions.assertTrue(nested.containsKey("f"));
nested = (Map<String, Object>) nested.get("f");
Assertions.assertEquals(1,
- nested.keySet().size());
+ nested.size());
Assertions.assertEquals("z", nested.get("b1"));
}
diff --git
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/TransformationRuleUpdateVisitor.java
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/TransformationRuleUpdateVisitor.java
index 9661b7705c..c79814d781 100644
---
a/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/TransformationRuleUpdateVisitor.java
+++
b/streampipes-extensions-management/src/main/java/org/apache/streampipes/extensions/management/connect/TransformationRuleUpdateVisitor.java
@@ -21,7 +21,6 @@ package org.apache.streampipes.extensions.management.connect;
import org.apache.streampipes.connect.shared.preprocessing.utils.Utils;
import org.apache.streampipes.model.connect.rules.ITransformationRuleVisitor;
import
org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -55,11 +54,6 @@ public class TransformationRuleUpdateVisitor implements
ITransformationRuleVisit
this.validRules = new ArrayList<>();
}
- @Override
- public void visit(CreateNestedRuleDescription rule) {
- validRules.add(rule);
- }
-
@Override
public void visit(DeleteRuleDescription rule) {
if (containsKey(rule.getRuntimeKey())) {
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/ITransformationRuleVisitor.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/ITransformationRuleVisitor.java
index 78dbd37da1..cdf92f891f 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/ITransformationRuleVisitor.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/ITransformationRuleVisitor.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.rules;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -34,8 +33,6 @@ import
org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescrip
public interface ITransformationRuleVisitor {
- void visit(CreateNestedRuleDescription rule);
-
void visit(DeleteRuleDescription rule);
void visit(MoveRuleDescription rule);
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
index 94b1817e8f..98fc076b4b 100644
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
+++
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/TransformationRuleDescription.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.rules;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -45,7 +44,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@JsonSubTypes.Type(UnitTransformRuleDescription.class),
@JsonSubTypes.Type(EventRateTransformationRuleDescription.class),
@JsonSubTypes.Type(RemoveDuplicatesTransformationRuleDescription.class),
- @JsonSubTypes.Type(CreateNestedRuleDescription.class),
@JsonSubTypes.Type(DeleteRuleDescription.class),
@JsonSubTypes.Type(RenameRuleDescription.class),
@JsonSubTypes.Type(RegexTransformationRuleDescription.class),
diff --git
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java
b/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java
deleted file mode 100644
index 3ed301f1e2..0000000000
---
a/streampipes-model/src/main/java/org/apache/streampipes/model/connect/rules/schema/CreateNestedRuleDescription.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.model.connect.rules.schema;
-
-import org.apache.streampipes.model.connect.rules.ITransformationRuleVisitor;
-import org.apache.streampipes.model.connect.rules.TransformationRulePriority;
-
-/**
- * @deprecated The functionlality to add nested rules was removed in version
0.97.0 form the UI
- * For the next release we can also remove the functionality from the backend
- */
-@Deprecated(since = "0.97.0", forRemoval = true)
-public class CreateNestedRuleDescription extends
SchemaTransformationRuleDescription {
-
- private String runtimeKey;
-
- public CreateNestedRuleDescription() {
- super();
- }
-
- public CreateNestedRuleDescription(String runtimeKey) {
- super();
- this.runtimeKey = runtimeKey;
- }
-
- public CreateNestedRuleDescription(CreateNestedRuleDescription other) {
- super(other);
- this.runtimeKey = other.getRuntimeKey();
- }
-
- public String getRuntimeKey() {
- return runtimeKey;
- }
-
- public void setRuntimeKey(String runtimeKey) {
- this.runtimeKey = runtimeKey;
- }
-
- @Override
- public void accept(ITransformationRuleVisitor visitor) {
- visitor.visit(this);
- }
-
- @Override
- public int getRulePriority() {
- return TransformationRulePriority.CREATE_NESTED.getCode();
- }
-}
diff --git
a/streampipes-model/src/test/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionTest.java
b/streampipes-model/src/test/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionTest.java
index 63824ac0bf..13f72cb548 100644
---
a/streampipes-model/src/test/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionTest.java
+++
b/streampipes-model/src/test/java/org/apache/streampipes/model/connect/adapter/AdapterDescriptionTest.java
@@ -18,7 +18,6 @@
package org.apache.streampipes.model.connect.adapter;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import
org.apache.streampipes.model.connect.rules.value.UnitTransformRuleDescription;
@@ -27,7 +26,6 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
import java.util.List;
public class AdapterDescriptionTest {
@@ -39,16 +37,11 @@ public class AdapterDescriptionTest {
adapterDescription = new AdapterDescription() {
};
- List rules = new ArrayList<>();
- rules.add(new CreateNestedRuleDescription());
- rules.add(new CreateNestedRuleDescription());
- rules.add(new DeleteRuleDescription());
- rules.add(new UnitTransformRuleDescription());
- rules.add(new CreateNestedRuleDescription());
- rules.add(new CreateNestedRuleDescription());
- rules.add(new UnitTransformRuleDescription());
- rules.add(new MoveRuleDescription());
- rules.add(new CreateNestedRuleDescription());
+ var rules = List.of(
+ new DeleteRuleDescription(),
+ new UnitTransformRuleDescription(),
+ new UnitTransformRuleDescription(),
+ new MoveRuleDescription());
adapterDescription.setRules(rules);
}
@@ -67,7 +60,7 @@ public class AdapterDescriptionTest {
@Test
public void getSchemaRules() {
- Assertions.assertEquals(7,
+ Assertions.assertEquals(2,
adapterDescription.getSchemaRules().size());
}
}
\ No newline at end of file
diff --git
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
index fee35a57a3..d51874e4fb 100644
---
a/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
+++
b/streampipes-storage-couchdb/src/main/java/org/apache/streampipes/storage/couchdb/serializer/GsonSerializer.java
@@ -25,7 +25,6 @@ import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.client.user.Principal;
import org.apache.streampipes.model.connect.adapter.AdapterDescription;
import
org.apache.streampipes.model.connect.rules.TransformationRuleDescription;
-import
org.apache.streampipes.model.connect.rules.schema.CreateNestedRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.DeleteRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.MoveRuleDescription;
import org.apache.streampipes.model.connect.rules.schema.RenameRuleDescription;
@@ -99,7 +98,6 @@ public class GsonSerializer {
"org.apache.streampipes.model.RegexTransformationRuleDescription")
.registerSubtype(MoveRuleDescription.class,
"org.apache.streampipes.model.MoveRuleDescription")
.registerSubtype(DeleteRuleDescription.class,
"org.apache.streampipes.model.DeleteRuleDescription")
- .registerSubtype(CreateNestedRuleDescription.class,
"org.apache.streampipes.model.CreateNestedRuleDescription")
.registerSubtype(RemoveDuplicatesTransformationRuleDescription.class,
"org.apache.streampipes.model.RemoveDuplicatesRuleDescription")
.registerSubtype(AddTimestampRuleDescription.class,
"org.apache.streampipes.model.AddTimestampRuleDescription")
