Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove yang-test
[controller.git]
/
opendaylight
/
config
/
config-persister-file-xml-adapter
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
persist
/
storage
/
file
/
xml
/
model
/
SnapshotHandler.java
diff --git
a/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/SnapshotHandler.java
b/opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/SnapshotHandler.java
index 8214b369702d4c1441975b6d13c019d00a306d95..e99694751b8726c8e9470a86400b211bc9476c74 100644
(file)
--- a/
opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/SnapshotHandler.java
+++ b/
opendaylight/config/config-persister-file-xml-adapter/src/main/java/org/opendaylight/controller/config/persist/storage/file/xml/model/SnapshotHandler.java
@@
-7,6
+7,7
@@
*/
package org.opendaylight.controller.config.persist.storage.file.xml.model;
*/
package org.opendaylight.controller.config.persist.storage.file.xml.model;
+import com.google.common.base.Preconditions;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.bind.ValidationEventHandler;
import java.io.StringReader;
import java.io.StringWriter;
import javax.xml.bind.ValidationEventHandler;
@@
-22,24
+23,29
@@
class SnapshotHandler implements DomHandler<String, StreamResult> {
private StringWriter xmlWriter = new StringWriter();
private StringWriter xmlWriter = new StringWriter();
- public StreamResult createUnmarshaller(ValidationEventHandler errorHandler) {
+ @Override
+ public StreamResult createUnmarshaller(final ValidationEventHandler errorHandler) {
xmlWriter.getBuffer().setLength(0);
return new StreamResult(xmlWriter);
}
xmlWriter.getBuffer().setLength(0);
return new StreamResult(xmlWriter);
}
- public String getElement(StreamResult rt) {
+ @Override
+ public String getElement(final StreamResult rt) {
String xml = rt.getWriter().toString();
int beginIndex = xml.indexOf(START_TAG) + START_TAG.length();
int endIndex = xml.indexOf(END_TAG);
String xml = rt.getWriter().toString();
int beginIndex = xml.indexOf(START_TAG) + START_TAG.length();
int endIndex = xml.indexOf(END_TAG);
+ Preconditions.checkArgument(beginIndex != -1 && endIndex != -1,
+ "Unknown element present in config snapshot(expected only configuration): %s", xml);
return xml.substring(beginIndex, endIndex);
}
return xml.substring(beginIndex, endIndex);
}
- public Source marshal(String n, ValidationEventHandler errorHandler) {
+ @Override
+ public Source marshal(final String n, final ValidationEventHandler errorHandler) {
try {
String xml = START_TAG + n.trim() + END_TAG;
StringReader xmlReader = new StringReader(xml);
return new StreamSource(xmlReader);
try {
String xml = START_TAG + n.trim() + END_TAG;
StringReader xmlReader = new StringReader(xml);
return new StreamSource(xmlReader);
- } catch(Exception e) {
+ } catch(
final
Exception e) {
throw new RuntimeException(e);
}
}
throw new RuntimeException(e);
}
}