feature(protobuf): Include compiled protobuf payload in simulator kur…

…a module
eclipse-kapua · Jun 29, 2023 · 8613eea · 8613eea
1 parent 32db2f4
commit 8613eea
Show file tree

Hide file tree

Showing 11 changed files with 4,644 additions and 85 deletions.
diff --git a/pom.xml b/pom.xml
@@ -165,7 +165,6 @@
         <karaf-maven-plugin.version>4.4.2</karaf-maven-plugin.version>
         <license-maven-plugin.version>1.9</license-maven-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.5</nexus-staging-maven-plugin.version>
-        <protoc-jar-maven-plugin.version>3.11.4</protoc-jar-maven-plugin.version>
         <sql-maven-plugin.version>1.5</sql-maven-plugin.version>
         <surefire.version>3.0.0-M7</surefire.version>
 
@@ -318,12 +317,6 @@
                     <version>${nexus-staging-maven-plugin.version}</version>
                 </plugin>
 
-                <plugin>
-                    <groupId>com.github.os72</groupId>
-                    <artifactId>protoc-jar-maven-plugin</artifactId>
-                    <version>${protoc-jar-maven-plugin.version}</version>
-                </plugin>
-
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>

diff --git a/qa/common/src/main/java/org/eclipse/kapua/qa/common/SimulatedDeviceApplication.java b/qa/common/src/main/java/org/eclipse/kapua/qa/common/SimulatedDeviceApplication.java
@@ -12,19 +12,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.qa.common;
 
-import java.time.Instant;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 import org.eclipse.kapua.kura.simulator.app.Application;
 import org.eclipse.kapua.kura.simulator.app.ApplicationContext;
 import org.eclipse.kapua.kura.simulator.app.Descriptor;
 import org.eclipse.kapua.kura.simulator.app.Handler;
 import org.eclipse.kapua.kura.simulator.payload.Metrics;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.Builder;
 import org.eclipse.kapua.kura.simulator.topic.Topic;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.Builder;
+
+import java.time.Instant;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 public class SimulatedDeviceApplication implements Application {
 

diff --git a/.../test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/KuraDevice.java b/.../test-steps/src/main/java/org/eclipse/kapua/service/device/registry/steps/KuraDevice.java
@@ -13,10 +13,10 @@
 package org.eclipse.kapua.service.device.registry.steps;
 
 import com.google.protobuf.InvalidProtocolBufferException;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto;
 import org.eclipse.kapua.qa.common.Suppressed;
 import org.eclipse.kapua.service.device.call.message.kura.KuraPayload;
 import org.eclipse.kapua.service.device.call.message.kura.app.request.KuraRequestPayload;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;

diff --git a/simulator-kura/pom.xml b/simulator-kura/pom.xml
@@ -112,26 +112,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.github.os72</groupId>
-                <artifactId>protoc-jar-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe</protocArtifact>
-                            <protocVersion>${protobuf.version}</protocVersion>
-                            <includeMavenTypes>transitive</includeMavenTypes>
-                            <inputDirectories>
-                                <include>src/main/protobuf</include>
-                            </inputDirectories>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/app/Request.java b/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/app/Request.java
@@ -12,19 +12,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.kura.simulator.app;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.kapua.kura.simulator.payload.Message;
 import org.eclipse.kapua.kura.simulator.payload.Metrics;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.Builder;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.KuraMetricOrBuilder;
 import org.eclipse.kapua.kura.simulator.topic.Topic;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.Builder;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.KuraMetricOrBuilder;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 public class Request {
 

diff --git a/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/app/Sender.java b/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/app/Sender.java
@@ -12,18 +12,17 @@
  *******************************************************************************/
 package org.eclipse.kapua.kura.simulator.app;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Map;
-
+import com.google.protobuf.ByteString;
 import org.eclipse.kapua.kura.simulator.Transport;
 import org.eclipse.kapua.kura.simulator.payload.Metrics;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.Builder;
 import org.eclipse.kapua.kura.simulator.topic.Topic;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.Builder;
 
-import com.google.protobuf.ByteString;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Map;
 
 public interface Sender {
 

diff --git a/...lator-kura/src/main/java/org/eclipse/kapua/kura/simulator/app/data/PeriodicGenerator.java b/...lator-kura/src/main/java/org/eclipse/kapua/kura/simulator/app/data/PeriodicGenerator.java
@@ -12,23 +12,23 @@
  *******************************************************************************/
 package org.eclipse.kapua.kura.simulator.app.data;
 
-import java.time.Instant;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-
 import org.eclipse.kapua.kura.simulator.app.ApplicationContext;
 import org.eclipse.kapua.kura.simulator.app.Handler;
 import org.eclipse.kapua.kura.simulator.app.Sender;
 import org.eclipse.kapua.kura.simulator.generator.Generator;
 import org.eclipse.kapua.kura.simulator.generator.GeneratorScheduler;
 import org.eclipse.kapua.kura.simulator.generator.Payload;
 import org.eclipse.kapua.kura.simulator.payload.Metrics;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.Builder;
 import org.eclipse.kapua.kura.simulator.simulation.Configuration.MetricsMapping;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.Builder;
+
+import java.time.Instant;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
 
 public class PeriodicGenerator implements Handler {
 

diff --git a/...kura/src/main/java/org/eclipse/kapua/kura/simulator/app/data/SimplePeriodicGenerator.java b/...kura/src/main/java/org/eclipse/kapua/kura/simulator/app/data/SimplePeriodicGenerator.java
@@ -12,19 +12,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.kura.simulator.app.data;
 
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-
 import org.eclipse.kapua.kura.simulator.app.ApplicationContext;
 import org.eclipse.kapua.kura.simulator.app.Sender;
 import org.eclipse.kapua.kura.simulator.generator.Generator;
 import org.eclipse.kapua.kura.simulator.generator.GeneratorScheduler;
 import org.eclipse.kapua.kura.simulator.generator.Payload;
 import org.eclipse.kapua.kura.simulator.payload.Metrics;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.Builder;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.Builder;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
 
 public class SimplePeriodicGenerator extends AbstractSingleTopicPeriodicGenerator {
 

diff --git a/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/payload/Metrics.java b/simulator-kura/src/main/java/org/eclipse/kapua/kura/simulator/payload/Metrics.java
@@ -12,6 +12,16 @@
  *******************************************************************************/
 package org.eclipse.kapua.kura.simulator.payload;
 
+import com.google.protobuf.ByteString;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.MethodUtils;
+import org.eclipse.kapua.kura.simulator.generator.Payload;
+import org.eclipse.kapua.kura.simulator.generator.Position;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.KuraMetric;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.KuraMetric.ValueType;
+import org.eclipse.kapua.kura.simulator.proto.KuraPayloadProto.KuraPayload.KuraPosition;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -21,17 +31,6 @@
 import java.util.Objects;
 import java.util.TreeMap;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.reflect.MethodUtils;
-import org.eclipse.kapua.kura.simulator.generator.Payload;
-import org.eclipse.kapua.kura.simulator.generator.Position;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.KuraMetric;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.KuraMetric.ValueType;
-import org.eclipse.kura.core.message.protobuf.KuraPayloadProto.KuraPayload.KuraPosition;
-
-import com.google.protobuf.ByteString;
-
 public final class Metrics {
 
     private Metrics() {