From d4e15bfbd60aac8b3ea8b1a66a245bc0e5a57c43 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 10 Oct 2021 20:30:07 +0200 Subject: [PATCH] Remove deprecated XStream.setupDefaultSecurity calls (#11365) The XStream.setupDefaultSecurity method is deprecated since XStream 1.4.18. It no longer does anything, because this is the default in newer XStream versions. Signed-off-by: Wouter Born --- .../binding/homematic/internal/communicator/CcuGateway.java | 1 - .../lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java | 1 - .../org/openhab/binding/lutron/internal/xml/DbXmlInfoReader.java | 1 - 3 files changed, 3 deletions(-) diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/CcuGateway.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/CcuGateway.java index 5810194cd..12f83c1ae 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/CcuGateway.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/CcuGateway.java @@ -63,7 +63,6 @@ public class CcuGateway extends AbstractHomematicGateway { HttpClient httpClient) { super(id, config, gatewayAdapter, httpClient); - XStream.setupDefaultSecurity(xStream); xStream.allowTypesByWildcard(new String[] { HmDevice.class.getPackageName() + ".**" }); xStream.setClassLoader(CcuGateway.class.getClassLoader()); xStream.autodetectAnnotations(true); diff --git a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java index 1780e327a..19ba17458 100644 --- a/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java +++ b/bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/pchkdiscovery/LcnPchkDiscoveryService.java @@ -146,7 +146,6 @@ public class LcnPchkDiscoveryService extends AbstractDiscoveryService { ServicesResponse xmlToServiceResponse(String response) { XStream xstream = new XStream(new StaxDriver()); - XStream.setupDefaultSecurity(xstream); xstream.allowTypesByWildcard(new String[] { ServicesResponse.class.getPackageName() + ".**" }); xstream.setClassLoader(getClass().getClassLoader()); xstream.autodetectAnnotations(true); diff --git a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/xml/DbXmlInfoReader.java b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/xml/DbXmlInfoReader.java index f57638c82..d027f6d84 100644 --- a/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/xml/DbXmlInfoReader.java +++ b/bundles/org.openhab.binding.lutron/src/main/java/org/openhab/binding/lutron/internal/xml/DbXmlInfoReader.java @@ -59,7 +59,6 @@ public class DbXmlInfoReader { } private void configureSecurity(XStream xstream) { - XStream.setupDefaultSecurity(xstream); xstream.allowTypesByWildcard(new String[] { Project.class.getPackageName() + ".**" }); }