Changeset 982 for AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/JaxbJobFactory.java

Timestamp:

08/28/10 21:55:08 (21 months ago)

Author:

kasper

Message:

Ticket #382: Added CLI for executing jobs

File:

• AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/JaxbJobFactory.java (modified) (15 diffs)

AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/JaxbJobFactory.java

@@ -14 +14 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
 
 import org.eobjects.analyzer.beans.ExploringAnalyzer;
 import org.eobjects.analyzer.beans.RowProcessingAnalyzer;
+import org.eobjects.analyzer.configuration.AnalyzerBeansConfiguration;
 import org.eobjects.analyzer.connection.DataContextProvider;
 import org.eobjects.analyzer.connection.Datastore;
@@ -37 +36 @@
 import org.eobjects.analyzer.job.jaxb.InputType;
 import org.eobjects.analyzer.job.jaxb.Job;
+import org.eobjects.analyzer.job.jaxb.JobMetadataType;
 import org.eobjects.analyzer.job.jaxb.ObjectFactory;
 import org.eobjects.analyzer.job.jaxb.OutputType;
@@ -43 +43 @@
 import org.eobjects.analyzer.job.jaxb.TransformerDescriptorType;
 import org.eobjects.analyzer.job.jaxb.TransformerType;
+import org.eobjects.analyzer.util.JaxbValidationEventHandler;
 import org.eobjects.analyzer.util.SchemaNavigator;
+import org.eobjects.analyzer.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79 +81 @@
                         Unmarshaller unmarshaller = _jaxbContext.createUnmarshaller();
 
-                        unmarshaller.setEventHandler(new ValidationEventHandler() {
-                                @Override
-                                public boolean handleEvent(ValidationEvent event) {
-                                        int severity = event.getSeverity();
-                                        if (severity == ValidationEvent.WARNING) {
-                                                logger.warn("encountered JAXB parsing warning: "
-                                                                + event.getMessage());
-                                                return true;
-                                        }
-
-                                        logger.warn("encountered JAXB parsing error: "
-                                                        + event.getMessage());
-                                        return false;
-                                }
-                        });
+                        unmarshaller.setEventHandler(new JaxbValidationEventHandler());
                         Job job = (Job) unmarshaller.unmarshal(inputStream);
                         return create(job);
@@ -102 +90 @@
 
         public AnalysisJobBuilder create(Job job) {
+                JobMetadataType metadata = job.getJobMetadata();
+                if (metadata != null) {
+                        logger.info("Job name: {}", metadata.getJobName());
+                        logger.info("Job version: {}", metadata.getJobVersion());
+                        logger.info("Job description: {}", metadata.getJobDescription());
+                        logger.info("Author: {}", metadata.getAuthor());
+                        logger.info("Created date: {}", metadata.getCreatedDate());
+                        logger.info("Updated date: {}", metadata.getUpdatedDate());
+                }
+
                 SourceType source = job.getSource();
 
@@ -109 +107 @@
                 DataContextType dataContext = source.getDataContext();
                 String ref = dataContext.getRef();
-                if (isNullOrEmpty(ref)) {
+                if (StringUtils.isNullOrEmpty(ref)) {
                         throw new IllegalStateException("Datastore ref cannot be null");
                 }
@@ -131 +129 @@
                 for (ColumnType column : columns) {
                         String path = column.getPath();
-                        if (isNullOrEmpty(path)) {
+                        if (StringUtils.isNullOrEmpty(path)) {
                                 throw new IllegalStateException("Column path cannot be null");
                         }
@@ -141 +139 @@
                                         physicalColumn);
                         String id = column.getId();
-                        if (isNullOrEmpty(id)) {
+                        if (StringUtils.isNullOrEmpty(id)) {
                                 throw new IllegalStateException(
                                                 "Source column id cannot be null");
@@ -158 +156 @@
                         TransformerDescriptorType descriptor = transformer.getDescriptor();
                         ref = descriptor.getRef();
-                        if (isNullOrEmpty(ref)) {
+                        if (StringUtils.isNullOrEmpty(ref)) {
                                 throw new IllegalStateException(
                                                 "Transformer descriptor ref cannot be null");
@@ -189 +187 @@
                                 for (InputType inputType : input) {
                                         ref = inputType.getRef();
-                                        if (isNullOrEmpty(ref)) {
+                                        if (StringUtils.isNullOrEmpty(ref)) {
                                                 throw new IllegalStateException(
                                                                 "Transformer input column ref cannot be null");
@@ -220 +218 @@
                                                 MutableInputColumn<?> o2 = outputColumns.get(i);
                                                 String name = o1.getName();
-                                                if (!isNullOrEmpty(name)) {
+                                                if (!StringUtils.isNullOrEmpty(name)) {
                                                         o2.setName(name);
                                                 }
                                                 String id = o1.getId();
-                                                if (isNullOrEmpty(id)) {
+                                                if (StringUtils.isNullOrEmpty(id)) {
                                                         throw new IllegalStateException(
                                                                         "Transformer output column id cannot be null");
@@ -240 +238 @@
                 for (AnalyzerType analyzerType : analyzers) {
                         ref = analyzerType.getDescriptor().getRef();
-                        if (isNullOrEmpty(ref)) {
+                        if (StringUtils.isNullOrEmpty(ref)) {
                                 throw new IllegalStateException(
                                                 "Analyzer descriptor ref cannot be null");
@@ -264 +262 @@
                                 for (InputType inputType : input) {
                                         ref = inputType.getRef();
-                                        if (isNullOrEmpty(ref)) {
+                                        if (StringUtils.isNullOrEmpty(ref)) {
                                                 throw new IllegalStateException(
                                                                 "Analyzer input column ref cannot be null");
@@ -300 +298 @@
         }
 
-        private boolean isNullOrEmpty(String str) {
-                return str == null || str.trim().length() == 0;
-        }
-
         private void applyProperties(
                         AbstractBeanJobBuilder<? extends BeanDescriptor<?>, ?, ?> builder,
@@ -313 +307 @@
                                 String name = property.getName();
                                 String value = property.getValue();
-                                
+
                                 ConfiguredPropertyDescriptor configuredProperty = descriptor
-                                .getConfiguredProperty(name);
-                                
+                                                .getConfiguredProperty(name);
+
                                 // TODO: Convert value according to configuredProperty's type
                                 builder.setConfiguredProperty(configuredProperty, value);