Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove StreamReaderCompat
......................................................................
core: Remove StreamReaderCompat
This patch removes the deprecate class StreamReaderCompat and its
ancestor, TextReaderCompat.
StreamReaderCompat was only used in a single place,
GetCACertificateQuery, which was rewritten to use FileUtil and
TextReaderCompat was not used anywhere (besides both classes' unit
tests, that is).
This patch rewrites the single usage of StreamReaderCompat so it is no
longer needed, and removes the two useless classes and their unit tests.
Change-Id: Id5a072fbcdfabb3291fd3ecd83c4c722a5a3813a
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
D
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/StreamReaderCompat.java
D
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TextReaderCompat.java
D
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StreamReaderCompatTest.java
D
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TextReaderCompatTest.java
5 files changed, 4 insertions(+), 155 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/12170/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
index 1cd19f0..459fe8c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCACertificateQuery.java
@@ -2,7 +2,6 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
-import org.ovirt.engine.core.compat.backendcompat.StreamReaderCompat;
import org.ovirt.engine.core.utils.FileUtil;
public class GetCACertificateQuery<P extends VdcQueryParametersBase> extends
QueriesCommandBase<P> {
@@ -13,14 +12,10 @@
@Override
protected void executeQueryCommand() {
getQueryReturnValue().setSucceeded(false);
- if (FileUtil.fileExists(Config.resolveCACertificatePath())) {
- StreamReaderCompat reader = new
StreamReaderCompat(Config.resolveCACertificatePath());
- try {
- getQueryReturnValue().setReturnValue(reader.ReadToEnd());
- getQueryReturnValue().setSucceeded(true);
- } finally {
- reader.dispose();
- }
+ String path = Config.resolveCACertificatePath();
+ if (FileUtil.fileExists(path)) {
+ getQueryReturnValue().setReturnValue(FileUtil.readAllText(path));
+ getQueryReturnValue().setSucceeded(true);
}
}
}
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/StreamReaderCompat.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/StreamReaderCompat.java
deleted file mode 100644
index ccf4388..0000000
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/StreamReaderCompat.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.ovirt.engine.core.compat.backendcompat;
-
-import java.io.IOException;
-import java.io.Reader;
-import org.ovirt.engine.core.compat.CompatException;
-
-public class StreamReaderCompat extends TextReaderCompat {
-
- public StreamReaderCompat(Reader content) {
- super(content);
- }
-
- public StreamReaderCompat(String path) {
- super();
- try {
- setReader(new java.io.FileReader(path));
- } catch (java.io.FileNotFoundException e) {
- throw new CompatException(e);
- }
- }
-
- public String ReadToEnd() {
- StringBuilder output = new StringBuilder();
- try {
- char[] nextChar = new char[1];
- int success = 0;
- do {
- success = content.read(nextChar);
- if (success != -1)
- output.append(nextChar);
- } while (success != -1);
- } catch (IOException e) {
- throw new CompatException(e);
- }
- return output.toString();
- }
-
- public void Dispose() {
- try {
- content.close();
- } catch (IOException e) {
- throw new CompatException(e);
- }
- }
-
- public void dispose() {
- this.Dispose();
- }
-}
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TextReaderCompat.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TextReaderCompat.java
deleted file mode 100644
index 61cabd9..0000000
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TextReaderCompat.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.ovirt.engine.core.compat.backendcompat;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-
-import org.ovirt.engine.core.compat.CompatException;
-
-public class TextReaderCompat {
-
- protected BufferedReader content;
-
- public TextReaderCompat() {
- }
-
- public TextReaderCompat(Reader reader) {
- setReader(reader);
- }
-
- public void setReader(Reader reader) {
- content = new BufferedReader(reader);
- }
-
- public String ReadLine() {
- try {
- return content.readLine();
- } catch (IOException e) {
- throw new CompatException(e);
- }
- }
-
-}
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StreamReaderCompatTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StreamReaderCompatTest.java
deleted file mode 100644
index 4558a1a..0000000
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StreamReaderCompatTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.ovirt.engine.core.compat;
-
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
-import org.ovirt.engine.core.compat.backendcompat.StreamReaderCompat;
-
-public class StreamReaderCompatTest extends TestCase {
- public void testReadLine() {
- String foo = "This is a test.\nA real test.";
- StringReader reader = new StringReader(foo);
- StreamReaderCompat compat = new StreamReaderCompat(reader);
- assertEquals("first line", "This is a test.", compat.ReadLine());
- assertEquals("second line", "A real test.", compat.ReadLine());
- }
-
- public void testReadToEnd1() {
- String foo = "This is a test.\nA real test.";
- StringReader reader = new StringReader(foo);
- StreamReaderCompat compat = new StreamReaderCompat(reader);
- assertEquals("first line", "This is a test.", compat.ReadLine());
- assertEquals("second line", "A real test.", compat.ReadToEnd());
- }
-
- public void testReadToEnd2() {
- String foo = "This is a test.\nA real test.";
- StringReader reader = new StringReader(foo);
- StreamReaderCompat compat = new StreamReaderCompat(reader);
- assertEquals("the whole thing", foo, compat.ReadToEnd());
- }
-
- public void testDisposeAndExceptions() {
-
- boolean exception = false;
- try {
- String foo = "This is a test.\nA real test.";
- StringReader reader = new StringReader(foo);
- StreamReaderCompat compat = new StreamReaderCompat(reader);
- compat.ReadLine();
- compat.Dispose();
- compat.ReadLine();
- } catch (CompatException e) {
- exception = true;
- }
- assertTrue("Dispose should make subsequent reads fail", exception);
- }
-}
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TextReaderCompatTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TextReaderCompatTest.java
deleted file mode 100644
index 96c7c2b..0000000
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TextReaderCompatTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.compat;
-
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
-import org.ovirt.engine.core.compat.backendcompat.TextReaderCompat;
-
-public class TextReaderCompatTest extends TestCase {
- public void testReadLine() {
- String foo = "This is a test.\nA real test.";
- StringReader reader = new StringReader(foo);
- TextReaderCompat compat = new TextReaderCompat(reader);
- assertEquals("first line", "This is a test.", compat.ReadLine());
- assertEquals("second line", "A real test.", compat.ReadLine());
- }
-}
--
To view, visit http://gerrit.ovirt.org/12170
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5a072fbcdfabb3291fd3ecd83c4c722a5a3813a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
