Remove yang-test

[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 4ad080c6f516382d2289fe9f98692956b2a0e578..14619a24809c555c022017d697b060417040af09 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
@@ -1,15 +1,23 @@
+/*
+ * Copyright (c) 2013, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+

 package org.opendaylight.controller.config.yangjmxgenerator.plugin.java;
 
 package org.opendaylight.controller.config.yangjmxgenerator.plugin.java;
 

+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 org.apache.commons.io.FileUtils;
-import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.StringUtil;
-
+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 static com.google.common.base.Preconditions.checkNotNull;
+import org.opendaylight.controller.config.yangjmxgenerator.plugin.util.StringUtil;

 
 public class GeneratedObject {
 
 
 public class GeneratedObject {
 


@@ -31,8 +39,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();


@@ -61,11 +71,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