Juan Hernandez has uploaded a new change for review.
Change subject: codegen: Use commons-io instead of custom code
......................................................................
codegen: Use commons-io instead of custom code
This patch replaces the custom FileUtils class with commons-io, which
provides many functionalities that will be used by future patches.
Change-Id: Ifbfd45e9207137bd9148ddf69763dec6c675dc92
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M generator/pom.xml
M generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java
D generator/src/main/java/org/ovirt/engine/sdk/generator/utils/FileUtils.java
3 files changed, 16 insertions(+), 76 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/58/37858/1
diff --git a/generator/pom.xml b/generator/pom.xml
index ea3538f..865e4f0 100644
--- a/generator/pom.xml
+++ b/generator/pom.xml
@@ -22,6 +22,16 @@
</license>
</licenses>
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+
+ </dependencies>
+
<properties>
<!-- Make sure that we always compile with UTF-8 encoding: -->
diff --git
a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java
b/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java
index b7e318e..0f81a7f 100644
---
a/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java
+++
b/generator/src/main/java/org/ovirt/engine/sdk/generator/rsdl/RsdlCodegen.java
@@ -35,8 +35,8 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
+import org.apache.commons.io.FileUtils;
import org.ovirt.engine.sdk.generator.common.AbstractCodegen;
-import org.ovirt.engine.sdk.generator.utils.FileUtils;
import org.ovirt.engine.sdk.generator.utils.StringUtils;
import org.ovirt.engine.sdk.generator.utils.TypeUtils;
import org.ovirt.engine.sdk.generator.xsd.XsdData;
@@ -48,8 +48,8 @@
* Provides RSDL related generator capabilities.
*/
public class RsdlCodegen extends AbstractCodegen {
- private static final String BROKERS_FILE =
"../src/ovirtsdk/infrastructure/brokers.py";
- private static final String ENTRY_POINT_FILE = "../src/ovirtsdk/api.py";
+ private static final File BROKERS_FILE = new
File("../src/ovirtsdk/infrastructure/brokers.py");
+ private static final File ENTRY_POINT_FILE = new
File("../src/ovirtsdk/api.py");
private static final Set<String> KNOWN_ACTIONS = setOf(
"get",
@@ -157,7 +157,7 @@
/**
* Persist generated content.
*/
- private void persist() {
+ private void persist() throws IOException {
String brokersFile = "";
String apiFile = "";
@@ -194,8 +194,8 @@
apiFile += EntryPoint.entryPoint(rootCollCandidates, collCandidates);
- FileUtils.saveFile(BROKERS_FILE, brokersFile);
- FileUtils.saveFile(ENTRY_POINT_FILE, apiFile);
+ FileUtils.writeStringToFile(BROKERS_FILE, brokersFile);
+ FileUtils.writeStringToFile(ENTRY_POINT_FILE, apiFile);
}
private void appendResource(
diff --git
a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/FileUtils.java
b/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/FileUtils.java
deleted file mode 100644
index c175680..0000000
---
a/generator/src/main/java/org/ovirt/engine/sdk/generator/utils/FileUtils.java
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-// Copyright (c) 2014 Red Hat, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package org.ovirt.engine.sdk.generator.utils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-
-/**
- * Provides file/directory related services.
- */
-public class FileUtils {
- /**
- * Deletes all files in given directory.
- */
- public static boolean deleteAllFiles(String directory) {
- boolean res = true;
- for (File f : list(directory)) {
- res = res & f.delete();
- }
- return res;
- }
-
- /**
- * List all files in given directory.
- */
- public static File[] list(String directory) {
- return new File(directory).listFiles();
- }
-
- /**
- * Stores file.
- *
- * @param path file path
- * @param content file content
- */
- public static void saveFile(String path, String content) {
- PrintWriter out = null;
- if (path != null && content != null) {
- try {
- out = new PrintWriter(path);
- out.println(content);
- }
- catch (FileNotFoundException e) {
- // TODO: Log error
- e.printStackTrace();
- throw new RuntimeException("File \"" + path + "\" write
failed.");
- }
- finally {
- if (out != null) {
- out.close();
- }
- }
- }
- }
-}
--
To view, visit http://gerrit.ovirt.org/37858
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbfd45e9207137bd9148ddf69763dec6c675dc92
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
