[jboss-cvs] JBossAS SVN: r106884 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/metadata/jbossra and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 20 04:33:32 EDT 2010
Author: maeste
Date: 2010-07-20 04:33:31 -0400 (Tue, 20 Jul 2010)
New Revision: 106884
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java
Log:
JBJCA-385: removing File from parse method signature, using InputStream instead
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2010-07-20 07:32:02 UTC (rev 106883)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2010-07-20 08:33:31 UTC (rev 106884)
@@ -28,6 +28,8 @@
import org.jboss.jca.common.metadata.ra.RaParser;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
import org.jboss.logging.Logger;
@@ -62,12 +64,14 @@
if (metadataFile.exists())
{
+ InputStream input = null;
String url = metadataFile.getAbsolutePath();
try
{
long start = System.currentTimeMillis();
+ input = new FileInputStream(metadataFile);
- result = (new RaParser()).parse(metadataFile);
+ result = (new RaParser()).parse(input);
log.debugf("Total parse for %s took %d ms", url, (System.currentTimeMillis() - start));
@@ -79,6 +83,12 @@
log.errorf(e, "Error during parsing: %s", url);
throw e;
}
+ finally
+ {
+ if (input != null)
+ input.close();
+ }
+
}
return result;
@@ -98,12 +108,14 @@
if (metadataFile.exists())
{
+ InputStream input = null;
String url = metadataFile.getAbsolutePath();
try
{
long start = System.currentTimeMillis();
- result = (new JbossRaParser()).parse(metadataFile);
+ input = new FileInputStream(metadataFile);
+ result = (new JbossRaParser()).parse(input);
log.debugf("Total parse for $s took %d ms", url, (System.currentTimeMillis() - start));
@@ -114,6 +126,11 @@
log.error("Error during parsing: " + url, e);
throw e;
}
+ finally
+ {
+ if (input != null)
+ input.close();
+ }
}
return result;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java 2010-07-20 07:32:02 UTC (rev 106883)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataParser.java 2010-07-20 08:33:31 UTC (rev 106884)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.common.metadata;
-import java.io.File;
+import java.io.InputStream;
/**
*
@@ -35,11 +35,12 @@
{
/**
- * Parse the xml file and return the JCAMetaData for which the concrete parser is designed
- * @param xmlFile The xml file to parse
+ * Parse the xml file and return the JCAMetaData for which the concrete parser is designed.
+ * Note that is responsibility of the client to open and close the stream
+ * @param xmlInputStream an InputStrema opened on the xml file to parse
* @return The metadata
* @exception Exception Thrown if an error occurs
*/
- public T parse(File xmlFile) throws Exception;
+ public T parse(InputStream xmlInputStream) throws Exception;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java 2010-07-20 07:32:02 UTC (rev 106883)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java 2010-07-20 08:33:31 UTC (rev 106884)
@@ -29,8 +29,6 @@
import org.jboss.jca.common.metadata.jbossra.jbossra20.OverrideElementAttribute;
import org.jboss.jca.common.metadata.jbossra.jbossra20.RaConfigProperty;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -59,17 +57,15 @@
* @exception Exception Thrown if an error occurs
*/
@Override
- public JbossRa parse(File xmlFile) throws Exception
+ public JbossRa parse(InputStream xmlInputStream) throws Exception
{
- InputStream input = null;
XMLStreamReader reader = null;
JbossRa jbossRa = null;
try
{
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- input = new FileInputStream(xmlFile);
- reader = inputFactory.createXMLStreamReader(input);
+ reader = inputFactory.createXMLStreamReader(xmlInputStream);
//iterate over tags
switch (reader.nextTag())
@@ -124,8 +120,6 @@
{
if (reader != null)
reader.close();
- if (input != null)
- input.close();
}
return jbossRa;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2010-07-20 07:32:02 UTC (rev 106883)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2010-07-20 08:33:31 UTC (rev 106884)
@@ -23,7 +23,7 @@
import org.jboss.jca.common.metadata.MetadataParser;
-import java.io.File;
+import java.io.InputStream;
/**
*
@@ -36,7 +36,7 @@
{
@Override
- public Connector parse(File xmlFile) throws Exception
+ public Connector parse(InputStream xmlInputStream) throws Exception
{
return null;
}
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java 2010-07-20 07:32:02 UTC (rev 106883)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/JbossRaParserTestCase.java 2010-07-20 08:33:31 UTC (rev 106884)
@@ -28,6 +28,7 @@
import org.jboss.jca.common.metadata.jbossra.jbossra20.RaConfigProperty;
import java.io.File;
+import java.io.FileInputStream;
import org.junit.Test;
@@ -56,7 +57,7 @@
.getResource("jboss-ra-1.0-single-attribute.xml").toURI());
JbossRaParser parser = new JbossRaParser();
//when
- JbossRa jbossRa = parser.parse(xmlFile);
+ JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
//then
assertThat(jbossRa, instanceOf(JbossRa10.class));
assertThat(jbossRa.getRaConfigProperties().size(), is(1));
@@ -84,7 +85,7 @@
.getResource("jboss-ra-1.0-no-attributes.xml").toURI());
JbossRaParser parser = new JbossRaParser();
//when
- JbossRa jbossRa = parser.parse(xmlFile);
+ JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
//then
assertThat(jbossRa, instanceOf(JbossRa10.class));
assertThat(jbossRa.getRaConfigProperties().size(), is(0));
@@ -105,7 +106,7 @@
.getResource("jboss-ra-1.0-multiple-attributes.xml").toURI());
JbossRaParser parser = new JbossRaParser();
//when
- JbossRa jbossRa = parser.parse(xmlFile);
+ JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
//then
assertThat(jbossRa, instanceOf(JbossRa10.class));
assertThat(jbossRa.getRaConfigProperties().size(), is(2));
@@ -137,7 +138,7 @@
.getResource("jboss-ra-2.0-single-attribute.xml").toURI());
JbossRaParser parser = new JbossRaParser();
//when
- JbossRa jbossRa = parser.parse(xmlFile);
+ JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
//then
assertThat(jbossRa, instanceOf(JbossRa20.class));
assertThat(jbossRa.getRaConfigProperties().size(), is(1));
@@ -167,7 +168,7 @@
.getResource("jboss-ra-2.0-no-attributes.xml").toURI());
JbossRaParser parser = new JbossRaParser();
//when
- JbossRa jbossRa = parser.parse(xmlFile);
+ JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
//then
assertThat(jbossRa, instanceOf(JbossRa20.class));
assertThat(jbossRa.getRaConfigProperties().size(), is(0));
@@ -189,7 +190,7 @@
.getResource("jboss-ra-2.0-multiple-attributes.xml").toURI());
JbossRaParser parser = new JbossRaParser();
//when
- JbossRa jbossRa = parser.parse(xmlFile);
+ JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
//then
assertThat(jbossRa, instanceOf(JbossRa20.class));
assertThat(jbossRa.getRaConfigProperties().size(), is(2));
@@ -220,7 +221,7 @@
// .getResource("jboss-ra-1.0-tons-attributes.xml").toURI());
// JbossRaParser parser = new JbossRaParser();
// //when
- // JbossRa jbossRa = parser.parse(xmlFile);
+ // JbossRa jbossRa = parser.parse(new FileInputStream(xmlFile));
// //then
// assertThat(jbossRa, instanceOf(JbossRa10.class));
// assertThat(jbossRa.getRaConfigProperties().size(), is(200000));
More information about the jboss-cvs-commits
mailing list