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.

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

Split up command router modules #3623

Merged
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e214996
Split client-device-connection-infinispan module into client-device-c…
StFS Apr 3, 2024
d29a8a1
Move common classes from client-device-connection-infinispan module i…
StFS Apr 3, 2024
8766a49
Split services/command-router module into services/command-router-bas…
StFS Apr 3, 2024
b7c79c6
Merge remote-tracking branch 'origin/master' into split_command_route…
StFS Apr 9, 2024
1f24cc2
Merge remote-tracking branch 'upstream/master' into split_command_rou…
StFS Apr 11, 2024
86eec84
Merge branch 'split_command_router_modules' of github.com:controlant-…
StFS Apr 11, 2024
e20bbb8
Remove upper boundary of copyright timespan in all touched files as p…
StFS Apr 11, 2024
e3f7fe2
Minor whitespace formatting and cleanup as per PR comments
StFS Apr 11, 2024
86241c2
Minor whitespace formatting and cleanup as per PR comments
StFS Apr 11, 2024
e04bada
whitespace fixes to reduce diff clutter
StFS Apr 15, 2024
331053d
reorder pom.xml to minimize changes in PR
StFS Apr 16, 2024
569898d
final changes to pom.xml for PR
StFS Apr 16, 2024
43c3539
silly whitespace changes
StFS Apr 16, 2024
f2ec9b1
Update copyright year
StFS Apr 16, 2024
3744a9c
Use correct name for native command router image in tests
StFS Apr 16, 2024
4726d6e
responding to PR comments
StFS Apr 17, 2024
2cd72e9
Tag command-server image with it's legacy name and push to maintain b…
StFS Apr 17, 2024
9eb22f7
Merge remote-tracking branch 'origin/master' into split_command_route…
StFS Apr 29, 2024
37da591
Attempt to make push_hono_images.sh script a bit clearer
StFS Apr 29, 2024
6708624
Update push_hono_images.sh
StFS Apr 30, 2024
5702e40
Update push_hono_images.sh
StFS Apr 30, 2024
b0a3fd6
Responding to PR comments
StFS Apr 30, 2024
a969467
Shortening lines
StFS Apr 30, 2024
47459fa
Exiting the script in case of failure tagging images
StFS Apr 30, 2024
fb643ab
Split script into two phases, ensuring all images exist in one phase …
StFS Apr 30, 2024
cbdba7b
Merge branch 'eclipse-hono:master' into split_command_router_modules
StFS May 6, 2024
d114bfe
Change quarkus dependency in client-device-connection-infinispan modu…
StFS May 6, 2024
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
9 changes: 7 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2016, 2023 Contributors to the Eclipse Foundation
Copyright (c) 2016 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.
Expand Down Expand Up @@ -427,7 +427,12 @@ quarkus.vertx.max-event-loop-execute-time=${max.event-loop.execute-time:20000}
</dependency>
<dependency>
<groupId>org.eclipse.hono</groupId>
<artifactId>hono-service-command-router</artifactId>
<artifactId>hono-service-command-router-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.hono</groupId>
<artifactId>client-device-connection-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
159 changes: 159 additions & 0 deletions client-device-connection-base/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0

SPDX-License-Identifier: EPL-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.hono</groupId>
<artifactId>hono-bom</artifactId>
<version>2.6.0-SNAPSHOT</version>
<relativePath>../bom</relativePath>
</parent>
<artifactId>client-device-connection-base</artifactId>

<name>Device Connection client</name>
<description>Base classes for client for accessing device connection information in a remote cache / data grid.</description>

<dependencies>
<dependency>
<groupId>org.eclipse.hono</groupId>
<artifactId>hono-legal</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.hono</groupId>
<artifactId>hono-core</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.hono</groupId>
<artifactId>hono-client-common</artifactId>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config-core</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-health-check</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core</artifactId>
<optional>true</optional>
StFS marked this conversation as resolved.
Show resolved Hide resolved
<exclusions>
<exclusion>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager-embedded</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-development-mode-spi</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-runner</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logmanager</artifactId>
</exclusion>
<exclusion>
<groupId>org.graalvm.sdk</groupId>
<artifactId>graal-sdk</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-fs-util</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- testing -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.hono</groupId>
<artifactId>core-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import java.util.Collection;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import java.util.Map;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2020, 2023 Contributors to the Eclipse Foundation
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import java.net.HttpURLConnection;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import com.google.common.base.MoreObjects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import org.eclipse.hono.util.CommandRouterConstants;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2020, 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import java.time.Duration;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import io.opentracing.Span;
import io.vertx.core.Future;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/


package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import java.util.Collection;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand All @@ -11,7 +11,7 @@
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.infinispan.client;
package org.eclipse.hono.deviceconnection.common;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* Copyright (c) 2024 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/

package org.eclipse.hono.deviceconnection.common;

import static com.google.common.truth.Truth.assertThat;

import org.eclipse.hono.test.ConfigMappingSupport;
import org.junit.jupiter.api.Test;

/**
* Tests verifying binding of configuration properties to {@link CommonCacheConfig}.
*
*/
public class CommonCacheQuarkusPropertyBindingTest {

@Test
void testCommonCacheConfigurationPropertiesArePickedUp() {
final var commonCacheConfig = new CommonCacheConfig(
ConfigMappingSupport.getConfigMapping(
CommonCacheOptions.class,
this.getClass().getResource("/common-cache-options.yaml")));

assertThat(commonCacheConfig.getCacheName()).isEqualTo("the-cache");
assertThat(commonCacheConfig.getCheckKey()).isEqualTo("the-key");
assertThat(commonCacheConfig.getCheckValue()).isEqualTo("the-value");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2024 Contributors to the Eclipse Foundation

See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0

SPDX-License-Identifier: EPL-2.0
-->

<!DOCTYPE configuration>

<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT" />
</root>

<logger name="org.eclipse.hono.client" level="INFO"/>
<logger name="org.eclipse.hono.config" level="INFO"/>
<logger name="org.eclipse.hono.connection" level="INFO"/>
<logger name="org.eclipse.hono.util" level="INFO"/>
StFS marked this conversation as resolved.
Show resolved Hide resolved

</configuration>
Loading
Loading