From 08718bf4bc3cc5297dc7e918e9e8e97a45b74391 Mon Sep 17 00:00:00 2001 From: Marian Dubai Date: Thu, 20 Nov 2014 10:57:18 +0100 Subject: [PATCH] Fix checkstyle warnings in config-persister-directory-xml-adapter Change-Id: I9f6a57a22b470359c7eb038e77736376cd2ac3ee Signed-off-by: Marian Dubai --- .../storage/directory/xml/XmlDirectoryPersister.java | 9 ++++++--- .../directory/xml/DirectoryStorageAdapterTest.java | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/opendaylight/config/config-persister-directory-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/xml/XmlDirectoryPersister.java b/opendaylight/config/config-persister-directory-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/xml/XmlDirectoryPersister.java index 92bf080662..85f70b9a01 100644 --- a/opendaylight/config/config-persister-directory-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/xml/XmlDirectoryPersister.java +++ b/opendaylight/config/config-persister-directory-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/directory/xml/XmlDirectoryPersister.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.config.persist.storage.directory.xml; import static com.google.common.base.Preconditions.checkArgument; + import com.google.common.base.Optional; import com.google.common.io.Files; import java.io.File; @@ -90,10 +91,12 @@ public class XmlDirectoryPersister implements Persister { } catch (JAXBException e) { // In case of parse error, issue a warning, ignore and continue LOG.warn( - "Unable to parse configuration snapshot from {}. Initial config from {} will be IGNORED in this run. " + - "Note that subsequent config files may fail due to this problem. " + + "Unable to parse configuration snapshot from {}. Initial config from {} will be IGNORED in this run. ", + file, file); + LOG.warn( + "Note that subsequent config files may fail due to this problem. ", "Xml markup in this file needs to be fixed, for detailed information see enclosed exception.", - file, file, e); + e); } return Optional.absent(); diff --git a/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java b/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java index 11c7e1253a..b652dce1aa 100644 --- a/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java +++ b/opendaylight/config/config-persister-directory-xml-adapter/src/test/java/org/opendaylight/controller/config/persist/storage/directory/xml/DirectoryStorageAdapterTest.java @@ -12,6 +12,7 @@ import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import com.google.common.base.Optional; import java.io.File; import java.io.IOException; -- 2.36.6