currentFuture = null;
- for (HealthCheck check : checks) {
- try {
- if (onStartConsumer != null) {
- onStartConsumer.accept(check);
- }
- currentFuture = executorService.submit(() -> {
+ /**
+ * Creates a completable future for the given health check.
+ *
+ * The returned future is guaranteed to complete within the timeout given in the context instance. Listener
+ * callbacks have been called before the future completes.
+ */
+ private CompletionStage> completionStage(HealthCheck check, Context context, ProgressListener listener) {
+ return FutureUtils.completionStageWithDefaultOnTimeout(
+ () -> {
try {
- final Response response = check.perform(context);
- if (response == null) {
- return new Response(Status.Unknown);
+ if (listener != null) {
+ listener.onPerform(check);
}
- return response;
- } catch (Exception ex) {
- // Log the stack trace
- LOG.warn("Health check {} failed with exception: {}", check, ex.getMessage(), ex);
- return new Response(ex);
+ var response = check.perform(context);
+ return response != null ? response : Response.UNKNOWN;
+ } catch (Throwable t) {
+ return new Response(t);
}
- });
- final Response response = currentFuture.get(context.getTimeout(), TimeUnit.MILLISECONDS);
- if (onFinishConsumer != null) {
- onFinishConsumer.accept(check, response);
- }
- } catch (TimeoutException timeoutException) {
- if (currentFuture != null) {
- currentFuture.cancel(true);
- }
- onFinishConsumer.accept(check, new Response(Status.Timeout, "Health Check did not finish within " + context.getTimeout() + " ms"));
- } catch (Exception ex) {
- if (currentFuture != null) {
- currentFuture.cancel(true);
- }
- onFinishConsumer.accept(check, new Response(ex));
+ },
+ Duration.ofMillis(context.getTimeout()),
+ () -> new Response(Status.Timeout, "Health Check did not finish within " + context.getTimeout() + " ms"),
+ executorService
+ ).thenApply(response -> {
+ if (listener != null) {
+ listener.onResponse(check, response);
}
- }
+ return Pair.of(check, response);
+ });
+ }
+
+ // Asynchronously run all checks
+ private CompletionStage runChecks(Context context, List checks, ProgressListener listener) {
+ return FutureUtils.traverse(checks, check -> completionStage(check, context, listener)).thenApply(list -> {
+ var health = new Health(list);
+ if (listener != null) {
+ listener.onAllHealthChecksCompleted(health);
+ }
+ return health;
+ });
}
}
diff --git a/core/health/impl/src/test/java/org/opennms/core/health/impl/DefaultHealthCheckServiceTest.java b/core/health/impl/src/test/java/org/opennms/core/health/impl/DefaultHealthCheckServiceTest.java
index f17dec1ea714..e342ed3df6f8 100644
--- a/core/health/impl/src/test/java/org/opennms/core/health/impl/DefaultHealthCheckServiceTest.java
+++ b/core/health/impl/src/test/java/org/opennms/core/health/impl/DefaultHealthCheckServiceTest.java
@@ -33,7 +33,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -47,10 +46,11 @@
import org.opennms.core.health.api.Context;
import org.opennms.core.health.api.Health;
import org.opennms.core.health.api.HealthCheck;
+import org.opennms.core.health.api.HealthCheckConstants;
+import org.opennms.core.health.api.HealthCheckService;
import org.opennms.core.health.api.Response;
import org.opennms.core.health.api.SimpleHealthCheck;
import org.opennms.core.health.api.Status;
-import org.opennms.core.health.api.HealthCheckConstants;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.slf4j.Logger;
@@ -125,12 +125,21 @@ protected List getHealthChecks() {
context.setTimeout(1000); // ms
for (int i=0; i<2; i++) {
- final CompletableFuture future = healthCheckService
+ var eitherErrorOrFuture = healthCheckService
.performAsyncHealthCheck(context,
- healthCheck -> LOG.info("Executing: {}", healthCheck.getDescription()),
- (healthCheck, response) -> LOG.info("=> {} : {}", response.getStatus().name(), response.getMessage()),
+ new HealthCheckService.ProgressListener() {
+ @Override
+ public void onPerform(HealthCheck healthCheck) {
+ LOG.info("Executing: {}", healthCheck.getDescription());
+ }
+
+ @Override
+ public void onResponse(HealthCheck check, Response response) {
+ LOG.info("=> {} : {}", response.getStatus().name(), response.getMessage());
+ }
+ },
null);
- final Health health = future.get();
+ final Health health = eitherErrorOrFuture.get().toCompletableFuture().get();
final List timedOutResponsed = health.getResponses().stream().map(Pair::getRight).filter(r -> r.getStatus() == Status.Timeout).collect(Collectors.toList());
Assert.assertThat(timedOutResponsed.size(), is(1));
}
diff --git a/core/health/pom.xml b/core/health/pom.xml
index 0498f5e8f6fa..38e998349399 100644
--- a/core/health/pom.xml
+++ b/core/health/pom.xml
@@ -4,7 +4,7 @@
org.opennms
org.opennms.core
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core
diff --git a/core/health/rest/pom.xml b/core/health/rest/pom.xml
index 80cee519c288..51d1064f121d 100644
--- a/core/health/rest/pom.xml
+++ b/core/health/rest/pom.xml
@@ -4,7 +4,7 @@
org.opennms.core
org.opennms.core.health
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.health
diff --git a/core/health/rest/src/main/java/org/opennms/core/health/rest/HealthCheckRestService.java b/core/health/rest/src/main/java/org/opennms/core/health/rest/HealthCheckRestService.java
index dce858b012d4..251f165df3e3 100644
--- a/core/health/rest/src/main/java/org/opennms/core/health/rest/HealthCheckRestService.java
+++ b/core/health/rest/src/main/java/org/opennms/core/health/rest/HealthCheckRestService.java
@@ -44,9 +44,9 @@ public interface HealthCheckRestService {
@GET
@Path("probe")
@Produces(MediaType.TEXT_PLAIN)
- Response probeHealth(@QueryParam("t") @DefaultValue("5000") int timeoutInMs, @QueryParam("maxAgeMs") @DefaultValue("0") int maxAgeMs, @Context final UriInfo uriInfo);
+ Response probeHealth(@QueryParam("t") @DefaultValue("5000") int timeoutInMs, @QueryParam("maxAgeMs") @DefaultValue("90000") int maxAgeMs, @Context final UriInfo uriInfo);
@GET
@Produces(MediaType.APPLICATION_JSON)
- Response getHealth(@QueryParam("t") @DefaultValue("5000") int timeoutInMs, @QueryParam("maxAgeMs") @DefaultValue("0") int maxAgeMs, @Context final UriInfo uriInfo);
+ Response getHealth(@QueryParam("t") @DefaultValue("5000") int timeoutInMs, @QueryParam("maxAgeMs") @DefaultValue("90000") int maxAgeMs, @Context final UriInfo uriInfo);
}
diff --git a/core/health/rest/src/main/java/org/opennms/core/health/rest/internal/HealthCheckRestServiceImpl.java b/core/health/rest/src/main/java/org/opennms/core/health/rest/internal/HealthCheckRestServiceImpl.java
index 014fc8763232..f2d3546e5e41 100644
--- a/core/health/rest/src/main/java/org/opennms/core/health/rest/internal/HealthCheckRestServiceImpl.java
+++ b/core/health/rest/src/main/java/org/opennms/core/health/rest/internal/HealthCheckRestServiceImpl.java
@@ -29,17 +29,14 @@
package org.opennms.core.health.rest.internal;
import java.time.Duration;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicReference;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.apache.commons.lang3.tuple.Pair;
import org.json.JSONArray;
import org.json.JSONObject;
import org.opennms.core.health.api.Context;
@@ -47,6 +44,8 @@
import org.opennms.core.health.api.HealthCheckService;
import org.opennms.core.health.rest.HealthCheckRestService;
+import io.vavr.control.Either;
+
public class HealthCheckRestServiceImpl implements HealthCheckRestService {
private static final String SUCCESS_MESSAGE = "Everything is awesome";
@@ -61,8 +60,11 @@ public HealthCheckRestServiceImpl(final HealthCheckService healthCheckService) {
@Override
public Response probeHealth(int timeoutInMs, int maxAgeMs, UriInfo uriInfo) {
List tags = uriInfo.getQueryParameters().get("tag");
- final Health health = getHealthInternally(timeoutInMs, maxAgeMs, tags);
- if (health.isSuccess()) {
+ var isSuccess = getHealthInternally(timeoutInMs, maxAgeMs, tags).fold(
+ errorMessage -> false,
+ health -> health.isSuccess()
+ );
+ if (isSuccess) {
return Response.ok()
.header("Health", SUCCESS_MESSAGE)
.entity(SUCCESS_MESSAGE)
@@ -75,46 +77,52 @@ public Response probeHealth(int timeoutInMs, int maxAgeMs, UriInfo uriInfo) {
}
@Override
- public Response getHealth(int timeoutInMs, int maxAgeMs, UriInfo uriInfo){
+ public Response getHealth(int timeoutInMs, int maxAgeMs, UriInfo uriInfo) {
List tags = uriInfo.getQueryParameters().get("tag");
- final Health health = getHealthInternally(timeoutInMs, maxAgeMs, tags);
-
- // Create response object
- final JSONArray jsonResponseArray = new JSONArray();
- for (var pair : health.getResponses()) {
- final JSONObject eachJsonResponse = new JSONObject();
- eachJsonResponse.put("status", pair.getRight().getStatus().name());
- eachJsonResponse.put("description", pair.getLeft().getDescription());
- eachJsonResponse.put("message", pair.getRight().getMessage());
- jsonResponseArray.put(eachJsonResponse);
- }
- final JSONObject jsonHealth = new JSONObject();
- jsonHealth.put("healthy", health.isSuccess());
- jsonHealth.put("errorMessage", health.getErrorMessage());
- jsonHealth.put("responses", jsonResponseArray);
+ var flagAndResponse = getHealthInternally(timeoutInMs, maxAgeMs, tags).fold(
+ errorMessage -> {
+ final JSONObject jsonHealth = new JSONObject();
+ final JSONArray jsonResponseArray = new JSONArray();
+ jsonHealth.put("healthy", false);
+ jsonHealth.put("errorMessage", errorMessage);
+ jsonHealth.put("responses", jsonResponseArray);
+ return Pair.of(false, jsonHealth);
+ },
+ health -> {
+ final JSONObject jsonHealth = new JSONObject();
+ final JSONArray jsonResponseArray = new JSONArray();
+ jsonHealth.put("healthy", health.isSuccess());
+ jsonHealth.put("errorMessage", (String) null);
+ jsonHealth.put("responses", jsonResponseArray);
+ for (var pair : health.getResponses()) {
+ final JSONObject eachJsonResponse = new JSONObject();
+ eachJsonResponse.put("status", pair.getRight().getStatus().name());
+ eachJsonResponse.put("description", pair.getLeft().getDescription());
+ eachJsonResponse.put("message", pair.getRight().getMessage());
+ jsonResponseArray.put(eachJsonResponse);
+ }
+ return Pair.of(health.isSuccess(), jsonHealth);
+ }
+ );
// Return response
return Response.ok()
- .header("Health", health.isSuccess() ? SUCCESS_MESSAGE : ERROR_MESSAGE)
- .entity(jsonHealth.toString())
+ .header("Health", flagAndResponse.getLeft() ? SUCCESS_MESSAGE : ERROR_MESSAGE)
+ .entity(flagAndResponse.getRight().toString())
.build();
}
- private Health getHealthInternally(int timeoutInMs, int maxAgeMs, List tags){
- try {
- final Context context = new Context();
- context.setTimeout(timeoutInMs);
- context.setMaxAge(Duration.ofMillis(maxAgeMs));
- final CompletableFuture future = healthCheckService.performAsyncHealthCheck(
- context,
- healthCheck -> {},
- (healthCheck, response) -> {},
- tags
- );
- return future.get();
- } catch (InterruptedException | ExecutionException e) {
- throw new RuntimeException(e);
- }
+ private Either getHealthInternally(int timeoutInMs, int maxAgeMs, List tags) {
+ final Context context = new Context();
+ context.setTimeout(timeoutInMs);
+ context.setMaxAge(Duration.ofMillis(maxAgeMs));
+ return healthCheckService.performAsyncHealthCheck(context, null, tags).map(f -> {
+ try {
+ return f.toCompletableFuture().get();
+ } catch (InterruptedException | ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ });
}
}
diff --git a/core/health/shell/pom.xml b/core/health/shell/pom.xml
index 56227c614e9f..866e2a8a23b4 100644
--- a/core/health/shell/pom.xml
+++ b/core/health/shell/pom.xml
@@ -4,7 +4,7 @@
org.opennms.core
org.opennms.core.health
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.health
@@ -47,7 +47,7 @@
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckCommand.java b/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckCommand.java
index 2b68b37de941..e4ba84872559 100644
--- a/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckCommand.java
+++ b/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckCommand.java
@@ -30,11 +30,12 @@
import java.time.Duration;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Comparator;
+import java.util.IdentityHashMap;
import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
import org.apache.karaf.shell.api.action.Action;
import org.apache.karaf.shell.api.action.Command;
@@ -45,15 +46,22 @@
import org.opennms.core.health.api.Health;
import org.opennms.core.health.api.HealthCheck;
import org.opennms.core.health.api.HealthCheckService;
+import org.opennms.core.health.api.Response;
import org.opennms.core.health.api.Status;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
@Command(scope = "opennms", name = "health-check", description="Verifies that the container is healthy.")
@Service
public class HealthCheckCommand implements Action {
+ public static final String SUCCESS_MESSAGE = "=> Everything is awesome";
+ public static final String FAILURE_MESSAGE = "=> Oh no, something is wrong";
+
+ public static boolean isEndMessage(String s) {
+ // a newline is appended to the string -> do a startsWith check
+ return s.startsWith(SUCCESS_MESSAGE) || s.startsWith(FAILURE_MESSAGE);
+ }
+
private static final String DESCRIPTION_FORMAT = "%%-%ds ";
private static final String STATUS_FORMAT = "[ %%-%ds ]";
@@ -79,48 +87,28 @@ public Object execute() throws Exception {
final Context context = new Context();
context.setTimeout(timeout);
context.setMaxAge(Duration.ofMillis(maxAgeMs));
- final CompletableFuture future = performHealthCheck(bundleContext, context);
- final Health health = future.get();
- // Print results
- System.out.println();
- if (health.isSuccess()) {
- System.out.println("=> Everything is awesome");
- } else {
- if (health.getErrorMessage() != null) {
- System.out.println(Colorizer.colorize("Error: " + health.getErrorMessage(), Color.Red));
- }
- System.out.println("=> Oh no, something is wrong");
- }
- return null;
- }
+ final var listener = new Listener();
+
+ healthCheckService.performAsyncHealthCheck(context, listener, null).fold(
+ errorMessage -> {
+ System.out.println(Colorizer.colorize("Error: " + errorMessage, Color.Red));
+ System.out.println("=> Oh no, something is wrong");
+ return null;
+ },
+ completionStage -> {
+ // the concurrent execution of health checks is started
+ // -> the listener is informed about progress and creates corresponding ouput
+ // -> consume that output and print it to the console
+ String next;
+ while ((next = listener.read()) != null) {
+ System.out.print(next);
+ System.out.flush();
+ }
+ return null;
+ });
- private CompletableFuture performHealthCheck(BundleContext bundleContext, Context context) throws InvalidSyntaxException {
- // Determine attributes (e.g. max length) for visualization
- final Collection> serviceReferences = bundleContext.getServiceReferences(HealthCheck.class, null);
- final List healthChecks = serviceReferences.stream().map(s -> bundleContext.getService(s)).collect(Collectors.toList());
- final int maxColorLength = Arrays.stream(Color.values()).map(c -> c.toAnsi()).max(Comparator.comparingInt(String::length)).get().length();
- final int maxDescriptionLength = healthChecks.stream().map(check -> check.getDescription()).max(Comparator.comparingInt(String::length)).orElse("").length();
- final int maxStatusLength = Arrays.stream(Status.values()).map(v -> v.name()).max(Comparator.comparingInt(String::length)).get().length() + maxColorLength + "\033[m".length() * 2 + Color.NoColor.toAnsi().length();
- final String descFormat = String.format(DESCRIPTION_FORMAT, maxDescriptionLength);
- final String statusFormat = String.format(STATUS_FORMAT, maxStatusLength);
-
- // Run Health Checks
- final CompletableFuture future = healthCheckService
- .performAsyncHealthCheck(context,
- healthCheck -> System.out.print(String.format(descFormat, healthCheck.getDescription())),
- (healthCheck, response) -> {
- final Status status = response.getStatus();
- final Color statusColor = determineColor(status);
- final String statusText = String.format(statusFormat, Colorizer.colorize(status.name(), statusColor));
- System.out.print(statusText);
- if (response.getMessage() != null) {
- System.out.print(" => " + response.getMessage());
- }
- System.out.println();
- },
- null);
- return future;
+ return null;
}
private static Color determineColor(Status status) {
@@ -133,4 +121,95 @@ private static Color determineColor(Status status) {
default: return Color.NoColor;
}
}
+
+ /**
+ * Listens for progress during the health check executions.
+ *
+ * The listener must not output to the console directly when its callbacks are called. There is some multiplexing
+ * logic that takes care that System.out is multiplexed to the Karaf shell session that invoked a command.
+ * When a callback is called the listener just stores a corresponding messages in its {@code out} queue.
+ * That queue is consumed by the thread that called the command. The final success or failure messages are
+ * used like a poison pill to indicate the end of messages.
+ */
+ private static class Listener implements HealthCheckService.ProgressListener {
+
+ private List checks;
+ private String descFormat, statusFormat;
+ private final Map responses = new IdentityHashMap<>();
+ private final BlockingQueue out = new LinkedBlockingQueue<>();
+ private boolean completed = false;
+
+ private void print(String string) {
+ out.add(string);
+ }
+
+ private void println() {
+ print("\n");
+ }
+
+ private void println(String string) {
+ print(string + "\n");
+ }
+
+ @Override
+ public synchronized void onHealthChecksFound(List healthChecks) {
+ this.checks = healthChecks;
+ final int maxColorLength = Arrays.stream(Color.values()).map(c -> c.toAnsi()).max(Comparator.comparingInt(String::length)).get().length();
+ final int maxDescriptionLength = healthChecks.stream().map(check -> check.getDescription()).max(Comparator.comparingInt(String::length)).orElse("").length();
+ final int maxStatusLength = Arrays.stream(Status.values()).map(v -> v.name()).max(Comparator.comparingInt(String::length)).get().length() + maxColorLength + "\033[m".length() * 2 + Color.NoColor.toAnsi().length();
+ descFormat = String.format(DESCRIPTION_FORMAT, maxDescriptionLength);
+ statusFormat = String.format(STATUS_FORMAT, maxStatusLength);
+ printCurrentExecutionState();
+ }
+
+ @Override
+ public synchronized void onResponse(HealthCheck check, Response response) {
+ responses.put(check, response);
+ print(String.format("\033[%dA", checks.size())); // move cursor up
+ printCurrentExecutionState();
+ }
+
+ @Override
+ public synchronized void onAllHealthChecksCompleted(Health health) {
+ println();
+ if (health.isSuccess()) {
+ println(SUCCESS_MESSAGE);
+ } else {
+ println(FAILURE_MESSAGE);
+ }
+ }
+
+ private void printCurrentExecutionState() {
+ for (var healthCheck : checks) {
+ String str;
+ str = String.format(descFormat, healthCheck.getDescription());
+ var response = responses.get(healthCheck);
+ if (response != null) {
+ final Status status = response.getStatus();
+ final Color statusColor = determineColor(status);
+ final String statusText = String.format(statusFormat, Colorizer.colorize(status.name(), statusColor));
+ str = str + statusText;
+ if (response.getMessage() != null) {
+ str = str + " => " + response.getMessage();
+ }
+ } else {
+ str = str + "[ ]";
+ }
+ println(str);
+ }
+ }
+
+ public String read() {
+ if (completed) {
+ return null;
+ }
+ try {
+ var string = out.take();
+ completed = isEndMessage(string);
+ return string;
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
diff --git a/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckTagCompleter.java b/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckTagCompleter.java
new file mode 100644
index 000000000000..5f8adcd7e722
--- /dev/null
+++ b/core/health/shell/src/main/java/org/opennms/core/health/shell/HealthCheckTagCompleter.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2018-2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.health.shell;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.karaf.shell.api.action.lifecycle.Reference;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.console.CommandLine;
+import org.apache.karaf.shell.api.console.Completer;
+import org.apache.karaf.shell.api.console.Session;
+import org.apache.karaf.shell.support.completers.StringsCompleter;
+import org.opennms.core.health.api.HealthCheck;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+
+@Service
+public class HealthCheckTagCompleter implements Completer {
+
+ @Reference
+ private BundleContext bundleContext;
+
+ @Override
+ public int complete(Session session, CommandLine commandLine, List candidates) {
+ try {
+ var tags = bundleContext
+ .getServiceReferences(HealthCheck.class, null)
+ .stream()
+ .flatMap(s -> bundleContext.getService(s).getTags().stream())
+ .collect(Collectors.toSet());
+ StringsCompleter delegate = new StringsCompleter();
+ delegate.getStrings().addAll(tags);
+ return delegate.complete(session, commandLine, candidates);
+ } catch (InvalidSyntaxException e) {
+ throw new RuntimeException("could not retrieve tags", e);
+ }
+ }
+
+}
diff --git a/core/icmp-jna/pom.xml b/core/icmp-jna/pom.xml
index 1b4a6e741391..89d2fe9bd18e 100644
--- a/core/icmp-jna/pom.xml
+++ b/core/icmp-jna/pom.xml
@@ -3,7 +3,7 @@
org.opennms
org.opennms.core
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core
@@ -62,7 +62,7 @@
true
opennms-repo
OpenNMS Repository
- http://maven.opennms.org/content/groups/opennms.org-release
+ https://maven.opennms.org/content/groups/opennms.org-release
diff --git a/core/ipc/common/aws-sqs/pom.xml b/core/ipc/common/aws-sqs/pom.xml
deleted file mode 100644
index 0344e27d1ae5..000000000000
--- a/core/ipc/common/aws-sqs/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
- org.opennms.core.ipc
- org.opennms.core.ipc.common
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.common
- org.opennms.core.ipc.common.aws-sqs
- OpenNMS :: Core :: IPC :: Common :: Amazon SQS
- bundle
-
- true
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
- JavaSE-1.8
- ${project.artifactId}
- ${project.version}
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- test-jar
-
-
-
-
-
-
-
-
- com.google.guava
- guava
-
-
- org.opennms.core
- org.opennms.core.logging
-
-
- org.opennms.dependencies
- aws-dependencies
- pom
-
-
- org.opennms.core
- org.opennms.core.lib
-
-
- org.osgi
- org.osgi.compendium
- provided
-
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-library
- test
-
-
- org.mockito
- mockito-core
- test
-
-
-
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSConfig.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSConfig.java
deleted file mode 100644
index 98c8a7ef5a59..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSConfig.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import com.amazonaws.regions.Regions;
-
-/**
- * Encapsulates all the SQS related bits that can be configured.
- */
-public interface AmazonSQSConfig {
-
- /**
- * Prefix to be added to all queues.
- *
- * This can be used to differentiate between OpenNMS deployments in a single region.
- *
- * @return the prefix, or null if no prefix should be used.
- */
- String getQueuePrefix();
-
- /**
- * AWS region to use.
- *
- * @return the region, or null if the default region should be used.
- */
- Regions getRegion();
-
- /**
- * AWS access key.
- *
- * @return the key, or null if the client should be initialized without static credentials.
- */
- String getAccessKey();
-
- /**
- * AWS secret key.
- *
- * @return the key, or null if the client should be initialized without static credentials.
- */
- String getSecretKey();
-
- /**
- * Convenience method that returns true if both an access key and secret key have been set.
- *
- * @return true if both an access key and secret key have been set, false otherwise.
- */
- boolean hasStaticCredentials();
-
- /**
- * Used to force the SQS client to use HTTP instead of HTTPS.
- *
- * This can be used for testing, making it easier to intercept the messages sent over the wire.
- *
- * @return true if HTTP should be used insetad of HTTPS, false otherwise.
- */
- boolean isUseHttp();
-
- /**
- * Retrieves the queue configuration for queues used by the Sink API.
- *
- * @return the queue configuration
- */
- AmazonSQSQueueConfig getSinkQueueConfig();
-
- /**
- * Retrieves the queue configuration for queues used by the RPC API.
- *
- * @return the queue configuration
- */
- AmazonSQSQueueConfig getRpcQueueConfig();
-
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSConstants.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSConstants.java
deleted file mode 100644
index 191ffb2ef510..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSConstants.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-/**
- * The Interface AmazonSQSConstants.
- *
- * @author Alejandro Galue
- */
-public interface AmazonSQSConstants {
-
- final String AWS_CONFIG_PID = "org.opennms.core.ipc.aws.sqs";
-
- final String AWS_CONFIG_SYS_PROP_PREFIX = AWS_CONFIG_PID + ".";
-
- final String SINK_QUEUE_PROP_PREFIX = "sink.";
-
- final String RPC_QUEUE_PROP_PREFIX = "rpc.";
-
- final String AWS_REGION = "aws_region";
-
- final String AWS_ACCESS_KEY_ID = "aws_access_key_id";
-
- final String AWS_SECRET_ACCESS_KEY = "aws_secret_access_key";
-
- final String AWS_QUEUE_NAME_PREFIX = "aws_queue_name_prefix";
-
- final String AWS_USE_HTTP = "aws_use_http";
-
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSManager.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSManager.java
deleted file mode 100644
index 8b776a57bcc5..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSManager.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import com.amazon.sqs.javamessaging.SQSConnectionFactory;
-import com.amazonaws.services.sqs.AmazonSQS;
-
-public interface AmazonSQSManager {
-
- /**
- * Retrieve the underlying SQS client.
- *
- * @return the sqs client
- */
- AmazonSQS getSQSClient();
-
- /**
- * Retrieve a connection factory that wraps the
- * SQS client as a JMS provider.
- *
- * @return the JMS connection factory
- */
- SQSConnectionFactory getSQSConnectionFactory();
-
- /**
- * Retrieve the queue URL for the given Sink Module
- * and create the queue if it does not already exist.
- *
- * This is a blocking operation. If AWS is unreachable,
- * the method will keep retrying indefinitely until the queue is
- * created and the queue URL is determined, or the thread is interrupted.
- *
- * This function may cache the queue URL, avoiding unecesssary
- * API calls.
- *
- * @param moduleId the ID of the Sink Module
- * @return the queue URL
- */
- String getSinkQueueUrlAndCreateIfNecessary(String moduleId) throws InterruptedException;
-
- /**
- * Retrieve the queue name to use for RPC request targetting
- * a specific RPC Module and location. Also create the queue if
- * it does not already exist.
- *
- * This function may cache the queue URL, avoiding unecesssary
- * API calls.
- *
- * @param moduleId the ID of the RPC Module
- * @param location the targetted location of the request
- * @return the queue name
- * @throws AmazonSQSQueueException if some error occured creating the queue or determining the URL
- */
- String getRpcRequestQueueNameAndCreateIfNecessary(String moduleId, String location) throws AmazonSQSQueueException;
-
- /**
- * Retrieve the queue name to use for RPC replies from a
- * specific RPC Module and location. Also create the queue if
- * it does not already exist.
- *
- * This function may cache the queue URL, avoiding unecesssary
- * API calls.
- *
- * @param moduleId the ID of the RPC Module
- * @param location the source location of the reply
- * @return the queue name
- * @throws AmazonSQSQueueException if some error occured creating the queue or determining the URL
- */
- String getRpcReplyQueueNameAndCreateIfNecessary(String moduleId, String location) throws AmazonSQSQueueException;
-
- /**
- * Send message.
- *
- * This is a blocking operation. If AWS is unreachable,
- * the method will keep retrying indefinitely until the message is delivered
- * or the thread is interrupted.
- *
- * @param queueUrl the queue URL
- * @param body the message body
- * @return the message ID
- */
- String sendMessage(String queueUrl, String body) throws InterruptedException;
-
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueAttributes.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueAttributes.java
deleted file mode 100644
index b4cd8fae8717..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueAttributes.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import java.io.Serializable;
-
-/**
- * An Enumeration for the SQS Queue Attributes.
- */
-public enum AmazonSQSQueueAttributes implements Serializable {
-
- /** The Delay seconds. */
- DelaySeconds,
-
- /** The Maximum message size. */
- MaximumMessageSize,
-
- /** The Message retention period. */
- MessageRetentionPeriod,
-
- /** The Receive message wait time seconds. */
- ReceiveMessageWaitTimeSeconds,
-
- /** The Visibility timeout. */
- VisibilityTimeout,
-
- /** The FIFO queue. */
- FifoQueue,
-
- /** The Content based deduplication. */
- ContentBasedDeduplication,
-
- /** The Policy. */
- Policy,
-
- /** The Redrive policy. */
- RedrivePolicy,
-
- /** The KMS master key id. */
- KmsMasterKeyId,
-
- /** The KMS data key reuse period seconds. */
- KmsDataKeyReusePeriodSeconds
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueConfig.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueConfig.java
deleted file mode 100644
index 9d2dda776f41..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueConfig.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import com.google.common.collect.ImmutableMap;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class AmazonSQSQueueConfig {
-
- public static final ImmutableMap DEFAULT_QUEUE_ATTRIBUTES = new ImmutableMap.Builder()
- .put(AmazonSQSQueueAttributes.DelaySeconds.toString(), "0")
- .put(AmazonSQSQueueAttributes.MaximumMessageSize.toString(), "262144")
- .put(AmazonSQSQueueAttributes.MessageRetentionPeriod.toString(), "1209600")
- .put(AmazonSQSQueueAttributes.ReceiveMessageWaitTimeSeconds.toString(), "10")
- .put(AmazonSQSQueueAttributes.VisibilityTimeout.toString(), "30")
- .put(AmazonSQSQueueAttributes.FifoQueue.toString(), "false")
- .put(AmazonSQSQueueAttributes.ContentBasedDeduplication.toString(), "false")
- .build();
-
- private final Map attributes;
-
- public AmazonSQSQueueConfig(Map sqsConfig) {
- final Map attributes = new HashMap<>();
- for (AmazonSQSQueueAttributes attr : AmazonSQSQueueAttributes.values()) {
- // Retrieve the property, using the default if provided
- final String val = sqsConfig.getOrDefault(attr.toString(), DEFAULT_QUEUE_ATTRIBUTES.get(attr.toString()));
- if (val != null) {
- attributes.put(attr.toString(), val);
- }
- }
- if (!Boolean.parseBoolean(attributes.get(AmazonSQSQueueAttributes.FifoQueue.toString()))) {
- attributes.remove(AmazonSQSQueueAttributes.FifoQueue.toString());
- attributes.remove(AmazonSQSQueueAttributes.ContentBasedDeduplication.toString());
- }
- this.attributes = ImmutableMap.copyOf(attributes);
- }
-
- public Map getAttributes() {
- return attributes;
- }
-
- public boolean isFifoEnabled() {
- return Boolean.parseBoolean(attributes.get(AmazonSQSQueueAttributes.FifoQueue.toString()));
- }
-
- public boolean isFifoContentDedupEnabled() {
- return Boolean.parseBoolean(attributes.get(AmazonSQSQueueAttributes.ContentBasedDeduplication.toString()));
-
- }
-
- @Override
- public String toString() {
- return "AmazonSQSQueueConfig{" +
- "attributes=" + attributes +
- '}';
- }
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueException.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueException.java
deleted file mode 100644
index 8fd53a7fdf9c..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/AmazonSQSQueueException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-public class AmazonSQSQueueException extends Exception {
-
- public AmazonSQSQueueException(Throwable cause) {
- super(cause);
- }
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/DefaultAmazonSQSManager.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/DefaultAmazonSQSManager.java
deleted file mode 100644
index f629c3c98d82..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/DefaultAmazonSQSManager.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import com.amazon.sqs.javamessaging.ProviderConfiguration;
-import com.amazon.sqs.javamessaging.SQSConnectionFactory;
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.Protocol;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
-import com.amazonaws.services.sqs.model.CreateQueueRequest;
-import com.amazonaws.services.sqs.model.QueueNameExistsException;
-import com.amazonaws.services.sqs.model.SendMessageRequest;
-import com.amazonaws.services.sqs.model.SetQueueAttributesRequest;
-import com.google.common.base.Strings;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import org.opennms.core.utils.SystemInfoUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
-
-public class DefaultAmazonSQSManager implements AmazonSQSManager {
-
- private static final Logger LOG = LoggerFactory.getLogger(DefaultAmazonSQSManager.class);
-
- private final AmazonSQSConfig sqsConfig;
-
- /**
- * Creates the SQS client in the first get.
- */
- private final Supplier sqsClientSupplier = Suppliers.memoize(() -> createSQSClient());
-
- /**
- * Caches the RPC queue URL once created.
- */
- private LoadingCache rpcQueueUrlsByName = CacheBuilder.newBuilder()
- .maximumSize(1000)
- .build(new CacheLoader() {
- public String load(String queueName) {
- return ensureRpcQueueExists(queueName);
- }
- });
-
- /**
- * Caches the Sink queue URL once created.
- */
- private LoadingCache sinkQueueUrlsById = CacheBuilder.newBuilder()
- .maximumSize(1000)
- .build(new CacheLoader() {
- public String load(String moduleId) {
- final String queueName = getSinkQueueName(moduleId);
- return ensureSinkQueueExists(queueName);
- }
- });
-
- public DefaultAmazonSQSManager(AmazonSQSConfig sqsConfig) {
- this.sqsConfig = Objects.requireNonNull(sqsConfig);
- }
-
- @Override
- public String getSinkQueueUrlAndCreateIfNecessary(String moduleId) throws InterruptedException {
- while (true) {
- try {
- return sinkQueueUrlsById.get(moduleId);
- } catch (ExecutionException e) {
- if (isCause(UnknownHostException.class, e) || isCause(SocketException.class, e)) {
- LOG.warn("Cannot reach AWS while trying to retrieve the queue details for module {}, trying again in 5 seconds...", moduleId);
- Thread.sleep(5000);
- } else {
- throw new RuntimeException(e);
- }
- }
- }
- }
-
- @Override
- public String getRpcRequestQueueNameAndCreateIfNecessary(String moduleId, String location) throws AmazonSQSQueueException {
- final String rpcRequestQueueName = getRpcRequestQueueName(moduleId, location);
- try {
- rpcQueueUrlsByName.get(rpcRequestQueueName);
- return rpcRequestQueueName;
- } catch (ExecutionException e) {
- throw new AmazonSQSQueueException(e);
- }
- }
-
- @Override
- public String getRpcReplyQueueNameAndCreateIfNecessary(String moduleId, String location) throws AmazonSQSQueueException {
- final String rpcReplyQueueName = getRpcReplyQueueName(moduleId, location);
- try {
- rpcQueueUrlsByName.get(rpcReplyQueueName);
- return rpcReplyQueueName;
- } catch (ExecutionException e) {
- throw new AmazonSQSQueueException(e);
- }
- }
-
- @Override
- public AmazonSQS getSQSClient() {
- return sqsClientSupplier.get();
- }
-
- @Override
- public SQSConnectionFactory getSQSConnectionFactory() {
- return new SQSConnectionFactory(
- new ProviderConfiguration(),
- getSQSClient()
- );
- }
-
- @Override
- public String sendMessage(String queueUrl, String body) throws InterruptedException {
- final SendMessageRequest sendMessageRequest = new SendMessageRequest(queueUrl, body);
- if (sqsConfig.getSinkQueueConfig().isFifoEnabled()) {
- sendMessageRequest.setMessageGroupId(queueUrl);
- if (!sqsConfig.getSinkQueueConfig().isFifoContentDedupEnabled()) {
- sendMessageRequest.setMessageDeduplicationId(Long.toString(System.nanoTime()));
- }
- }
- while (true) {
- try {
- return getSQSClient().sendMessage(sendMessageRequest).getMessageId();
- } catch (RuntimeException ex) {
- if (isCause(UnknownHostException.class, ex) || isCause(SocketException.class, ex)) {
- LOG.warn("Cannot reach AWS at {} while trying to send a message, trying again in 5 seconds...", queueUrl);
- Thread.sleep(5000);
- } else {
- throw ex;
- }
- }
- }
- }
-
- private AmazonSQS createSQSClient() {
- final AmazonSQSClientBuilder builder = AmazonSQSClientBuilder.standard()
- .withRegion(sqsConfig.getRegion());
- if (sqsConfig.hasStaticCredentials()) {
- final BasicAWSCredentials awsCreds = new BasicAWSCredentials(sqsConfig.getAccessKey(), sqsConfig.getSecretKey());
- builder.withCredentials(new AWSStaticCredentialsProvider(awsCreds));
- }
- if (sqsConfig.isUseHttp()) {
- final ClientConfiguration clientConfig = new ClientConfiguration();
- clientConfig.setProtocol(Protocol.HTTP);
- builder.withClientConfiguration(clientConfig);
- }
- return builder.build();
- }
-
- private String getRpcRequestQueueName(String moduleId, String location) {
- String queueName = String.format("%s-%s-%s",
- SystemInfoUtils.getInstanceId(),
- moduleId,
- location);
- if (!Strings.isNullOrEmpty(sqsConfig.getQueuePrefix())) {
- queueName = String.format("%s-%s", sqsConfig.getQueuePrefix(), queueName);
- }
- return queueName;
- }
-
- private String getRpcReplyQueueName(String moduleId, String location) {
- return getRpcRequestQueueName(moduleId, location) + "-Reply";
- }
-
- protected String getSinkQueueName(String moduleId) {
- final String prefix = !Strings.isNullOrEmpty(sqsConfig.getQueuePrefix()) ? sqsConfig.getQueuePrefix() + "-" : "";
- final String suffix = sqsConfig.getSinkQueueConfig().isFifoEnabled() ? ".fifo" : "";
- return String.format("%s%s-%s-%s%s",
- prefix,
- SystemInfoUtils.getInstanceId(),
- "Sink",
- moduleId,
- suffix);
- }
-
- private String ensureRpcQueueExists(String queueName) {
- final Map attributes = sqsConfig.getRpcQueueConfig().getAttributes();
- return ensureQueueExists(queueName, attributes);
- }
-
- private String ensureSinkQueueExists(String queueName) {
- final Map attributes = sqsConfig.getSinkQueueConfig().getAttributes();
- return ensureQueueExists(queueName, attributes);
- }
-
- private String ensureQueueExists(String queueName, Map attributes) {
- final AmazonSQS sqsClient = getSQSClient();
- try {
- return sqsClient.createQueue(new CreateQueueRequest(queueName).withAttributes(attributes)).getQueueUrl();
- } catch (QueueNameExistsException e) {
- final String queueUrl = sqsClient.getQueueUrl(queueName).getQueueUrl();
- sqsClient.setQueueAttributes(new SetQueueAttributesRequest(queueUrl, attributes));
- return queueUrl;
- }
- }
-
- /**
- * Checks if is cause.
- *
- * @param expected the expected
- * @param exc the exception
- * @return true, if is cause
- */
- private static boolean isCause(Class expected, Throwable exc) {
- return expected.isInstance(exc) || (exc != null && isCause(expected, exc.getCause()));
- }
-
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/ManagedSQSConfig.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/ManagedSQSConfig.java
deleted file mode 100644
index cd950a3073d4..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/ManagedSQSConfig.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import org.osgi.service.cm.ConfigurationAdmin;
-
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Map;
-
-public class ManagedSQSConfig extends MapBasedSQSConfig {
-
- public ManagedSQSConfig(ConfigurationAdmin configAdmin) throws IOException {
- // Use the system properties as initial values and overwrite
- // the values with the properties from org.opennms.core.ipc.aws.sqs.cfg
- super(getConfigMapFromConfigAdmin(configAdmin, getConfigMapFromSystemProperties()));
- }
-
- private static Map getConfigMapFromConfigAdmin(ConfigurationAdmin configAdmin, Map sqsConfig) throws IOException {
- final Dictionary properties = configAdmin.getConfiguration(AmazonSQSConstants.AWS_CONFIG_PID).getProperties();
- if (properties != null) {
- final Enumeration keys = properties.keys();
- while (keys.hasMoreElements()) {
- final String key = keys.nextElement();
- sqsConfig.put(key, (String)properties.get(key));
- }
- }
- return sqsConfig;
- }
-}
diff --git a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/MapBasedSQSConfig.java b/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/MapBasedSQSConfig.java
deleted file mode 100644
index 68bb90dddfa1..000000000000
--- a/core/ipc/common/aws-sqs/src/main/java/org/opennms/core/ipc/common/aws/sqs/MapBasedSQSConfig.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import com.amazonaws.regions.Regions;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * SQS configuration from a map of values.
- *
- * The associated keys are defined in {@link AmazonSQSConstants}.
- *
- */
-public class MapBasedSQSConfig implements AmazonSQSConfig {
- public static final String DEFAULT_REGION = Regions.US_EAST_1.getName();
- private final String queuePrefix;
- private final Regions region;
- private final String accessKey;
- private final String secretKey;
- private final boolean useHttp;
- private final AmazonSQSQueueConfig sinkQueueConfig;
- private final AmazonSQSQueueConfig rpcQueueConfig;
-
- public MapBasedSQSConfig() {
- this(getConfigMapFromSystemProperties());
- }
-
- public MapBasedSQSConfig(Map sqsConfig) {
- queuePrefix = sqsConfig.get(AmazonSQSConstants.AWS_QUEUE_NAME_PREFIX);
- region = Regions.fromName(sqsConfig.getOrDefault(AmazonSQSConstants.AWS_REGION, DEFAULT_REGION));
- accessKey = sqsConfig.get(AmazonSQSConstants.AWS_ACCESS_KEY_ID);
- secretKey = sqsConfig.get(AmazonSQSConstants.AWS_SECRET_ACCESS_KEY);
- useHttp = Boolean.TRUE.toString().equals(sqsConfig.get(AmazonSQSConstants.AWS_USE_HTTP));
- sinkQueueConfig = new AmazonSQSQueueConfig(filterKeysByPrefix(sqsConfig, AmazonSQSConstants.SINK_QUEUE_PROP_PREFIX));
- rpcQueueConfig = new AmazonSQSQueueConfig(filterKeysByPrefix(sqsConfig, AmazonSQSConstants.RPC_QUEUE_PROP_PREFIX));
- }
-
- protected static Map getConfigMapFromSystemProperties() {
- return filterKeysByPrefix(System.getProperties().entrySet(), AmazonSQSConstants.AWS_CONFIG_SYS_PROP_PREFIX);
- }
-
- @Override
- public String getQueuePrefix() {
- return queuePrefix;
- }
-
- @Override
- public Regions getRegion() {
- return region;
- }
-
- @Override
- public boolean hasStaticCredentials() {
- return accessKey != null && secretKey != null;
- }
-
- @Override
- public String getAccessKey() {
- return accessKey;
- }
-
- @Override
- public String getSecretKey() {
- return secretKey;
- }
-
- @Override
- public boolean isUseHttp() {
- return useHttp;
- }
-
- @Override
- public AmazonSQSQueueConfig getSinkQueueConfig() {
- return sinkQueueConfig;
- }
-
- @Override
- public AmazonSQSQueueConfig getRpcQueueConfig() {
- return rpcQueueConfig;
- }
-
- @Override
- public String toString() {
- return "MapBasedSQSConfig{" +
- "queuePrefix='" + queuePrefix + '\'' +
- ", region='" + region + '\'' +
- ", accessKey='" + accessKey != null ? "********" : accessKey + '\'' +
- ", secretKey='" + secretKey != null ? "********" : secretKey + '\'' +
- ", useHttp=" + useHttp +
- ", sinkQueueConfig=" + sinkQueueConfig +
- ", rpcQueueConfig=" + rpcQueueConfig +
- '}';
- }
-
- private static Map filterKeysByPrefix(Map map, String prefix) {
- return filterKeysByPrefix(map.entrySet(), prefix);
- }
-
- private static Map filterKeysByPrefix(Set> entrySet, String prefix) {
- return entrySet.stream()
- // Filter out invalid keys and/or values
- .filter(e -> e.getKey() != null && e.getKey() instanceof String)
- .filter(e -> e.getValue() == null || e.getValue() instanceof String)
- .map(e -> (Map.Entry)e)
- // Extract the keys from the map that are prefixed
- .filter(e -> e.getKey().startsWith(prefix))
- // Remove the prefix, and collect the results back into a map
- .collect(Collectors.toMap(e -> e.getKey().substring(prefix.length(), e.getKey().length()),
- e -> e.getValue()));
- }
-}
diff --git a/core/ipc/common/aws-sqs/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/core/ipc/common/aws-sqs/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index 7517446b4032..000000000000
--- a/core/ipc/common/aws-sqs/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/ipc/common/aws-sqs/src/test/java/org/opennms/core/ipc/common/aws/sqs/DefaultAmazonSQSManagerTest.java b/core/ipc/common/aws-sqs/src/test/java/org/opennms/core/ipc/common/aws/sqs/DefaultAmazonSQSManagerTest.java
deleted file mode 100644
index 99a62b863fd9..000000000000
--- a/core/ipc/common/aws-sqs/src/test/java/org/opennms/core/ipc/common/aws/sqs/DefaultAmazonSQSManagerTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2002-2018 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2018 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.common.aws.sqs;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertEquals;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.opennms.core.utils.SystemInfoUtils;
-
-import org.junit.Test;
-
-/**
- * The Class DefaultAmazonSQSManagerTest.
- *
- * @author Alejandro Galue
- */
-public class DefaultAmazonSQSManagerTest {
-
- /**
- * Test queue name.
- */
- @Test
- public void testQueueName() {
- String moduleId = "Heartbeat";
- Map sqsConfig = new HashMap<>();
- DefaultAmazonSQSManager mgr = getManagerWith(sqsConfig);
- assertEquals(SystemInfoUtils.DEFAULT_INSTANCE_ID + "-Sink-Heartbeat", mgr.getSinkQueueName(moduleId));
-
- sqsConfig.put(AmazonSQSConstants.AWS_QUEUE_NAME_PREFIX, "PROD");
- mgr = getManagerWith(sqsConfig);
- assertEquals("PROD-" + SystemInfoUtils.DEFAULT_INSTANCE_ID + "-Sink-Heartbeat", mgr.getSinkQueueName(moduleId));
-
- sqsConfig.put(AmazonSQSConstants.SINK_QUEUE_PROP_PREFIX + AmazonSQSQueueAttributes.FifoQueue.toString(), "true");
- mgr = getManagerWith(sqsConfig);
- assertEquals("PROD-" + SystemInfoUtils.DEFAULT_INSTANCE_ID + "-Sink-Heartbeat.fifo", mgr.getSinkQueueName(moduleId));
- }
-
- /**
- * Test queue attributes.
- */
- @Test
- public void testQueueAttributes() {
- Map sqsConfig = new HashMap<>();
- sqsConfig.put(AmazonSQSConstants.AWS_REGION, "us-east-2");
-
- // FifoQueue=false should not be passed.
- AmazonSQSQueueConfig queueConfig = getSinkQueueConfig(sqsConfig);
- Map queueAttributes = queueConfig.getAttributes();
- assertThat(queueAttributes, not(hasKey(AmazonSQSQueueAttributes.FifoQueue.toString())));
- assertThat(queueAttributes, not(hasKey(AmazonSQSQueueAttributes.ContentBasedDeduplication.toString())));
-
- sqsConfig.put(AmazonSQSConstants.SINK_QUEUE_PROP_PREFIX + AmazonSQSQueueAttributes.FifoQueue.toString(), "true");
- queueConfig = getSinkQueueConfig(sqsConfig);
- queueAttributes = queueConfig.getAttributes();
- assertThat(queueConfig.isFifoEnabled(), equalTo(true));
- assertThat(queueConfig.isFifoContentDedupEnabled(), equalTo(false));
- // FifoQueue was added as well as ContentBasedDeduplication
- assertThat(queueAttributes, hasEntry(AmazonSQSQueueAttributes.FifoQueue.toString(), "true"));
- assertThat(queueAttributes, hasEntry(AmazonSQSQueueAttributes.ContentBasedDeduplication.toString(), "false"));
-
- sqsConfig.put(AmazonSQSConstants.SINK_QUEUE_PROP_PREFIX + AmazonSQSQueueAttributes.ContentBasedDeduplication.toString(), "true");
- queueConfig = getSinkQueueConfig(sqsConfig);
- queueAttributes = queueConfig.getAttributes();
- assertThat(queueConfig.isFifoEnabled(), equalTo(true));
- assertThat(queueConfig.isFifoContentDedupEnabled(), equalTo(true));
- // FifoQueue was added as well as ContentBasedDeduplication
- assertThat(queueAttributes, hasEntry(AmazonSQSQueueAttributes.FifoQueue.toString(), "true"));
- assertThat(queueAttributes, hasEntry(AmazonSQSQueueAttributes.ContentBasedDeduplication.toString(), "true"));
-
- // Another entry
- sqsConfig.put(AmazonSQSConstants.SINK_QUEUE_PROP_PREFIX + AmazonSQSQueueAttributes.Policy.toString(), "a-policy-here");
- queueConfig = getSinkQueueConfig(sqsConfig);
- queueAttributes = queueConfig.getAttributes();
- assertThat(queueAttributes, hasEntry(AmazonSQSQueueAttributes.Policy.toString(), "a-policy-here"));
- }
-
- private DefaultAmazonSQSManager getManagerWith(Map sqsConfig) {
- AmazonSQSConfig config = new MapBasedSQSConfig(sqsConfig);
- return new DefaultAmazonSQSManager(config);
- }
-
- private AmazonSQSQueueConfig getSinkQueueConfig(Map sqsConfig) {
- AmazonSQSConfig config = new MapBasedSQSConfig(sqsConfig);
- return config.getSinkQueueConfig();
- }
-}
diff --git a/core/ipc/common/kafka-shell/pom.xml b/core/ipc/common/kafka-shell/pom.xml
index b77879e4ae5d..6c32428f6fae 100644
--- a/core/ipc/common/kafka-shell/pom.xml
+++ b/core/ipc/common/kafka-shell/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc.common
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
diff --git a/core/ipc/common/kafka/pom.xml b/core/ipc/common/kafka/pom.xml
index e4c6b0f3e4fc..6caf521d97e9 100644
--- a/core/ipc/common/kafka/pom.xml
+++ b/core/ipc/common/kafka/pom.xml
@@ -4,7 +4,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.common
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.common
@@ -46,7 +46,7 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
diff --git a/core/ipc/common/kafka/src/main/java/org/opennms/core/ipc/common/kafka/KafkaTwinConstants.java b/core/ipc/common/kafka/src/main/java/org/opennms/core/ipc/common/kafka/KafkaTwinConstants.java
new file mode 100644
index 000000000000..0ca3a735c5cf
--- /dev/null
+++ b/core/ipc/common/kafka/src/main/java/org/opennms/core/ipc/common/kafka/KafkaTwinConstants.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2016 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.common.kafka;
+
+public interface KafkaTwinConstants {
+ String KAFKA_CONFIG_PID = "org.opennms.core.ipc.twin.kafka";
+ String KAFKA_CONFIG_SYS_PROP_PREFIX = KAFKA_CONFIG_PID + ".";
+}
diff --git a/core/ipc/common/pom.xml b/core/ipc/common/pom.xml
index f829dad688af..f4be6d5d8009 100644
--- a/core/ipc/common/pom.xml
+++ b/core/ipc/common/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc
@@ -11,7 +11,6 @@
pom
OpenNMS :: Core :: IPC :: Common
- aws-sqs
kafka
kafka-shell
diff --git a/core/ipc/grpc/client/pom.xml b/core/ipc/grpc/client/pom.xml
index b1b34757a07e..60300ee844eb 100644
--- a/core/ipc/grpc/client/pom.xml
+++ b/core/ipc/grpc/client/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc.grpc
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
@@ -59,12 +59,12 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
provided
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/grpc/client/src/main/java/org/opennms/core/ipc/grpc/client/MinionGrpcClient.java b/core/ipc/grpc/client/src/main/java/org/opennms/core/ipc/grpc/client/MinionGrpcClient.java
index 65200b157510..70330a34216a 100644
--- a/core/ipc/grpc/client/src/main/java/org/opennms/core/ipc/grpc/client/MinionGrpcClient.java
+++ b/core/ipc/grpc/client/src/main/java/org/opennms/core/ipc/grpc/client/MinionGrpcClient.java
@@ -122,7 +122,7 @@
public class MinionGrpcClient extends AbstractMessageDispatcherFactory {
private static final Logger LOG = LoggerFactory.getLogger(MinionGrpcClient.class);
- private static final long SINK_BLOCKING_TIMEOUT = 3000;
+ private static final long SINK_BLOCKING_TIMEOUT = 1000;
private static final int SINK_BLOCKING_THREAD_POOL_SIZE = 100;
private ManagedChannel channel;
private OpenNMSIpcGrpc.OpenNMSIpcStub asyncStub;
diff --git a/core/ipc/grpc/common/pom.xml b/core/ipc/grpc/common/pom.xml
index 01c633112a9a..60bb3e3dcdbe 100644
--- a/core/ipc/grpc/common/pom.xml
+++ b/core/ipc/grpc/common/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc.grpc
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.grpc
@@ -34,7 +34,7 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
provided
diff --git a/core/ipc/grpc/itests/pom.xml b/core/ipc/grpc/itests/pom.xml
index a1fa1d27cf0e..26c714abee3b 100644
--- a/core/ipc/grpc/itests/pom.xml
+++ b/core/ipc/grpc/itests/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc.grpc
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
@@ -47,12 +47,12 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
provided
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcRpcIT.java b/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcRpcIT.java
index 9af10319e3e2..d68134646518 100644
--- a/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcRpcIT.java
+++ b/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcRpcIT.java
@@ -47,6 +47,8 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.opennms.core.grpc.common.GrpcIpcServer;
+import org.opennms.core.grpc.common.GrpcIpcServerBuilder;
import org.opennms.core.ipc.grpc.client.GrpcClientConstants;
import org.opennms.core.ipc.grpc.client.MinionGrpcClient;
import org.opennms.core.ipc.grpc.common.RpcRequestProto;
@@ -91,8 +93,8 @@ public void setup() throws Exception {
grpcClient = new MinionGrpcClient(minionIdentity, configAdmin);
grpcClient.bind(echoRpcModule);
- server = new OpennmsGrpcServer();
- server.setConfigAdmin(configAdmin);
+ GrpcIpcServer grpcIpcServer = new GrpcIpcServerBuilder(configAdmin, port, "PT0S");
+ server = new OpennmsGrpcServer(grpcIpcServer);
echoClient = new MockEchoClient(server);
server.start();
grpcClient.start();
@@ -120,7 +122,7 @@ public void testRpcWithDefaultLocation() {
@Test(timeout = 30000)
public void testRpcAtRemoteLocation() {
- await().atMost(10, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS)
+ await().atMost(15, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS)
.until(() -> {
grpcClient.dispatch(new HeartbeatModule(), null, new Heartbeat());
return server.getRpcHandlerByLocation().size();
@@ -135,12 +137,11 @@ public void testRpcAtRemoteLocation() {
} catch (InterruptedException | ExecutionException e) {
fail();
}
-
}
@Test(timeout = 30000)
public void testLargeMessageWithRpcAtRemoteLocation() {
- await().atMost(10, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS)
+ await().atMost(15, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS)
.until(() -> {
grpcClient.dispatch(new HeartbeatModule(), null, new Heartbeat());
return server.getRpcHandlerByLocation().size();
diff --git a/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcSinkIT.java b/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcSinkIT.java
index 9fb1b69d5ff8..a28281d66f03 100644
--- a/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcSinkIT.java
+++ b/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcIpcSinkIT.java
@@ -44,6 +44,8 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.opennms.core.grpc.common.GrpcIpcServer;
+import org.opennms.core.grpc.common.GrpcIpcServerBuilder;
import org.opennms.core.ipc.grpc.client.GrpcClientConstants;
import org.opennms.core.ipc.grpc.client.MinionGrpcClient;
import org.opennms.core.ipc.grpc.server.GrpcServerConstants;
@@ -82,8 +84,8 @@ public void setup() throws Exception {
MinionIdentity minionIdentity = new MockMinionIdentity(REMOTE_LOCATION_NAME);
grpcClient = new MinionGrpcClient(minionIdentity, configAdmin);
- server = new OpennmsGrpcServer();
- server.setConfigAdmin(configAdmin);
+ GrpcIpcServer grpcIpcServer = new GrpcIpcServerBuilder(configAdmin, port, "PT0S");
+ server = new OpennmsGrpcServer(grpcIpcServer);
grpcClient.start();
}
diff --git a/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcTLSMutualAuthIT.java b/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcTLSMutualAuthIT.java
index 0e472e97bb27..4ef9e0c561e1 100644
--- a/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcTLSMutualAuthIT.java
+++ b/core/ipc/grpc/itests/src/test/java/org/opennms/core/ipc/grpc/GrpcTLSMutualAuthIT.java
@@ -44,6 +44,8 @@
import org.junit.Before;
import org.junit.Test;
+import org.opennms.core.grpc.common.GrpcIpcServer;
+import org.opennms.core.grpc.common.GrpcIpcServerBuilder;
import org.opennms.core.ipc.grpc.client.GrpcClientConstants;
import org.opennms.core.ipc.grpc.client.MinionGrpcClient;
import org.opennms.core.ipc.grpc.server.GrpcServerConstants;
@@ -96,8 +98,8 @@ public void setup() throws Exception {
grpcClient = new MinionGrpcClient(minionIdentity, configAdmin);
grpcClient.bind(echoRpcModule);
- server = new OpennmsGrpcServer();
- server.setConfigAdmin(configAdmin);
+ GrpcIpcServer grpcIpcServer = new GrpcIpcServerBuilder(configAdmin, port, "PT0S");
+ server = new OpennmsGrpcServer(grpcIpcServer);
echoClient = new MockEchoClient(server);
server.start();
grpcClient.start();
@@ -105,7 +107,7 @@ public void setup() throws Exception {
@Test(timeout = 30000)
public void testgRPCWithTLSAtRemoteLocation() {
- await().atMost(10, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS)
+ await().atMost(15, TimeUnit.SECONDS).pollInterval(2, TimeUnit.SECONDS)
.until(() -> {
grpcClient.dispatch(new HeartbeatModule(), null, new Heartbeat());
return server.getRpcHandlerByLocation().size();
diff --git a/core/ipc/grpc/pom.xml b/core/ipc/grpc/pom.xml
index 6afd4b1b15eb..f16f5d7ca094 100644
--- a/core/ipc/grpc/pom.xml
+++ b/core/ipc/grpc/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc
org.opennms.core
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
OpenNMS :: Core :: IPC :: GRPC :: Parent
diff --git a/core/ipc/grpc/server/pom.xml b/core/ipc/grpc/server/pom.xml
index 20c16ed4de87..2c1e7dfbb6de 100644
--- a/core/ipc/grpc/server/pom.xml
+++ b/core/ipc/grpc/server/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc.grpc
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.grpc
@@ -33,7 +33,7 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
provided
@@ -41,6 +41,11 @@
grpc-netty-shaded
${grpcVersion}
+
+ org.opennms.core.grpc
+ org.opennms.core.grpc.common
+ ${project.version}
+
org.opennms.core.ipc.grpc
org.opennms.core.ipc.grpc.common
@@ -63,7 +68,7 @@
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/grpc/server/src/main/java/org/opennms/core/ipc/grpc/server/OpennmsGrpcServer.java b/core/ipc/grpc/server/src/main/java/org/opennms/core/ipc/grpc/server/OpennmsGrpcServer.java
index 6fdbb7026ed2..751b6115595b 100644
--- a/core/ipc/grpc/server/src/main/java/org/opennms/core/ipc/grpc/server/OpennmsGrpcServer.java
+++ b/core/ipc/grpc/server/src/main/java/org/opennms/core/ipc/grpc/server/OpennmsGrpcServer.java
@@ -28,26 +28,15 @@
package org.opennms.core.ipc.grpc.server;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.DEFAULT_GRPC_PORT;
import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.DEFAULT_GRPC_TTL;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.DEFAULT_MESSAGE_SIZE;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.GRPC_MAX_INBOUND_SIZE;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.GRPC_SERVER_PID;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.GRPC_SERVER_PORT;
import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.GRPC_TTL_PROPERTY;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.PRIVATE_KEY_FILE_PATH;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.SERVER_CERTIFICATE_FILE_PATH;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.TLS_ENABLED;
-import static org.opennms.core.ipc.grpc.server.GrpcServerConstants.TRUST_CERTIFICATE_FILE_PATH;
import static org.opennms.core.ipc.sink.api.Message.SINK_METRIC_CONSUMER_DOMAIN;
import static org.opennms.core.rpc.api.RpcModule.MINION_HEADERS_MODULE;
import static org.opennms.core.tracing.api.TracerConstants.TAG_LOCATION;
import static org.opennms.core.tracing.api.TracerConstants.TAG_SYSTEM_ID;
import static org.opennms.core.tracing.api.TracerConstants.TAG_TIMEOUT;
-import java.io.File;
import java.io.IOException;
-import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -65,7 +54,7 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.opennms.core.ipc.grpc.common.ConfigUtils;
+import org.opennms.core.grpc.common.GrpcIpcServer;
import org.opennms.core.ipc.grpc.common.Empty;
import org.opennms.core.ipc.grpc.common.OpenNMSIpcGrpc;
import org.opennms.core.ipc.grpc.common.RpcRequestProto;
@@ -89,7 +78,6 @@
import org.opennms.core.tracing.util.TracingInfoCarrier;
import org.opennms.core.utils.PropertiesUtils;
import org.opennms.distributed.core.api.Identity;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,12 +92,6 @@
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.protobuf.ByteString;
-import io.grpc.Server;
-import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
-import io.grpc.netty.shaded.io.netty.handler.ssl.ClientAuth;
-import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
-import io.grpc.netty.shaded.io.netty.handler.ssl.SslProvider;
import io.grpc.stub.StreamObserver;
import io.opentracing.References;
import io.opentracing.Scope;
@@ -141,8 +123,7 @@
public class OpennmsGrpcServer extends AbstractMessageConsumerManager implements RpcClientFactory {
private static final Logger LOG = LoggerFactory.getLogger(OpennmsGrpcServer.class);
- private ConfigurationAdmin configAdmin;
- private Server server;
+ private final GrpcIpcServer grpcIpcServer;
private String location;
private Identity identity;
private Properties properties;
@@ -184,26 +165,19 @@ public class OpennmsGrpcServer extends AbstractMessageConsumerManager implements
// Maintains the map of sink consumer executor and by module Id.
private final Map sinkConsumersByModuleId = new ConcurrentHashMap<>();
+ public OpennmsGrpcServer(GrpcIpcServer grpcIpcServer) {
+ this.grpcIpcServer = grpcIpcServer;
+ }
+
public void start() throws IOException {
try (Logging.MDCCloseable mdc = Logging.withPrefixCloseable(RpcClientFactory.LOG_PREFIX)) {
- properties = ConfigUtils.getPropertiesFromConfig(configAdmin, GRPC_SERVER_PID);
- int port = PropertiesUtils.getProperty(properties, GRPC_SERVER_PORT, DEFAULT_GRPC_PORT);
- int maxInboundMessageSize = PropertiesUtils.getProperty(properties, GRPC_MAX_INBOUND_SIZE, DEFAULT_MESSAGE_SIZE);
+
+ grpcIpcServer.startServer(new OpennmsIpcService());
+ LOG.info("Added RPC/Sink Service to OpenNMS IPC Grpc Server");
+
+ properties = grpcIpcServer.getProperties();
ttl = PropertiesUtils.getProperty(properties, GRPC_TTL_PROPERTY, DEFAULT_GRPC_TTL);
- boolean tlsEnabled = PropertiesUtils.getProperty(properties, TLS_ENABLED, false);
-
- NettyServerBuilder serverBuilder = NettyServerBuilder.forAddress(new InetSocketAddress(port))
- .addService(new OpennmsIpcService())
- .maxInboundMessageSize(maxInboundMessageSize);
- if (tlsEnabled) {
- SslContextBuilder sslContextBuilder = getSslContextBuilder();
- if (sslContextBuilder != null) {
- serverBuilder.sslContext(sslContextBuilder.build());
- LOG.info("TLS enabled for gRPC");
- }
- }
- server = serverBuilder.build();
rpcTimeoutExecutor.execute(this::handleRpcTimeouts);
rpcMetricsReporter = JmxReporter.forRegistry(getRpcMetrics())
.inDomain(JMX_DOMAIN_RPC)
@@ -213,35 +187,13 @@ public void start() throws IOException {
.inDomain(SINK_METRIC_CONSUMER_DOMAIN)
.build();
sinkMetricsReporter.start();
- server.start();
// Initialize tracer from tracer registry.
if (tracerRegistry != null) {
tracerRegistry.init(identity.getId());
}
- LOG.info("OpenNMS gRPC server started");
}
}
-
- private SslContextBuilder getSslContextBuilder() {
- String certChainFilePath = properties.getProperty(SERVER_CERTIFICATE_FILE_PATH);
- String privateKeyFilePath = properties.getProperty(PRIVATE_KEY_FILE_PATH);
- String trustCertCollectionFilePath = properties.getProperty(TRUST_CERTIFICATE_FILE_PATH);
- if (Strings.isNullOrEmpty(certChainFilePath) || Strings.isNullOrEmpty(privateKeyFilePath)) {
- return null;
- }
-
- SslContextBuilder sslClientContextBuilder = SslContextBuilder.forServer(new File(certChainFilePath),
- new File(privateKeyFilePath));
- if (!Strings.isNullOrEmpty(trustCertCollectionFilePath)) {
- sslClientContextBuilder.trustManager(new File(trustCertCollectionFilePath));
- sslClientContextBuilder.clientAuth(ClientAuth.REQUIRE);
- }
- return GrpcSslContexts.configure(sslClientContextBuilder,
- SslProvider.OPENSSL);
- }
-
-
@Override
protected void startConsumingForModule(SinkModule module) throws Exception {
if (sinkConsumersByModuleId.get(module.getId()) == null) {
@@ -463,10 +415,6 @@ public void setIdentity(Identity identity) {
this.identity = identity;
}
- public void setConfigAdmin(ConfigurationAdmin configAdmin) {
- this.configAdmin = configAdmin;
- }
-
private MetricRegistry getRpcMetrics() {
if (rpcMetrics == null) {
rpcMetrics = new MetricRegistry();
@@ -519,9 +467,7 @@ public void shutdown() {
if (sinkMetricsReporter != null) {
sinkMetricsReporter.close();
}
- if (server != null) {
- server.shutdown();
- }
+ grpcIpcServer.stopServer();
rpcTimeoutExecutor.shutdownNow();
responseHandlerExecutor.shutdownNow();
LOG.info("OpenNMS gRPC server stopped");
diff --git a/core/ipc/grpc/server/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/core/ipc/grpc/server/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 61f9129676ba..f07798edec66 100644
--- a/core/ipc/grpc/server/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/core/ipc/grpc/server/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -1,35 +1,21 @@
-
-
-
-
-
-
-
-
+
+
+
+
-
diff --git a/core/ipc/osgi/pom.xml b/core/ipc/osgi/pom.xml
index da519c39b356..17f96138353c 100644
--- a/core/ipc/osgi/pom.xml
+++ b/core/ipc/osgi/pom.xml
@@ -5,7 +5,7 @@
org.opennms.core.ipc
org.opennms.core
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
@@ -47,9 +47,19 @@
org.opennms.core.ipc.sink.common
${project.version}
+
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc.twin.api
+ ${project.version}
+
+
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc.twin.common
+ ${project.version}
+
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/osgi/src/main/java/org/opennms/core/ipc/twin/osgi/OsgiTwinPublisher.java b/core/ipc/osgi/src/main/java/org/opennms/core/ipc/twin/osgi/OsgiTwinPublisher.java
new file mode 100644
index 000000000000..7bb16dae447e
--- /dev/null
+++ b/core/ipc/osgi/src/main/java/org/opennms/core/ipc/twin/osgi/OsgiTwinPublisher.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.osgi;
+
+import java.io.IOException;
+
+import org.opennms.core.ipc.twin.api.TwinPublisher;
+import org.opennms.core.soa.lookup.ServiceLookup;
+import org.opennms.core.soa.lookup.ServiceLookupBuilder;
+import org.opennms.core.soa.lookup.ServiceRegistryLookup;
+import org.opennms.core.soa.support.DefaultServiceRegistry;
+
+public class OsgiTwinPublisher implements TwinPublisher {
+
+ private final ServiceLookup, String> blockingServiceLookup;
+
+ public OsgiTwinPublisher() {
+ this.blockingServiceLookup = new ServiceLookupBuilder(new ServiceRegistryLookup(DefaultServiceRegistry.INSTANCE))
+ .blocking()
+ .build();
+ ;
+ }
+
+ private TwinPublisher getDelegate() throws IOException {
+ final TwinPublisher twinPublisher = this.blockingServiceLookup.lookup(TwinPublisher.class, "(!(strategy=delegate))");
+ if (twinPublisher != null) {
+ return twinPublisher;
+ } else {
+ throw new IOException("Only delegate publisher is registered. No real publisher available");
+ }
+ }
+
+ @Override
+ public Session register(String key, Class clazz, String location) throws IOException {
+ return this.getDelegate().register(key, clazz, location);
+ }
+
+ @Override
+ public void close() throws IOException {
+ this.getDelegate().close();
+ }
+}
diff --git a/core/ipc/osgi/src/main/resources/META-INF/opennms/applicationContext-ipc-osgi.xml b/core/ipc/osgi/src/main/resources/META-INF/opennms/applicationContext-ipc-osgi.xml
index acf688691795..35ebecdb56e1 100644
--- a/core/ipc/osgi/src/main/resources/META-INF/opennms/applicationContext-ipc-osgi.xml
+++ b/core/ipc/osgi/src/main/resources/META-INF/opennms/applicationContext-ipc-osgi.xml
@@ -17,6 +17,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/ipc/pom.xml b/core/ipc/pom.xml
index c8da82fc73c4..cf98cf695d17 100644
--- a/core/ipc/pom.xml
+++ b/core/ipc/pom.xml
@@ -3,7 +3,7 @@
org.opennms
org.opennms.core
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core
@@ -16,5 +16,6 @@
sink
grpc
osgi
+ twin
diff --git a/core/ipc/rpc/api/pom.xml b/core/ipc/rpc/api/pom.xml
index 05e1aa2cfa5d..2120a2410a8c 100644
--- a/core/ipc/rpc/api/pom.xml
+++ b/core/ipc/rpc/api/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/rpc/aws-sqs-impl/pom.xml b/core/ipc/rpc/aws-sqs-impl/pom.xml
deleted file mode 100644
index 5bcf7ead15ee..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
- org.opennms.core.ipc
- org.opennms.core.ipc.rpc
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.rpc
- org.opennms.core.ipc.rpc.aws-sqs-impl
- OpenNMS :: Core :: IPC :: RPC :: Amazon SQS Impl.
- bundle
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
- JavaSE-1.8
- ${project.artifactId}
- ${project.version}
-
-
-
-
-
-
-
- org.opennms.core.ipc.rpc
- org.opennms.core.ipc.rpc.common
-
-
- org.opennms.core.ipc.rpc
- org.opennms.core.ipc.rpc.camel
-
-
- org.opennms.core.ipc.common
- org.opennms.core.ipc.common.aws-sqs
- ${project.version}
-
-
- org.opennms.features.distributed
- core-api
- ${project.version}
- provided
-
-
- org.opennms.core
- org.opennms.core.daemon
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.activemq
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.snmp
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.services
- test
-
-
- org.opennms.core.tracing
- org.opennms.core.tracing.registry
- ${project.version}
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.camel
- test
-
-
- org.opennms.core.ipc.rpc
- org.opennms.core.ipc.rpc.camel
- ${project.version}
- test-jar
- test
-
-
- org.hamcrest
- hamcrest-library
- test
-
-
- org.opennms
- opennms-dao
- test
-
-
- org.opennms
- opennms-dao-mock
- test
-
-
-
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSClientPreProcessor.java b/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSClientPreProcessor.java
deleted file mode 100644
index 1c9c5ae6f8fa..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSClientPreProcessor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import org.apache.camel.Exchange;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSQueueException;
-import org.opennms.core.rpc.api.RpcRequest;
-import org.opennms.core.rpc.api.RpcResponse;
-import org.opennms.core.rpc.camel.CamelRpcClientPreProcessor;
-import org.opennms.core.rpc.camel.CamelRpcConstants;
-import org.opennms.core.rpc.camel.CamelRpcRequest;
-
-import java.util.Objects;
-
-public class AmazonSQSClientPreProcessor extends CamelRpcClientPreProcessor {
-
- private final AmazonSQSManager sqsManager;
-
- public AmazonSQSClientPreProcessor(AmazonSQSManager sqsManager) {
- this.sqsManager = Objects.requireNonNull(sqsManager);
- }
-
- @Override
- public void process(Exchange exchange) throws AmazonSQSQueueException {
- @SuppressWarnings("unchecked")
- final CamelRpcRequest wrapper = exchange.getIn().getBody(CamelRpcRequest.class);
-
- final String requestQueueName = sqsManager.getRpcRequestQueueNameAndCreateIfNecessary(
- wrapper.getModule().getId(),
- wrapper.getRequest().getLocation());
- final String replyQueueName = sqsManager.getRpcReplyQueueNameAndCreateIfNecessary(
- wrapper.getModule().getId(),
- wrapper.getRequest().getLocation());
- exchange.getIn().setHeader(CamelRpcConstants.JMS_QUEUE_NAME_HEADER, requestQueueName);
- exchange.getIn().setHeader(CamelRpcConstants.JMS_REPLY_TO_QUEUE_NAME_HEADER, replyQueueName);
-
- exchange.getIn().setHeader(CamelRpcConstants.CAMEL_JMS_REQUEST_TIMEOUT_HEADER, wrapper.getRequest().getTimeToLiveMs() != null ? wrapper.getRequest().getTimeToLiveMs() : CAMEL_JMS_REQUEST_TIMEOUT);
- if (wrapper.getRequest().getSystemId() != null) {
- exchange.getIn().setHeader(CamelRpcConstants.JMS_SYSTEM_ID_HEADER, wrapper.getRequest().getSystemId());
- }
-
- final String request = wrapper.getModule().marshalRequest((RpcRequest)wrapper.getRequest());
- exchange.getIn().setBody(request);
- }
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSRPCConstants.java b/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSRPCConstants.java
deleted file mode 100644
index 251e33d699ff..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSRPCConstants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-public interface AmazonSQSRPCConstants {
-
- static final String AWS_SQS_CORRELATION_ID_HEADER = "RPCCorrelationId";
-
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSServerProcessor.java b/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSServerProcessor.java
deleted file mode 100644
index e52afc451007..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSServerProcessor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import org.apache.camel.Exchange;
-import org.opennms.core.rpc.api.RpcModule;
-import org.opennms.core.rpc.api.RpcRequest;
-import org.opennms.core.rpc.api.RpcResponse;
-import org.opennms.core.rpc.camel.CamelRpcServerProcessor;
-import org.opennms.core.tracing.api.TracerRegistry;
-
-public class AmazonSQSServerProcessor extends CamelRpcServerProcessor {
- public AmazonSQSServerProcessor(RpcModule module, TracerRegistry tracerRegistry) {
- super(module, tracerRegistry);
- }
-
- @Override
- public void postProcess(Exchange exchange) {
- // Copy the value of the correlation id header from the in to the out
- exchange.getOut().setHeader(AmazonSQSRPCConstants.AWS_SQS_CORRELATION_ID_HEADER,
- exchange.getIn().getHeader(AmazonSQSRPCConstants.AWS_SQS_CORRELATION_ID_HEADER));
- }
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSServerRouteManager.java b/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSServerRouteManager.java
deleted file mode 100644
index 89018b85aa0a..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/AmazonSQSServerRouteManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import java.util.Objects;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.JmsEndpoint;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.rpc.api.RpcModule;
-import org.opennms.core.rpc.api.RpcRequest;
-import org.opennms.core.rpc.api.RpcResponse;
-import org.opennms.core.rpc.camel.CamelRpcServerRouteManager;
-import org.opennms.core.tracing.api.TracerRegistry;
-import org.opennms.distributed.core.api.MinionIdentity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AmazonSQSServerRouteManager extends CamelRpcServerRouteManager {
- private static final Logger LOG = LoggerFactory.getLogger(CamelRpcServerRouteManager.class);
-
- private final AmazonSQSManager sqsManager;
- private final TracerRegistry tracerRegistry;
-
- public AmazonSQSServerRouteManager(CamelContext context, MinionIdentity identity, AmazonSQSManager sqsManager, TracerRegistry tracerRegistry) {
- super(context, identity);
- this.sqsManager = Objects.requireNonNull(sqsManager);
- this.tracerRegistry = Objects.requireNonNull(tracerRegistry);
- }
-
- @Override
- public RouteBuilder getRouteBuilder(CamelContext context, MinionIdentity identity, RpcModule module) {
- return new DynamicRpcRouteBuilder(sqsManager, context, identity, module, tracerRegistry);
- }
-
- private static final class DynamicRpcRouteBuilder extends RouteBuilder {
- private final AmazonSQSManager sqsManager;
- private final MinionIdentity identity;
- private final RpcModule module;
- private final TracerRegistry tracerRegistry;
-
- private DynamicRpcRouteBuilder(AmazonSQSManager sqsManager, CamelContext context, MinionIdentity identity, RpcModule module, TracerRegistry tracerRegistry) {
- super(context);
- this.sqsManager = sqsManager;
- this.identity = identity;
- this.module = module;
- this.tracerRegistry = tracerRegistry;
- }
-
- @Override
- public void configure() throws Exception {
- final String requestQueueName = sqsManager.getRpcRequestQueueNameAndCreateIfNecessary(module.getId(), identity.getLocation());
- final JmsEndpoint endpoint = getContext().getEndpoint(String.format("jms:queue:%s?connectionFactory=#connectionFactory"
- + "&correlationProperty=%s"
- + "&asyncConsumer=true", requestQueueName,
- AmazonSQSRPCConstants.AWS_SQS_CORRELATION_ID_HEADER), JmsEndpoint.class);
- tracerRegistry.init(identity.getLocation()+"@"+identity.getId());
- from(endpoint).setExchangePattern(ExchangePattern.InOut)
- .process(new SystemIdFilterProcessor(identity.getId()))
- .process(new AmazonSQSServerProcessor(module, tracerRegistry))
- .routeId(getRouteId(module));
- }
- }
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/ConditionalAmazonSqsRpcContext.java b/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/ConditionalAmazonSqsRpcContext.java
deleted file mode 100644
index 3a60f4e8239c..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/ConditionalAmazonSqsRpcContext.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2016 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import org.opennms.core.rpc.common.RpcStrategy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ConfigurationCondition;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-import static org.opennms.core.rpc.common.RpcStrategy.Strategy.SQS;
-
-@Configuration
-@Conditional(ConditionalAmazonSqsRpcContext.Condition.class)
-@ImportResource("/META-INF/opennms/applicationContext-rpc-client-sqs.xml")
-public class ConditionalAmazonSqsRpcContext {
- private static final Logger LOG = LoggerFactory.getLogger(ConditionalAmazonSqsRpcContext.class);
-
- static class Condition implements ConfigurationCondition {
- @Override
- public ConfigurationPhase getConfigurationPhase() {
- return ConfigurationPhase.PARSE_CONFIGURATION;
- }
-
- @Override
- public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
- final boolean enabled = SQS.equals(RpcStrategy.getRpcStrategy());
- LOG.debug("Enable SQS RPC: {}", enabled);
- return enabled;
- }
- }
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/SystemIdFilterProcessor.java b/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/SystemIdFilterProcessor.java
deleted file mode 100644
index cac92cfefd01..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/java/org/opennms/core/rpc/aws/sqs/SystemIdFilterProcessor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.AsyncProcessor;
-import org.apache.camel.Exchange;
-import org.opennms.core.rpc.camel.CamelRpcConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Objects;
-
-public class SystemIdFilterProcessor implements AsyncProcessor {
- private static final Logger LOG = LoggerFactory.getLogger(SystemIdFilterProcessor.class);
-
- private final String systemId;
-
- public SystemIdFilterProcessor(String systemId) {
- this.systemId = Objects.requireNonNull(systemId);
- }
-
- @Override
- public void process(Exchange exchange) throws Exception {
- throw new UnsupportedOperationException("This processor must be invoked using the async interface.");
- }
-
- @Override
- public boolean process(Exchange exchange, AsyncCallback callback) {
- // Retrieve the system id header in the given request
- final String targettedSystemId = (String)exchange.getIn().getHeader(CamelRpcConstants.JMS_SYSTEM_ID_HEADER);
- if (targettedSystemId == null || systemId.equals(targettedSystemId)) {
- // Either no system was specified, or the requested system id matches our
- // Accept the request
- } else {
- // We should reject this request, but the SQS JMS connector doesn't provide
- // a way for us to reset the visibility timeout of the message at this stage
- // so for now we just log and process the message anyways
- LOG.info("Directed RPCs are not supported with SQS. The message targeted to %s, but our system id is %s." +
- "Processing the message anyways.");
- }
- callback.done(false);
- return false;
- }
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-sqs.xml b/core/ipc/rpc/aws-sqs-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-sqs.xml
deleted file mode 100644
index d59f9aaa5aa7..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/resources/META-INF/opennms/applicationContext-rpc-client-sqs.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- jms:queue:${header.JmsQueueName}?connectionFactory=#connectionFactory&replyTo=${header.JmsReplyToQueueName}&replyToType=Exclusive&correlationProperty=RPCCorrelationId
-
-
-
-
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/rpc/aws-sqs-impl/src/main/resources/META-INF/opennms/component-dao.xml
deleted file mode 100644
index d0f753bb159f..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/resources/META-INF/opennms/component-dao.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/core/ipc/rpc/aws-sqs-impl/src/main/resources/OSGI-INF/blueprint/blueprint-rpc-server.xml b/core/ipc/rpc/aws-sqs-impl/src/main/resources/OSGI-INF/blueprint/blueprint-rpc-server.xml
deleted file mode 100644
index 908381521697..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/main/resources/OSGI-INF/blueprint/blueprint-rpc-server.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcBlueprintIT.java b/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcBlueprintIT.java
deleted file mode 100644
index 2d0249012a0e..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcBlueprintIT.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2016 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import java.util.Dictionary;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.camel.util.KeyValueHolder;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSConfig;
-import org.opennms.core.ipc.common.aws.sqs.MapBasedSQSConfig;
-import org.opennms.core.rpc.camel.MockMinionIdentity;
-import org.opennms.core.test.OpenNMSJUnit4ClassRunner;
-import org.opennms.distributed.core.api.MinionIdentity;
-import org.opennms.test.JUnitConfigurationEnvironment;
-import org.springframework.test.context.ContextConfiguration;
-
-@Ignore("Requires access to AWS")
-@RunWith(OpenNMSJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
- "classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-rpc-client-sqs.xml",
- "classpath:/META-INF/opennms/applicationContext-rpc-echo.xml",
- "classpath:/META-INF/opennms/applicationContext-tracer-registry.xml"
-})
-@JUnitConfigurationEnvironment(systemProperties={
- "org.opennms.core.ipc.aws.sqs.aws_use_http=true",
- "org.opennms.core.ipc.aws.sqs.aws_region=ca-central-1"})
-public class EchoRpcBlueprintIT extends org.opennms.core.rpc.camel.EchoRpcBlueprintIT {
-
- @SuppressWarnings( "rawtypes" )
- @Override
- protected void addServicesOnStartup(Map> services) {
- services.put(MinionIdentity.class.getName(),
- new KeyValueHolder(new MockMinionIdentity(REMOTE_LOCATION_NAME),
- new Properties()));
- services.put(AmazonSQSConfig.class.getName(),
- new KeyValueHolder(new MapBasedSQSConfig(),
- new Properties()));
- }
-
- @Override
- protected String getBlueprintDescriptor() {
- return "classpath:OSGI-INF/blueprint/blueprint-rpc-server.xml";
- }
-
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcIT.java b/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcIT.java
deleted file mode 100644
index e698c1aaed90..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcIT.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2016 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.SimpleRegistry;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.rpc.camel.CamelRpcServerRouteManager;
-import org.opennms.core.rpc.camel.MockMinionIdentity;
-import org.opennms.core.test.OpenNMSJUnit4ClassRunner;
-import org.opennms.core.tracing.api.TracerRegistry;
-import org.opennms.netmgt.model.OnmsDistPoller;
-import org.opennms.test.JUnitConfigurationEnvironment;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.annotation.DirtiesContext.ClassMode;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
-import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
-
-import com.amazon.sqs.javamessaging.SQSConnectionFactory;
-
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
-
-@Ignore("Requires access to AWS")
-@RunWith(OpenNMSJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
- "classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-rpc-client-sqs.xml",
- "classpath:/META-INF/opennms/applicationContext-rpc-echo.xml",
- "classpath:/META-INF/opennms/applicationContext-tracer-registry.xml"
-})
-@JUnitConfigurationEnvironment(systemProperties={
- "org.opennms.core.ipc.aws.sqs.aws_use_http=true",
- "org.opennms.core.ipc.aws.sqs.aws_region=ca-central-1"})
-@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
-@TestExecutionListeners({DirtiesContextTestExecutionListener.class})
-public class EchoRpcIT extends org.opennms.core.rpc.camel.EchoRpcIT {
-
- @Autowired
- private OnmsDistPoller identity;
-
- @Autowired
- private AmazonSQSManager sqsManager;
-
- @Autowired
- private SQSConnectionFactory sqsConnectionFactory;
-
- @Autowired
- @Qualifier("rpcClient")
- private CamelContext rpcClientContext;
-
- private TracerRegistry tracerRegistry = new TracerRegistry() {
- @Override
- public Tracer getTracer() {
- return GlobalTracer.get();
- }
-
- @Override
- public void init(String serviceName) {
- }
- };
-
- @Override
- public CamelContext getContext() {
- SimpleRegistry registry = new SimpleRegistry();
- registry.put("connectionFactory", sqsManager.getSQSConnectionFactory());
- return new DefaultCamelContext(registry);
- }
-
- @Override
- public CamelContext getClientContext() {
- return rpcClientContext;
- }
-
- @Override
- public CamelRpcServerRouteManager getRouteManager(CamelContext context) {
- return new AmazonSQSServerRouteManager(context,
- new MockMinionIdentity(REMOTE_LOCATION_NAME), sqsManager, tracerRegistry);
- }
-
- @Ignore("Directed RPCs are not supported.")
- public void failsWithTimeoutWhenSystemIdDoesNotExist() {
- // pass
- }
-}
diff --git a/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcThreadIT.java b/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcThreadIT.java
deleted file mode 100644
index d0d4f9255f1a..000000000000
--- a/core/ipc/rpc/aws-sqs-impl/src/test/java/org/opennms/core/rpc/aws/sqs/EchoRpcThreadIT.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2016 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2016 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.rpc.aws.sqs;
-
-import java.util.Dictionary;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.camel.util.KeyValueHolder;
-import org.junit.Ignore;
-import org.junit.runner.RunWith;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSConfig;
-import org.opennms.core.ipc.common.aws.sqs.MapBasedSQSConfig;
-import org.opennms.core.rpc.api.RpcModule;
-import org.opennms.core.rpc.camel.MockMinionIdentity;
-import org.opennms.core.test.OpenNMSJUnit4ClassRunner;
-import org.opennms.distributed.core.api.MinionIdentity;
-import org.opennms.netmgt.model.OnmsDistPoller;
-import org.opennms.test.JUnitConfigurationEnvironment;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * Used to verify and validate the thread profiles of the RPC
- * server via the EchoRpcModule.
- *
- * @author jwhite
- */
-@Ignore("Requires access to AWS")
-@RunWith(OpenNMSJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
- "classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-rpc-client-sqs.xml",
- "classpath:/META-INF/opennms/applicationContext-tracer-registry.xml"
-})
-@JUnitConfigurationEnvironment(systemProperties={
- "org.opennms.ipc.rpc.threads=1",
- "org.opennms.ipc.rpc.queue.max=-1" ,
- "org.opennms.ipc.rpc.threads.max=" + EchoRpcThreadIT.NTHREADS,
- "org.opennms.core.ipc.aws.sqs.aws_use_http=true",
- "org.opennms.core.ipc.aws.sqs.aws_region=ca-central-1"
- })
-public class EchoRpcThreadIT extends org.opennms.core.rpc.camel.EchoRpcThreadIT {
-
- @Autowired
- private OnmsDistPoller identity;
-
- @SuppressWarnings( "rawtypes" )
- @Override
- protected void addServicesOnStartup(Map> services) {
- services.put(MinionIdentity.class.getName(),
- new KeyValueHolder(new MockMinionIdentity(REMOTE_LOCATION_NAME),
- new Properties()));
- services.put(AmazonSQSConfig.class.getName(),
- new KeyValueHolder(new MapBasedSQSConfig(),
- new Properties()));
- services.put(RpcModule.class.getName(), new KeyValueHolder(lockingRpcModule, new Properties()));
- }
-
- @Override
- protected String getBlueprintDescriptor() {
- return "classpath:OSGI-INF/blueprint/blueprint-rpc-server.xml";
- }
-
-}
diff --git a/core/ipc/rpc/camel/pom.xml b/core/ipc/rpc/camel/pom.xml
index 4b6bfaa089e5..a6571c8d3395 100644
--- a/core/ipc/rpc/camel/pom.xml
+++ b/core/ipc/rpc/camel/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/rpc/common/pom.xml b/core/ipc/rpc/common/pom.xml
index 5261f6f33e2a..54c0a044635e 100644
--- a/core/ipc/rpc/common/pom.xml
+++ b/core/ipc/rpc/common/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/rpc/common/src/main/java/org/opennms/core/rpc/common/RpcStrategy.java b/core/ipc/rpc/common/src/main/java/org/opennms/core/rpc/common/RpcStrategy.java
index 683b764f92a5..f2e73b052d1d 100644
--- a/core/ipc/rpc/common/src/main/java/org/opennms/core/rpc/common/RpcStrategy.java
+++ b/core/ipc/rpc/common/src/main/java/org/opennms/core/rpc/common/RpcStrategy.java
@@ -38,8 +38,6 @@ public class RpcStrategy {
private static final String JMS_RPC_STRATEGY_NAME = "jms";
- private static final String SQS_RPC_STRATEGY_NAME = "sqs";
-
private static final String KAFKA_RPC_STRATEGY_NAME = "kafka";
private static final String GRPC_RPC_STRATEGY_NAME = "grpc";
@@ -48,7 +46,6 @@ public class RpcStrategy {
public static enum Strategy {
JMS(JMS_RPC_STRATEGY_NAME, "JMS implementation using Camel"),
- SQS(SQS_RPC_STRATEGY_NAME, "Amazon SQS implementation"),
KAFKA(KAFKA_RPC_STRATEGY_NAME, "Kafka implementation"),
GRPC(GRPC_RPC_STRATEGY_NAME, "GRPC implementation"),
OSGI(OSGI_RPC_STRATEGY_NAME, "OSGI Delegate implementation");
diff --git a/core/ipc/rpc/jms-impl/pom.xml b/core/ipc/rpc/jms-impl/pom.xml
index 29b509656653..d89006b91e6a 100644
--- a/core/ipc/rpc/jms-impl/pom.xml
+++ b/core/ipc/rpc/jms-impl/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/rpc/kafka/pom.xml b/core/ipc/rpc/kafka/pom.xml
index f12d87d50d01..bafd88ef2c12 100644
--- a/core/ipc/rpc/kafka/pom.xml
+++ b/core/ipc/rpc/kafka/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
@@ -89,7 +89,7 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
provided
@@ -151,7 +151,7 @@
org.osgi
- org.osgi.core
+ osgi.core
test
diff --git a/core/ipc/rpc/mock-impl/pom.xml b/core/ipc/rpc/mock-impl/pom.xml
index 4218694a2c38..e3df3f3e241b 100644
--- a/core/ipc/rpc/mock-impl/pom.xml
+++ b/core/ipc/rpc/mock-impl/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/rpc/pom.xml b/core/ipc/rpc/pom.xml
index 4048aad16cfd..81e5a08fef1b 100644
--- a/core/ipc/rpc/pom.xml
+++ b/core/ipc/rpc/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc
@@ -12,7 +12,6 @@
OpenNMS :: Core :: IPC :: RPC
api
- aws-sqs-impl
camel
common
jms-impl
diff --git a/core/ipc/rpc/shell-commands/pom.xml b/core/ipc/rpc/shell-commands/pom.xml
index 5fb689389429..ab33bf7226a8 100644
--- a/core/ipc/rpc/shell-commands/pom.xml
+++ b/core/ipc/rpc/shell-commands/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
@@ -53,7 +53,7 @@
org.osgi
- org.osgi.enterprise
+ osgi.enterprise
provided
diff --git a/core/ipc/rpc/utils/pom.xml b/core/ipc/rpc/utils/pom.xml
index 53ceccf0d527..3512c9df4f12 100644
--- a/core/ipc/rpc/utils/pom.xml
+++ b/core/ipc/rpc/utils/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/rpc/xml/pom.xml b/core/ipc/rpc/xml/pom.xml
index 2dc6b112264a..18bc5257ce89 100644
--- a/core/ipc/rpc/xml/pom.xml
+++ b/core/ipc/rpc/xml/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.rpc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.rpc
diff --git a/core/ipc/sink/api/pom.xml b/core/ipc/sink/api/pom.xml
index dd667709b4e0..98d1709c27de 100644
--- a/core/ipc/sink/api/pom.xml
+++ b/core/ipc/sink/api/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
diff --git a/core/ipc/sink/aws-sqs/client/pom.xml b/core/ipc/sink/aws-sqs/client/pom.xml
deleted file mode 100644
index e9ba3ca0d5d8..000000000000
--- a/core/ipc/sink/aws-sqs/client/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.aws.sqs
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.client
- OpenNMS :: Core :: IPC :: Sink :: AWS :: SQS :: Client
- bundle
-
- true
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
- JavaSE-1.8
- ${project.artifactId}
- ${project.version}
-
-
- !org.opennms.core.ipc.sink.aws.sqs.server,
- *
-
-
-
-
-
-
-
-
- org.osgi
- org.osgi.core
- provided
-
-
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.common
- ${project.version}
-
-
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.server
- ${project.version}
-
-
-
diff --git a/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSConditionalSinkContext.java b/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSConditionalSinkContext.java
deleted file mode 100644
index 59196591fa99..000000000000
--- a/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSConditionalSinkContext.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.client;
-
-import static org.opennms.core.ipc.sink.common.SinkStrategy.Strategy.SQS;
-
-import org.opennms.core.ipc.sink.api.MessageConsumerManager;
-import org.opennms.core.ipc.sink.common.SinkStrategy;
-import org.opennms.core.logging.Logging;
-import org.opennms.core.logging.Logging.MDCCloseable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ConfigurationCondition;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-@Configuration
-@Conditional(AmazonSQSConditionalSinkContext.Condition.class)
-@ImportResource("/META-INF/opennms/applicationContext-ipc-sink-aws-client.xml")
-public class AmazonSQSConditionalSinkContext {
-
- /** The Constant LOG. */
- private static final Logger LOG = LoggerFactory.getLogger(AmazonSQSConditionalSinkContext.class);
-
- /**
- * The Class Condition.
- */
- static class Condition implements ConfigurationCondition {
-
- /* (non-Javadoc)
- * @see org.springframework.context.annotation.ConfigurationCondition#getConfigurationPhase()
- */
- @Override
- public ConfigurationPhase getConfigurationPhase() {
- return ConfigurationPhase.PARSE_CONFIGURATION;
- }
-
- /* (non-Javadoc)
- * @see org.springframework.context.annotation.Condition#matches(org.springframework.context.annotation.ConditionContext, org.springframework.core.type.AnnotatedTypeMetadata)
- */
- @Override
- public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
- final boolean enabled = SQS.equals(SinkStrategy.getSinkStrategy());
- try (MDCCloseable mdc = Logging.withPrefixCloseable(MessageConsumerManager.LOG_PREFIX)) {
- LOG.debug("Enable AWS SQS Sink: {}", enabled);
- }
- return enabled;
- }
- }
-}
diff --git a/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSLocalMessageDispatcherFactory.java b/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSLocalMessageDispatcherFactory.java
deleted file mode 100644
index 5bffebe18635..000000000000
--- a/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSLocalMessageDispatcherFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.client;
-
-import static org.opennms.core.ipc.sink.api.Message.SINK_METRIC_PRODUCER_DOMAIN;
-
-import org.opennms.core.ipc.sink.api.Message;
-import org.opennms.core.ipc.sink.api.SinkModule;
-import org.opennms.core.ipc.sink.aws.sqs.server.AmazonSQSMessageConsumerManager;
-import org.opennms.core.ipc.sink.common.AbstractMessageDispatcherFactory;
-import org.osgi.framework.BundleContext;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.codahale.metrics.MetricRegistry;
-
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
-
-/**
- * Dispatches the messages directly the consumers.
- *
- * @author Alejandro Galue
- */
-public class AmazonSQSLocalMessageDispatcherFactory extends AbstractMessageDispatcherFactory implements InitializingBean, DisposableBean {
-
- /** The message consumer manager. */
- @Autowired
- private AmazonSQSMessageConsumerManager messageConsumerManager;
-
- private MetricRegistry metrics;
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.common.AbstractMessageDispatcherFactory#dispatch(org.opennms.core.ipc.sink.api.SinkModule, java.lang.Object, org.opennms.core.ipc.sink.api.Message)
- */
- public void dispatch(final SinkModule module, final Void metadata, final T message) {
- messageConsumerManager.dispatch(module, message);
- }
-
- /* (non-Javadoc)
- * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
- */
- @Override
- public void afterPropertiesSet() {
- onInit();
- }
-
- @Override
- public void destroy() {
- onDestroy();
- }
-
- @Override
- public String getMetricDomain() {
- return SINK_METRIC_PRODUCER_DOMAIN;
- }
-
- @Override
- public BundleContext getBundleContext() {
- return null;
- }
-
- @Override
- public Tracer getTracer() {
- return GlobalTracer.get();
- }
-
- @Override
- public MetricRegistry getMetrics() {
- return new MetricRegistry();
- }
-
- public void setMetrics(MetricRegistry metrics) {
- this.metrics = metrics;
- }
-}
diff --git a/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSRemoteMessageDispatcherFactory.java b/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSRemoteMessageDispatcherFactory.java
deleted file mode 100644
index 0c077226fdef..000000000000
--- a/core/ipc/sink/aws-sqs/client/src/main/java/org/opennms/core/ipc/sink/aws/sqs/client/AmazonSQSRemoteMessageDispatcherFactory.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.client;
-
-import static org.opennms.core.ipc.sink.api.Message.SINK_METRIC_PRODUCER_DOMAIN;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.ipc.sink.api.Message;
-import org.opennms.core.ipc.sink.api.MessageConsumerManager;
-import org.opennms.core.ipc.sink.api.SinkModule;
-import org.opennms.core.ipc.sink.common.AbstractMessageDispatcherFactory;
-import org.opennms.core.logging.Logging;
-import org.opennms.core.logging.Logging.MDCCloseable;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.model.AmazonSQSException;
-import com.codahale.metrics.MetricRegistry;
-
-import io.opentracing.Tracer;
-import io.opentracing.util.GlobalTracer;
-
-/**
- * A factory for creating AwsRemoteMessageDispatcher objects.
- *
- * @author Alejandro Galue
- */
-public class AmazonSQSRemoteMessageDispatcherFactory extends AbstractMessageDispatcherFactory {
-
- /** The Constant LOG. */
- private static final Logger LOG = LoggerFactory.getLogger(AmazonSQSRemoteMessageDispatcherFactory.class);
-
- /** The AWS SQS Object. */
- private AmazonSQS sqs;
-
- /** The AWS SQS manager. */
- private AmazonSQSManager awsSqsManager;
-
- private BundleContext bundleContext;
-
- private MetricRegistry metrics;
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.common.AbstractMessageDispatcherFactory#dispatch(org.opennms.core.ipc.sink.api.SinkModule, java.lang.Object, org.opennms.core.ipc.sink.api.Message)
- */
- @Override
- public void dispatch(SinkModule module, String topic, T message) {
- try (MDCCloseable mdc = Logging.withPrefixCloseable(MessageConsumerManager.LOG_PREFIX)) {
- LOG.trace("dispatch({}): sending message {}", topic, message);
- try {
- final String queueUrl = awsSqsManager.getSinkQueueUrlAndCreateIfNecessary(module.getId());
- final String messageId = awsSqsManager.sendMessage(queueUrl, new String(module.marshal((T)message), StandardCharsets.UTF_8));
- LOG.debug("SQS Message with ID {} has been successfully sent to {}", messageId, queueUrl);
- } catch (InterruptedException ex) {
- LOG.warn("Interrupted while trying to send message. Aborting.", ex);
- } catch (RuntimeException ex) {
- LOG.error("Unexpected AWS SDK exception while sending a message. Aborting.", ex);
- }
- }
- }
-
- /**
- * Initializes the producers.
- *
- * @throws IOException Signals that an I/O exception has occurred.
- */
- public void init() throws IOException {
- try (MDCCloseable mdc = Logging.withPrefixCloseable(MessageConsumerManager.LOG_PREFIX)) {
- try {
- sqs = awsSqsManager.getSQSClient();
- } catch (AmazonSQSException e) {
- LOG.error("Can't create an AmazonSQS Object", e);
- }
- onInit();
- }
- }
-
- /**
- * Destroy.
- */
- public void destroy() {
- onDestroy();
- sqs.shutdown();
- }
-
- @Override
- public String getMetricDomain() {
- return SINK_METRIC_PRODUCER_DOMAIN;
- }
-
- @Override
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
-
- @Override
- public Tracer getTracer() {
- return GlobalTracer.get();
- }
-
- /**
- * Sets the AWS SQS manager.
- *
- * @param awsSqsManager the new AWS SQS manager
- */
- public void setAwsSqsManager(AmazonSQSManager awsSqsManager) {
- this.awsSqsManager = awsSqsManager;
- }
-
- public void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
- @Override
- public MetricRegistry getMetrics() {
- return new MetricRegistry();
- }
-
- public void setMetrics(MetricRegistry metrics) {
- this.metrics = metrics;
- }
-}
diff --git a/core/ipc/sink/aws-sqs/client/src/main/resources/META-INF/opennms/applicationContext-ipc-sink-aws-client.xml b/core/ipc/sink/aws-sqs/client/src/main/resources/META-INF/opennms/applicationContext-ipc-sink-aws-client.xml
deleted file mode 100644
index 219d879a59e1..000000000000
--- a/core/ipc/sink/aws-sqs/client/src/main/resources/META-INF/opennms/applicationContext-ipc-sink-aws-client.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/core/ipc/sink/aws-sqs/client/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/sink/aws-sqs/client/src/main/resources/META-INF/opennms/component-dao.xml
deleted file mode 100644
index a871c9e0c219..000000000000
--- a/core/ipc/sink/aws-sqs/client/src/main/resources/META-INF/opennms/component-dao.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/core/ipc/sink/aws-sqs/client/src/main/resources/OSGI-INF/blueprint/blueprint-ipc-client.xml b/core/ipc/sink/aws-sqs/client/src/main/resources/OSGI-INF/blueprint/blueprint-ipc-client.xml
deleted file mode 100644
index 69ba83741c6e..000000000000
--- a/core/ipc/sink/aws-sqs/client/src/main/resources/OSGI-INF/blueprint/blueprint-ipc-client.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/ipc/sink/aws-sqs/common/pom.xml b/core/ipc/sink/aws-sqs/common/pom.xml
deleted file mode 100644
index baf6fdcfb393..000000000000
--- a/core/ipc/sink/aws-sqs/common/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.aws.sqs
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.common
- OpenNMS :: Core :: IPC :: Sink :: AWS :: SQS :: Common
- bundle
-
- true
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
- JavaSE-1.8
- ${project.artifactId}
- ${project.version}
-
-
-
-
-
-
-
- com.google.guava
- guava
-
-
- org.opennms.core
- org.opennms.core.logging
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.api
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.common
- ${project.version}
-
-
- org.osgi
- org.osgi.compendium
- provided
-
-
- org.opennms.dependencies
- spring-dependencies
- pom
-
-
- org.opennms.core.ipc.common
- org.opennms.core.ipc.common.aws-sqs
- ${project.version}
-
-
-
diff --git a/core/ipc/sink/aws-sqs/itests/pom.xml b/core/ipc/sink/aws-sqs/itests/pom.xml
deleted file mode 100644
index 1e8af9a44ee1..000000000000
--- a/core/ipc/sink/aws-sqs/itests/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.aws.sqs
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.itests
- OpenNMS :: Core :: IPC :: Sink :: AWS :: SQS :: Integration Tests
- bundle
-
- true
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
- JavaSE-1.8
- ${project.artifactId}
- ${project.version}
-
-
-
-
-
-
-
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.client
- ${project.version}
- test
-
-
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.server
- ${project.version}
- test
-
-
- org.opennms.core
- org.opennms.core.daemon
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.snmp
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.services
- test
-
-
- org.opennms.core.test-api
- org.opennms.core.test-api.camel
- test
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.xml
- test
-
-
- org.hamcrest
- hamcrest-library
- test
-
-
- com.jayway.awaitility
- awaitility
- test
-
-
- org.mockito
- mockito-core
-
-
- org.opennms
- opennms-dao
- test
-
-
- org.opennms
- opennms-dao-mock
- test
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.mock-impl
- ${project.version}
- test
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.common
- ${project.version}
- test-jar
- test
-
-
-
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/AmazonSQSDispatcherBlueprintIT.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/AmazonSQSDispatcherBlueprintIT.java
deleted file mode 100644
index 131dbfb2312e..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/AmazonSQSDispatcherBlueprintIT.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests;
-
-import org.apache.camel.util.KeyValueHolder;
-import org.junit.Test;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSConfig;
-import org.opennms.core.ipc.common.aws.sqs.MapBasedSQSConfig;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSConstants;
-import org.opennms.core.test.camel.CamelBlueprintTest;
-
-import java.util.Dictionary;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * The Class AwsDispatcherBlueprintIT.
- *
- * @author Alejandro Galue
- */
-public class AmazonSQSDispatcherBlueprintIT extends CamelBlueprintTest {
-
- @SuppressWarnings( "rawtypes" )
- @Override
- protected void addServicesOnStartup(Map> services) {
- services.put(AmazonSQSConfig.class.getName(),
- new KeyValueHolder(new MapBasedSQSConfig(),
- new Properties()));
- }
-
- /* (non-Javadoc)
- * @see org.apache.camel.test.blueprint.CamelBlueprintTestSupport#getBlueprintDescriptor()
- */
- @Override
- protected String getBlueprintDescriptor() {
- return "classpath:/OSGI-INF/blueprint/blueprint-ipc-client.xml,blueprint-empty-camel-context.xml";
- }
-
- /* (non-Javadoc)
- * @see org.apache.camel.test.blueprint.CamelBlueprintTestSupport#setConfigAdminInitialConfiguration(java.util.Properties)
- */
- @Override
- protected String setConfigAdminInitialConfiguration(final Properties props) {
- return AmazonSQSConstants.AWS_CONFIG_PID;
- }
-
- /**
- * Can blueprint load successfully.
- */
- @Test
- public void canBlueprintLoadSuccessfully() {
- }
-
-}
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/HeartbeatSinkIT.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/HeartbeatSinkIT.java
deleted file mode 100644
index 6eb749dd41e1..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/HeartbeatSinkIT.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2020 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2020 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.ipc.sink.api.MessageConsumer;
-import org.opennms.core.ipc.sink.api.MessageDispatcherFactory;
-import org.opennms.core.ipc.sink.api.SinkModule;
-import org.opennms.core.ipc.sink.api.SyncDispatcher;
-import org.opennms.core.ipc.sink.aws.sqs.client.AmazonSQSRemoteMessageDispatcherFactory;
-import org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat.Heartbeat;
-import org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat.HeartbeatModule;
-import org.opennms.core.ipc.sink.aws.sqs.server.AmazonSQSMessageConsumerManager;
-import org.opennms.core.test.OpenNMSJUnit4ClassRunner;
-import org.opennms.test.JUnitConfigurationEnvironment;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.model.Message;
-
-/**
- * The Class HeartbeatSinkIT.
- *
- * Warning: This test requires AWS Access and appropriate credentials stored on ~/.aws/credentials
- *
- * @author Alejandro Galue
- */
-@RunWith(OpenNMSJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
- "classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-ipc-sink-server-aws-mock.xml"
-})
-@JUnitConfigurationEnvironment
-public class HeartbeatSinkIT {
-
- /** The local message dispatcher factory. */
- @Autowired
- private MessageDispatcherFactory localMessageDispatcherFactory;
-
- /** The consumer manager. */
- @Autowired
- private AmazonSQSMessageConsumerManager consumerManager;
-
- /** The SQS manager. */
- @Autowired
- private AmazonSQSManager sqsManager;
-
- /** The remote message dispatcher factory. */
- private AmazonSQSRemoteMessageDispatcherFactory remoteMessageDispatcherFactory;
-
- /**
- * Sets the up.
- *
- * @throws Exception the exception
- */
- @Before
- public void setUp() throws Exception {
- remoteMessageDispatcherFactory = new AmazonSQSRemoteMessageDispatcherFactory();
- remoteMessageDispatcherFactory.setAwsSqsManager(sqsManager);
- remoteMessageDispatcherFactory.init();
-
- LinkedBlockingQueue bodies = new LinkedBlockingQueue<>();
- AmazonSQS sqsClient = mock(AmazonSQS.class, RETURNS_DEEP_STUBS);
- when(sqsClient.receiveMessage(anyString()).getMessages()).thenAnswer(new Answer>() {
- @Override
- public List answer(InvocationOnMock invocation) {
- List messageBodies = new LinkedList<>();
- bodies.drainTo(messageBodies);
- return messageBodies.stream()
- .map(b -> {
- Message msg = new Message();
- msg.setBody(b);
- return msg;
- })
- .collect(Collectors.toList());
- }
- });
-
- when(sqsManager.getSQSClient()).thenReturn(sqsClient);
- when(sqsManager.getSinkQueueUrlAndCreateIfNecessary(anyString())).thenReturn("some-url");
- when(sqsManager.sendMessage(anyString(), anyString())).thenAnswer(new Answer() {
- @Override
- public String answer(InvocationOnMock invocation) throws Throwable {
- String body = invocation.getArgument(1);
- bodies.add(body);
- return null;
- }
- });
- }
-
- /**
- * Can produce and consume messages.
- *
- * @throws Exception the exception
- */
- @Test(timeout=30000)
- public void canProduceAndConsumeMessages() throws Exception {
- HeartbeatModule module = new HeartbeatModule();
-
- AtomicInteger heartbeatCount = new AtomicInteger();
- final MessageConsumer heartbeatConsumer = new MessageConsumer() {
- @Override
- public SinkModule getModule() {
- return module;
- }
-
- @Override
- public void handleMessage(final Heartbeat heartbeat) {
- heartbeatCount.incrementAndGet();
- }
- };
-
- try {
- consumerManager.registerConsumer(heartbeatConsumer);
-
- final SyncDispatcher localDispatcher = localMessageDispatcherFactory.createSyncDispatcher(module);
- localDispatcher.send(new Heartbeat());
- await().atMost(1, MINUTES).until(() -> heartbeatCount.get(), equalTo(1));
-
- final SyncDispatcher dispatcher = remoteMessageDispatcherFactory.createSyncDispatcher(HeartbeatModule.INSTANCE);
-
- dispatcher.send(new Heartbeat());
- await().atMost(1, MINUTES).until(() -> heartbeatCount.get(), equalTo(2));
- } finally {
- consumerManager.unregisterConsumer(heartbeatConsumer);
- }
- }
-
-}
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/HeartbeatSinkPerfIT.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/HeartbeatSinkPerfIT.java
deleted file mode 100644
index 3749e5283dbd..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/HeartbeatSinkPerfIT.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017-2020 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2020 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests;
-
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.model.Message;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.ipc.sink.api.SyncDispatcher;
-import org.opennms.core.ipc.sink.aws.sqs.server.AmazonSQSMessageConsumerManager;
-import org.opennms.core.ipc.sink.aws.sqs.client.AmazonSQSRemoteMessageDispatcherFactory;
-import org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat.Heartbeat;
-import org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat.HeartbeatConsumer;
-import org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat.HeartbeatGenerator;
-import org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat.HeartbeatModule;
-import org.opennms.core.test.OpenNMSJUnit4ClassRunner;
-import org.opennms.test.JUnitConfigurationEnvironment;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static com.jayway.awaitility.Awaitility.await;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-/**
- * Used to help profile the sink producer and consumer against AWS SQS.
- *
- * Warning: This test requires AWS Access and appropriate credentials stored on ~/.aws/credentials
- *
- * @author Alejandro Galue
- */
-@RunWith(OpenNMSJUnit4ClassRunner.class)
-@ContextConfiguration(locations={
- "classpath:/META-INF/opennms/applicationContext-soa.xml",
- "classpath:/META-INF/opennms/applicationContext-mockDao.xml",
- "classpath:/META-INF/opennms/applicationContext-proxy-snmp.xml",
- "classpath:/META-INF/opennms/applicationContext-ipc-sink-server-aws-mock.xml"
-})
-@JUnitConfigurationEnvironment
-public class HeartbeatSinkPerfIT {
-
- /** The consumer manager. */
- @Autowired
- private AmazonSQSMessageConsumerManager consumerManager;
-
- /** The SQS manager. */
- @Autowired
- private AmazonSQSManager sqsManager;
-
- /** The message dispatcher factory. */
- private AmazonSQSRemoteMessageDispatcherFactory messageDispatcherFactory = new AmazonSQSRemoteMessageDispatcherFactory();
-
- /** The generators. */
- private List generators = new ArrayList<>();
-
- /** The metrics. */
- private final MetricRegistry metrics = new MetricRegistry();
-
- /** The received meter. */
- private final Meter receivedMeter = metrics.meter("receivedMeter");
-
- /** The sent meter. */
- private final Meter sentMeter = metrics.meter("sent");
-
- /** The send timer. */
- private final Timer sendTimer = metrics.timer("send");
-
- /** The Constant NUM_CONSUMER_THREADS. */
- private static final int NUM_CONSUMER_THREADS = 2;
-
- /** The Constant NUM_GENERATORS. */
- private static final int NUM_GENERATORS = 2;
-
- /** The Constant RATE_PER_GENERATOR. */
- private static final double RATE_PER_GENERATOR = 1000.0;
-
- /**
- * Sets the up.
- *
- * @throws Exception the exception
- */
- @Before
- public void setUp() throws Exception {
- messageDispatcherFactory = new AmazonSQSRemoteMessageDispatcherFactory();
- messageDispatcherFactory.setAwsSqsManager(sqsManager);
- messageDispatcherFactory.init();
-
- LinkedBlockingQueue bodies = new LinkedBlockingQueue<>();
- AmazonSQS sqsClient = mock(AmazonSQS.class, RETURNS_DEEP_STUBS);
- when(sqsClient.receiveMessage(anyString()).getMessages()).thenAnswer(new Answer>() {
- @Override
- public List answer(InvocationOnMock invocation) {
- List messageBodies = new LinkedList<>();
- bodies.drainTo(messageBodies);
- return messageBodies.stream()
- .map(b -> {
- Message msg = new Message();
- msg.setBody(b);
- return msg;
- })
- .collect(Collectors.toList());
- }
- });
-
- when(sqsManager.getSQSClient()).thenReturn(sqsClient);
- when(sqsManager.getSinkQueueUrlAndCreateIfNecessary(anyString())).thenReturn("some-url");
- when(sqsManager.sendMessage(anyString(), anyString())).thenAnswer(new Answer() {
- @Override
- public String answer(InvocationOnMock invocation) throws Throwable {
- String body = invocation.getArgument(1);
- bodies.add(body);
- return null;
- }
- });
- }
-
- /**
- * Configure generators.
- *
- * @throws Exception the exception
- */
- public void configureGenerators() throws Exception {
- System.err.println("Starting Heartbeat generators.");
-
- // Start the consumer
- final HeartbeatModule parallelHeartbeatModule = new HeartbeatModule() {
- @Override
- public int getNumConsumerThreads() {
- return NUM_CONSUMER_THREADS;
- }
- };
- final HeartbeatConsumer consumer = new HeartbeatConsumer(parallelHeartbeatModule, receivedMeter);
- consumerManager.registerConsumer(consumer);
-
- // Start the dispatcher
- final SyncDispatcher dispatcher = messageDispatcherFactory.createSyncDispatcher(HeartbeatModule.INSTANCE);
-
- // Fire up the generators
- generators = new ArrayList<>(NUM_GENERATORS);
- for (int k = 0; k < NUM_GENERATORS; k++) {
- final HeartbeatGenerator generator = new HeartbeatGenerator(dispatcher, RATE_PER_GENERATOR, sentMeter, sendTimer);
- generators.add(generator);
- generator.start();
- }
- }
-
- /**
- * Tear down.
- *
- * @throws Exception the exception
- */
- @After
- public void tearDown() throws Exception {
- if (generators != null) {
- for (HeartbeatGenerator generator : generators) {
- generator.stop();
- }
- generators.clear();
- }
- consumerManager.unregisterAllConsumers();
- }
-
- /**
- * Quick run.
- *
- * @throws Exception the exception
- */
- @Test(timeout=30000)
- public void quickRun() throws Exception {
- configureGenerators();
- await().atMost(30, TimeUnit.SECONDS).until(() -> Long.valueOf(receivedMeter.getCount()), greaterThan(100L));
- }
-
-}
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/Heartbeat.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/Heartbeat.java
deleted file mode 100644
index 878276f042ed..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/Heartbeat.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.opennms.core.ipc.sink.api.Message;
-
-/**
- * The Class Heartbeat.
- *
- * @author Alejandro Galue
- */
-@XmlRootElement(name="heartbeat")
-@XmlAccessorType(XmlAccessType.NONE)
-public class Heartbeat implements Message {
-
-}
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatConsumer.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatConsumer.java
deleted file mode 100644
index af07c0d17ced..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatConsumer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat;
-
-import org.opennms.core.ipc.sink.api.MessageConsumer;
-import org.opennms.core.ipc.sink.api.SinkModule;
-
-import com.codahale.metrics.Meter;
-
-/**
- * The Class HeartbeatConsumer.
- *
- * @author Alejandro Galue
- */
-public class HeartbeatConsumer implements MessageConsumer {
-
- /** The heartbeat module. */
- private final HeartbeatModule heartbeatModule;
-
- /** The received meter. */
- private final Meter receivedMeter;
-
- /**
- * Instantiates a new heartbeat consumer.
- *
- * @param heartbeatModule the heartbeat module
- * @param receivedMeter the received meter
- */
- public HeartbeatConsumer(HeartbeatModule heartbeatModule, Meter receivedMeter) {
- this.heartbeatModule = heartbeatModule;
- this.receivedMeter = receivedMeter;
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.api.MessageConsumer#getModule()
- */
- @Override
- public SinkModule getModule() {
- return heartbeatModule;
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.api.MessageConsumer#handleMessage(org.opennms.core.ipc.sink.api.Message)
- */
- @Override
- public void handleMessage(Heartbeat message) {
- receivedMeter.mark();
- }
-
-}
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatGenerator.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatGenerator.java
deleted file mode 100644
index 8e2e27e532ca..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatGenerator.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.opennms.core.ipc.sink.api.SyncDispatcher;
-
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-import com.codahale.metrics.Timer.Context;
-import com.google.common.util.concurrent.RateLimiter;
-
-/**
- * The Class HeartbeatGenerator.
- *
- * @author Alejandro Galue
- */
-public class HeartbeatGenerator {
-
- /** The thread. */
- Thread thread;
-
- /** The dispatcher. */
- final SyncDispatcher dispatcher;
-
- /** The rate. */
- final double rate;
-
- /** The stopped. */
- final AtomicBoolean stopped = new AtomicBoolean(false);
-
- /** The sent meter. */
- private final Meter sentMeter;
-
- /** The send timer. */
- private final Timer sendTimer;
-
- /**
- * Instantiates a new heartbeat generator.
- *
- * @param dispatcher the dispatcher
- * @param rate the rate
- */
- public HeartbeatGenerator(SyncDispatcher dispatcher, double rate) {
- this.dispatcher = dispatcher;
- this.rate = rate;
- MetricRegistry metrics = new MetricRegistry();
- this.sentMeter = metrics.meter("sent");
- this.sendTimer = metrics.timer("send");
- }
-
- /**
- * Instantiates a new heartbeat generator.
- *
- * @param dispatcher the dispatcher
- * @param rate the rate
- * @param sentMeter the sent meter
- * @param sendTimer the send timer
- */
- public HeartbeatGenerator(SyncDispatcher dispatcher, double rate, Meter sentMeter, Timer sendTimer) {
- this.dispatcher = dispatcher;
- this.rate = rate;
- this.sentMeter = sentMeter;
- this.sendTimer = sendTimer;
- }
-
- /**
- * Start.
- */
- public synchronized void start() {
- stopped.set(false);
- final RateLimiter rateLimiter = RateLimiter.create(rate);
- thread = new Thread(new Runnable() {
- @Override
- public void run() {
-
- while(!stopped.get()) {
- rateLimiter.acquire();
- try (Context ctx = sendTimer.time()) {
- dispatcher.send(new Heartbeat());
- sentMeter.mark();
- }
- }
- }
- });
- thread.start();
- }
-
- /**
- * Stop.
- *
- * @throws InterruptedException the interrupted exception
- */
- public synchronized void stop() throws InterruptedException {
- stopped.set(true);
- if (thread != null) {
- thread.join();
- thread = null;
- }
- }
-}
\ No newline at end of file
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatModule.java b/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatModule.java
deleted file mode 100644
index bb41907a9092..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/java/org/opennms/core/ipc/sink/aws/sqs/itests/heartbeat/HeartbeatModule.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.itests.heartbeat;
-
-import org.opennms.core.ipc.sink.api.AggregationPolicy;
-import org.opennms.core.ipc.sink.api.AsyncPolicy;
-import org.opennms.core.ipc.sink.xml.AbstractXmlSinkModule;
-
-/**
- * The Class HeartbeatModule.
- *
- * @author Alejandro Galue
- */
-public class HeartbeatModule extends AbstractXmlSinkModule {
-
- /** The Constant INSTANCE. */
- public static final HeartbeatModule INSTANCE = new HeartbeatModule();
-
- /**
- * Instantiates a new heartbeat module.
- */
- public HeartbeatModule() {
- super(Heartbeat.class);
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.api.SinkModule#getNumConsumerThreads()
- */
- @Override
- public int getNumConsumerThreads() {
- return 1;
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.api.SinkModule#getId()
- */
- @Override
- public String getId() {
- return "Heartbeat";
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.api.SinkModule#getAggregationPolicy()
- */
- @Override
- public AggregationPolicy getAggregationPolicy() {
- // No aggregation
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.api.SinkModule#getAsyncPolicy()
- */
- @Override
- public AsyncPolicy getAsyncPolicy() {
- // Only synchronous dispatching
- return null;
- }
-
-}
diff --git a/core/ipc/sink/aws-sqs/itests/src/test/resources/META-INF/opennms/applicationContext-ipc-sink-server-aws-mock.xml b/core/ipc/sink/aws-sqs/itests/src/test/resources/META-INF/opennms/applicationContext-ipc-sink-server-aws-mock.xml
deleted file mode 100644
index 4247f086d750..000000000000
--- a/core/ipc/sink/aws-sqs/itests/src/test/resources/META-INF/opennms/applicationContext-ipc-sink-server-aws-mock.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/ipc/sink/aws-sqs/pom.xml b/core/ipc/sink/aws-sqs/pom.xml
deleted file mode 100644
index 8415d318f939..000000000000
--- a/core/ipc/sink/aws-sqs/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- org.opennms.core.ipc
- org.opennms.core.ipc.sink
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.aws.sqs
- pom
- OpenNMS :: Core :: IPC :: Sink :: AWS :: SQS
-
- common
- client
- server
- itests
-
-
diff --git a/core/ipc/sink/aws-sqs/server/pom.xml b/core/ipc/sink/aws-sqs/server/pom.xml
deleted file mode 100644
index 3ca7092659f6..000000000000
--- a/core/ipc/sink/aws-sqs/server/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- org.opennms.core.ipc.sink
- org.opennms.core.ipc.sink.aws.sqs
- 28.1.1
-
- 4.0.0
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.server
- OpenNMS :: Core :: IPC :: Sink :: AWS :: SQS :: Server
- bundle
-
- true
-
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
- JavaSE-1.8
- ${project.artifactId}
- ${project.version}
-
-
-
-
-
-
-
- org.opennms.core.ipc.sink.aws.sqs
- org.opennms.core.ipc.sink.aws.sqs.common
- ${project.version}
-
-
-
diff --git a/core/ipc/sink/aws-sqs/server/src/main/java/org/opennms/core/ipc/sink/aws/sqs/server/AmazonSQSConditionalSinkContext.java b/core/ipc/sink/aws-sqs/server/src/main/java/org/opennms/core/ipc/sink/aws/sqs/server/AmazonSQSConditionalSinkContext.java
deleted file mode 100644
index 7b1ab7d532bd..000000000000
--- a/core/ipc/sink/aws-sqs/server/src/main/java/org/opennms/core/ipc/sink/aws/sqs/server/AmazonSQSConditionalSinkContext.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.server;
-
-import static org.opennms.core.ipc.sink.common.SinkStrategy.Strategy.SQS;
-
-import org.opennms.core.ipc.sink.api.MessageConsumerManager;
-import org.opennms.core.ipc.sink.common.SinkStrategy;
-import org.opennms.core.logging.Logging;
-import org.opennms.core.logging.Logging.MDCCloseable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ConfigurationCondition;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.core.type.AnnotatedTypeMetadata;
-
-@Configuration
-@Conditional(AmazonSQSConditionalSinkContext.Condition.class)
-@ImportResource("/META-INF/opennms/applicationContext-ipc-sink-aws-server.xml")
-public class AmazonSQSConditionalSinkContext {
-
- /** The Constant LOG. */
- private static final Logger LOG = LoggerFactory.getLogger(AmazonSQSConditionalSinkContext.class);
-
- /**
- * The Class Condition.
- */
- static class Condition implements ConfigurationCondition {
-
- /* (non-Javadoc)
- * @see org.springframework.context.annotation.ConfigurationCondition#getConfigurationPhase()
- */
- @Override
- public ConfigurationPhase getConfigurationPhase() {
- return ConfigurationPhase.PARSE_CONFIGURATION;
- }
-
- /* (non-Javadoc)
- * @see org.springframework.context.annotation.Condition#matches(org.springframework.context.annotation.ConditionContext, org.springframework.core.type.AnnotatedTypeMetadata)
- */
- @Override
- public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
- final boolean enabled = SQS.equals(SinkStrategy.getSinkStrategy());
- try (MDCCloseable mdc = Logging.withPrefixCloseable(MessageConsumerManager.LOG_PREFIX)) {
- LOG.debug("Enable AWS SQS Sink: {}", enabled);
- }
- return enabled;
- }
- }
-}
diff --git a/core/ipc/sink/aws-sqs/server/src/main/java/org/opennms/core/ipc/sink/aws/sqs/server/AmazonSQSMessageConsumerManager.java b/core/ipc/sink/aws-sqs/server/src/main/java/org/opennms/core/ipc/sink/aws/sqs/server/AmazonSQSMessageConsumerManager.java
deleted file mode 100644
index ab899540fdcb..000000000000
--- a/core/ipc/sink/aws-sqs/server/src/main/java/org/opennms/core/ipc/sink/aws/sqs/server/AmazonSQSMessageConsumerManager.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2017 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2017 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.core.ipc.sink.aws.sqs.server;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.opennms.core.ipc.common.aws.sqs.AmazonSQSManager;
-import org.opennms.core.ipc.sink.api.Message;
-import org.opennms.core.ipc.sink.api.MessageConsumerManager;
-import org.opennms.core.ipc.sink.api.SinkModule;
-import org.opennms.core.ipc.sink.common.AbstractMessageConsumerManager;
-import org.opennms.core.logging.Logging;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.model.AmazonSQSException;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-/**
- * The Class AwsMessageConsumerManager.
- *
- * @author Alejandro Galue
- */
-public class AmazonSQSMessageConsumerManager extends AbstractMessageConsumerManager {
-
- /** The Constant LOG. */
- private static final Logger LOG = LoggerFactory.getLogger(AmazonSQSMessageConsumerManager.class);
-
- /** The consumer runners by module. */
- private final Map, List> consumerRunnersByModule = new ConcurrentHashMap<>();
-
- /** The thread factory. */
- private final ThreadFactory threadFactory = new ThreadFactoryBuilder()
- .setNameFormat("sqs-consumer-%d")
- .build();
-
- /** The executor. */
- private final ExecutorService executor = Executors.newCachedThreadPool(threadFactory);
-
- /** The AWS SQS manager. */
- private AmazonSQSManager awsSqsManager;
-
- /**
- * The Class AwsConsumerRunner.
- */
- private class AwsConsumerRunner implements Runnable {
-
- /** The module. */
- private final SinkModule module;
-
- /** The closed. */
- private final AtomicBoolean closed = new AtomicBoolean(false);
-
- /** The AWS SQS Object. */
- private final AmazonSQS sqs;
-
- /** The queue URL. This is cached to avoid an API call on each attempt to send a message. */
- private String queueUrl;
-
- /**
- * Instantiates a new AWS consumer runner.
- *
- * @param module the module
- * @throws AmazonSQSException the Amazon SQS exception
- */
- public AwsConsumerRunner(SinkModule module) throws AmazonSQSException {
- this.module = module;
- sqs = awsSqsManager.getSQSClient();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- @Override
- public void run() {
- Logging.putPrefix(MessageConsumerManager.LOG_PREFIX);
- try {
- LOG.debug("Retrieving queue URL for module with id: {}", module.getId());
- queueUrl = awsSqsManager.getSinkQueueUrlAndCreateIfNecessary(module.getId());
- LOG.debug("Using queue URL: {}", queueUrl);
- } catch (InterruptedException e) {
- LOG.error("Interrupted while retrieving queue URL. Aborting consumer.", e);
- }
-
- while (!closed.get()) {
- // The SQS Queue is configured to use "Long Polling" through "ReceiveMessageWaitTimeSeconds".
- // That means, calling receiveMessage will block the thread execution for that amount of time if there are no messages on the queue.
- // This is recommended to reduce the traffic against AWS, which can be translated into undesired costs.
- List messages = null;
- try {
- messages = sqs.receiveMessage(queueUrl).getMessages();
- } catch (RuntimeException e) {
- LOG.error("Unexpected exception while receiving messages from " + queueUrl, e);
- }
- if (messages != null) {
- for (com.amazonaws.services.sqs.model.Message m : messages) {
- try {
- LOG.debug("Received SQS message with ID {} from {}", m.getMessageId(), queueUrl);
- final Message msg = module.unmarshal(m.getBody().getBytes(StandardCharsets.UTF_8));
- dispatch(module, msg);
- LOG.debug("Message with ID {} successfully dispatched.", m.getMessageId(), queueUrl);
- } catch (RuntimeException e) {
- final String msg = String.format("Unexpected exception while dispatching message with ID %s from %s", m.getMessageId(), queueUrl);
- LOG.warn(msg, e);
- } finally {
- // This is mandatory to avoid re-process a message on a subsequent receive request.
- LOG.debug("Deleting SQS message receipt handle {} from {}", m.getReceiptHandle(), queueUrl);
- sqs.deleteMessage(queueUrl, m.getReceiptHandle());
- }
- }
- }
- }
- }
-
- /**
- * Shutdown hook which can be called from a separate thread
- */
- public void shutdown() {
- closed.set(true);
- sqs.shutdown();
- }
- }
-
- /**
- * Sets the AWS SQS manager.
- *
- * @param awsSqsManager the new AWS SQS manager
- */
- public void setAwsSqsManager(AmazonSQSManager awsSqsManager) {
- this.awsSqsManager = awsSqsManager;
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.common.AbstractMessageConsumerManager#startConsumingForModule(org.opennms.core.ipc.sink.api.SinkModule)
- */
- @Override
- protected void startConsumingForModule(SinkModule module) throws Exception {
- if (!consumerRunnersByModule.containsKey(module)) {
- LOG.info("Starting consumers for module: {}", module);
-
- final int numConsumerThreads = getNumConsumerThreads(module);
- final List consumerRunners = new ArrayList<>(numConsumerThreads);
- for (int i = 0; i < numConsumerThreads; i++) {
- final AwsConsumerRunner consumerRunner = new AwsConsumerRunner(module);
- executor.execute(consumerRunner);
- consumerRunners.add(new AwsConsumerRunner(module));
- }
-
- consumerRunnersByModule.put(module, consumerRunners);
- }
- }
-
- /* (non-Javadoc)
- * @see org.opennms.core.ipc.sink.common.AbstractMessageConsumerManager#stopConsumingForModule(org.opennms.core.ipc.sink.api.SinkModule)
- */
- @Override
- protected void stopConsumingForModule(SinkModule module) throws Exception {
- if (consumerRunnersByModule.containsKey(module)) {
- LOG.info("Stopping consumers for module: {}", module);
- final List consumerRunners = consumerRunnersByModule.get(module);
- for (AwsConsumerRunner consumerRunner : consumerRunners) {
- consumerRunner.shutdown();
- }
- consumerRunnersByModule.remove(module);
- }
- }
-
- public void shutdown() {
- executor.shutdown();
- if(getStartupExecutor() != null) {
- getStartupExecutor().shutdown();
- }
- }
-}
diff --git a/core/ipc/sink/aws-sqs/server/src/main/resources/META-INF/opennms/applicationContext-ipc-sink-aws-server.xml b/core/ipc/sink/aws-sqs/server/src/main/resources/META-INF/opennms/applicationContext-ipc-sink-aws-server.xml
deleted file mode 100644
index 1d664405d61c..000000000000
--- a/core/ipc/sink/aws-sqs/server/src/main/resources/META-INF/opennms/applicationContext-ipc-sink-aws-server.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/ipc/sink/aws-sqs/server/src/main/resources/META-INF/opennms/component-dao.xml b/core/ipc/sink/aws-sqs/server/src/main/resources/META-INF/opennms/component-dao.xml
deleted file mode 100644
index 36fd9fc370a8..000000000000
--- a/core/ipc/sink/aws-sqs/server/src/main/resources/META-INF/opennms/component-dao.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/core/ipc/sink/aws-sqs/server/src/main/resources/OSGI-INF/blueprint/blueprint-ipc-server.xml b/core/ipc/sink/aws-sqs/server/src/main/resources/OSGI-INF/blueprint/blueprint-ipc-server.xml
deleted file mode 100644
index a301df63312b..000000000000
--- a/core/ipc/sink/aws-sqs/server/src/main/resources/OSGI-INF/blueprint/blueprint-ipc-server.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/ipc/sink/camel/client/pom.xml b/core/ipc/sink/camel/client/pom.xml
index 028b32bbfae1..51eb998160b7 100644
--- a/core/ipc/sink/camel/client/pom.xml
+++ b/core/ipc/sink/camel/client/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.camel
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
@@ -42,7 +42,7 @@
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/sink/camel/common/pom.xml b/core/ipc/sink/camel/common/pom.xml
index 70ffef02539f..da6f7371b034 100644
--- a/core/ipc/sink/camel/common/pom.xml
+++ b/core/ipc/sink/camel/common/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.camel
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
diff --git a/core/ipc/sink/camel/itests/pom.xml b/core/ipc/sink/camel/itests/pom.xml
index bbc385347cc5..dcf86f47ebee 100644
--- a/core/ipc/sink/camel/itests/pom.xml
+++ b/core/ipc/sink/camel/itests/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.camel
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
diff --git a/core/ipc/sink/camel/pom.xml b/core/ipc/sink/camel/pom.xml
index 29feba05abbc..858013b5603a 100644
--- a/core/ipc/sink/camel/pom.xml
+++ b/core/ipc/sink/camel/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
diff --git a/core/ipc/sink/camel/server/pom.xml b/core/ipc/sink/camel/server/pom.xml
index f87039578aa7..905f6b414587 100644
--- a/core/ipc/sink/camel/server/pom.xml
+++ b/core/ipc/sink/camel/server/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.camel
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
diff --git a/core/ipc/sink/common/pom.xml b/core/ipc/sink/common/pom.xml
index d086160bb5ce..fa963396064a 100644
--- a/core/ipc/sink/common/pom.xml
+++ b/core/ipc/sink/common/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
@@ -69,7 +69,7 @@
org.osgi
- org.osgi.core
+ osgi.core
provided
@@ -103,7 +103,7 @@
org.osgi
- org.osgi.compendium
+ osgi.cmpn
provided
diff --git a/core/ipc/sink/common/src/main/java/org/opennms/core/ipc/sink/common/SinkStrategy.java b/core/ipc/sink/common/src/main/java/org/opennms/core/ipc/sink/common/SinkStrategy.java
index 75e787bdda85..f8232f3499fd 100644
--- a/core/ipc/sink/common/src/main/java/org/opennms/core/ipc/sink/common/SinkStrategy.java
+++ b/core/ipc/sink/common/src/main/java/org/opennms/core/ipc/sink/common/SinkStrategy.java
@@ -40,8 +40,6 @@ public class SinkStrategy {
private static final String KAFKA_SINK_STRATEGY_NAME = "kafka";
- private static final String SQS_SINK_STRATEGY_NAME = "sqs";
-
private static final String GRPC_SINK_STRATEGY_NAME = "grpc";
private static final String OSGI_SINK_STRATEGY_NAME = "osgi";
@@ -49,7 +47,6 @@ public class SinkStrategy {
public static enum Strategy {
CAMEL(CAMEL_SINK_STRATEGY_NAME, "JMS implementation using Camel"),
KAFKA(KAFKA_SINK_STRATEGY_NAME, "Kafka implementation using the Kafka consumer/producer APIs"),
- SQS(SQS_SINK_STRATEGY_NAME, "AWS SQS implementation using the AWS SDK"),
GRPC(GRPC_SINK_STRATEGY_NAME, "GRPC implementation using gRPC APIs"),
OSGI(OSGI_SINK_STRATEGY_NAME, "OSGI Delegate implementation");
diff --git a/core/ipc/sink/kafka/client/pom.xml b/core/ipc/sink/kafka/client/pom.xml
index 8b6a315c41ed..519144ab660e 100644
--- a/core/ipc/sink/kafka/client/pom.xml
+++ b/core/ipc/sink/kafka/client/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.kafka
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink.kafka
@@ -40,7 +40,7 @@
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/sink/kafka/itests/pom.xml b/core/ipc/sink/kafka/itests/pom.xml
index ae82b5ed8eca..765b01c52ee7 100644
--- a/core/ipc/sink/kafka/itests/pom.xml
+++ b/core/ipc/sink/kafka/itests/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.kafka
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink.kafka
diff --git a/core/ipc/sink/kafka/pom.xml b/core/ipc/sink/kafka/pom.xml
index 95957be3428f..59710c15470c 100644
--- a/core/ipc/sink/kafka/pom.xml
+++ b/core/ipc/sink/kafka/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
diff --git a/core/ipc/sink/kafka/server/pom.xml b/core/ipc/sink/kafka/server/pom.xml
index 79dcacb44d44..30d60d27ca42 100644
--- a/core/ipc/sink/kafka/server/pom.xml
+++ b/core/ipc/sink/kafka/server/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc.sink
org.opennms.core.ipc.sink.kafka
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink.kafka
diff --git a/core/ipc/sink/mock-impl/pom.xml b/core/ipc/sink/mock-impl/pom.xml
index 40d28f3293b8..abc68d3766f7 100644
--- a/core/ipc/sink/mock-impl/pom.xml
+++ b/core/ipc/sink/mock-impl/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
@@ -29,7 +29,7 @@
org.osgi
- org.osgi.core
+ osgi.core
provided
diff --git a/core/ipc/sink/off-heap/pom.xml b/core/ipc/sink/off-heap/pom.xml
index f6a1d3ffd5fb..1d3d6ca316d0 100644
--- a/core/ipc/sink/off-heap/pom.xml
+++ b/core/ipc/sink/off-heap/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
diff --git a/core/ipc/sink/pom.xml b/core/ipc/sink/pom.xml
index bf0cacd93774..32fe627c7fbf 100644
--- a/core/ipc/sink/pom.xml
+++ b/core/ipc/sink/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core
org.opennms.core.ipc
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc
@@ -15,7 +15,6 @@
common
camel
kafka
- aws-sqs
mock-impl
xml
off-heap
diff --git a/core/ipc/sink/xml/pom.xml b/core/ipc/sink/xml/pom.xml
index 804c46b6f26c..d7bb52aed4f3 100644
--- a/core/ipc/sink/xml/pom.xml
+++ b/core/ipc/sink/xml/pom.xml
@@ -3,7 +3,7 @@
org.opennms.core.ipc
org.opennms.core.ipc.sink
- 28.1.1
+ 29.0.0-SNAPSHOT
4.0.0
org.opennms.core.ipc.sink
diff --git a/core/ipc/twin/api/pom.xml b/core/ipc/twin/api/pom.xml
new file mode 100644
index 000000000000..a75e6916524b
--- /dev/null
+++ b/core/ipc/twin/api/pom.xml
@@ -0,0 +1,37 @@
+
+
+
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc
+ 29.0.0-SNAPSHOT
+
+ 4.0.0
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc.twin.api
+ bundle
+ OpenNMS :: Core :: IPC :: Twin :: API
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ JavaSE-1.8
+ ${project.artifactId}
+ ${project.version}
+
+
+
+
+
+
+
+ com.google.guava
+ guava
+
+
+
\ No newline at end of file
diff --git a/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinPublisher.java b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinPublisher.java
new file mode 100644
index 000000000000..1b876af57ae9
--- /dev/null
+++ b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinPublisher.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.api;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * TwinPublisher lives on OpenNMS that handles all the Objects that need to be replicated.
+ * At boot up, modules register module specific key with TwinPublisher.
+ * Modules publish initial objects/updated objects on the session.
+ */
+
+public interface TwinPublisher extends Closeable {
+
+ /**
+ * Session that can publish initial objects and updates to T.
+ *
+ * @param type of object that is getting replicated.
+ */
+ interface Session extends Closeable {
+ /**
+ * @param obj an object that needs replication on Minion
+ */
+ void publish(T obj) throws IOException;
+ }
+
+ /**
+ * @param type of object for replication
+ * @param key unique key for the object.
+ * @param clazz a class used for serialization.
+ * @param location targeted Minion location for the object, set null for all locations.
+ * @return Session which provides updates to object.
+ */
+ Session register(String key, Class clazz, String location) throws IOException;
+
+ default Session register(String key, Class clazz) throws IOException {
+ return register(key, clazz, null);
+ }
+}
+
diff --git a/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinStrategy.java b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinStrategy.java
new file mode 100644
index 000000000000..a87fb011ff2e
--- /dev/null
+++ b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinStrategy.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.api;
+
+import com.google.common.base.Strings;
+
+public class TwinStrategy {
+
+ public static final String IPC_STRATEGY = "org.opennms.core.ipc.strategy";
+
+ public static final String TWIN_STRATEGY_PROPERTY = "org.opennms.core.ipc.twin.strategy";
+
+ private static final String JMS_TWIN_STRATEGY_NAME = "jms";
+
+ private static final String KAFKA_TWIN_STRATEGY_NAME = "kafka";
+
+ private static final String GRPC_TWIN_STRATEGY_NAME = "grpc";
+
+ private static final String OSGI_TWIN_STRATEGY_NAME = "osgi";
+
+ public static enum Strategy {
+ JMS(JMS_TWIN_STRATEGY_NAME, "JMS implementation using Camel"),
+ KAFKA(KAFKA_TWIN_STRATEGY_NAME, "Kafka implementation using the Kafka consumer/producer APIs"),
+ GRPC(GRPC_TWIN_STRATEGY_NAME, "GRPC implementation using gRPC APIs"),
+ OSGI(OSGI_TWIN_STRATEGY_NAME, "OSGI Delegate implementation");
+
+ private final String m_name;
+ private final String m_descr;
+
+ Strategy(String name, String descr) {
+ m_name = name;
+ m_descr = descr;
+ }
+ Strategy(String name) {
+ this(name, name);
+ }
+
+ public String getName() {
+ return m_name;
+ }
+
+ public String getDescr() {
+ return m_descr;
+ }
+ }
+
+ public static Strategy getTwinStrategy() {
+ String effectiveStrategyName = System.getProperty(IPC_STRATEGY);
+ if (Strings.isNullOrEmpty(effectiveStrategyName)) {
+ effectiveStrategyName = System.getProperty(TWIN_STRATEGY_PROPERTY, JMS_TWIN_STRATEGY_NAME);
+ }
+ for (Strategy strategy : Strategy.values()) {
+ if (strategy.getName().equalsIgnoreCase(effectiveStrategyName)) {
+ return strategy;
+ }
+ }
+ throw new IllegalArgumentException("Unsupported Twin strategy: " + effectiveStrategyName);
+ }
+}
diff --git a/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinSubscriber.java b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinSubscriber.java
new file mode 100644
index 000000000000..8cfc828d6c94
--- /dev/null
+++ b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/TwinSubscriber.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.api;
+
+import java.io.Closeable;
+import java.util.function.Consumer;
+
+/**
+ * TwinSubscriber lives on Minion that handles all the Object subscriptions on Minion.
+ * At boot up, a module that lives on Minion issues an RPC from Minion to OpenNMS to get an object.
+ * Subsequent updates of the object will come as reverse sink messages from OpenNMS to Minion
+ */
+public interface TwinSubscriber extends Closeable {
+
+ /**
+ * @param key Unique key for the object.
+ * @param clazz Specific bean class of T to marshal/unmarshal.
+ * @param consumer Consumer of T for subsequent updates to T.
+ * @param T is an object type that needs to be replicated from OpenNMS to Minion.
+ * @return Closeable to close the subscription of T.
+ */
+ Closeable subscribe(String key, Class clazz, Consumer consumer);
+}
diff --git a/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/util/StatefulSubscription.java b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/util/StatefulSubscription.java
new file mode 100644
index 000000000000..1c775e702ee0
--- /dev/null
+++ b/core/ipc/twin/api/src/main/java/org/opennms/core/ipc/twin/api/util/StatefulSubscription.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.api.util;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+
+public abstract class StatefulSubscription implements Consumer {
+
+ private T current = null;
+
+ protected abstract void accept(final T current, final T update);
+
+ @Override
+ public final void accept(final T update) {
+ if (!Objects.equals(this.current, update)) {
+ this.accept(this.current, update);
+ }
+
+ this.current = update;
+ }
+
+ public T getCurrent() {
+ return this.current;
+ }
+}
diff --git a/core/ipc/twin/common/pom.xml b/core/ipc/twin/common/pom.xml
new file mode 100644
index 000000000000..4e71c6feddc6
--- /dev/null
+++ b/core/ipc/twin/common/pom.xml
@@ -0,0 +1,157 @@
+
+
+
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc
+ 29.0.0-SNAPSHOT
+
+ 4.0.0
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc.twin.common
+ OpenNMS :: Core :: IPC :: Twin :: Common
+ bundle
+
+ ${project.basedir}/src/main
+
+
+
+
+
+
+
+
+ ${protobuf.source.dir}
+
+ proto/twin-message.proto
+
+
+
+
+
+
+
+
+
+ org.apache.felix
+ maven-bundle-plugin
+ true
+
+
+ JavaSE-1.8
+ ${project.artifactId}
+ ${project.version}
+
+
+
+
+
+
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.opennms.core.ipc.twin
+ org.opennms.core.ipc.twin.api
+ ${project.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson2Version}
+
+
+ com.github.java-json-tools
+ json-patch
+ ${jsonPatchVersion}
+
+
+ org.opennms.features.distributed
+ core-api
+ ${project.version}
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobufVersion}
+
+
+ junit
+ junit
+ test
+
+
+ org.opennms.core.test-api
+ org.opennms.core.test-api.kafka
+ ${project.version}
+ test
+
+
+ com.jayway.awaitility
+ awaitility
+ test
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.11.2
+ test
+
+
+
\ No newline at end of file
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/AbstractTwinPublisher.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/AbstractTwinPublisher.java
new file mode 100644
index 000000000000..994f94847a9b
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/AbstractTwinPublisher.java
@@ -0,0 +1,238 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.BiConsumer;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jsonpatch.diff.JsonDiff;
+import com.google.common.base.Strings;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import org.opennms.core.ipc.twin.api.TwinPublisher;
+import org.opennms.core.ipc.twin.model.TwinRequestProto;
+import org.opennms.core.ipc.twin.model.TwinResponseProto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public abstract class AbstractTwinPublisher implements TwinPublisher {
+
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractTwinPublisher.class);
+ private final Map twinTrackerMap = new HashMap<>();
+ protected final ObjectMapper objectMapper = new ObjectMapper();
+
+ private final LocalTwinSubscriber localTwinSubscriber;
+
+ public AbstractTwinPublisher(LocalTwinSubscriber localTwinSubscriber) {
+ this.localTwinSubscriber = Objects.requireNonNull(localTwinSubscriber);
+ }
+
+ /**
+ * @param sinkUpdate Handle sink Update from @{@link AbstractTwinPublisher}.
+ */
+ protected abstract void handleSinkUpdate(TwinUpdate sinkUpdate);
+
+ @Override
+ public Session register(String key, Class clazz, String location) throws IOException {
+ SessionKey sessionKey = new SessionKey(key, location);
+ LOG.info("Registered a session with key {}", sessionKey);
+ return new SessionImpl<>(sessionKey);
+ }
+
+ protected TwinUpdate getTwin(TwinRequest twinRequest) {
+ TwinTracker twinTracker = getTwinTracker(twinRequest.getKey(), twinRequest.getLocation());
+ TwinUpdate twinUpdate;
+ if (twinTracker == null) {
+ // No twin object exists for this key yet, return with null object.
+ twinUpdate = new TwinUpdate(twinRequest.getKey(), twinRequest.getLocation(), null);
+ } else {
+ // Fill TwinUpdate fields from TwinTracker.
+ twinUpdate = new TwinUpdate(twinRequest.getKey(), twinRequest.getLocation(), twinTracker.getObj());
+ twinUpdate.setPatch(false);
+ twinUpdate.setVersion(twinTracker.getVersion());
+ twinUpdate.setSessionId(twinTracker.getSessionId());
+ }
+ return twinUpdate;
+ }
+
+ private synchronized TwinTracker getTwinTracker(String key, String location) {
+ // Check if we have a session key specific to location else check session key without location.
+ TwinTracker twinTracker = twinTrackerMap.get(new SessionKey(key, location));
+ if(twinTracker == null) {
+ twinTracker = twinTrackerMap.get(new SessionKey(key, null));
+ }
+ return twinTracker;
+ }
+
+ protected TwinResponseProto mapTwinResponse(TwinUpdate twinUpdate) {
+ TwinResponseProto.Builder builder = TwinResponseProto.newBuilder();
+ if (!Strings.isNullOrEmpty(twinUpdate.getLocation())) {
+ builder.setLocation(twinUpdate.getLocation());
+ }
+ if(!Strings.isNullOrEmpty(twinUpdate.getSessionId())) {
+ builder.setSessionId(twinUpdate.getSessionId());
+ }
+ builder.setConsumerKey(twinUpdate.getKey());
+ if (twinUpdate.getObject() != null) {
+ builder.setTwinObject(ByteString.copyFrom(twinUpdate.getObject()));
+ }
+ builder.setIsPatchObject(twinUpdate.isPatch());
+ builder.setVersion(twinUpdate.getVersion());
+ return builder.build();
+ }
+
+ protected TwinRequest mapTwinRequestProto(byte[] twinRequestBytes) {
+ TwinRequest twinRequest = new TwinRequest();
+ try {
+ TwinRequestProto twinRequestProto = TwinRequestProto.parseFrom(twinRequestBytes);
+ twinRequest.setKey(twinRequestProto.getConsumerKey());
+ if (!Strings.isNullOrEmpty(twinRequestProto.getLocation())) {
+ twinRequest.setLocation(twinRequestProto.getLocation());
+ }
+ } catch (InvalidProtocolBufferException e) {
+ LOG.warn("Failed to parse protobuf for the request", e);
+ throw new RuntimeException(e);
+ }
+ return twinRequest;
+ }
+
+ private synchronized TwinUpdate getResponseFromUpdatedObj(byte[] updatedObj, SessionKey sessionKey) {
+ TwinTracker twinTracker = getTwinTracker(sessionKey.key, sessionKey.location);
+ if (twinTracker == null || !Arrays.equals(twinTracker.getObj(), updatedObj)) {
+ TwinUpdate twinUpdate = new TwinUpdate(sessionKey.key, sessionKey.location, updatedObj);
+ if (twinTracker == null) {
+ twinTracker = new TwinTracker(updatedObj);
+ } else {
+ // Generate patch and update response with patch.
+ byte[] patchValue = getPatchValue(twinTracker.getObj(), updatedObj, sessionKey);
+ if (patchValue != null) {
+ twinUpdate.setObject(patchValue);
+ twinUpdate.setPatch(true);
+ }
+ // Update Twin tracker with updated obj.
+ twinTracker.setObj(updatedObj);
+ twinTracker.incrementVersion();
+ }
+ twinTrackerMap.put(sessionKey, twinTracker);
+ twinUpdate.setVersion(twinTracker.getVersion());
+ twinUpdate.setSessionId(twinTracker.getSessionId());
+ return twinUpdate;
+ }
+ return null;
+ }
+
+ private byte[] getPatchValue(byte[] originalObj, byte[] updatedObj, SessionKey sessionKey) {
+ try {
+ JsonNode sourceNode = objectMapper.readTree(originalObj);
+ JsonNode targetNode = objectMapper.readTree(updatedObj);
+ JsonNode diffNode = JsonDiff.asJson(sourceNode, targetNode);
+ return diffNode.toString().getBytes(StandardCharsets.UTF_8);
+ } catch (Exception e) {
+ LOG.error("Unable to generate patch for SessionKey {}", sessionKey, e);
+ }
+ return null;
+ }
+
+ private synchronized void removeSessionKey(SessionKey sessionKey) {
+ twinTrackerMap.remove(sessionKey);
+ }
+
+ public synchronized void forEachSession(BiConsumer consumer) {
+ twinTrackerMap.forEach(consumer);
+ }
+
+ private class SessionImpl implements Session {
+
+ private final SessionKey sessionKey;
+
+ public SessionImpl(SessionKey sessionKey) {
+ this.sessionKey = sessionKey;
+ }
+
+ @Override
+ public void publish(T obj) throws IOException {
+ LOG.info("Published an object update for the session with key {}", sessionKey.toString());
+ byte[] objInBytes = objectMapper.writeValueAsBytes(obj);
+ TwinUpdate twinUpdate = getResponseFromUpdatedObj(objInBytes, sessionKey);
+ if(twinUpdate != null) {
+ // Send update to local subscriber and on sink path.
+ localTwinSubscriber.accept(twinUpdate);
+ handleSinkUpdate(twinUpdate);
+ }
+ }
+
+
+ @Override
+ public void close() throws IOException {
+ removeSessionKey(sessionKey);
+ LOG.info("Closed session with key {} ", sessionKey);
+ }
+ }
+
+ public static class SessionKey {
+
+ public final String key;
+ public final String location;
+
+ private SessionKey(String key, String location) {
+ this.key = key;
+ this.location = location;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ SessionKey that = (SessionKey) o;
+ return Objects.equals(key, that.key) && Objects.equals(location, that.location);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(key, location);
+ }
+
+ @Override
+ public String toString() {
+ return "SessionKey{" +
+ "key='" + key + '\'' +
+ ", location='" + location + '\'' +
+ '}';
+ }
+ }
+
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/AbstractTwinSubscriber.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/AbstractTwinSubscriber.java
new file mode 100644
index 000000000000..540d90cecf5b
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/AbstractTwinSubscriber.java
@@ -0,0 +1,302 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.function.Consumer;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jsonpatch.JsonPatch;
+import com.google.common.base.Strings;
+import com.google.common.collect.Multimap;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.google.protobuf.InvalidProtocolBufferException;
+import org.opennms.core.ipc.twin.api.TwinSubscriber;
+import org.opennms.core.ipc.twin.model.TwinRequestProto;
+import org.opennms.core.ipc.twin.model.TwinResponseProto;
+import org.opennms.distributed.core.api.MinionIdentity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimaps;
+
+public abstract class AbstractTwinSubscriber implements TwinSubscriber {
+
+ private final Multimap> sessionMap = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
+ private final Map objMap = new ConcurrentHashMap<>();
+ private final ObjectMapper objectMapper = new ObjectMapper();
+ private MinionIdentity minionIdentity;
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractTwinSubscriber.class);
+ private final ThreadFactory threadFactory = new ThreadFactoryBuilder()
+ .setNameFormat("abstract-twin-subscriber-%d")
+ .build();
+ private ExecutorService executorService = Executors.newSingleThreadExecutor(threadFactory);
+
+ protected AbstractTwinSubscriber(MinionIdentity minionIdentity) {
+ this.minionIdentity = minionIdentity;
+ }
+
+ public AbstractTwinSubscriber() {
+ }
+
+ /**
+ * @param twinRequest Send RpcRequest from @{@link AbstractTwinSubscriber}
+ */
+ protected abstract void sendRpcRequest(TwinRequest twinRequest);
+
+
+ @Override
+ public Closeable subscribe(String key, Class clazz, Consumer consumer) {
+ SessionImpl session = new SessionImpl(key, clazz, consumer);
+ sessionMap.put(key, session);
+ String location = minionIdentity != null ? minionIdentity.getLocation() : null;
+
+ TwinTracker twinTracker = objMap.get(key);
+ // If there is an existing object, send that update to subscriber
+ if (twinTracker != null) {
+ try {
+ session.accept(twinTracker.getObj());
+ } catch (Exception e) {
+ LOG.error("Exception while sending response to consumer", e);
+ }
+ } else {
+ TwinRequest twinRequest = new TwinRequest(key, location);
+ sendRpcRequest(twinRequest);
+ }
+
+ LOG.info("Subscribed to object updates with key {}", key);
+ return session;
+ }
+
+ protected void accept(TwinUpdate twinUpdate) {
+
+ // If Response is targeted to a location, ignore if it doesn't belong to the location of subscriber.
+ if (twinUpdate.getLocation() != null && !twinUpdate.getLocation().equals(getLocation())) {
+ return;
+ }
+
+ // Got empty response
+ if (twinUpdate.getObject() == null || twinUpdate.getSessionId() == null) {
+ return;
+ }
+
+ // Consume in our own thread instead of using broker's callback thread.
+ executorService.execute(() -> {
+ validateAndHandleUpdate(twinUpdate);
+ });
+ }
+
+ private void validateAndHandleUpdate(TwinUpdate twinUpdate) {
+ TwinTracker twinTracker = objMap.get(twinUpdate.getKey());
+ if (twinTracker == null) {
+ if (!twinUpdate.isPatch()) {
+ updateSessions(twinUpdate, twinUpdate.getObject());
+ }
+ return;
+ }
+ if (isObjectUpdated(twinTracker, twinUpdate)) {
+ LOG.trace("Received object update with key {}", twinUpdate.getKey());
+ // No need to update if version we are getting is less than what we have with the same session.
+ if (twinTracker.getSessionId().equals(twinUpdate.getSessionId())
+ && twinTracker.getVersion() > twinUpdate.getVersion()) {
+ return;
+ }
+ // If this is coming completely from new session, reset tracker.
+ if (!twinTracker.getSessionId().equals(twinUpdate.getSessionId())) {
+ if (!twinUpdate.isPatch()) {
+ updateSessions(twinUpdate, twinUpdate.getObject());
+ }
+ return;
+ }
+ // We can't apply patch when the version jumps more than one version.
+ if (twinUpdate.getVersion() != twinTracker.getVersion() + 1) {
+ sendRpcRequest(new TwinRequest(twinUpdate.getKey(), twinUpdate.getLocation()));
+ return;
+ }
+ byte[] patchedBytes = applyPatch(twinTracker, twinUpdate);
+ // Invoke RPC when we can't apply patch properly.
+ if (patchedBytes != null) {
+ // Update twin object for sessions.
+ updateSessions(twinUpdate, patchedBytes);
+ } else {
+ sendRpcRequest(new TwinRequest(twinUpdate.getKey(), twinUpdate.getLocation()));
+ }
+ }
+ }
+
+ private byte[] applyPatch(TwinTracker twinTracker, TwinUpdate twinUpdate) {
+ if (!twinUpdate.isPatch()) {
+ return twinUpdate.getObject();
+ }
+ try {
+ JsonNode resultingDiff = objectMapper.readTree(twinUpdate.getObject());
+ JsonNode original = objectMapper.readTree(twinTracker.getObj());
+ JsonPatch patch = JsonPatch.fromJson(resultingDiff);
+ JsonNode resultNode = patch.apply(original);
+ return resultNode.toString().getBytes(StandardCharsets.UTF_8);
+ } catch (Exception e) {
+ LOG.error("Not able to apply patch for key {}", twinUpdate.getKey(), e);
+ }
+ return null;
+ }
+
+ private boolean isObjectUpdated(TwinTracker twinTracker, TwinUpdate twinUpdate) {
+ if (twinUpdate.isPatch()) {
+ return true;
+ }
+ return !Arrays.equals(twinTracker.getObj(), twinUpdate.getObject());
+ }
+
+ private void updateSessions(TwinUpdate twinUpdate, byte[] newObjBytes) {
+ // Update twin object in local cache.
+ objMap.put(twinUpdate.getKey(), new TwinTracker(newObjBytes, twinUpdate.getVersion(), twinUpdate.getSessionId()));
+ // Send update to each session.
+ synchronized(sessionMap) {
+ final var sessions = sessionMap.get(twinUpdate.getKey());
+ if (sessions != null) {
+ sessions.forEach(session -> {
+ try {
+ session.accept(newObjBytes);
+ } catch (Exception e) {
+ LOG.error("Exception while sending update to Session {} for key {}", session, twinUpdate.getKey(), e);
+ }
+ });
+ }
+ }
+ }
+
+
+ protected TwinUpdate mapTwinResponseToProto(byte[] responseBytes) {
+ TwinUpdate twinUpdate = new TwinUpdate();
+ try {
+ TwinResponseProto twinResponseProto = TwinResponseProto.parseFrom(responseBytes);
+
+ if (!Strings.isNullOrEmpty(twinResponseProto.getLocation())) {
+ twinUpdate.setLocation(twinResponseProto.getLocation());
+ }
+ if(!Strings.isNullOrEmpty(twinResponseProto.getSessionId())) {
+ twinUpdate.setSessionId(twinResponseProto.getSessionId());
+ }
+ twinUpdate.setKey(twinResponseProto.getConsumerKey());
+ if (twinResponseProto.getTwinObject() != null) {
+ twinUpdate.setObject(twinResponseProto.getTwinObject().toByteArray());
+ }
+ twinUpdate.setPatch(twinResponseProto.getIsPatchObject());
+ twinUpdate.setVersion(twinResponseProto.getVersion());
+ return twinUpdate;
+ } catch (InvalidProtocolBufferException e) {
+ LOG.error("Failed to parse response from proto", e);
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected TwinRequestProto mapTwinRequestToProto(TwinRequest twinRequest) {
+ TwinRequestProto.Builder builder = TwinRequestProto.newBuilder();
+ builder.setConsumerKey(twinRequest.getKey()).setLocation(getMinionIdentity().getLocation())
+ .setSystemId(getMinionIdentity().getId());
+ return builder.build();
+ }
+
+ public void close() throws IOException {
+ executorService.shutdown();
+ objMap.clear();
+ sessionMap.clear();
+ }
+
+ public MinionIdentity getMinionIdentity() {
+ return minionIdentity;
+ }
+
+ private String getLocation() {
+ if (minionIdentity != null) {
+ return minionIdentity.getLocation();
+ }
+ return null;
+ }
+
+ private class SessionImpl implements Closeable {
+
+ private final String key;
+ private final Consumer consumer;
+ private final Class clazz;
+
+ public SessionImpl(String key, Class clazz, Consumer consumer) {
+ this.key = key;
+ this.clazz = clazz;
+ this.consumer = consumer;
+ }
+
+ @Override
+ public void close() throws IOException {
+ sessionMap.remove(key, this);
+ LOG.info("Closed session with key {} ", key);
+ }
+
+ public void accept(byte[] objValue) throws IOException {
+ final T value = objectMapper.readValue(objValue, clazz);
+ LOG.trace("Updated consumer with key {}", key);
+ consumer.accept(value);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ SessionImpl session = (SessionImpl) o;
+ return Objects.equals(key, session.key) && Objects.equals(consumer, session.consumer) && Objects.equals(clazz, session.clazz);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(key, consumer, clazz);
+ }
+
+ @Override
+ public String toString() {
+ return new StringJoiner(", ", SessionImpl.class.getSimpleName() + "[", "]")
+ .add("key='" + key + "'")
+ .add("consumer=" + consumer)
+ .add("clazz=" + clazz)
+ .toString();
+ }
+ }
+
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/LocalTwinSubscriber.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/LocalTwinSubscriber.java
new file mode 100644
index 000000000000..7f9d7f83a180
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/LocalTwinSubscriber.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+import org.opennms.core.ipc.twin.api.TwinSubscriber;
+
+public interface LocalTwinSubscriber extends TwinSubscriber {
+
+ void accept(TwinUpdate twinResponse);
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/LocalTwinSubscriberImpl.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/LocalTwinSubscriberImpl.java
new file mode 100644
index 000000000000..769479b22844
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/LocalTwinSubscriberImpl.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+
+import java.io.IOException;
+
+public class LocalTwinSubscriberImpl extends AbstractTwinSubscriber implements LocalTwinSubscriber {
+
+
+ @Override
+ protected void sendRpcRequest(TwinRequest twinRequest) {
+ // no need to send any RPC on local subscriber.
+ }
+
+ @Override
+ public void accept(TwinUpdate twinUpdate) {
+ super.accept(twinUpdate);
+ }
+
+ @Override
+ public void close() throws IOException {
+ }
+}
+
+
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinRequest.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinRequest.java
new file mode 100644
index 000000000000..a2a5fb3bd08a
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinRequest.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+import java.util.Objects;
+
+public class TwinRequest {
+
+ protected String key;
+
+ protected String location;
+
+ public TwinRequest(String key, String location) {
+ this.key = key;
+ this.location = location;
+ }
+
+ public TwinRequest() {
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ TwinRequest that = (TwinRequest) o;
+ return Objects.equals(key, that.key) && Objects.equals(location, that.location);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(key, location);
+ }
+
+ @Override
+ public String toString() {
+ return "TwinRequestBean{" +
+ "key='" + key + '\'' +
+ ", location='" + location + '\'' +
+ '}';
+ }
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinTracker.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinTracker.java
new file mode 100644
index 000000000000..7a0feff0d9aa
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinTracker.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * This Tracks Twin Object Updates for a given SessionKey (key, location).
+ * Twin Tracker consists of marshalled object( byte[]), version and sessionId.
+ * Version is incremented whenever object updates.
+ * sessionId is created only once per a SessionKey.
+ * TwinTracker is created and updated by publisher and only consumed by Subscriber.
+ * Subscriber will ignore any stale updates based on version but resets version whenever there is new SessionId.
+ */
+public class TwinTracker {
+
+ private final AtomicInteger version;
+ private byte[] obj;
+ private final String sessionId;
+
+ public TwinTracker(byte[] obj) {
+ this(obj, 0, UUID.randomUUID().toString());
+ }
+ public TwinTracker(byte[] obj, int version, String sessionId) {
+ this.obj = obj;
+ this.version = new AtomicInteger(version);
+ this.sessionId = Objects.requireNonNull(sessionId);
+ }
+
+ public int getVersion() {
+ return version.get();
+ }
+
+ public int incrementVersion() {
+ return version.incrementAndGet();
+ }
+
+ public byte[] getObj() {
+ return obj;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+
+ public void setObj(byte[] obj) {
+ this.obj = obj;
+ }
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinUpdate.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinUpdate.java
new file mode 100644
index 000000000000..098c3f7eeb8c
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/common/TwinUpdate.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.core.ipc.twin.common;
+
+import com.google.common.base.Objects;
+
+import java.util.Arrays;
+import java.util.StringJoiner;
+
+public class TwinUpdate {
+
+
+ private final TwinRequest twinRequest;
+
+ public TwinUpdate() {
+ this.twinRequest = new TwinRequest();
+ }
+
+ public TwinUpdate(String key, String location, byte[] object) {
+ this.twinRequest = new TwinRequest(key, location);
+ this.object = object;
+ }
+ public TwinUpdate(String key, String location) {
+ this.twinRequest = new TwinRequest(key, location);
+ }
+
+ private byte[] object;
+
+ private int version;
+
+ private boolean isPatch;
+
+ private String sessionId;
+
+ public byte[] getObject() {
+ return object;
+ }
+
+ public void setObject(byte[] object) {
+ this.object = object;
+ }
+
+ public int getVersion() {
+ return version;
+ }
+
+ public void setVersion(int version) {
+ this.version = version;
+ }
+
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public boolean isPatch() {
+ return isPatch;
+ }
+
+ public void setPatch(boolean patch) {
+ isPatch = patch;
+ }
+
+ public void setLocation(String location) {
+ twinRequest.setLocation(location);
+ }
+
+ public void setKey(String key) {
+ twinRequest.setKey(key);
+ }
+
+ public String getLocation() {
+ return twinRequest.getLocation();
+ }
+
+ public String getKey() {
+ return twinRequest.getKey();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof TwinUpdate)) return false;
+ TwinUpdate that = (TwinUpdate) o;
+ return version == that.version && isPatch == that.isPatch
+ && Objects.equal(twinRequest, that.twinRequest)
+ && Objects.equal(object, that.object)
+ && Objects.equal(sessionId, that.sessionId);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(twinRequest, object, version, isPatch, sessionId);
+ }
+
+ @Override
+ public String toString() {
+ return new StringJoiner(", ", TwinUpdate.class.getSimpleName() + "[", "]")
+ .add("twinRequest=" + twinRequest)
+ .add("object=" + Arrays.toString(object))
+ .add("version=" + version)
+ .add("isPatch=" + isPatch)
+ .add("sessionId='" + sessionId + "'")
+ .toString();
+ }
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinMessageProto.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinMessageProto.java
new file mode 100644
index 000000000000..bc43b319e210
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinMessageProto.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: twin-message.proto
+
+package org.opennms.core.ipc.twin.model;
+
+public final class TwinMessageProto {
+ private TwinMessageProto() {}
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistryLite registry) {
+ }
+
+ public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistry registry) {
+ registerAllExtensions(
+ (com.google.protobuf.ExtensionRegistryLite) registry);
+ }
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_TwinRequestProto_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_TwinRequestProto_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_TwinRequestProto_TracingInfoEntry_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_TwinRequestProto_TracingInfoEntry_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_TwinResponseProto_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_TwinResponseProto_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_TwinResponseProto_TracingInfoEntry_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_TwinResponseProto_TracingInfoEntry_fieldAccessorTable;
+
+ public static com.google.protobuf.Descriptors.FileDescriptor
+ getDescriptor() {
+ return descriptor;
+ }
+ private static com.google.protobuf.Descriptors.FileDescriptor
+ descriptor;
+ static {
+ java.lang.String[] descriptorData = {
+ "\n\022twin-message.proto\"\273\001\n\020TwinRequestProt" +
+ "o\022\024\n\014consumer_key\030\001 \001(\t\022\021\n\tsystem_id\030\002 \001" +
+ "(\t\022\020\n\010location\030\003 \001(\t\0228\n\014tracing_info\030\004 \003" +
+ "(\0132\".TwinRequestProto.TracingInfoEntry\0322" +
+ "\n\020TracingInfoEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" +
+ "\030\002 \001(\t:\0028\001\"\220\002\n\021TwinResponseProto\022\024\n\014cons" +
+ "umer_key\030\001 \001(\t\022\023\n\013twin_object\030\002 \001(\014\022\021\n\ts" +
+ "ystem_id\030\003 \001(\t\022\020\n\010location\030\004 \001(\t\022\027\n\017is_p" +
+ "atch_object\030\005 \001(\010\022\022\n\nsession_id\030\006 \001(\t\022\017\n" +
+ "\007version\030\007 \001(\005\0229\n\014tracing_info\030\010 \003(\0132#.T" +
+ "winResponseProto.TracingInfoEntry\0322\n\020Tra" +
+ "cingInfoEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" +
+ "\t:\0028\001B5\n\037org.opennms.core.ipc.twin.model" +
+ "B\020TwinMessageProtoP\001b\006proto3"
+ };
+ com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+ new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
+ public com.google.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.protobuf.Descriptors.FileDescriptor root) {
+ descriptor = root;
+ return null;
+ }
+ };
+ com.google.protobuf.Descriptors.FileDescriptor
+ .internalBuildGeneratedFileFrom(descriptorData,
+ new com.google.protobuf.Descriptors.FileDescriptor[] {
+ }, assigner);
+ internal_static_TwinRequestProto_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_TwinRequestProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_TwinRequestProto_descriptor,
+ new java.lang.String[] { "ConsumerKey", "SystemId", "Location", "TracingInfo", });
+ internal_static_TwinRequestProto_TracingInfoEntry_descriptor =
+ internal_static_TwinRequestProto_descriptor.getNestedTypes().get(0);
+ internal_static_TwinRequestProto_TracingInfoEntry_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_TwinRequestProto_TracingInfoEntry_descriptor,
+ new java.lang.String[] { "Key", "Value", });
+ internal_static_TwinResponseProto_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_TwinResponseProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_TwinResponseProto_descriptor,
+ new java.lang.String[] { "ConsumerKey", "TwinObject", "SystemId", "Location", "IsPatchObject", "SessionId", "Version", "TracingInfo", });
+ internal_static_TwinResponseProto_TracingInfoEntry_descriptor =
+ internal_static_TwinResponseProto_descriptor.getNestedTypes().get(0);
+ internal_static_TwinResponseProto_TracingInfoEntry_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_TwinResponseProto_TracingInfoEntry_descriptor,
+ new java.lang.String[] { "Key", "Value", });
+ }
+
+ // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinRequestProto.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinRequestProto.java
new file mode 100644
index 000000000000..6fab747ca203
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinRequestProto.java
@@ -0,0 +1,1109 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: twin-message.proto
+
+package org.opennms.core.ipc.twin.model;
+
+/**
+ *
+ *Twin Request object used by Minion to make RPC Request.
+ *
+ *
+ * Protobuf type {@code TwinRequestProto}
+ */
+public final class TwinRequestProto extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:TwinRequestProto)
+ TwinRequestProtoOrBuilder {
+private static final long serialVersionUID = 0L;
+ // Use TwinRequestProto.newBuilder() to construct.
+ private TwinRequestProto(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private TwinRequestProto() {
+ consumerKey_ = "";
+ systemId_ = "";
+ location_ = "";
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private TwinRequestProto(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ consumerKey_ = s;
+ break;
+ }
+ case 18: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ systemId_ = s;
+ break;
+ }
+ case 26: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ location_ = s;
+ break;
+ }
+ case 34: {
+ if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+ tracingInfo_ = com.google.protobuf.MapField.newMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ mutable_bitField0_ |= 0x00000008;
+ }
+ com.google.protobuf.MapEntry
+ tracingInfo__ = input.readMessage(
+ TracingInfoDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+ tracingInfo_.getMutableMap().put(
+ tracingInfo__.getKey(), tracingInfo__.getValue());
+ break;
+ }
+ default: {
+ if (!parseUnknownFieldProto3(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinRequestProto_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ @java.lang.Override
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 4:
+ return internalGetTracingInfo();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinRequestProto_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.opennms.core.ipc.twin.model.TwinRequestProto.class, org.opennms.core.ipc.twin.model.TwinRequestProto.Builder.class);
+ }
+
+ private int bitField0_;
+ public static final int CONSUMER_KEY_FIELD_NUMBER = 1;
+ private volatile java.lang.Object consumerKey_;
+ /**
+ * string consumer_key = 1;
+ */
+ public java.lang.String getConsumerKey() {
+ java.lang.Object ref = consumerKey_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ consumerKey_ = s;
+ return s;
+ }
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public com.google.protobuf.ByteString
+ getConsumerKeyBytes() {
+ java.lang.Object ref = consumerKey_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ consumerKey_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int SYSTEM_ID_FIELD_NUMBER = 2;
+ private volatile java.lang.Object systemId_;
+ /**
+ * string system_id = 2;
+ */
+ public java.lang.String getSystemId() {
+ java.lang.Object ref = systemId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ systemId_ = s;
+ return s;
+ }
+ }
+ /**
+ * string system_id = 2;
+ */
+ public com.google.protobuf.ByteString
+ getSystemIdBytes() {
+ java.lang.Object ref = systemId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ systemId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int LOCATION_FIELD_NUMBER = 3;
+ private volatile java.lang.Object location_;
+ /**
+ * string location = 3;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ }
+ }
+ /**
+ * string location = 3;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int TRACING_INFO_FIELD_NUMBER = 4;
+ private static final class TracingInfoDefaultEntryHolder {
+ static final com.google.protobuf.MapEntry<
+ java.lang.String, java.lang.String> defaultEntry =
+ com.google.protobuf.MapEntry
+ .newDefaultInstance(
+ org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinRequestProto_TracingInfoEntry_descriptor,
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "",
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "");
+ }
+ private com.google.protobuf.MapField<
+ java.lang.String, java.lang.String> tracingInfo_;
+ private com.google.protobuf.MapField
+ internalGetTracingInfo() {
+ if (tracingInfo_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ }
+ return tracingInfo_;
+ }
+
+ public int getTracingInfoCount() {
+ return internalGetTracingInfo().getMap().size();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public boolean containsTracingInfo(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ return internalGetTracingInfo().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getTracingInfoMap()} instead.
+ */
+ @java.lang.Deprecated
+ public java.util.Map getTracingInfo() {
+ return getTracingInfoMap();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public java.util.Map getTracingInfoMap() {
+ return internalGetTracingInfo().getMap();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public java.lang.String getTracingInfoOrDefault(
+ java.lang.String key,
+ java.lang.String defaultValue) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public java.lang.String getTracingInfoOrThrow(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ if (!map.containsKey(key)) {
+ throw new java.lang.IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!getConsumerKeyBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, consumerKey_);
+ }
+ if (!getSystemIdBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 2, systemId_);
+ }
+ if (!getLocationBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 3, location_);
+ }
+ com.google.protobuf.GeneratedMessageV3
+ .serializeStringMapTo(
+ output,
+ internalGetTracingInfo(),
+ TracingInfoDefaultEntryHolder.defaultEntry,
+ 4);
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!getConsumerKeyBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, consumerKey_);
+ }
+ if (!getSystemIdBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, systemId_);
+ }
+ if (!getLocationBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, location_);
+ }
+ for (java.util.Map.Entry entry
+ : internalGetTracingInfo().getMap().entrySet()) {
+ com.google.protobuf.MapEntry
+ tracingInfo__ = TracingInfoDefaultEntryHolder.defaultEntry.newBuilderForType()
+ .setKey(entry.getKey())
+ .setValue(entry.getValue())
+ .build();
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(4, tracingInfo__);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof org.opennms.core.ipc.twin.model.TwinRequestProto)) {
+ return super.equals(obj);
+ }
+ org.opennms.core.ipc.twin.model.TwinRequestProto other = (org.opennms.core.ipc.twin.model.TwinRequestProto) obj;
+
+ boolean result = true;
+ result = result && getConsumerKey()
+ .equals(other.getConsumerKey());
+ result = result && getSystemId()
+ .equals(other.getSystemId());
+ result = result && getLocation()
+ .equals(other.getLocation());
+ result = result && internalGetTracingInfo().equals(
+ other.internalGetTracingInfo());
+ result = result && unknownFields.equals(other.unknownFields);
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + CONSUMER_KEY_FIELD_NUMBER;
+ hash = (53 * hash) + getConsumerKey().hashCode();
+ hash = (37 * hash) + SYSTEM_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getSystemId().hashCode();
+ hash = (37 * hash) + LOCATION_FIELD_NUMBER;
+ hash = (53 * hash) + getLocation().hashCode();
+ if (!internalGetTracingInfo().getMap().isEmpty()) {
+ hash = (37 * hash) + TRACING_INFO_FIELD_NUMBER;
+ hash = (53 * hash) + internalGetTracingInfo().hashCode();
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(org.opennms.core.ipc.twin.model.TwinRequestProto prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ *
+ *Twin Request object used by Minion to make RPC Request.
+ *
+ *
+ * Protobuf type {@code TwinRequestProto}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:TwinRequestProto)
+ org.opennms.core.ipc.twin.model.TwinRequestProtoOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinRequestProto_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 4:
+ return internalGetTracingInfo();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMutableMapField(
+ int number) {
+ switch (number) {
+ case 4:
+ return internalGetMutableTracingInfo();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinRequestProto_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.opennms.core.ipc.twin.model.TwinRequestProto.class, org.opennms.core.ipc.twin.model.TwinRequestProto.Builder.class);
+ }
+
+ // Construct using org.opennms.core.ipc.twin.model.TwinRequestProto.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ consumerKey_ = "";
+
+ systemId_ = "";
+
+ location_ = "";
+
+ internalGetMutableTracingInfo().clear();
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinRequestProto_descriptor;
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinRequestProto getDefaultInstanceForType() {
+ return org.opennms.core.ipc.twin.model.TwinRequestProto.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinRequestProto build() {
+ org.opennms.core.ipc.twin.model.TwinRequestProto result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinRequestProto buildPartial() {
+ org.opennms.core.ipc.twin.model.TwinRequestProto result = new org.opennms.core.ipc.twin.model.TwinRequestProto(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ result.consumerKey_ = consumerKey_;
+ result.systemId_ = systemId_;
+ result.location_ = location_;
+ result.tracingInfo_ = internalGetTracingInfo();
+ result.tracingInfo_.makeImmutable();
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return (Builder) super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return (Builder) super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return (Builder) super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return (Builder) super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.opennms.core.ipc.twin.model.TwinRequestProto) {
+ return mergeFrom((org.opennms.core.ipc.twin.model.TwinRequestProto)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.opennms.core.ipc.twin.model.TwinRequestProto other) {
+ if (other == org.opennms.core.ipc.twin.model.TwinRequestProto.getDefaultInstance()) return this;
+ if (!other.getConsumerKey().isEmpty()) {
+ consumerKey_ = other.consumerKey_;
+ onChanged();
+ }
+ if (!other.getSystemId().isEmpty()) {
+ systemId_ = other.systemId_;
+ onChanged();
+ }
+ if (!other.getLocation().isEmpty()) {
+ location_ = other.location_;
+ onChanged();
+ }
+ internalGetMutableTracingInfo().mergeFrom(
+ other.internalGetTracingInfo());
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ org.opennms.core.ipc.twin.model.TwinRequestProto parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (org.opennms.core.ipc.twin.model.TwinRequestProto) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ private java.lang.Object consumerKey_ = "";
+ /**
+ * string consumer_key = 1;
+ */
+ public java.lang.String getConsumerKey() {
+ java.lang.Object ref = consumerKey_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ consumerKey_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public com.google.protobuf.ByteString
+ getConsumerKeyBytes() {
+ java.lang.Object ref = consumerKey_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ consumerKey_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public Builder setConsumerKey(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ consumerKey_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public Builder clearConsumerKey() {
+
+ consumerKey_ = getDefaultInstance().getConsumerKey();
+ onChanged();
+ return this;
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public Builder setConsumerKeyBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ consumerKey_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object systemId_ = "";
+ /**
+ * string system_id = 2;
+ */
+ public java.lang.String getSystemId() {
+ java.lang.Object ref = systemId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ systemId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string system_id = 2;
+ */
+ public com.google.protobuf.ByteString
+ getSystemIdBytes() {
+ java.lang.Object ref = systemId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ systemId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string system_id = 2;
+ */
+ public Builder setSystemId(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ systemId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string system_id = 2;
+ */
+ public Builder clearSystemId() {
+
+ systemId_ = getDefaultInstance().getSystemId();
+ onChanged();
+ return this;
+ }
+ /**
+ * string system_id = 2;
+ */
+ public Builder setSystemIdBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ systemId_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object location_ = "";
+ /**
+ * string location = 3;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string location = 3;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string location = 3;
+ */
+ public Builder setLocation(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string location = 3;
+ */
+ public Builder clearLocation() {
+
+ location_ = getDefaultInstance().getLocation();
+ onChanged();
+ return this;
+ }
+ /**
+ * string location = 3;
+ */
+ public Builder setLocationBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.MapField<
+ java.lang.String, java.lang.String> tracingInfo_;
+ private com.google.protobuf.MapField
+ internalGetTracingInfo() {
+ if (tracingInfo_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ }
+ return tracingInfo_;
+ }
+ private com.google.protobuf.MapField
+ internalGetMutableTracingInfo() {
+ onChanged();;
+ if (tracingInfo_ == null) {
+ tracingInfo_ = com.google.protobuf.MapField.newMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ }
+ if (!tracingInfo_.isMutable()) {
+ tracingInfo_ = tracingInfo_.copy();
+ }
+ return tracingInfo_;
+ }
+
+ public int getTracingInfoCount() {
+ return internalGetTracingInfo().getMap().size();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public boolean containsTracingInfo(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ return internalGetTracingInfo().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getTracingInfoMap()} instead.
+ */
+ @java.lang.Deprecated
+ public java.util.Map getTracingInfo() {
+ return getTracingInfoMap();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public java.util.Map getTracingInfoMap() {
+ return internalGetTracingInfo().getMap();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public java.lang.String getTracingInfoOrDefault(
+ java.lang.String key,
+ java.lang.String defaultValue) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public java.lang.String getTracingInfoOrThrow(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ if (!map.containsKey(key)) {
+ throw new java.lang.IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ public Builder clearTracingInfo() {
+ internalGetMutableTracingInfo().getMutableMap()
+ .clear();
+ return this;
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public Builder removeTracingInfo(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ internalGetMutableTracingInfo().getMutableMap()
+ .remove(key);
+ return this;
+ }
+ /**
+ * Use alternate mutation accessors instead.
+ */
+ @java.lang.Deprecated
+ public java.util.Map
+ getMutableTracingInfo() {
+ return internalGetMutableTracingInfo().getMutableMap();
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+ public Builder putTracingInfo(
+ java.lang.String key,
+ java.lang.String value) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ if (value == null) { throw new java.lang.NullPointerException(); }
+ internalGetMutableTracingInfo().getMutableMap()
+ .put(key, value);
+ return this;
+ }
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ public Builder putAllTracingInfo(
+ java.util.Map values) {
+ internalGetMutableTracingInfo().getMutableMap()
+ .putAll(values);
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFieldsProto3(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:TwinRequestProto)
+ }
+
+ // @@protoc_insertion_point(class_scope:TwinRequestProto)
+ private static final org.opennms.core.ipc.twin.model.TwinRequestProto DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new org.opennms.core.ipc.twin.model.TwinRequestProto();
+ }
+
+ public static org.opennms.core.ipc.twin.model.TwinRequestProto getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public TwinRequestProto parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new TwinRequestProto(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinRequestProto getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+}
+
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinRequestProtoOrBuilder.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinRequestProtoOrBuilder.java
new file mode 100644
index 000000000000..476486b440d8
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinRequestProtoOrBuilder.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: twin-message.proto
+
+package org.opennms.core.ipc.twin.model;
+
+public interface TwinRequestProtoOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:TwinRequestProto)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * string consumer_key = 1;
+ */
+ java.lang.String getConsumerKey();
+ /**
+ * string consumer_key = 1;
+ */
+ com.google.protobuf.ByteString
+ getConsumerKeyBytes();
+
+ /**
+ * string system_id = 2;
+ */
+ java.lang.String getSystemId();
+ /**
+ * string system_id = 2;
+ */
+ com.google.protobuf.ByteString
+ getSystemIdBytes();
+
+ /**
+ * string location = 3;
+ */
+ java.lang.String getLocation();
+ /**
+ * string location = 3;
+ */
+ com.google.protobuf.ByteString
+ getLocationBytes();
+
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+ int getTracingInfoCount();
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+ boolean containsTracingInfo(
+ java.lang.String key);
+ /**
+ * Use {@link #getTracingInfoMap()} instead.
+ */
+ @java.lang.Deprecated
+ java.util.Map
+ getTracingInfo();
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+ java.util.Map
+ getTracingInfoMap();
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ java.lang.String getTracingInfoOrDefault(
+ java.lang.String key,
+ java.lang.String defaultValue);
+ /**
+ * map<string, string> tracing_info = 4;
+ */
+
+ java.lang.String getTracingInfoOrThrow(
+ java.lang.String key);
+}
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinResponseProto.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinResponseProto.java
new file mode 100644
index 000000000000..2eee5568db78
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinResponseProto.java
@@ -0,0 +1,1414 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: twin-message.proto
+
+package org.opennms.core.ipc.twin.model;
+
+/**
+ *
+ *Twin Response object sent by OpenNMS for RPC response as well as for Sink update.
+ *
+ *
+ * Protobuf type {@code TwinResponseProto}
+ */
+public final class TwinResponseProto extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:TwinResponseProto)
+ TwinResponseProtoOrBuilder {
+private static final long serialVersionUID = 0L;
+ // Use TwinResponseProto.newBuilder() to construct.
+ private TwinResponseProto(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private TwinResponseProto() {
+ consumerKey_ = "";
+ twinObject_ = com.google.protobuf.ByteString.EMPTY;
+ systemId_ = "";
+ location_ = "";
+ isPatchObject_ = false;
+ sessionId_ = "";
+ version_ = 0;
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private TwinResponseProto(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ consumerKey_ = s;
+ break;
+ }
+ case 18: {
+
+ twinObject_ = input.readBytes();
+ break;
+ }
+ case 26: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ systemId_ = s;
+ break;
+ }
+ case 34: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ location_ = s;
+ break;
+ }
+ case 40: {
+
+ isPatchObject_ = input.readBool();
+ break;
+ }
+ case 50: {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ sessionId_ = s;
+ break;
+ }
+ case 56: {
+
+ version_ = input.readInt32();
+ break;
+ }
+ case 66: {
+ if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
+ tracingInfo_ = com.google.protobuf.MapField.newMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ mutable_bitField0_ |= 0x00000080;
+ }
+ com.google.protobuf.MapEntry
+ tracingInfo__ = input.readMessage(
+ TracingInfoDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+ tracingInfo_.getMutableMap().put(
+ tracingInfo__.getKey(), tracingInfo__.getValue());
+ break;
+ }
+ default: {
+ if (!parseUnknownFieldProto3(
+ input, unknownFields, extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinResponseProto_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ @java.lang.Override
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 8:
+ return internalGetTracingInfo();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinResponseProto_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.opennms.core.ipc.twin.model.TwinResponseProto.class, org.opennms.core.ipc.twin.model.TwinResponseProto.Builder.class);
+ }
+
+ private int bitField0_;
+ public static final int CONSUMER_KEY_FIELD_NUMBER = 1;
+ private volatile java.lang.Object consumerKey_;
+ /**
+ * string consumer_key = 1;
+ */
+ public java.lang.String getConsumerKey() {
+ java.lang.Object ref = consumerKey_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ consumerKey_ = s;
+ return s;
+ }
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public com.google.protobuf.ByteString
+ getConsumerKeyBytes() {
+ java.lang.Object ref = consumerKey_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ consumerKey_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int TWIN_OBJECT_FIELD_NUMBER = 2;
+ private com.google.protobuf.ByteString twinObject_;
+ /**
+ * bytes twin_object = 2;
+ */
+ public com.google.protobuf.ByteString getTwinObject() {
+ return twinObject_;
+ }
+
+ public static final int SYSTEM_ID_FIELD_NUMBER = 3;
+ private volatile java.lang.Object systemId_;
+ /**
+ * string system_id = 3;
+ */
+ public java.lang.String getSystemId() {
+ java.lang.Object ref = systemId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ systemId_ = s;
+ return s;
+ }
+ }
+ /**
+ * string system_id = 3;
+ */
+ public com.google.protobuf.ByteString
+ getSystemIdBytes() {
+ java.lang.Object ref = systemId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ systemId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int LOCATION_FIELD_NUMBER = 4;
+ private volatile java.lang.Object location_;
+ /**
+ * string location = 4;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ }
+ }
+ /**
+ * string location = 4;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int IS_PATCH_OBJECT_FIELD_NUMBER = 5;
+ private boolean isPatchObject_;
+ /**
+ * bool is_patch_object = 5;
+ */
+ public boolean getIsPatchObject() {
+ return isPatchObject_;
+ }
+
+ public static final int SESSION_ID_FIELD_NUMBER = 6;
+ private volatile java.lang.Object sessionId_;
+ /**
+ * string session_id = 6;
+ */
+ public java.lang.String getSessionId() {
+ java.lang.Object ref = sessionId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ sessionId_ = s;
+ return s;
+ }
+ }
+ /**
+ * string session_id = 6;
+ */
+ public com.google.protobuf.ByteString
+ getSessionIdBytes() {
+ java.lang.Object ref = sessionId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ sessionId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int VERSION_FIELD_NUMBER = 7;
+ private int version_;
+ /**
+ * int32 version = 7;
+ */
+ public int getVersion() {
+ return version_;
+ }
+
+ public static final int TRACING_INFO_FIELD_NUMBER = 8;
+ private static final class TracingInfoDefaultEntryHolder {
+ static final com.google.protobuf.MapEntry<
+ java.lang.String, java.lang.String> defaultEntry =
+ com.google.protobuf.MapEntry
+ .newDefaultInstance(
+ org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinResponseProto_TracingInfoEntry_descriptor,
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "",
+ com.google.protobuf.WireFormat.FieldType.STRING,
+ "");
+ }
+ private com.google.protobuf.MapField<
+ java.lang.String, java.lang.String> tracingInfo_;
+ private com.google.protobuf.MapField
+ internalGetTracingInfo() {
+ if (tracingInfo_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ }
+ return tracingInfo_;
+ }
+
+ public int getTracingInfoCount() {
+ return internalGetTracingInfo().getMap().size();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public boolean containsTracingInfo(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ return internalGetTracingInfo().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getTracingInfoMap()} instead.
+ */
+ @java.lang.Deprecated
+ public java.util.Map getTracingInfo() {
+ return getTracingInfoMap();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public java.util.Map getTracingInfoMap() {
+ return internalGetTracingInfo().getMap();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public java.lang.String getTracingInfoOrDefault(
+ java.lang.String key,
+ java.lang.String defaultValue) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public java.lang.String getTracingInfoOrThrow(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ if (!map.containsKey(key)) {
+ throw new java.lang.IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (!getConsumerKeyBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, consumerKey_);
+ }
+ if (!twinObject_.isEmpty()) {
+ output.writeBytes(2, twinObject_);
+ }
+ if (!getSystemIdBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 3, systemId_);
+ }
+ if (!getLocationBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, location_);
+ }
+ if (isPatchObject_ != false) {
+ output.writeBool(5, isPatchObject_);
+ }
+ if (!getSessionIdBytes().isEmpty()) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, sessionId_);
+ }
+ if (version_ != 0) {
+ output.writeInt32(7, version_);
+ }
+ com.google.protobuf.GeneratedMessageV3
+ .serializeStringMapTo(
+ output,
+ internalGetTracingInfo(),
+ TracingInfoDefaultEntryHolder.defaultEntry,
+ 8);
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (!getConsumerKeyBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, consumerKey_);
+ }
+ if (!twinObject_.isEmpty()) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBytesSize(2, twinObject_);
+ }
+ if (!getSystemIdBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, systemId_);
+ }
+ if (!getLocationBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, location_);
+ }
+ if (isPatchObject_ != false) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(5, isPatchObject_);
+ }
+ if (!getSessionIdBytes().isEmpty()) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, sessionId_);
+ }
+ if (version_ != 0) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(7, version_);
+ }
+ for (java.util.Map.Entry entry
+ : internalGetTracingInfo().getMap().entrySet()) {
+ com.google.protobuf.MapEntry
+ tracingInfo__ = TracingInfoDefaultEntryHolder.defaultEntry.newBuilderForType()
+ .setKey(entry.getKey())
+ .setValue(entry.getValue())
+ .build();
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(8, tracingInfo__);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof org.opennms.core.ipc.twin.model.TwinResponseProto)) {
+ return super.equals(obj);
+ }
+ org.opennms.core.ipc.twin.model.TwinResponseProto other = (org.opennms.core.ipc.twin.model.TwinResponseProto) obj;
+
+ boolean result = true;
+ result = result && getConsumerKey()
+ .equals(other.getConsumerKey());
+ result = result && getTwinObject()
+ .equals(other.getTwinObject());
+ result = result && getSystemId()
+ .equals(other.getSystemId());
+ result = result && getLocation()
+ .equals(other.getLocation());
+ result = result && (getIsPatchObject()
+ == other.getIsPatchObject());
+ result = result && getSessionId()
+ .equals(other.getSessionId());
+ result = result && (getVersion()
+ == other.getVersion());
+ result = result && internalGetTracingInfo().equals(
+ other.internalGetTracingInfo());
+ result = result && unknownFields.equals(other.unknownFields);
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (37 * hash) + CONSUMER_KEY_FIELD_NUMBER;
+ hash = (53 * hash) + getConsumerKey().hashCode();
+ hash = (37 * hash) + TWIN_OBJECT_FIELD_NUMBER;
+ hash = (53 * hash) + getTwinObject().hashCode();
+ hash = (37 * hash) + SYSTEM_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getSystemId().hashCode();
+ hash = (37 * hash) + LOCATION_FIELD_NUMBER;
+ hash = (53 * hash) + getLocation().hashCode();
+ hash = (37 * hash) + IS_PATCH_OBJECT_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+ getIsPatchObject());
+ hash = (37 * hash) + SESSION_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getSessionId().hashCode();
+ hash = (37 * hash) + VERSION_FIELD_NUMBER;
+ hash = (53 * hash) + getVersion();
+ if (!internalGetTracingInfo().getMap().isEmpty()) {
+ hash = (37 * hash) + TRACING_INFO_FIELD_NUMBER;
+ hash = (53 * hash) + internalGetTracingInfo().hashCode();
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(org.opennms.core.ipc.twin.model.TwinResponseProto prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ *
+ *Twin Response object sent by OpenNMS for RPC response as well as for Sink update.
+ *
+ *
+ * Protobuf type {@code TwinResponseProto}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:TwinResponseProto)
+ org.opennms.core.ipc.twin.model.TwinResponseProtoOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinResponseProto_descriptor;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMapField(
+ int number) {
+ switch (number) {
+ case 8:
+ return internalGetTracingInfo();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @SuppressWarnings({"rawtypes"})
+ protected com.google.protobuf.MapField internalGetMutableMapField(
+ int number) {
+ switch (number) {
+ case 8:
+ return internalGetMutableTracingInfo();
+ default:
+ throw new RuntimeException(
+ "Invalid map field number: " + number);
+ }
+ }
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinResponseProto_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.opennms.core.ipc.twin.model.TwinResponseProto.class, org.opennms.core.ipc.twin.model.TwinResponseProto.Builder.class);
+ }
+
+ // Construct using org.opennms.core.ipc.twin.model.TwinResponseProto.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ consumerKey_ = "";
+
+ twinObject_ = com.google.protobuf.ByteString.EMPTY;
+
+ systemId_ = "";
+
+ location_ = "";
+
+ isPatchObject_ = false;
+
+ sessionId_ = "";
+
+ version_ = 0;
+
+ internalGetMutableTracingInfo().clear();
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.opennms.core.ipc.twin.model.TwinMessageProto.internal_static_TwinResponseProto_descriptor;
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinResponseProto getDefaultInstanceForType() {
+ return org.opennms.core.ipc.twin.model.TwinResponseProto.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinResponseProto build() {
+ org.opennms.core.ipc.twin.model.TwinResponseProto result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinResponseProto buildPartial() {
+ org.opennms.core.ipc.twin.model.TwinResponseProto result = new org.opennms.core.ipc.twin.model.TwinResponseProto(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ result.consumerKey_ = consumerKey_;
+ result.twinObject_ = twinObject_;
+ result.systemId_ = systemId_;
+ result.location_ = location_;
+ result.isPatchObject_ = isPatchObject_;
+ result.sessionId_ = sessionId_;
+ result.version_ = version_;
+ result.tracingInfo_ = internalGetTracingInfo();
+ result.tracingInfo_.makeImmutable();
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return (Builder) super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return (Builder) super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return (Builder) super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return (Builder) super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return (Builder) super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.opennms.core.ipc.twin.model.TwinResponseProto) {
+ return mergeFrom((org.opennms.core.ipc.twin.model.TwinResponseProto)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.opennms.core.ipc.twin.model.TwinResponseProto other) {
+ if (other == org.opennms.core.ipc.twin.model.TwinResponseProto.getDefaultInstance()) return this;
+ if (!other.getConsumerKey().isEmpty()) {
+ consumerKey_ = other.consumerKey_;
+ onChanged();
+ }
+ if (other.getTwinObject() != com.google.protobuf.ByteString.EMPTY) {
+ setTwinObject(other.getTwinObject());
+ }
+ if (!other.getSystemId().isEmpty()) {
+ systemId_ = other.systemId_;
+ onChanged();
+ }
+ if (!other.getLocation().isEmpty()) {
+ location_ = other.location_;
+ onChanged();
+ }
+ if (other.getIsPatchObject() != false) {
+ setIsPatchObject(other.getIsPatchObject());
+ }
+ if (!other.getSessionId().isEmpty()) {
+ sessionId_ = other.sessionId_;
+ onChanged();
+ }
+ if (other.getVersion() != 0) {
+ setVersion(other.getVersion());
+ }
+ internalGetMutableTracingInfo().mergeFrom(
+ other.internalGetTracingInfo());
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ org.opennms.core.ipc.twin.model.TwinResponseProto parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (org.opennms.core.ipc.twin.model.TwinResponseProto) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ private java.lang.Object consumerKey_ = "";
+ /**
+ * string consumer_key = 1;
+ */
+ public java.lang.String getConsumerKey() {
+ java.lang.Object ref = consumerKey_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ consumerKey_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public com.google.protobuf.ByteString
+ getConsumerKeyBytes() {
+ java.lang.Object ref = consumerKey_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ consumerKey_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public Builder setConsumerKey(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ consumerKey_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public Builder clearConsumerKey() {
+
+ consumerKey_ = getDefaultInstance().getConsumerKey();
+ onChanged();
+ return this;
+ }
+ /**
+ * string consumer_key = 1;
+ */
+ public Builder setConsumerKeyBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ consumerKey_ = value;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.ByteString twinObject_ = com.google.protobuf.ByteString.EMPTY;
+ /**
+ * bytes twin_object = 2;
+ */
+ public com.google.protobuf.ByteString getTwinObject() {
+ return twinObject_;
+ }
+ /**
+ * bytes twin_object = 2;
+ */
+ public Builder setTwinObject(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ twinObject_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * bytes twin_object = 2;
+ */
+ public Builder clearTwinObject() {
+
+ twinObject_ = getDefaultInstance().getTwinObject();
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object systemId_ = "";
+ /**
+ * string system_id = 3;
+ */
+ public java.lang.String getSystemId() {
+ java.lang.Object ref = systemId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ systemId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string system_id = 3;
+ */
+ public com.google.protobuf.ByteString
+ getSystemIdBytes() {
+ java.lang.Object ref = systemId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ systemId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string system_id = 3;
+ */
+ public Builder setSystemId(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ systemId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string system_id = 3;
+ */
+ public Builder clearSystemId() {
+
+ systemId_ = getDefaultInstance().getSystemId();
+ onChanged();
+ return this;
+ }
+ /**
+ * string system_id = 3;
+ */
+ public Builder setSystemIdBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ systemId_ = value;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object location_ = "";
+ /**
+ * string location = 4;
+ */
+ public java.lang.String getLocation() {
+ java.lang.Object ref = location_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ location_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string location = 4;
+ */
+ public com.google.protobuf.ByteString
+ getLocationBytes() {
+ java.lang.Object ref = location_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ location_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string location = 4;
+ */
+ public Builder setLocation(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string location = 4;
+ */
+ public Builder clearLocation() {
+
+ location_ = getDefaultInstance().getLocation();
+ onChanged();
+ return this;
+ }
+ /**
+ * string location = 4;
+ */
+ public Builder setLocationBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ location_ = value;
+ onChanged();
+ return this;
+ }
+
+ private boolean isPatchObject_ ;
+ /**
+ * bool is_patch_object = 5;
+ */
+ public boolean getIsPatchObject() {
+ return isPatchObject_;
+ }
+ /**
+ * bool is_patch_object = 5;
+ */
+ public Builder setIsPatchObject(boolean value) {
+
+ isPatchObject_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * bool is_patch_object = 5;
+ */
+ public Builder clearIsPatchObject() {
+
+ isPatchObject_ = false;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object sessionId_ = "";
+ /**
+ * string session_id = 6;
+ */
+ public java.lang.String getSessionId() {
+ java.lang.Object ref = sessionId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ sessionId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * string session_id = 6;
+ */
+ public com.google.protobuf.ByteString
+ getSessionIdBytes() {
+ java.lang.Object ref = sessionId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ sessionId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * string session_id = 6;
+ */
+ public Builder setSessionId(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ sessionId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * string session_id = 6;
+ */
+ public Builder clearSessionId() {
+
+ sessionId_ = getDefaultInstance().getSessionId();
+ onChanged();
+ return this;
+ }
+ /**
+ * string session_id = 6;
+ */
+ public Builder setSessionIdBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ sessionId_ = value;
+ onChanged();
+ return this;
+ }
+
+ private int version_ ;
+ /**
+ * int32 version = 7;
+ */
+ public int getVersion() {
+ return version_;
+ }
+ /**
+ * int32 version = 7;
+ */
+ public Builder setVersion(int value) {
+
+ version_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * int32 version = 7;
+ */
+ public Builder clearVersion() {
+
+ version_ = 0;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.MapField<
+ java.lang.String, java.lang.String> tracingInfo_;
+ private com.google.protobuf.MapField
+ internalGetTracingInfo() {
+ if (tracingInfo_ == null) {
+ return com.google.protobuf.MapField.emptyMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ }
+ return tracingInfo_;
+ }
+ private com.google.protobuf.MapField
+ internalGetMutableTracingInfo() {
+ onChanged();;
+ if (tracingInfo_ == null) {
+ tracingInfo_ = com.google.protobuf.MapField.newMapField(
+ TracingInfoDefaultEntryHolder.defaultEntry);
+ }
+ if (!tracingInfo_.isMutable()) {
+ tracingInfo_ = tracingInfo_.copy();
+ }
+ return tracingInfo_;
+ }
+
+ public int getTracingInfoCount() {
+ return internalGetTracingInfo().getMap().size();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public boolean containsTracingInfo(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ return internalGetTracingInfo().getMap().containsKey(key);
+ }
+ /**
+ * Use {@link #getTracingInfoMap()} instead.
+ */
+ @java.lang.Deprecated
+ public java.util.Map getTracingInfo() {
+ return getTracingInfoMap();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public java.util.Map getTracingInfoMap() {
+ return internalGetTracingInfo().getMap();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public java.lang.String getTracingInfoOrDefault(
+ java.lang.String key,
+ java.lang.String defaultValue) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ return map.containsKey(key) ? map.get(key) : defaultValue;
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public java.lang.String getTracingInfoOrThrow(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ java.util.Map map =
+ internalGetTracingInfo().getMap();
+ if (!map.containsKey(key)) {
+ throw new java.lang.IllegalArgumentException();
+ }
+ return map.get(key);
+ }
+
+ public Builder clearTracingInfo() {
+ internalGetMutableTracingInfo().getMutableMap()
+ .clear();
+ return this;
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public Builder removeTracingInfo(
+ java.lang.String key) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ internalGetMutableTracingInfo().getMutableMap()
+ .remove(key);
+ return this;
+ }
+ /**
+ * Use alternate mutation accessors instead.
+ */
+ @java.lang.Deprecated
+ public java.util.Map
+ getMutableTracingInfo() {
+ return internalGetMutableTracingInfo().getMutableMap();
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+ public Builder putTracingInfo(
+ java.lang.String key,
+ java.lang.String value) {
+ if (key == null) { throw new java.lang.NullPointerException(); }
+ if (value == null) { throw new java.lang.NullPointerException(); }
+ internalGetMutableTracingInfo().getMutableMap()
+ .put(key, value);
+ return this;
+ }
+ /**
+ * map<string, string> tracing_info = 8;
+ */
+
+ public Builder putAllTracingInfo(
+ java.util.Map values) {
+ internalGetMutableTracingInfo().getMutableMap()
+ .putAll(values);
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFieldsProto3(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:TwinResponseProto)
+ }
+
+ // @@protoc_insertion_point(class_scope:TwinResponseProto)
+ private static final org.opennms.core.ipc.twin.model.TwinResponseProto DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new org.opennms.core.ipc.twin.model.TwinResponseProto();
+ }
+
+ public static org.opennms.core.ipc.twin.model.TwinResponseProto getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public TwinResponseProto parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new TwinResponseProto(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public org.opennms.core.ipc.twin.model.TwinResponseProto getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+}
+
diff --git a/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinResponseProtoOrBuilder.java b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinResponseProtoOrBuilder.java
new file mode 100644
index 000000000000..82f56740314e
--- /dev/null
+++ b/core/ipc/twin/common/src/main/java/org/opennms/core/ipc/twin/model/TwinResponseProtoOrBuilder.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ *
+ * Copyright (C) 2021 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2021 The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ *
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R). If not, see:
+ * http://www.gnu.org/licenses/
+ *
+ * For more information contact:
+ * OpenNMS(R) Licensing