import com.google.common.base.Optional;
import com.google.common.io.Files;
+
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.stream.StreamSource;
+
import org.opendaylight.controller.config.persist.api.ConfigSnapshotHolder;
import org.opendaylight.controller.config.persist.api.Persister;
import org.opendaylight.controller.config.persist.storage.file.xml.model.ConfigSnapshot;
private final Optional<FilenameFilter> extensionsFilter;
/**
- * Creates XmlDirectoryPersister that picks up all files in specified folder
+ * Creates XmlDirectoryPersister that picks up all files in specified folder.
*/
public XmlDirectoryPersister(final File storage) {
this(storage, Optional.<FilenameFilter>absent());
}
/**
- * Creates XmlDirectoryPersister that picks up files only with specified file extension
+ * Creates XmlDirectoryPersister that picks up files only with specified file extension.
*/
public XmlDirectoryPersister(final File storage, final Set<String> fileExtensions) {
this(storage, Optional.of(getFilter(fileExtensions)));
@Override
public List<ConfigSnapshotHolder> loadLastConfigs() throws IOException {
- File[] filesArray = extensionsFilter.isPresent() ? storage.listFiles(extensionsFilter.get()) : storage.listFiles();
+ File[] filesArray =
+ extensionsFilter.isPresent() ? storage.listFiles(extensionsFilter.get()) : storage.listFiles();
if (filesArray == null || filesArray.length == 0) {
return Collections.emptyList();
}
List<ConfigSnapshotHolder> result = new ArrayList<>();
for (File file : sortedFiles) {
LOG.trace("Adding file '{}' to combined result", file);
- Optional<ConfigSnapshotHolder> h = fromXmlSnapshot(file);
+ Optional<ConfigSnapshotHolder> configSnapshotHolderOptional = fromXmlSnapshot(file);
// Ignore non valid snapshot
- if(h.isPresent() == false) {
+ if (!configSnapshotHolderOptional.isPresent()) {
continue;
}
- result.add(h.get());
+ result.add(configSnapshotHolderOptional.get());
}
return result;
}
private Optional<ConfigSnapshotHolder> fromXmlSnapshot(final File file) {
try {
return Optional.of(loadLastConfig(file));
- } catch (JAXBException e) {
+ } catch (final 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. ",
+ "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. ",
public static ConfigSnapshotHolder loadLastConfig(final File file) throws JAXBException {
JAXBContext jaxbContext = JAXBContext.newInstance(ConfigSnapshot.class);
Unmarshaller um = jaxbContext.createUnmarshaller();
-
- return asHolder((ConfigSnapshot) um.unmarshal(file));
+ XMLInputFactory xif = XMLInputFactory.newFactory();
+ xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
+ xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+ try {
+ XMLStreamReader xsr = xif.createXMLStreamReader(new StreamSource(file));
+ return asHolder((ConfigSnapshot) um.unmarshal(xsr));
+ } catch (final XMLStreamException e) {
+ throw new JAXBException(e);
+ }
}
private static ConfigSnapshotHolder asHolder(final ConfigSnapshot unmarshalled) {
};
}
- private static FilenameFilter getFilter(final Set<String>fileExtensions) {
- checkArgument(fileExtensions.isEmpty() == false, "No file extension provided", fileExtensions);
+ private static FilenameFilter getFilter(final Set<String> fileExtensions) {
+ checkArgument(!fileExtensions.isEmpty(), "No file extension provided", fileExtensions);
- return new FilenameFilter() {
- @Override
- public boolean accept(final File dir, final String name) {
- String ext = Files.getFileExtension(name);
- return fileExtensions.contains(ext);
- }
+ return (dir, name) -> {
+ String ext = Files.getFileExtension(name);
+ return fileExtensions.contains(ext);
};
}
@Override
public void close() {
-
}
@Override
public String toString() {
- final StringBuffer sb = new StringBuffer("XmlDirectoryPersister{");
- sb.append("storage=").append(storage);
- sb.append('}');
- return sb.toString();
+ return "XmlDirectoryPersister{storage=" + storage + "}";
}
}
\ No newline at end of file