improve: include compiled protobuf payload

eclipse · Nov 16, 2023 · 0e6e694 · 0e6e694
1 parent 1ebcfa5
commit 0e6e694
Show file tree

Hide file tree

Showing 21 changed files with 13,867 additions and 154 deletions.
diff --git a/build-tools/src/main/resources/checkstyle/kapua.suppressions.xml b/build-tools/src/main/resources/checkstyle/kapua.suppressions.xml
@@ -28,4 +28,7 @@
 
     <!-- Ignore the about.html file -->
     <suppress checks="FileTabCharacter" files="about\.html"/>
+
+    <!-- Ignore protobuf compiled files -->
+    <suppress checks=".*" files="KuraPayloadProto\.java"/>
 </suppressions>
diff --git a/client/gateway/profile/kura/pom.xml b/client/gateway/profile/kura/pom.xml
@@ -94,34 +94,12 @@
 
     <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>
-                            <protocVersion>${protobuf.version}</protocVersion>
-                            <includeStdTypes>true</includeStdTypes>
-                            <inputDirectories>
-                                <include>src/main/protobuf</include>
-                            </inputDirectories>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <excludePackageNames>org.eclipse.kapua.gateway.client.kura.payload</excludePackageNames>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 

diff --git a/...file/kura/src/main/java/org/eclipse/kapua/client/gateway/kura/KuraBinaryPayloadCodec.java b/...file/kura/src/main/java/org/eclipse/kapua/client/gateway/kura/KuraBinaryPayloadCodec.java
@@ -12,17 +12,17 @@
  *******************************************************************************/
 package org.eclipse.kapua.client.gateway.kura;
 
-import java.nio.ByteBuffer;
-import java.time.Instant;
-import java.util.Map;
-import java.util.Objects;
-
 import org.eclipse.kapua.client.gateway.BinaryPayloadCodec;
 import org.eclipse.kapua.client.gateway.Payload;
 import org.eclipse.kapua.client.gateway.kura.internal.Metrics;
+import org.eclipse.kapua.client.gateway.kura.proto.KuraPayloadProto;
+import org.eclipse.kapua.client.gateway.kura.proto.KuraPayloadProto.KuraPayload;
 import org.eclipse.kapua.client.gateway.spi.util.Buffers;
-import org.eclipse.kapua.gateway.client.kura.payload.KuraPayloadProto;
-import org.eclipse.kapua.gateway.client.kura.payload.KuraPayloadProto.KuraPayload;
+
+import java.nio.ByteBuffer;
+import java.time.Instant;
+import java.util.Map;
+import java.util.Objects;
 
 public class KuraBinaryPayloadCodec implements BinaryPayloadCodec {
 

diff --git a/.../kura/src/main/java/org/eclipse/kapua/client/gateway/kura/KuraBirthCertificateModule.java b/.../kura/src/main/java/org/eclipse/kapua/client/gateway/kura/KuraBirthCertificateModule.java
@@ -12,6 +12,14 @@
  *******************************************************************************/
 package org.eclipse.kapua.client.gateway.kura;
 
+import org.eclipse.kapua.client.gateway.kura.internal.Metrics;
+import org.eclipse.kapua.client.gateway.kura.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.client.gateway.mqtt.MqttModuleContext;
+import org.eclipse.kapua.client.gateway.spi.Module;
+import org.eclipse.kapua.client.gateway.spi.ModuleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Collections;
@@ -23,14 +31,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.eclipse.kapua.client.gateway.kura.internal.Metrics;
-import org.eclipse.kapua.client.gateway.mqtt.MqttModuleContext;
-import org.eclipse.kapua.client.gateway.spi.Module;
-import org.eclipse.kapua.client.gateway.spi.ModuleContext;
-import org.eclipse.kapua.gateway.client.kura.payload.KuraPayloadProto.KuraPayload;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class KuraBirthCertificateModule implements Module {
 
     private static final Logger logger = LoggerFactory.getLogger(KuraBirthCertificateModule.class);

diff --git a/...ay/profile/kura/src/main/java/org/eclipse/kapua/client/gateway/kura/internal/Metrics.java b/...ay/profile/kura/src/main/java/org/eclipse/kapua/client/gateway/kura/internal/Metrics.java
@@ -12,18 +12,17 @@
  *******************************************************************************/
 package org.eclipse.kapua.client.gateway.kura.internal;
 
+import com.google.protobuf.ByteString;
+import org.eclipse.kapua.client.gateway.kura.proto.KuraPayloadProto.KuraPayload;
+import org.eclipse.kapua.client.gateway.kura.proto.KuraPayloadProto.KuraPayload.KuraMetric;
+import org.eclipse.kapua.client.gateway.kura.proto.KuraPayloadProto.KuraPayload.KuraMetric.ValueType;
+
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import org.eclipse.kapua.gateway.client.kura.payload.KuraPayloadProto.KuraPayload;
-import org.eclipse.kapua.gateway.client.kura.payload.KuraPayloadProto.KuraPayload.KuraMetric;
-import org.eclipse.kapua.gateway.client.kura.payload.KuraPayloadProto.KuraPayload.KuraMetric.ValueType;
-
-import com.google.protobuf.ByteString;
-
 public final class Metrics {
 
     private Metrics() {