*/
package org.opendaylight.controller.config.persist.storage.file.xml.model;
-import com.google.common.base.Charsets;
import com.google.common.base.Optional;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.stream.StreamSource;
import org.apache.commons.lang3.StringUtils;
@XmlRootElement(name = "persisted-snapshots")
private List<ConfigSnapshot> snapshots;
- Config(List<ConfigSnapshot> snapshots) {
+ Config(final List<ConfigSnapshot> snapshots) {
this.snapshots = snapshots;
}
return snapshots;
}
- public void setSnapshots(List<ConfigSnapshot> snapshots) {
+ public void setSnapshots(final List<ConfigSnapshot> snapshots) {
this.snapshots = snapshots;
}
- public void toXml(File to) {
+ public void toXml(final File to) {
try {
// TODO Moxy has to be used instead of default jaxb impl due to a bug
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
marshaller.marshal(this, to);
- } catch (JAXBException e) {
+ } catch (final JAXBException e) {
throw new PersistException("Unable to persist configuration", e);
}
}
- public static Config fromXml(File from) {
- if(isEmpty(from))
+ public static Config fromXml(final File from) {
+ if(isEmpty(from)) {
return new Config();
+ }
try {
JAXBContext jaxbContext = JAXBContext.newInstance(Config.class);
Unmarshaller um = jaxbContext.createUnmarshaller();
-
- return (Config) um.unmarshal(from);
- } catch (JAXBException e) {
+ XMLInputFactory xif = XMLInputFactory.newFactory();
+ xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+ xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+ XMLStreamReader xsr = xif.createXMLStreamReader(new StreamSource(from));
+ return (Config) um.unmarshal(xsr);
+ } catch (JAXBException | XMLStreamException e) {
throw new PersistException("Unable to restore configuration", e);
}
}
- private static boolean isEmpty(File from) {
+ private static boolean isEmpty(final File from) {
return from.length() == 0 || isBlank(from);
}
- private static boolean isBlank(File from) {
+ private static boolean isBlank(final File from) {
try {
- return StringUtils.isBlank(Files.toString(from, Charsets.UTF_8));
- } catch (IOException e) {
+ return StringUtils.isBlank(Files.toString(from, StandardCharsets.UTF_8));
+ } catch (final IOException e) {
throw new IllegalStateException("Unexpected error reading file" + from, e);
}
}
return last == null ? Optional.<ConfigSnapshot>absent() : Optional.of(last);
}
- public void addConfigSnapshot(ConfigSnapshot snap, int numberOfStoredBackups) {
- if(shouldReplaceLast(numberOfStoredBackups) && snapshots.isEmpty() == false) {
+ public void addConfigSnapshot(final ConfigSnapshot snap, final int numberOfStoredBackups) {
+ if (shouldReplaceLast(numberOfStoredBackups) && !snapshots.isEmpty()) {
snapshots.remove(0);
}
snapshots.add(snap);
}
- private boolean shouldReplaceLast(int numberOfStoredBackups) {
+ private boolean shouldReplaceLast(final int numberOfStoredBackups) {
return numberOfStoredBackups == snapshots.size();
}
}