From 7e740eea342ab9300eaa91adf513852ebe74fa2c Mon Sep 17 00:00:00 2001 From: junaidkhan Date: Wed, 15 Jan 2025 15:53:06 +0500 Subject: [PATCH] NMS-15717 : DeviceConfig via Minion fails if sshScript output contains control characters.(update code). --- .../netmgt/poller/EscapeSequenceAdapter.java | 17 ++++------------- .../opennms/netmgt/poller/DeviceConfigTest.java | 4 ++-- .../poller/EscapeSequenceAdapterTest.java | 4 ++-- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java b/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java index a810457fc67c..cf7f50848ac4 100755 --- a/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java +++ b/features/poller/api/src/main/java/org/opennms/netmgt/poller/EscapeSequenceAdapter.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2023 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. + * Copyright (C) 2025 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2025 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * @@ -28,7 +28,6 @@ package org.opennms.netmgt.poller; -import org.eclipse.persistence.exceptions.XMLMarshalException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,12 +46,8 @@ public String unmarshal(String v) throws Exception { v = v.replace(" ", "\r") .replace(" ", "\n"); } - try { return v; - } catch (XMLMarshalException e) { - LOG.warn("Unable to unmarshal escape sequences value '{}' to a script output. Returning null instead.", v); - return null; - } + } @Override @@ -61,11 +56,7 @@ public String marshal(String v) throws Exception { v = v.replace("\r", " ") .replace("\n", " "); } - try { return v; - } catch (XMLMarshalException e) { - LOG.warn("Unable to marshal escape sequences value '{}' to a script output. Returning null instead.", v); - return null; - } + } } diff --git a/features/poller/api/src/test/java/org/opennms/netmgt/poller/DeviceConfigTest.java b/features/poller/api/src/test/java/org/opennms/netmgt/poller/DeviceConfigTest.java index ff3fb3c2ae5f..e8b5f19fff0b 100644 --- a/features/poller/api/src/test/java/org/opennms/netmgt/poller/DeviceConfigTest.java +++ b/features/poller/api/src/test/java/org/opennms/netmgt/poller/DeviceConfigTest.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2023 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. + * Copyright (C) 2025 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2025 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. * diff --git a/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java b/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java index 7228c69a4b03..d9dad741687c 100755 --- a/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java +++ b/features/poller/api/src/test/java/org/opennms/netmgt/poller/EscapeSequenceAdapterTest.java @@ -1,8 +1,8 @@ /******************************************************************************* * This file is part of OpenNMS(R). * - * Copyright (C) 2023 The OpenNMS Group, Inc. - * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. + * Copyright (C) 2025 The OpenNMS Group, Inc. + * OpenNMS(R) is Copyright (C) 1999-2025 The OpenNMS Group, Inc. * * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. *