Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 2839: Config: remove dependencies on commons-io
[controller.git]
/
opendaylight
/
config
/
yang-jmx-generator-plugin
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yangjmxgenerator
/
plugin
/
java
/
GeneratedObject.java
diff --git
a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObject.java
b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObject.java
index 4d8bd3e5b46935e1efaa89ac7a2d6f1df0dfb7dd..5eb58d5a1e5e910c08ef96f97c06b1218b027a64 100644
(file)
--- a/
opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObject.java
+++ b/
opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/java/GeneratedObject.java
@@
-4,10
+4,11
@@
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Optional;
import com.google.common.collect.Maps;
import com.google.common.base.Optional;
import com.google.common.collect.Maps;
+import com.google.common.io.Files;
import java.io.File;
import java.io.IOException;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Map.Entry;
import java.util.Map.Entry;
-import org.apache.commons.io.FileUtils;
import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.StringUtil;
public class GeneratedObject {
import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.StringUtil;
public class GeneratedObject {
@@
-30,8
+31,10
@@
public class GeneratedObject {
public Optional<Entry<FullyQualifiedName,File>> persist(File srcDirectory, boolean overwrite) throws IOException {
File dstFile = fqn.toFile(srcDirectory);
public Optional<Entry<FullyQualifiedName,File>> persist(File srcDirectory, boolean overwrite) throws IOException {
File dstFile = fqn.toFile(srcDirectory);
- if (overwrite == true || dstFile.exists() == false) {
- FileUtils.write(dstFile, content);
+ if (overwrite || !dstFile.exists()) {
+ Files.createParentDirs(dstFile);
+ Files.touch(dstFile);
+ Files.write(content, dstFile, StandardCharsets.UTF_8);
return Optional.of(Maps.immutableEntry(fqn, dstFile));
} else {
return Optional.absent();
return Optional.of(Maps.immutableEntry(fqn, dstFile));
} else {
return Optional.absent();
@@
-60,11
+63,8
@@
public class GeneratedObject {
GeneratedObject that = (GeneratedObject) o;
GeneratedObject that = (GeneratedObject) o;
- if (!fqn.equals(that.fqn)) {
- return false;
- }
+ return fqn.equals(that.fqn);
- return true;
}
@Override
}
@Override