http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java index 22668aa..679787d 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorBuilder.java @@ -97,12 +97,15 @@ public class WorkflowProcessorBuilder { WorkflowInstance.class }); WorkflowProcessor wp = clazzConstructor.newInstance(this.lifecycleManager, this.workflowInstance); - if (this.id != null) + if (this.id != null) { wp.getWorkflowInstance().setId(id); - if (this.priority != -1) + } + if (this.priority != -1) { wp.getWorkflowInstance().setPriority(Priority.getPriority(priority)); - if (this.subProcessors != null) + } + if (this.subProcessors != null) { wp.setSubProcessors(subProcessors); + } if (this.workflowInstance != null){ wp.setWorkflowInstance(workflowInstance); }
http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java index 29a6743..ceecc13 100755 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorHelper.java @@ -79,15 +79,19 @@ public class WorkflowProcessorHelper { // properties // = // " + processor.getStaticMetadata().asHashtable() + "]"); - if (skeleton.getPreConditions() != null) + if (skeleton.getPreConditions() != null) { stringModel.append(indent).append("{PreCond:").append(indent).append(" ") .append(toString(skeleton.getPreConditions(), indent + " ")).append("}"); - if (skeleton.getPostConditions() != null) + } + if (skeleton.getPostConditions() != null) { stringModel.append(indent).append("{PostCond:").append(indent).append(" ") .append(toString(skeleton.getPostConditions(), indent + " ")).append("}"); - if (skeleton.getSubProcessors() != null) - for (WorkflowProcessor subProcessor : skeleton.getSubProcessors()) + } + if (skeleton.getSubProcessors() != null) { + for (WorkflowProcessor subProcessor : skeleton.getSubProcessors()) { stringModel.append(indent).append(toString(subProcessor, indent + " ")); + } + } return stringModel.toString(); } @@ -115,16 +119,18 @@ public class WorkflowProcessorHelper { ",")).append("'\n"); stringModel.append(" - static metadata = \n"); for (String key : skeleton.getWorkflowInstance().getSharedContext() - .getAllKeys()) + .getAllKeys()) { stringModel.append(" + ").append(key).append(" -> '") .append(StringUtils.join(skeleton.getWorkflowInstance().getSharedContext() .getAllMetadata(key), ",")).append("'\n"); + } stringModel.append(" - dynamic metadata = \n"); for (String key : skeleton.getWorkflowInstance().getSharedContext() - .getAllKeys()) + .getAllKeys()) { stringModel.append(" + ").append(key).append(" -> '") .append(StringUtils.join(skeleton.getWorkflowInstance().getSharedContext() .getAllMetadata(key), ",")).append("'\n"); + } return stringModel.toString(); } @@ -159,12 +165,14 @@ public class WorkflowProcessorHelper { // need them in the PackagedWorkflowRepository, so not sure what they do. // wp.setExcusedSubProcessorIds(model.getGraph().getExcusedSubProcessorIds()); wp.getWorkflowInstance().setId(instanceId); - if (model.getPreConditions() != null) + if (model.getPreConditions() != null) { wp.setPreConditions(buildProcessor(instanceId, model, modelToProcessorMap, true)); - if (model.getPostConditions() != null) + } + if (model.getPostConditions() != null) { wp.setPostConditions(buildProcessor(instanceId, model, modelToProcessorMap, false)); + } wp.getWorkflowInstance().setPriority(Priority.getDefault()); wp.setMinReqSuccessfulSubProcessors(Integer.parseInt(model.getGraph() .getMinReqSuccessfulSubProcessors())); @@ -172,24 +180,28 @@ public class WorkflowProcessorHelper { wp.getWorkflowInstance().setState( wLifecycle.createState("Loaded", wLifecycle.getStageForWorkflow("Loaded").getName(), "")); - if (wp instanceof TaskProcessor) + if (wp instanceof TaskProcessor) { ((TaskProcessor) wp) .setInstanceClass((Class<? extends WorkflowTaskInstance>) Class .forName(model.getGraph().getTask().getTaskInstanceClassName())); + } return wp; } public WorkflowProcessor findSkeleton(WorkflowProcessor skeleton, String modelId) { if (skeleton.getWorkflowInstance().getParentChildWorkflow().getGraph() - .getModelId().equals(modelId)) + .getModelId().equals(modelId)) { return skeleton; + } WorkflowProcessor found = findSkeleton(skeleton.getSubProcessors(), modelId); if (found == null) { - if (skeleton.getPreConditions() != null) + if (skeleton.getPreConditions() != null) { found = findSkeleton(skeleton.getPreConditions(), modelId); - if (found == null && skeleton.getPostConditions() != null) + } + if (found == null && skeleton.getPostConditions() != null) { found = findSkeleton(skeleton.getPostConditions(), modelId); + } } return found; } @@ -202,8 +214,9 @@ public class WorkflowProcessorHelper { return skeleton; } else { skeleton = findSkeleton(skeleton, modelId); - if (skeleton != null) + if (skeleton != null) { return skeleton; + } } } return null; @@ -211,14 +224,17 @@ public class WorkflowProcessorHelper { public WorkflowProcessor findProcessor(WorkflowProcessor wp, String modelId) { if (wp.getWorkflowInstance().getParentChildWorkflow().getId() - .equals(modelId)) + .equals(modelId)) { return wp; + } WorkflowProcessor found = findProcessor(wp.getSubProcessors(), modelId); if (found == null) { - if (wp.getPreConditions() != null) + if (wp.getPreConditions() != null) { found = findProcessor(wp.getPreConditions(), modelId); - if (found == null && wp.getPostConditions() != null) + } + if (found == null && wp.getPostConditions() != null) { found = findProcessor(wp.getPostConditions(), modelId); + } } return found; } @@ -230,8 +246,9 @@ public class WorkflowProcessorHelper { return processor; } else { processor = findProcessor(processor, modelId); - if (processor != null) + if (processor != null) { return processor; + } } } return null; @@ -249,10 +266,12 @@ public class WorkflowProcessorHelper { */ public boolean allProcessorsSameCategory( List<WorkflowProcessor> workflowProcessors, String categoryName) { - for (WorkflowProcessor workflowProcessor : workflowProcessors) + for (WorkflowProcessor workflowProcessor : workflowProcessors) { if (!workflowProcessor.getWorkflowInstance().getState().getCategory() - .getName().equals(categoryName)) + .getName().equals(categoryName)) { return false; + } + } return true; } @@ -312,12 +331,15 @@ public class WorkflowProcessorHelper { if (currentOption.getSubProcessors().isEmpty()) { tasks.add(currentOption); } else { - if (currentOption.getPreConditions() != null) + if (currentOption.getPreConditions() != null) { options.add(currentOption.getPreConditions()); - if (currentOption.getPostConditions() != null) + } + if (currentOption.getPostConditions() != null) { options.add(currentOption.getPostConditions()); - for (WorkflowProcessor ps : currentOption.getSubProcessors()) + } + for (WorkflowProcessor ps : currentOption.getSubProcessors()) { options.add(ps); + } } } return tasks; @@ -325,10 +347,12 @@ public class WorkflowProcessorHelper { public boolean containsCategory(List<WorkflowProcessor> workflowProcessors, String categoryName) { - for (WorkflowProcessor workflowProcessor : workflowProcessors) + for (WorkflowProcessor workflowProcessor : workflowProcessors) { if (workflowProcessor.getWorkflowInstance().getState().getCategory() - .getName().equals(categoryName)) + .getName().equals(categoryName)) { return true; + } + } return false; } @@ -342,8 +366,9 @@ public class WorkflowProcessorHelper { } catch (Exception ignored) { } } - if (host == null) + if (host == null) { return "Unknown"; + } return host; } @@ -352,8 +377,9 @@ public class WorkflowProcessorHelper { && processor.getWorkflowInstance().getParentChildWorkflow() != null) { return processor.getLifecycleManager().getLifecycleForWorkflow( processor.getWorkflowInstance().getParentChildWorkflow()); - } else + } else { return processor.getLifecycleManager().getDefaultLifecycle(); + } } private WorkflowLifecycle getLifecycle(ParentChildWorkflow model) { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java index b594604..3588fe3 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/processor/WorkflowProcessorQueue.java @@ -96,8 +96,9 @@ public class WorkflowProcessorQueue { + "] into WorkflowProcessor: Message: " + e.getMessage()); continue; } - if (processor != null) + if (processor != null) { processors.add(processor); + } } } @@ -420,7 +421,9 @@ public class WorkflowProcessorQueue { private synchronized WorkflowTask toConditionTask(WorkflowCondition cond){ String taskId = cond.getConditionId()+"-task"; // TODO: this is incompat with DataSourceWorkflowRepository WorkflowTask condTask = safeGetTaskById(taskId); - if(condTask != null) return condTask; + if(condTask != null) { + return condTask; + } condTask = new WorkflowTask(); condTask.setTaskId(taskId); condTask.setTaskInstanceClassName(ConditionTaskInstance.class.getCanonicalName()); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java index 0b8b092..d5ad499 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AbstractEngineRunnerBase.java @@ -65,9 +65,10 @@ public abstract class AbstractEngineRunnerBase extends EngineRunner { taskProcessor.getWorkflowInstance().getParentChildWorkflow().getGraph().getTask() != null) { return taskProcessor.getWorkflowInstance().getParentChildWorkflow() .getGraph().getTask(); - } else + } else { return taskProcessor.getWorkflowInstance().getParentChildWorkflow() - .getTasks().get(0); + .getTasks().get(0); + } } protected WorkflowLifecycle getLifecycle(TaskProcessor taskProcessor) { @@ -75,7 +76,9 @@ public abstract class AbstractEngineRunnerBase extends EngineRunner { } protected synchronized void persist(WorkflowInstance instance) { - if(instRep == null) return; + if(instRep == null) { + return; + } try { if (instance.getId() == null || (instance.getId().equals(""))) { // we have to persist it by adding it http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java index 1306685..d8e96c1 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/AsynchronousLocalEngineRunner.java @@ -131,10 +131,11 @@ public class AsynchronousLocalEngineRunner extends AbstractEngineRunnerBase { */ @Override public void shutdown() { - for (Thread worker : this.workerMap.values()) + for (Thread worker : this.workerMap.values()) { if (worker != null) { worker.interrupt(); } + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java index 1f5267a..7ef7c94 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/runner/ResourceRunner.java @@ -145,10 +145,12 @@ public class ResourceRunner extends AbstractEngineRunnerBase implements CoreMetK LOG.log(Level.WARNING, "Attempt to kill " + "current resmgr job: [" + this.currentJobId + "]: failed"); return false; - } else + } else { return true; - } else + } + } else { return false; + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java index 100f9eb..9fcd271 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/CheckForMetadataKeys.java @@ -28,8 +28,9 @@ public class CheckForMetadataKeys implements WorkflowConditionInstance { String[] reqMetKeys = (config.getProperty("reqMetKeys") + ",") .split(","); for (String reqMetKey : reqMetKeys) { - if (!metadata.containsKey(reqMetKey)) - return false; + if (!metadata.containsKey(reqMetKey)) { + return false; + } } return true; } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java index 1f3c5a9..6bf82e0 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/examples/LongCondition.java @@ -57,7 +57,9 @@ public class LongCondition implements WorkflowConditionInstance { timesFalse++; return false; } - else return true; + else { + return true; + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java index 1978697..5c82ba8 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycle.java @@ -178,8 +178,9 @@ public class WorkflowLifecycle { } return null; - } else + } else { return null; + } } /** @@ -219,8 +220,9 @@ public class WorkflowLifecycle { if (this.getStages() != null) { for (WorkflowLifecycleStage stage : (SortedSet<WorkflowLifecycleStage>) this .getStages()) { - if (category != null && !stage.getName().equals(category)) + if (category != null && !stage.getName().equals(category)) { continue; + } if (stage.getStates() != null) { for (WorkflowState state : (List<WorkflowState>) stage.getStates()) { if (state.getName().equals(stateName)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java index 287a8ba..9350e5a 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowLifecycleManager.java @@ -70,8 +70,9 @@ public class WorkflowLifecycleManager { WorkflowLifecycleStage stage = getStage(inst); if (stage != null) { return stage.getOrder(); - } else + } else { return -1; + } } /** @@ -90,8 +91,9 @@ public class WorkflowLifecycleManager { WorkflowLifecycle lifecycle = getLifecycleForWorkflow(workflow); if (lifecycle != null) { return lifecycle.getStages().size(); - } else + } else { return -1; + } } /** @@ -111,8 +113,9 @@ public class WorkflowLifecycleManager { if (lifecycle != null) { return lifecycle.getStageForWorkflow(inst .getStatus()); - } else + } else { return null; + } } /** @@ -195,8 +198,9 @@ public class WorkflowLifecycleManager { } return defaultLifecycle; - } else + } else { return null; + } } /** @@ -221,8 +225,9 @@ public class WorkflowLifecycleManager { inst.getState().getCategory().getName().equals("done"))) && currStageNum == getNumStages(inst.getWorkflow())) { return currStageNum; - } else + } else { return currStageNum - 1; + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java index c90d242..1f0d5ac 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/lifecycle/WorkflowState.java @@ -70,10 +70,11 @@ public class WorkflowState { } public boolean equals(Object obj) { - if (obj instanceof WorkflowState) - return ((WorkflowState) obj).getName().equals(this.getName()); - else - return false; + if (obj instanceof WorkflowState) { + return ((WorkflowState) obj).getName().equals(this.getName()); + } else { + return false; + } } public String toString() { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java index 195c7b3..0da8cc8 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/DataSourceWorkflowRepository.java @@ -1722,8 +1722,9 @@ public class DataSourceWorkflowRepository implements WorkflowRepository { } private boolean hasTaskId(List<WorkflowTask> tasks, String id) { - if (tasks == null || (tasks.size() == 0)) + if (tasks == null || (tasks.size() == 0)) { return false; + } for (WorkflowTask task : tasks) { if (task.getTaskId().equals(id)) { @@ -1735,8 +1736,9 @@ public class DataSourceWorkflowRepository implements WorkflowRepository { } private boolean hasConditionId(List<WorkflowCondition> conds, String id) { - if (conds == null || (conds.size() == 0)) + if (conds == null || (conds.size() == 0)) { return false; + } for (WorkflowCondition cond : conds) { if (cond.getConditionId().equals(id)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java index f24f785..d2ce28f 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java @@ -164,8 +164,9 @@ public class PackagedWorkflowRepository implements WorkflowRepository { Workflow w = this.getWorkflowByName(workflowName); if (w != null) { return w.getTasks(); - } else + } else { return Collections.emptyList(); + } } /* @@ -180,8 +181,9 @@ public class PackagedWorkflowRepository implements WorkflowRepository { List<ParentChildWorkflow> workflows = this.eventWorkflowMap.get(eventName); if (workflows != null && workflows.size() > 0) { return workflows; - } else + } else { return Collections.emptyList(); + } } /* @@ -213,8 +215,9 @@ public class PackagedWorkflowRepository implements WorkflowRepository { public List getConditionsByTaskId(String taskId) throws RepositoryException { if (this.tasks.get(taskId) != null) { return this.tasks.get(taskId).getConditions(); - } else + } else { return Collections.emptyList(); + } } /* @@ -363,10 +366,11 @@ public class PackagedWorkflowRepository implements WorkflowRepository { @Override public List<WorkflowCondition> getConditionsByWorkflowId(String workflowId) throws RepositoryException { - if (!this.workflows.containsKey(workflowId)) + if (!this.workflows.containsKey(workflowId)) { throw new RepositoryException( "Attempt to obtain conditions for a workflow: " + "[" + workflowId - + "] that does not exist!"); + + "] that does not exist!"); + } return this.workflows.get(workflowId).getConditions(); } @@ -392,8 +396,9 @@ public class PackagedWorkflowRepository implements WorkflowRepository { try { parser = factory.newDocumentBuilder(); List<Element> rootElements = new Vector<Element>(); - for (File file : files) + for (File file : files) { rootElements.add(parser.parse(file).getDocumentElement()); + } for (Element root : rootElements) { Metadata staticMetadata = new Metadata(); loadConfiguration(rootElements, root, staticMetadata); @@ -461,9 +466,10 @@ public class PackagedWorkflowRepository implements WorkflowRepository { this.eventWorkflowMap.get(workflow.getId()).add(w); } } - } else + } else { throw new WorkflowException("Unsupported execution type: [" - + workflow.getGraph().getExecutionType() + "]"); + + workflow.getGraph().getExecutionType() + "]"); + } } } @@ -550,13 +556,15 @@ public class PackagedWorkflowRepository implements WorkflowRepository { if (curChild.getNodeName().equals("configuration")) { Metadata curMetadata = new Metadata(); - if (!((Element) curChild).getAttribute("extends").equals("")) + if (!((Element) curChild).getAttribute("extends").equals("")) { for (String extension : ((Element) curChild).getAttribute("extends") - .split(",")) + .split(",")) { curMetadata .replaceMetadata(globalConfGroups.containsKey(extension) ? globalConfGroups .get(extension) : this.loadConfGroup(rootElements, extension, globalConfGroups)); + } + } curMetadata.replaceMetadata(XmlStructFactory .getConfigurationAsMetadata(curChild)); NamedNodeMap attrMap = curChild.getAttributes(); @@ -592,8 +600,9 @@ public class PackagedWorkflowRepository implements WorkflowRepository { for (int i = 0; i < nodes.getLength(); i++) { Node node = nodes.item(i); String name = ((Element) node).getAttribute("name"); - if (name.equals(group)) + if (name.equals(group)) { return XmlStructFactory.getConfigurationAsMetadata(node); + } } } throw new WorkflowException("Configuration group '" + group + "' not defined!"); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java index 354fcc3..ea348bf 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java @@ -241,8 +241,9 @@ public class XMLWorkflowRepository implements WorkflowRepository { WorkflowTask t = (WorkflowTask) taskMap.get(taskId); if (t != null) { return t.getConditions(); - } else - return null; + } else { + return null; + } } /* @@ -327,9 +328,11 @@ public class XMLWorkflowRepository implements WorkflowRepository { @Override public List<WorkflowCondition> getConditionsByWorkflowId(String workflowId) throws RepositoryException { - if(!workflowMap.containsKey(workflowId)) throw new - RepositoryException("Attempt to obtain conditions for a workflow: " + - "["+workflowId+"] that does not exist!"); + if(!workflowMap.containsKey(workflowId)) { + throw new + RepositoryException("Attempt to obtain conditions for a workflow: " + + "[" + workflowId + "] that does not exist!"); + } return ((Workflow) workflowMap.get(workflowId)).getConditions(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Graph.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Graph.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Graph.java index 862f447..871db47 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Graph.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Graph.java @@ -109,9 +109,10 @@ public class Graph { this.executionType = graphElem.getNodeName(); } - if (!processorIds.contains(this.executionType)) + if (!processorIds.contains(this.executionType)) { throw new WorkflowException("Unsupported execution type id '" - + this.executionType + "'"); + + this.executionType + "'"); + } if (!checkValue(this.modelId) && !checkValue(this.modelIdRef)) { this.modelId = UUID.randomUUID().toString(); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Priority.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Priority.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Priority.java index fea1851..6552e83 100755 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Priority.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/Priority.java @@ -87,17 +87,17 @@ public abstract class Priority implements Comparable<Priority> { } public static Priority getPriority(final double priority) { - if (priority == LOW.getValue()) + if (priority == LOW.getValue()) { return LOW; - else if (priority == MEDIUM_LOW.getValue()) + } else if (priority == MEDIUM_LOW.getValue()) { return MEDIUM_LOW; - else if (priority == MEDIUM.getValue()) + } else if (priority == MEDIUM.getValue()) { return MEDIUM; - else if (priority == MEDIUM_HIGH.getValue()) + } else if (priority == MEDIUM_HIGH.getValue()) { return MEDIUM_HIGH; - else if (priority == HIGH.getValue()) + } else if (priority == HIGH.getValue()) { return HIGH; - else + } else { return new Priority() { public double getValue() { return priority; @@ -107,6 +107,7 @@ public abstract class Priority implements Comparable<Priority> { return "CUSTOM"; } }; + } } @Override @@ -116,10 +117,11 @@ public abstract class Priority implements Comparable<Priority> { @Override public boolean equals(Object obj) { - if (obj instanceof Priority) + if (obj instanceof Priority) { return new Double(this.getValue()).equals(((Priority) obj).getValue()); - else + } else { return false; + } } @Override http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java index 6653e61..5ced9d4 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java @@ -183,9 +183,12 @@ public class TaskJobInput implements JobInput { throw ex; } catch (Exception ignore) { } finally { - if (in != null) try { - in.close(); - } catch (IOException ignore) {} + if (in != null) { + try { + in.close(); + } catch (IOException ignore) { + } + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java index ecf58db..e91c602 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/WorkflowInstance.java @@ -168,8 +168,9 @@ public class WorkflowInstance { if (workflow != null && workflow instanceof ParentChildWorkflow) { this.workflow = (ParentChildWorkflow) workflow; } else { - if (workflow == null) + if (workflow == null) { workflow = new Workflow(); + } this.workflow = new ParentChildWorkflow(workflow); } } @@ -437,7 +438,9 @@ public class WorkflowInstance { return null; } - else return null; + else { + return null; + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java index dc54a70..f499061 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java @@ -98,8 +98,9 @@ public class XmlRpcWorkflowManager { webServer.shutdown(); webServer = null; return true; - } else - return false; + } else { + return false; + } } public boolean refreshRepository() { @@ -109,17 +110,19 @@ public class XmlRpcWorkflowManager { public String executeDynamicWorkflow(Vector<String> taskIds, Hashtable metadata) throws RepositoryException, EngineException { - if (taskIds == null || (taskIds.size() == 0)) + if (taskIds == null || (taskIds.size() == 0)) { throw new RepositoryException( "Must specify task identifiers to build dynamic workflows!"); + } Workflow dynamicWorkflow = new Workflow(); for (String taskId : taskIds) { WorkflowTask task = this.repo.getWorkflowTaskById(taskId); - if (task == null) + if (task == null) { throw new RepositoryException("Dynamic workflow task: [" + taskId - + "] is not defined!"); + + "] is not defined!"); + } dynamicWorkflow.getTasks().add(task); } @@ -165,10 +168,11 @@ public class XmlRpcWorkflowManager { if (page != null) { populateWorkflows(page.getPageWorkflows()); return XmlRpcStructFactory.getXmlRpcWorkflowInstancePage(page); - } else - return XmlRpcStructFactory - .getXmlRpcWorkflowInstancePage(WorkflowInstancePage - .blankPage()); + } else { + return XmlRpcStructFactory + .getXmlRpcWorkflowInstancePage(WorkflowInstancePage + .blankPage()); + } } public Hashtable getNextPage(Hashtable currentPage) { @@ -180,10 +184,11 @@ public class XmlRpcWorkflowManager { if (page != null) { populateWorkflows(page.getPageWorkflows()); return XmlRpcStructFactory.getXmlRpcWorkflowInstancePage(page); - } else - return XmlRpcStructFactory - .getXmlRpcWorkflowInstancePage(WorkflowInstancePage - .blankPage()); + } else { + return XmlRpcStructFactory + .getXmlRpcWorkflowInstancePage(WorkflowInstancePage + .blankPage()); + } } public Hashtable getPrevPage(Hashtable currentPage) { @@ -195,10 +200,11 @@ public class XmlRpcWorkflowManager { if (page != null) { populateWorkflows(page.getPageWorkflows()); return XmlRpcStructFactory.getXmlRpcWorkflowInstancePage(page); - } else - return XmlRpcStructFactory - .getXmlRpcWorkflowInstancePage(WorkflowInstancePage - .blankPage()); + } else { + return XmlRpcStructFactory + .getXmlRpcWorkflowInstancePage(WorkflowInstancePage + .blankPage()); + } } public Hashtable getLastPage() { @@ -207,10 +213,11 @@ public class XmlRpcWorkflowManager { if (page != null) { populateWorkflows(page.getPageWorkflows()); return XmlRpcStructFactory.getXmlRpcWorkflowInstancePage(page); - } else - return XmlRpcStructFactory - .getXmlRpcWorkflowInstancePage(WorkflowInstancePage - .blankPage()); + } else { + return XmlRpcStructFactory + .getXmlRpcWorkflowInstancePage(WorkflowInstancePage + .blankPage()); + } } public Hashtable paginateWorkflowInstances(int pageNum, String status) @@ -220,10 +227,11 @@ public class XmlRpcWorkflowManager { if (page != null) { populateWorkflows(page.getPageWorkflows()); return XmlRpcStructFactory.getXmlRpcWorkflowInstancePage(page); - } else - return XmlRpcStructFactory - .getXmlRpcWorkflowInstancePage(WorkflowInstancePage - .blankPage()); + } else { + return XmlRpcStructFactory + .getXmlRpcWorkflowInstancePage(WorkflowInstancePage + .blankPage()); + } } @@ -234,10 +242,11 @@ public class XmlRpcWorkflowManager { if (page != null) { populateWorkflows(page.getPageWorkflows()); return XmlRpcStructFactory.getXmlRpcWorkflowInstancePage(page); - } else - return XmlRpcStructFactory - .getXmlRpcWorkflowInstancePage(WorkflowInstancePage - .blankPage()); + } else { + return XmlRpcStructFactory + .getXmlRpcWorkflowInstancePage(WorkflowInstancePage + .blankPage()); + } } public Hashtable getWorkflowInstanceMetadata(String wInstId) { @@ -307,8 +316,9 @@ public class XmlRpcWorkflowManager { } } return true; - } else - return false; + } else { + return false; + } } public Hashtable getWorkflowInstanceById(String wInstId) { @@ -463,8 +473,9 @@ public class XmlRpcWorkflowManager { "Exception getting workflow instances from workflow engine: Message: " + e.getMessage()); } - } else - return null; + } else { + return null; + } } public Vector getWorkflows() throws RepositoryException { @@ -491,8 +502,9 @@ public class XmlRpcWorkflowManager { + e.getMessage()); } - } else - return null; + } else { + return null; + } } @@ -605,11 +617,12 @@ public class XmlRpcWorkflowManager { loadProperties(); new XmlRpcWorkflowManager(portNum); - for (;;) - try { - Thread.currentThread().join(); - } catch (InterruptedException ignore) { - } + for (;;) { + try { + Thread.currentThread().join(); + } catch (InterruptedException ignore) { + } + } } public static void loadProperties() throws IOException { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java index e535525..1e759de 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java @@ -412,8 +412,9 @@ public class XmlRpcWorkflowManagerClient { } return workflows; - } else - return null; + } else { + return null; + } } @@ -458,8 +459,9 @@ public class XmlRpcWorkflowManagerClient { instsUnpacked.add(inst); } return instsUnpacked; - } else - return null; + } else { + return null; + } } @@ -480,8 +482,9 @@ public class XmlRpcWorkflowManagerClient { instsUnpacked.add(inst); } return instsUnpacked; - } else + } else { return null; + } } public static void main(String[] args) { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java index b3b4d5a..123afb0 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/DbStructFactory.java @@ -94,8 +94,9 @@ public final class DbStructFactory { task.setOrder(rs.getInt("task_order")); }*/ return task; - } else + } else { return null; + } } public static WorkflowCondition getWorkflowCondition(ResultSet rs, @@ -115,8 +116,9 @@ public final class DbStructFactory { condition.setOrder(rs.getInt("condition_order")); }*/ return condition; - } else + } else { return null; + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java index 3a6f474..cf7e1aa 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/GenericWorkflowObjectFactory.java @@ -188,8 +188,9 @@ public final class GenericWorkflowObjectFactory { + className + ": cannot instantiate!"); return null; } - } else - return null; + } else { + return null; + } } /** @@ -249,8 +250,9 @@ public final class GenericWorkflowObjectFactory { + className + ": cannot instantiate!"); return null; } - } else - return null; + } else { + return null; + } } /** @@ -293,8 +295,9 @@ public final class GenericWorkflowObjectFactory { + className + ": cannot instantiate!"); return null; } - } else - return null; + } else { + return null; + } } /** @@ -336,8 +339,9 @@ public final class GenericWorkflowObjectFactory { + className + ": cannot instantiate!"); return null; } - } else - return null; + } else { + return null; + } } public static PrioritySorter getPrioritySorterFromClassName(String className){ @@ -365,7 +369,9 @@ public final class GenericWorkflowObjectFactory { return null; } } - else return null; + else { + return null; + } } public static List copyWorkflows(List workflows){ @@ -379,7 +385,9 @@ public final class GenericWorkflowObjectFactory { return newWorkflows; } - else return null; + else { + return null; + } } /** @@ -427,7 +435,9 @@ public final class GenericWorkflowObjectFactory { return newTaskList; } - else return null; + else { + return null; + } } public static WorkflowTask copyTask(WorkflowTask t){ @@ -461,7 +471,9 @@ public final class GenericWorkflowObjectFactory { return newConditionList; } - else return null; + else { + return null; + } } public static WorkflowCondition copyCondition(WorkflowCondition c){ http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java index 4216fef..5e9704d 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/util/XmlStructFactory.java @@ -87,10 +87,12 @@ public final class XmlStructFactory { Element taskElem = getFirstElement("tasks", workflowRoot); Element conditionsElem = getFirstElement("conditions", workflowRoot); - if (taskElem != null) + if (taskElem != null) { workflow.setTasks(getTasks(taskElem, tasks)); - if (conditionsElem != null) + } + if (conditionsElem != null) { workflow.setConditions(getConditions(conditionsElem, conditions)); + } return workflow; } @@ -240,13 +242,15 @@ public final class XmlStructFactory { String envReplace = property.getAttribute("envReplace"); String name = property.getAttribute("name"); String value = property.getAttribute("value"); - if (Boolean.parseBoolean(envReplace)) + if (Boolean.parseBoolean(envReplace)) { value = PathUtils.doDynamicReplacement(value); + } List<String> values = new Vector<String>(); - if (delim.length() > 0) + if (delim.length() > 0) { values.addAll(Arrays.asList(value.split("\\" + delim))); - else + } else { values.add(value); + } curMetadata.replaceMetadata(name, values); } } @@ -320,15 +324,17 @@ public final class XmlStructFactory { NodeList list = root.getElementsByTagName(name); if (list.getLength()>0) { return (Element) list.item(0); - } else + } else { return null; + } } private static String getSimpleElementText(Element node) { if (node.getChildNodes().item(0) instanceof Text) { return node.getChildNodes().item(0).getNodeValue(); - } else + } else { return null; + } } private static String getElementText(String elemName, Element root) { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java index 345c02d..317950d 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingField.java @@ -239,10 +239,12 @@ public class MappingField { */ public String getLocalName() { String dbColName = getName(); - if (getDbName() != null && !getDbName().isEmpty()) + if (getDbName() != null && !getDbName().isEmpty()) { dbColName = getDbName(); - if (getTableName() == null || getTableName().isEmpty()) + } + if (getTableName() == null || getTableName().isEmpty()) { return dbColName; + } return getTableName() + "." + dbColName; } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java index fb0e9c5..cf7ab3a 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/mapping/MappingReader.java @@ -100,8 +100,9 @@ public final class MappingReader implements MappingReaderMetKeys { for (int i = 0; i < tableNodes.getLength(); i++) { Element tableElem = (Element) tableNodes.item(i); DatabaseTable tbl = readTable(tableElem); - if (tbl.getDefaultTableJoin() == null || tbl.getDefaultTableJoin().isEmpty()) + if (tbl.getDefaultTableJoin() == null || tbl.getDefaultTableJoin().isEmpty()) { tbl.setDefaultTableJoin(map.getDefaultTable()); + } map.addTable(tbl.getName(), tbl); } } @@ -124,8 +125,9 @@ public final class MappingReader implements MappingReaderMetKeys { if (fldNodes != null && fldNodes.getLength() > 0) { for (int i = 0; i < fldNodes.getLength(); i++) { MappingField fld = readField((Element) fldNodes.item(i)); - if (fld.getTableName() == null || fld.getTableName().isEmpty()) + if (fld.getTableName() == null || fld.getTableName().isEmpty()) { fld.setTableName(map.getDefaultTable()); + } map.addField(fld.getName(), fld); } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java b/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java index 9f27c94..8cfd80a 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/product/XMLPSProductHandler.java @@ -150,8 +150,9 @@ public class XMLPSProductHandler implements QueryHandler { protected List<QueryElement> getElemNamesFromQueryElemSet( List<QueryElement> origSet) { - if (origSet == null || (origSet.size() == 0)) + if (origSet == null || (origSet.size() == 0)) { return Collections.emptyList(); + } List<QueryElement> newSet = new Vector<QueryElement>(); @@ -170,8 +171,9 @@ public class XMLPSProductHandler implements QueryHandler { protected List<QueryElement> getConstElemNamesFromQueryElemSet( List<QueryElement> origSet) { - if (origSet == null || (origSet.size() == 0)) + if (origSet == null || (origSet.size() == 0)) { return Collections.emptyList(); + } List<QueryElement> newSet = new Vector<QueryElement>(); @@ -258,8 +260,9 @@ public class XMLPSProductHandler implements QueryHandler { } private String toSQLSelectColumns(List<QueryElement> elems) { - if (elems == null || (elems.size() == 0)) + if (elems == null || (elems.size() == 0)) { return null; + } StringBuilder buf = new StringBuilder(); for (QueryElement qe : elems) { @@ -316,8 +319,9 @@ public class XMLPSProductHandler implements QueryHandler { && fld.getFuncs().size() > 0) { // the next query element should be // XMLQueryHelper.ROLE_LITERAL - if (!i.hasNext()) + if (!i.hasNext()) { break; + } QueryElement litElem = i.next(); if (!litElem.getRole().equals(XMLQueryHelper.ROLE_LITERAL)) { throw new XmlpsException("next query element not " http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java index 5b5e27a..9e59747 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/HandlerQueryParser.java @@ -59,8 +59,9 @@ public class HandlerQueryParser implements ParseConstants { if (!queryStack.empty()) { qe = (QueryElement) queryStack.pop(); - } else + } else { return null; + } if (qe.getRole().equalsIgnoreCase(XMLQUERY_LOGOP)) { @@ -69,8 +70,9 @@ public class HandlerQueryParser implements ParseConstants { return new AndExpression(parse(queryStack, map), parse(queryStack, map)); } else if (logOpType.equalsIgnoreCase(XMLQUERY_OR)) { return new OrExpression(parse(queryStack, map), parse(queryStack, map)); - } else + } else { return null; + } } else if (qe.getRole().equalsIgnoreCase(XMLQUERY_RELOP)) { String relOpType = qe.getValue(); @@ -103,13 +105,15 @@ public class HandlerQueryParser implements ParseConstants { return new LessThanExpression(lhsVal, new Literal(rhsVal)); } else if (relOpType.equalsIgnoreCase(XMLQUERY_LESS_THAN_OR_EQUAL_TO)) { return new LessThanEqualsExpression(lhsVal, new Literal(rhsVal)); - } else + } else { return null; + } } else if (qe.getRole().equalsIgnoreCase(XMLQUERY_LITERAL)) { return new Literal(qe.getValue()); - } else + } else { return null; + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/WildcardLiteral.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/WildcardLiteral.java b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/WildcardLiteral.java index 7c97c2a..2f91b9c 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/WildcardLiteral.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/queryparser/WildcardLiteral.java @@ -40,7 +40,9 @@ public class WildcardLiteral extends Literal { if(val.startsWith("'")){ return "'%"+val.substring(1, val.length()-1)+"%'"; } - else return "%" + val + "%"; + else { + return "%" + val + "%"; + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java index 800dae7..0f92082 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java @@ -73,8 +73,9 @@ public class CDEResult extends Result { @Override public InputStream getInputStream() throws IOException { - if (rs == null || con == null) + if (rs == null || con == null) { throw new IOException("InputStream not ready, ResultSet or Connection is null!"); + } return new CDEResultInputStream(this); } @@ -84,17 +85,20 @@ public class CDEResult extends Result { } public void close() throws SQLException { - if (rs != null) + if (rs != null) { rs.close(); - if (con != null) + } + if (con != null) { con.close(); + } } public String getNextRowAsString() throws SQLException { if (rs.next()) { CDERow row = createCDERow(); - if (mapping != null) + if (mapping != null) { applyMappingFuncs(row); + } if (this.constValues != null && ((this.orderedFields == null) || (this.orderedFields.size() == 0))){ addConstValues(row); } @@ -136,7 +140,9 @@ public class CDEResult extends Result { } } } - else row.getVals().addAll(orderedDbVals); + else { + row.getVals().addAll(orderedDbVals); + } return row; http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResultInputStream.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResultInputStream.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResultInputStream.java index 2198afe..4d358aa 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResultInputStream.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResultInputStream.java @@ -36,15 +36,17 @@ class CDEResultInputStream extends InputStream { s = res.getNextRowAsString(); } catch (SQLException ignored) { } - if (rowStream != null) + if (rowStream != null) { rowStream.close(); + } rowStream = s == null ? null : new ByteArrayInputStream(s.getBytes("UTF-8")); return rowStream != null; } private boolean ensureOpen() throws IOException { - if (rowStream == null || rowStream.available() <= 0) + if (rowStream == null || rowStream.available() <= 0) { return fetchNextRow(); + } return true; } @@ -55,8 +57,9 @@ class CDEResultInputStream extends InputStream { @Override public int read(byte[] b, int off, int len) throws IOException { - if (!ensureOpen()) + if (!ensureOpen()) { return -1; + } if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) { @@ -69,8 +72,9 @@ class CDEResultInputStream extends InputStream { int n = rowStream.read(b, off, len); total += n; while (n != -1 && total < len) { - if (!fetchNextRow()) + if (!fetchNextRow()) { return total; + } n = rowStream.read(b, off + total, len - total); total += n; } @@ -79,8 +83,9 @@ class CDEResultInputStream extends InputStream { @Override public void close() throws IOException { - if (rowStream != null) + if (rowStream != null) { rowStream.close(); + } rowStream = null; try { @@ -92,8 +97,9 @@ class CDEResultInputStream extends InputStream { @Override public synchronized int available() throws IOException { - if (rowStream == null) + if (rowStream == null) { return 0; + } return rowStream.available(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/ByteArrayCodec.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/ByteArrayCodec.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/ByteArrayCodec.java index 6b2146b..356b468 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/ByteArrayCodec.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/ByteArrayCodec.java @@ -42,11 +42,14 @@ class ByteArrayCodec implements Codec { public Object decode(Node node) { String encodedValue; - if (node.getFirstChild() != null && node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) - encodedValue = node.getFirstChild().getNodeValue(); - else - encodedValue = XML.text(node); - if (encodedValue.length() <= 0) return new byte[0]; + if (node.getFirstChild() != null && node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) { + encodedValue = node.getFirstChild().getNodeValue(); + } else { + encodedValue = XML.text(node); + } + if (encodedValue.length() <= 0) { + return new byte[0]; + } return Base64.decode(encodedValue.getBytes()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java index b74b238..0aedbda 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CodecFactory.java @@ -38,16 +38,18 @@ class CodecFactory { */ public static Codec createCodec(String className) { Codec codec = (Codec) codecs.get(className); - if (codec == null) try { + if (codec == null) { + try { Class clazz = Class.forName(className); codec = (Codec) clazz.newInstance(); codecs.put(className, codec); - } catch (ClassNotFoundException ex) { + } catch (ClassNotFoundException ex) { throw new RuntimeException("Class \"" + className + "\" not found"); - } catch (InstantiationException ex) { + } catch (InstantiationException ex) { throw new RuntimeException("Class \"" + className + "\" is abstract or is an interface"); - } catch (IllegalAccessException ex) { + } catch (IllegalAccessException ex) { throw new RuntimeException("Class \"" + className + "\" doesn't have public no-args constructor"); + } } return codec; } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedObjectCodec.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedObjectCodec.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedObjectCodec.java index c314915..2563890 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedObjectCodec.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedObjectCodec.java @@ -63,10 +63,11 @@ class CompressedObjectCodec implements Codec { public Object decode(Node node) throws ClassNotFoundException, InvalidClassException, StreamCorruptedException, OptionalDataException { String encodedValue; - if (node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) - encodedValue = node.getFirstChild().getNodeValue(); - else - encodedValue = XML.text(node); + if (node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) { + encodedValue = node.getFirstChild().getNodeValue(); + } else { + encodedValue = XML.text(node); + } Object rc = null; try { ByteArrayInputStream byteArray = new ByteArrayInputStream(encodedValue.getBytes()); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java index f77be48..de26113 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/CompressedStringCodec.java @@ -54,10 +54,11 @@ class CompressedStringCodec implements Codec { public Object decode(Node node) { String encodedValue; - if (node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) - encodedValue = node.getFirstChild().getNodeValue(); - else - encodedValue = XML.text(node); + if (node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) { + encodedValue = node.getFirstChild().getNodeValue(); + } else { + encodedValue = XML.text(node); + } String rc = null; try { ByteArrayInputStream byteArray = new ByteArrayInputStream(encodedValue.getBytes()); @@ -66,8 +67,9 @@ class CompressedStringCodec implements Codec { StringBuilder b = new StringBuilder(); int numRead; byte[] buf = new byte[1024]; - while ((numRead = gzip.read(buf)) != -1) - b.append(new String(buf, 0, numRead)); + while ((numRead = gzip.read(buf)) != -1) { + b.append(new String(buf, 0, numRead)); + } gzip.close(); rc = b.toString(); } catch (IOException ignored) {} http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java index abc666b..f148425 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Header.java @@ -43,8 +43,9 @@ public class Header implements Serializable, Cloneable, Documentable { * @return A list of <code>Header</code>s. */ public static List createHeaders(Node root) { - if (!"resultHeader".equals(root.getNodeName())) - throw new IllegalArgumentException("Expected <resultHeader> but got <" + root.getNodeName() + ">"); + if (!"resultHeader".equals(root.getNodeName())) { + throw new IllegalArgumentException("Expected <resultHeader> but got <" + root.getNodeName() + ">"); + } NodeList children = root.getChildNodes(); List rc = new ArrayList(); for (int i = 0; i < children.getLength(); ++i){ @@ -92,18 +93,20 @@ public class Header implements Serializable, Cloneable, Documentable { * @param node The DOM node, which must be a <headerElement> element. */ public Header(Node node) { - if (!"headerElement".equals(node.getNodeName())) - throw new IllegalArgumentException("Header must be constructed from <headerElement> node, not <" - + node.getNodeName() + ">"); + if (!"headerElement".equals(node.getNodeName())) { + throw new IllegalArgumentException("Header must be constructed from <headerElement> node, not <" + + node.getNodeName() + ">"); + } NodeList children = node.getChildNodes(); for (int i = 0; i < children.getLength(); ++i) { Node child = children.item(i); - if ("elemName".equals(child.getNodeName())) - name = XML.unwrappedText(child); - else if ("elemType".equals(child.getNodeName())) - type = XML.unwrappedText(child); - else if ("elemUnit".equals(child.getNodeName())) - unit = XML.unwrappedText(child); + if ("elemName".equals(child.getNodeName())) { + name = XML.unwrappedText(child); + } else if ("elemType".equals(child.getNodeName())) { + type = XML.unwrappedText(child); + } else if ("elemUnit".equals(child.getNodeName())) { + unit = XML.unwrappedText(child); + } } } @@ -168,8 +171,12 @@ public class Header implements Serializable, Cloneable, Documentable { } public boolean equals(Object rhs) { - if (rhs == this) return true; - if (rhs == null || !(rhs instanceof Header)) return false; + if (rhs == this) { + return true; + } + if (rhs == null || !(rhs instanceof Header)) { + return false; + } Header obj = (Header) rhs; return name.equals(obj.name) && ((type == null && obj.type == null) || type.equals(obj.type)) && ((unit == null && obj.unit == null) || unit.equals(obj.unit)); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/ObjectCodec.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/ObjectCodec.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/ObjectCodec.java index 0024b63..02723d8 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/ObjectCodec.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/ObjectCodec.java @@ -60,10 +60,11 @@ class ObjectCodec implements Codec { public Object decode(Node node) throws ClassNotFoundException, InvalidClassException, StreamCorruptedException, OptionalDataException { String encodedValue; - if (node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) - encodedValue = node.getFirstChild().getNodeValue(); - else - encodedValue = XML.text(node); + if (node.getFirstChild().getNodeType() == Node.CDATA_SECTION_NODE) { + encodedValue = node.getFirstChild().getNodeValue(); + } else { + encodedValue = XML.text(node); + } Object rc = null; try { ByteArrayInputStream byteArray = new ByteArrayInputStream(encodedValue.getBytes()); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java index 2e583f1..7529f5f 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryElement.java @@ -50,16 +50,18 @@ public class QueryElement implements Serializable, Cloneable, Documentable { } public QueryElement(Node node) { - if (!"queryElement".equals(node.getNodeName())) - throw new IllegalArgumentException("Query element must be constructed from <queryElement> node, not <" - + node.getNodeName() + ">"); + if (!"queryElement".equals(node.getNodeName())) { + throw new IllegalArgumentException("Query element must be constructed from <queryElement> node, not <" + + node.getNodeName() + ">"); + } NodeList children = node.getChildNodes(); for (int i = 0; i < children.getLength(); ++i) { Node child = children.item(i); - if ("tokenRole".equals(child.getNodeName())) - role = XML.unwrappedText(child); - else if ("tokenValue".equals(child.getNodeName())) - value = XML.unwrappedText(child); + if ("tokenRole".equals(child.getNodeName())) { + role = XML.unwrappedText(child); + } else if ("tokenValue".equals(child.getNodeName())) { + value = XML.unwrappedText(child); + } } } @@ -84,7 +86,9 @@ public class QueryElement implements Serializable, Cloneable, Documentable { * @param role The new role this element plays. */ public void setRole(String role) { - if (role == null) role = "UNKNOWN"; + if (role == null) { + role = "UNKNOWN"; + } this.role = role; } @@ -93,7 +97,9 @@ public class QueryElement implements Serializable, Cloneable, Documentable { * @param value The new value of this element. */ public void setValue(String value) { - if (value == null) value = "UNKNOWN"; + if (value == null) { + value = "UNKNOWN"; + } this.value = value; } @@ -105,8 +111,12 @@ public class QueryElement implements Serializable, Cloneable, Documentable { } public boolean equals(Object rhs) { - if (rhs == this) return true; - if (rhs == null || !(rhs instanceof QueryElement)) return false; + if (rhs == this) { + return true; + } + if (rhs == null || !(rhs instanceof QueryElement)) { + return false; + } QueryElement obj = (QueryElement) rhs; return role.equals(obj.role) && value.equals(obj.value); } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java index ce26d70..e6407ef 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryHeader.java @@ -68,32 +68,34 @@ public class QueryHeader implements Serializable, Cloneable, Documentable { * @param node The <queryAttributes> node. */ public QueryHeader(Node node) { - if (!"queryAttributes".equals(node.getNodeName())) - throw new IllegalArgumentException("QueryHeader must be constructed from <queryAttributes> node, not <" - + node.getNodeName() + ">"); + if (!"queryAttributes".equals(node.getNodeName())) { + throw new IllegalArgumentException("QueryHeader must be constructed from <queryAttributes> node, not <" + + node.getNodeName() + ">"); + } NodeList children = node.getChildNodes(); for (int i = 0; i < children.getLength(); ++i) { Node child = children.item(i); - if ("queryId".equals(child.getNodeName())) - id = XML.unwrappedText(child); - else if ("queryTitle".equals(child.getNodeName())) - title = XML.unwrappedText(child); - else if ("queryDesc".equals(child.getNodeName())) - description = XML.unwrappedText(child); - else if ("queryType".equals(child.getNodeName())) - type = XML.unwrappedText(child); - else if ("queryStatusId".equals(child.getNodeName())) - statusID = XML.unwrappedText(child); - else if ("querySecurityType".equals(child.getNodeName())) - securityType = XML.unwrappedText(child); - else if ("queryParentId".equals(child.getNodeName())) - ; // ignore - else if ("queryChildId".equals(child.getNodeName())) - ; // ignore - else if ("queryRevisionNote".equals(child.getNodeName())) - revisionNote = XML.unwrappedText(child); - else if ("queryDataDictId".equals(child.getNodeName())) - dataDictID = XML.unwrappedText(child); + if ("queryId".equals(child.getNodeName())) { + id = XML.unwrappedText(child); + } else if ("queryTitle".equals(child.getNodeName())) { + title = XML.unwrappedText(child); + } else if ("queryDesc".equals(child.getNodeName())) { + description = XML.unwrappedText(child); + } else if ("queryType".equals(child.getNodeName())) { + type = XML.unwrappedText(child); + } else if ("queryStatusId".equals(child.getNodeName())) { + statusID = XML.unwrappedText(child); + } else if ("querySecurityType".equals(child.getNodeName())) { + securityType = XML.unwrappedText(child); + } else if ("queryParentId".equals(child.getNodeName())) { + ; // ignore + } else if ("queryChildId".equals(child.getNodeName())) { + ; // ignore + } else if ("queryRevisionNote".equals(child.getNodeName())) { + revisionNote = XML.unwrappedText(child); + } else if ("queryDataDictId".equals(child.getNodeName())) { + dataDictID = XML.unwrappedText(child); + } } } @@ -253,8 +255,12 @@ public class QueryHeader implements Serializable, Cloneable, Documentable { } public boolean equals(Object rhs) { - if (rhs == this) return true; - if (rhs == null || !(rhs instanceof QueryHeader)) return false; + if (rhs == this) { + return true; + } + if (rhs == null || !(rhs instanceof QueryHeader)) { + return false; + } QueryHeader obj = (QueryHeader) rhs; return getID().equals(obj.getID()); } http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java index 75f9320..595dbc8 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/QueryResult.java @@ -57,15 +57,17 @@ public class QueryResult implements Serializable, Cloneable, Documentable { * @param node The <queryResultSet> node. */ public QueryResult(Node node) { - if (!"queryResultSet".equals(node.getNodeName())) - throw new IllegalArgumentException("QueryResult must be constructed from <queryResultSet> node, not <" - + node.getNodeName() + ">"); + if (!"queryResultSet".equals(node.getNodeName())) { + throw new IllegalArgumentException("QueryResult must be constructed from <queryResultSet> node, not <" + + node.getNodeName() + ">"); + } list = new ArrayList(); NodeList children = node.getChildNodes(); for (int i = 0; i < children.getLength(); ++i) { Node child = children.item(i); - if (child.getNodeType() == Node.ELEMENT_NODE && "resultElement".equals(child.getNodeName())) - list.add(new Result(child)); + if (child.getNodeType() == Node.ELEMENT_NODE && "resultElement".equals(child.getNodeName())) { + list.add(new Result(child)); + } } } @@ -99,7 +101,9 @@ public class QueryResult implements Serializable, Cloneable, Documentable { } public boolean equals(Object obj) { - if (obj == this) return true; + if (obj == this) { + return true; + } if (obj instanceof QueryResult) { QueryResult rhs = (QueryResult) obj; return list.equals(rhs.list); http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java index b5a2889..eee06c5 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Result.java @@ -82,11 +82,13 @@ public class Result implements Serializable, Cloneable, Documentable { */ public Result(String id, String mimeType, String profileID, String resourceID, List headers, Object value, boolean classified, long validity) { - if (validity < 0 && validity != INFINITE) - throw new IllegalArgumentException("Validity must be a nonnegative time in milliseconds or " - + " Result.INFINITE to indicate no expiration"); - if (!codecs.containsKey(mimeType)) - throw new IllegalArgumentException("MIME type \"" + mimeType + "\" unknown"); + if (validity < 0 && validity != INFINITE) { + throw new IllegalArgumentException("Validity must be a nonnegative time in milliseconds or " + + " Result.INFINITE to indicate no expiration"); + } + if (!codecs.containsKey(mimeType)) { + throw new IllegalArgumentException("MIME type \"" + mimeType + "\" unknown"); + } for (Object header : headers) { if (!(header instanceof Header)) { throw new IllegalArgumentException("List of headers doesn't contain Header object"); @@ -108,9 +110,10 @@ public class Result implements Serializable, Cloneable, Documentable { * @param node The DOM node, which must be a <resultElement> element. */ public Result(Node node) { - if (!"resultElement".equals(node.getNodeName())) - throw new IllegalArgumentException("Result must be constructed from <resultElement> node, not <" - + node.getNodeName() + ">"); + if (!"resultElement".equals(node.getNodeName())) { + throw new IllegalArgumentException("Result must be constructed from <resultElement> node, not <" + + node.getNodeName() + ">"); + } Element rootElement = (Element) node; classified = "true".equals(rootElement.getAttribute("classified")); validity = Long.parseLong(rootElement.getAttribute("validity")); @@ -118,21 +121,22 @@ public class Result implements Serializable, Cloneable, Documentable { String encodedValue = null; for (int i = 0; i < children.getLength(); ++i) { Node child = children.item(i); - if ("resultId".equals(child.getNodeName())) - id = XML.unwrappedText(child); - else if ("resultMimeType".equals(child.getNodeName())) - mimeType = XML.unwrappedText(child); - else if ("profId".equals(child.getNodeName())) - profileID = XML.unwrappedText(child); - else if ("identifier".equals(child.getNodeName())) - resourceID = XML.unwrappedText(child); - else if ("resultHeader".equals(child.getNodeName())) - headers = Header.createHeaders(child); - else if ("resultValue".equals(child.getNodeName())) { + if ("resultId".equals(child.getNodeName())) { + id = XML.unwrappedText(child); + } else if ("resultMimeType".equals(child.getNodeName())) { + mimeType = XML.unwrappedText(child); + } else if ("profId".equals(child.getNodeName())) { + profileID = XML.unwrappedText(child); + } else if ("identifier".equals(child.getNodeName())) { + resourceID = XML.unwrappedText(child); + } else if ("resultHeader".equals(child.getNodeName())) { + headers = Header.createHeaders(child); + } else if ("resultValue".equals(child.getNodeName())) { Codec codec = (Codec) codecs.get(mimeType); - if (codec == null) - throw new IllegalArgumentException("Unkown MIME type \"" + mimeType - + "\" in <resultElement>'s <resultMimeType>"); + if (codec == null) { + throw new IllegalArgumentException("Unkown MIME type \"" + mimeType + + "\" in <resultElement>'s <resultMimeType>"); + } try { value = codec.decode(child); } catch (RuntimeException ex) { @@ -246,8 +250,10 @@ public class Result implements Serializable, Cloneable, Documentable { */ public long getSize() { Codec codec = (Codec) codecs.get(mimeType); - if (codec == null) throw new IllegalStateException("No codec available for supposedly valid MIME type \"" - + mimeType + "\""); + if (codec == null) { + throw new IllegalStateException("No codec available for supposedly valid MIME type \"" + + mimeType + "\""); + } return codec.sizeOf(value); } @@ -266,8 +272,10 @@ public class Result implements Serializable, Cloneable, Documentable { resultHeader.appendChild(header.toXML(doc)); } Codec codec = (Codec) codecs.get(mimeType); - if (codec == null) throw new IllegalStateException("No codec available for supposedly valid MIME type \"" - + mimeType + "\""); + if (codec == null) { + throw new IllegalStateException("No codec available for supposedly valid MIME type \"" + + mimeType + "\""); + } root.appendChild(codec.encode(value, doc)); return root; } @@ -280,8 +288,10 @@ public class Result implements Serializable, Cloneable, Documentable { */ public InputStream getInputStream() throws IOException { Codec codec = (Codec) codecs.get(mimeType); - if (codec == null) throw new IllegalStateException("No codec available for allegedly valid MIME type \"" - + mimeType + "\""); + if (codec == null) { + throw new IllegalStateException("No codec available for allegedly valid MIME type \"" + + mimeType + "\""); + } return codec.getInputStream(value); } @@ -327,8 +337,12 @@ public class Result implements Serializable, Cloneable, Documentable { } public boolean equals(Object rhs) { - if (rhs == this) return true; - if (rhs == null || !(rhs instanceof Result)) return false; + if (rhs == this) { + return true; + } + if (rhs == null || !(rhs instanceof Result)) { + return false; + } Result obj = (Result) rhs; return id.equals(obj.id) && mimeType.equals(obj.mimeType) && profileID.equals(obj.profileID) && resourceID.equals(obj.resourceID) && headers.equals(obj.headers) && value.equals(obj.value); @@ -346,8 +360,12 @@ public class Result implements Serializable, Cloneable, Documentable { } public void setRetriever(Retriever retriever) { - if (retriever == null) throw new IllegalArgumentException("retriever must be non-null"); - if (this.retriever == null) this.retriever = retriever; + if (retriever == null) { + throw new IllegalArgumentException("retriever must be non-null"); + } + if (this.retriever == null) { + this.retriever = retriever; + } } public String toString() { http://git-wip-us.apache.org/repos/asf/oodt/blob/abd71645/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java ---------------------------------------------------------------------- diff --git a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java index fd7a565..2b4dae0 100755 --- a/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java +++ b/xmlquery/src/main/java/org/apache/oodt/xmlquery/Statistic.java @@ -74,11 +74,12 @@ public class Statistic implements java.io.Serializable, Cloneable if (node instanceof Element) { nodeName = node.getNodeName(); - if (nodeName.compareTo("url") == 0) - url = XML.unwrappedText(node); - else - if (nodeName.compareTo("time") == 0) - time = Long.parseLong(XML.unwrappedText(node)); + if (nodeName.compareTo("url") == 0) { + url = XML.unwrappedText(node); + } else + if (nodeName.compareTo("time") == 0) { + time = Long.parseLong(XML.unwrappedText(node)); + } } } }
