Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature provide compiled version of protobuf payload #3801

Merged
merged 3 commits into from
Jul 19, 2023
Merged

Feature provide compiled version of protobuf payload #3801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b168a05
feature(protobuf): Include compiled protobuf payload
MDeLuise Jun 29, 2023
32db2f4
feature(protobuf): Include compiled protobuf payload in client module
MDeLuise Jun 29, 2023
8613eea
feature(protobuf): Include compiled protobuf payload in simulator kur…
MDeLuise Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build-tools/src/main/resources/checkstyle/kapua.suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
23 changes: 0 additions & 23 deletions client/gateway/profile/kura/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,35 +95,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>
<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>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>org.eclipse.kapua.gateway.client.kura.payload</excludePackageNames>
</configuration>
</plugin>

</plugins>
</build>

Expand Down
14 changes: 7 additions & 7 deletions ...file/kura/src/main/java/org/eclipse/kapua/client/gateway/kura/KuraBinaryPayloadCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
16 changes: 8 additions & 8 deletions .../kura/src/main/java/org/eclipse/kapua/client/gateway/kura/KuraBirthCertificateModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
11 changes: 5 additions & 6 deletions ...ay/profile/kura/src/main/java/org/eclipse/kapua/client/gateway/kura/internal/Metrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading