From 95e04de914f7ae6098d801dfe8379efa4b7a1aaf Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 15 Feb 2012 17:59:02 +0000 Subject: [PATCH] [#1142] Rename Result.exportXML() to Result.intoXML() to stay more consistent --- .../src/org/jooq/test/_/testcases/FormatTests.java | 4 ++-- jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java | 4 ++-- jOOQ/src/main/java/org/jooq/Result.java | 12 +++++++++++- jOOQ/src/main/java/org/jooq/impl/ResultImpl.java | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java index d3e882438f..ba2f837653 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java @@ -243,9 +243,9 @@ extends BaseTest books = create().selectFrom(TBook()).fetch(); - testXML(books.exportXML(), books); + testXML(books.intoXML(), books); } private void testXML(Document doc, Result books) throws XPathExpressionException { diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java index 1a21bcd0d5..bedc71abf4 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java @@ -1007,8 +1007,8 @@ public abstract class jOOQAbstractTest< } @Test - public void testExportXML() throws Exception { - new FormatTests(this).testExportXML(); + public void testIntoXML() throws Exception { + new FormatTests(this).testIntoXML(); } @Test diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java index 7504c7396d..4308550820 100644 --- a/jOOQ/src/main/java/org/jooq/Result.java +++ b/jOOQ/src/main/java/org/jooq/Result.java @@ -1721,6 +1721,14 @@ public interface Result extends FieldProvider, List, Attach */ String formatXML(); + /** + * Get this result as XML + * + * @deprecated - 2.0.5 - Use {@link #intoXML()} instead + */ + @Deprecated + Document exportXML(); + /** * Get this result as XML * @@ -1728,7 +1736,7 @@ public interface Result extends FieldProvider, List, Attach * @see http://www.jooq.org/xsd/jooq-export-1.6.2.xsd */ - Document exportXML(); + Document intoXML(); /** * Convert this result into an array of arrays @@ -1788,4 +1796,6 @@ public interface Result extends FieldProvider, List, Attach */ > H into(H handler); + + } diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java index 974426b21d..ee9a62a02d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java @@ -1185,6 +1185,11 @@ class ResultImpl implements Result, AttachableInternal { @Override public final Document exportXML() { + return intoXML(); + } + + @Override + public final Document intoXML() { try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder();