This is an automated email from the ASF dual-hosted git repository.
zehnder 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 3523bc4d19 refactor: The event schema provider is not required anymore
(#4131)
3523bc4d19 is described below
commit 3523bc4d19bba655438a6520b48cdae605458270
Author: Philipp Zehnder <[email protected]>
AuthorDate: Tue Jan 27 15:41:42 2026 +0100
refactor: The event schema provider is not required anymore (#4131)
---
.../plc/adapter/generic/GenericPlc4xAdapter.java | 7 +--
.../generic/config/EventSchemaProvider.java | 59 ----------------------
2 files changed, 1 insertion(+), 65 deletions(-)
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/GenericPlc4xAdapter.java
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/GenericPlc4xAdapter.java
index 8df17e1bfe..ffd48c218a 100644
---
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/GenericPlc4xAdapter.java
+++
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/GenericPlc4xAdapter.java
@@ -29,7 +29,6 @@ import
org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtracto
import
org.apache.streampipes.extensions.api.extractor.IStaticPropertyExtractor;
import org.apache.streampipes.extensions.api.runtime.SupportsRuntimeConfig;
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.config.AdapterConfigurationProvider;
-import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.config.EventSchemaProvider;
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.config.MetadataOptionGenerator;
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.connection.ContinuousPlcRequestReader;
import
org.apache.streampipes.extensions.connectors.plc.adapter.generic.connection.OneTimePlcRequestReader;
@@ -57,7 +56,6 @@ public class GenericPlc4xAdapter implements
StreamPipesAdapter, SupportsRuntimeC
private PullAdapterScheduler pullAdapterScheduler;
private final PlcRequestProvider requestProvider;
- private final EventSchemaProvider schemaProvider;
private final PlcDriver driver;
private final PlcConnectionManager connectionManager;
@@ -65,7 +63,6 @@ public class GenericPlc4xAdapter implements
StreamPipesAdapter, SupportsRuntimeC
public GenericPlc4xAdapter(PlcDriver driver,
PlcConnectionManager connectionManager) {
this.requestProvider = new PlcRequestProvider();
- this.schemaProvider = new EventSchemaProvider();
this.driver = driver;
this.connectionManager = connectionManager;
}
@@ -104,11 +101,9 @@ public class GenericPlc4xAdapter implements
StreamPipesAdapter, SupportsRuntimeC
var event = new OneTimePlcRequestReader(connectionManager, settings,
requestProvider).readPlcDataSynchronized();
- var sampleData = SampleDataBuilder.create()
+ return SampleDataBuilder.create()
.sample(event)
.build();
-
- return sampleData;
} catch (Exception e) {
throw new AdapterException("Could not read plc", e);
}
diff --git
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/EventSchemaProvider.java
b/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/EventSchemaProvider.java
deleted file mode 100644
index ee7f5e642c..0000000000
---
a/streampipes-extensions/streampipes-connectors-plc/src/main/java/org/apache/streampipes/extensions/connectors/plc/adapter/generic/config/EventSchemaProvider.java
+++ /dev/null
@@ -1,59 +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.extensions.connectors.plc.adapter.generic.config;
-
-import org.apache.streampipes.commons.exceptions.connect.AdapterException;
-import
org.apache.streampipes.extensions.connectors.plc.adapter.s7.config.ConfigurationParser;
-import org.apache.streampipes.model.schema.EventProperty;
-import org.apache.streampipes.model.schema.EventPropertyList;
-import org.apache.streampipes.sdk.builder.PrimitivePropertyBuilder;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class EventSchemaProvider {
-
- public List<EventProperty> makeSchema(Map<String, String> nodes) throws
AdapterException {
- List<EventProperty> allProperties = new ArrayList<>();
- for (Map.Entry<String, String> entry : nodes.entrySet()) {
- var datatype = new
ConfigurationParser().getStreamPipesDataType(entry.getValue());
-
- var primitiveProperty = PrimitivePropertyBuilder
- .create(datatype, entry.getKey())
- .label(entry.getKey())
- .description("")
- .build();
-
- // Check if the address configuration is an array
- var isArray = new ConfigurationParser().isPLCArray(entry.getValue());
-
- if (isArray) {
- var propertyList = new EventPropertyList();
- propertyList.setRuntimeName(entry.getKey());
- propertyList.setLabel(entry.getKey());
- propertyList.setEventProperty(primitiveProperty);
- allProperties.add(propertyList);
- } else {
- allProperties.add(primitiveProperty);
- }
- }
- return allProperties;
- }
-}
