Changeset 4510

Timestamp:

02/13/14 14:57:31 (10 years ago)

Author:

twagoo

Message:

Completed vlo config factories

Location:

vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config

Files:

• DefaultVloConfigFactory.java (modified) (2 diffs)
• XmlVloConfigFactory.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactory.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.config;
 
+import java.io.IOException;
 import java.io.InputStream;
 import javax.xml.bind.JAXBException;
@@ -39 +40 @@
 
     public VloConfig newConfig() {
-        InputStream configResourceStream = getClass().getResourceAsStream(DEFAULT_CONFIG_RESOURCE);
         try {
-            return marshaller.unmarshal(new StreamSource(configResourceStream));
-        } catch (JAXBException ex) {
-            throw new RuntimeException("Could not read default configuration due to deserialization error", ex);
+            InputStream configResourceStream = getClass().getResourceAsStream(DEFAULT_CONFIG_RESOURCE);
+            try {
+                return marshaller.unmarshal(new StreamSource(configResourceStream));
+            } catch (JAXBException ex) {
+                throw new RuntimeException("Could not read default configuration due to deserialization error", ex);
+            } finally {
+                configResourceStream.close();
+            }
+        } catch (IOException ex) {
+            throw new RuntimeException("Could not close stream to default configuration", ex);
         }
     }

vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/XmlVloConfigFactory.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.config;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import javax.xml.bind.JAXBException;
+import javax.xml.transform.stream.StreamSource;
 
 /**
@@ -25 +29 @@
 public class XmlVloConfigFactory implements VloConfigFactory {
 
+    private final VloConfigMarshaller marshaller;
     private final URL configLocation;
 
     public XmlVloConfigFactory(URL configLocation) {
         this.configLocation = configLocation;
+        try {
+            this.marshaller = new VloConfigMarshaller();
+        } catch (JAXBException ex) {
+            throw new RuntimeException("Could not instantiate configuration marshaller while constructing configuration factory", ex);
+        }
     }
 
     public VloConfig newConfig() {
-        //TODO: Unmarshal from file
-        throw new UnsupportedOperationException("Not supported yet.");
+        try {
+            final InputStream fileStream = configLocation.openStream();
+            try {
+                return marshaller.unmarshal(new StreamSource(fileStream));
+            } catch (JAXBException ex) {
+                throw new RuntimeException("Could not deserialize configuration file", ex);
+            } finally {
+                fileStream.close();
+            }
+        } catch (IOException ex) {
+            throw new RuntimeException("Could not read configuration file", ex);
+        }
     }
-
 }