fixing compilation issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/14a566a4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/14a566a4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/14a566a4 Branch: refs/heads/master Commit: 14a566a47ce68d27684e1b891d1b39db2beba6ea Parents: 2a2782a Author: Chathuri Wimalasena <[email protected]> Authored: Wed Feb 3 15:42:49 2016 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Feb 3 15:42:49 2016 -0500 ---------------------------------------------------------------------- .../core/app/catalog/impl/AppCatalogImpl.java | 1 + .../app/catalog/impl/WorkflowCatalogImpl.java | 233 ------------------- .../catalog/impl/WorkflowCatalogImpl.java | 232 ++++++++++++++++++ .../core/workflow/catalog/model/Edge_PK.java | 8 +- .../core/workflow/catalog/model/Node_PK.java | 8 +- .../core/workflow/catalog/model/Port_PK.java | 8 +- .../catalog/model/WorkflowOutput_PK.java | 8 +- .../catalog/model/WorkflowStatus_PK.java | 8 +- 8 files changed, 253 insertions(+), 253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java index 27d2e14..60d4033 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/AppCatalogImpl.java @@ -22,6 +22,7 @@ package org.apache.airavata.registry.core.app.catalog.impl; +import org.apache.airavata.registry.core.workflow.catalog.impl.WorkflowCatalogImpl; import org.apache.airavata.registry.cpi.*; public class AppCatalogImpl implements AppCatalog { http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java deleted file mode 100644 index 9c7df56..0000000 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/WorkflowCatalogImpl.java +++ /dev/null @@ -1,233 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -package org.apache.airavata.registry.core.app.catalog.impl; - -import org.apache.airavata.model.Workflow; -import org.apache.airavata.model.application.io.InputDataObjectType; -import org.apache.airavata.model.application.io.OutputDataObjectType; -import org.apache.airavata.registry.core.workflow.catalog.resources.*; -import org.apache.airavata.registry.core.workflow.catalog.utils.WorkflowCatalogThriftConversion; -import org.apache.airavata.registry.core.workflow.catalog.utils.WorkflowCatalogUtils; -import org.apache.airavata.registry.cpi.AppCatalogException; -import org.apache.airavata.registry.cpi.WorkflowCatalog; -import org.apache.airavata.registry.cpi.WorkflowCatalogException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class WorkflowCatalogImpl implements WorkflowCatalog { - private final static Logger logger = LoggerFactory.getLogger(WorkflowCatalogImpl.class); - - @Override - public List<String> getAllWorkflows(String gatewayId) throws WorkflowCatalogException { - List<String> workflowIds = new ArrayList<String>(); - try { - WorkflowResource resource = new WorkflowResource(); - resource.setGatewayId(gatewayId); - workflowIds = resource.getAllIds(); - } catch (Exception e) { - logger.error("Error while retrieving all the workflow template ids...", e); - throw new WorkflowCatalogException(e); - } - return workflowIds; - } - - @Override - public Workflow getWorkflow(String workflowTemplateId) throws WorkflowCatalogException { - try { - WorkflowResource resource = new WorkflowResource(); - WorkflowResource wfResource = (WorkflowResource)resource.get(workflowTemplateId); - return WorkflowCatalogThriftConversion.getWorkflow(wfResource); - } catch (Exception e) { - logger.error("Error while retrieving the workflow...", e); - throw new WorkflowCatalogException(e); - } - } - - @Override - public void deleteWorkflow(String workflowTemplateId) throws WorkflowCatalogException { - try { - WorkflowResource resource = new WorkflowResource(); - resource.remove(workflowTemplateId); - } catch (Exception e) { - logger.error("Error while deleting the workflow...", e); - throw new WorkflowCatalogException(e); - } - } - - @Override - public String registerWorkflow(Workflow workflow, String gatewayId) throws WorkflowCatalogException { - try { - WorkflowResource resource = new WorkflowResource(); - resource.setWfTemplateId(WorkflowCatalogUtils.getID(workflow.getName())); - resource.setWfName(workflow.getName()); - resource.setGraph(workflow.getGraph()); - resource.setGatewayId(gatewayId); - if (workflow.getImage() != null){ - resource.setImage(new String(workflow.getImage())); - } - resource.save(); - workflow.setTemplateId(resource.getWfTemplateId()); - List<InputDataObjectType> workflowInputs = workflow.getWorkflowInputs(); - if (workflowInputs != null && workflowInputs.size() != 0){ - for (InputDataObjectType input : workflowInputs){ - WorkflowInputResource wfInputResource = new WorkflowInputResource(); - wfInputResource.setWorkflowResource(resource); - wfInputResource.setInputKey(input.getName()); - wfInputResource.setInputVal(input.getValue()); - wfInputResource.setWfTemplateId(resource.getWfTemplateId()); - wfInputResource.setDataType(input.getType().toString()); - wfInputResource.setAppArgument(input.getApplicationArgument()); - wfInputResource.setStandardInput(input.isStandardInput()); - wfInputResource.setUserFriendlyDesc(input.getUserFriendlyDescription()); - wfInputResource.setMetadata(input.getMetaData()); - wfInputResource.save(); - } - } - List<OutputDataObjectType> workflowOutputs = workflow.getWorkflowOutputs(); - if (workflowOutputs != null && workflowOutputs.size() != 0){ - for (OutputDataObjectType output : workflowOutputs){ - WorkflowOutputResource outputResource = new WorkflowOutputResource(); - outputResource.setWorkflowResource(resource); - outputResource.setOutputKey(output.getName()); - outputResource.setOutputVal(output.getValue()); - outputResource.setWfTemplateId(resource.getWfTemplateId()); - outputResource.setDataType(output.getType().toString()); - outputResource.save(); - } - } - return resource.getWfTemplateId(); - } catch (Exception e) { - logger.error("Error while saving the workflow...", e); - throw new WorkflowCatalogException(e); - } - } - - @Override - public void updateWorkflow(String workflowTemplateId, Workflow workflow) throws WorkflowCatalogException { - try { - WorkflowResource resource = new WorkflowResource(); - WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId); - existingWF.setWfName(workflow.getName()); - existingWF.setGraph(workflow.getGraph()); - if (workflow.getImage() != null){ - existingWF.setImage(new String(workflow.getImage())); - } - existingWF.save(); - List<InputDataObjectType> existingwFInputs = workflow.getWorkflowInputs(); - if (existingwFInputs != null && existingwFInputs.size() != 0){ - for (InputDataObjectType input : existingwFInputs){ - WorkflowInputResource wfInputResource = new WorkflowInputResource(); - Map<String, String> ids = new HashMap<String, String>(); - ids.put(WorkflowCatAbstractResource.WorkflowInputConstants.WF_TEMPLATE_ID,existingWF.getWfTemplateId()); - ids.put(WorkflowCatAbstractResource.WorkflowInputConstants.INPUT_KEY,input.getName()); - WorkflowInputResource existingInput = (WorkflowInputResource)wfInputResource.get(ids); - existingInput.setWorkflowResource(existingWF); - existingInput.setInputKey(input.getName()); - existingInput.setInputVal(input.getValue()); - existingInput.setWfTemplateId(existingWF.getWfTemplateId()); - existingInput.setDataType(input.getType().toString()); - existingInput.setAppArgument(input.getApplicationArgument()); - existingInput.setStandardInput(input.isStandardInput()); - existingInput.setUserFriendlyDesc(input.getUserFriendlyDescription()); - existingInput.setMetadata(input.getMetaData()); - existingInput.save(); - } - } - List<OutputDataObjectType> workflowOutputs = workflow.getWorkflowOutputs(); - if (workflowOutputs != null && workflowOutputs.size() != 0){ - for (OutputDataObjectType output : workflowOutputs){ - WorkflowOutputResource outputResource = new WorkflowOutputResource(); - Map<String, String> ids = new HashMap<String, String>(); - ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.WF_TEMPLATE_ID,existingWF.getWfTemplateId()); - ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.OUTPUT_KEY,output.getName()); - WorkflowOutputResource existingOutput = (WorkflowOutputResource)outputResource.get(ids); - existingOutput.setWorkflowResource(existingWF); - existingOutput.setOutputKey(output.getName()); - existingOutput.setOutputVal(output.getValue()); - existingOutput.setWfTemplateId(existingWF.getWfTemplateId()); - existingOutput.setDataType(output.getType().toString()); - existingOutput.save(); - } - } - } catch (Exception e) { - logger.error("Error while updating the workflow...", e); - throw new WorkflowCatalogException(e); - } - } - - @Override - public String getWorkflowTemplateId(String workflowName) throws WorkflowCatalogException { - try { - WorkflowResource resource = new WorkflowResource(); - List<WorkflowCatalogResource> resourceList = resource.get(WorkflowCatAbstractResource.WorkflowConstants.WORKFLOW_NAME, workflowName); - if (resourceList != null && !resourceList.isEmpty()){ - WorkflowResource wfResource = (WorkflowResource)resourceList.get(0); - return wfResource.getWfTemplateId(); - } - } catch (Exception e) { - logger.error("Error while retrieving the workflow with the workflow name...", e); - throw new WorkflowCatalogException(e); - } - return null; - } - - @Override - public boolean isWorkflowExistWithName(String workflowName) throws WorkflowCatalogException { - try { - WorkflowResource resource = new WorkflowResource(); - List<WorkflowCatalogResource> resourceList = resource.get(WorkflowCatAbstractResource.WorkflowConstants.WORKFLOW_NAME, workflowName); - if (resourceList != null && !resourceList.isEmpty()){ - return true; - } - } catch (Exception e) { - logger.error("Error while retrieving the workflow with the workflow name...", e); - throw new WorkflowCatalogException(e); - } - return false; - } - - @Override - public void updateWorkflowOutputs(String workflowTemplateId, List<OutputDataObjectType> workflowOutputs) throws WorkflowCatalogException { - WorkflowResource resource = new WorkflowResource(); - WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId); - if (workflowOutputs != null && workflowOutputs.size() != 0) { - for (OutputDataObjectType output : workflowOutputs) { - WorkflowOutputResource outputResource = new WorkflowOutputResource(); - Map<String, String> ids = new HashMap<String, String>(); - ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.WF_TEMPLATE_ID, existingWF.getWfTemplateId()); - ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.OUTPUT_KEY, output.getName()); - WorkflowOutputResource existingOutput = (WorkflowOutputResource) outputResource.get(ids); - existingOutput.setWorkflowResource(existingWF); - existingOutput.setOutputKey(output.getName()); - existingOutput.setOutputVal(output.getValue()); - existingOutput.setWfTemplateId(existingWF.getWfTemplateId()); - existingOutput.setDataType(output.getType().toString()); - existingOutput.save(); - } - } - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java new file mode 100644 index 0000000..8c0ced4 --- /dev/null +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/impl/WorkflowCatalogImpl.java @@ -0,0 +1,232 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.airavata.registry.core.workflow.catalog.impl; + +import org.apache.airavata.model.Workflow; +import org.apache.airavata.model.application.io.InputDataObjectType; +import org.apache.airavata.model.application.io.OutputDataObjectType; +import org.apache.airavata.registry.core.workflow.catalog.resources.*; +import org.apache.airavata.registry.core.workflow.catalog.utils.WorkflowCatalogThriftConversion; +import org.apache.airavata.registry.core.workflow.catalog.utils.WorkflowCatalogUtils; +import org.apache.airavata.registry.cpi.WorkflowCatalog; +import org.apache.airavata.registry.cpi.WorkflowCatalogException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class WorkflowCatalogImpl implements WorkflowCatalog { + private final static Logger logger = LoggerFactory.getLogger(WorkflowCatalogImpl.class); + + @Override + public List<String> getAllWorkflows(String gatewayId) throws WorkflowCatalogException { + List<String> workflowIds = new ArrayList<String>(); + try { + WorkflowResource resource = new WorkflowResource(); + resource.setGatewayId(gatewayId); + workflowIds = resource.getAllIds(); + } catch (Exception e) { + logger.error("Error while retrieving all the workflow template ids...", e); + throw new WorkflowCatalogException(e); + } + return workflowIds; + } + + @Override + public Workflow getWorkflow(String workflowTemplateId) throws WorkflowCatalogException { + try { + WorkflowResource resource = new WorkflowResource(); + WorkflowResource wfResource = (WorkflowResource)resource.get(workflowTemplateId); + return WorkflowCatalogThriftConversion.getWorkflow(wfResource); + } catch (Exception e) { + logger.error("Error while retrieving the workflow...", e); + throw new WorkflowCatalogException(e); + } + } + + @Override + public void deleteWorkflow(String workflowTemplateId) throws WorkflowCatalogException { + try { + WorkflowResource resource = new WorkflowResource(); + resource.remove(workflowTemplateId); + } catch (Exception e) { + logger.error("Error while deleting the workflow...", e); + throw new WorkflowCatalogException(e); + } + } + + @Override + public String registerWorkflow(Workflow workflow, String gatewayId) throws WorkflowCatalogException { + try { + WorkflowResource resource = new WorkflowResource(); + resource.setWfTemplateId(WorkflowCatalogUtils.getID(workflow.getName())); + resource.setWfName(workflow.getName()); + resource.setGraph(workflow.getGraph()); + resource.setGatewayId(gatewayId); + if (workflow.getImage() != null){ + resource.setImage(new String(workflow.getImage())); + } + resource.save(); + workflow.setTemplateId(resource.getWfTemplateId()); + List<InputDataObjectType> workflowInputs = workflow.getWorkflowInputs(); + if (workflowInputs != null && workflowInputs.size() != 0){ + for (InputDataObjectType input : workflowInputs){ + WorkflowInputResource wfInputResource = new WorkflowInputResource(); + wfInputResource.setWorkflowResource(resource); + wfInputResource.setInputKey(input.getName()); + wfInputResource.setInputVal(input.getValue()); + wfInputResource.setWfTemplateId(resource.getWfTemplateId()); + wfInputResource.setDataType(input.getType().toString()); + wfInputResource.setAppArgument(input.getApplicationArgument()); + wfInputResource.setStandardInput(input.isStandardInput()); + wfInputResource.setUserFriendlyDesc(input.getUserFriendlyDescription()); + wfInputResource.setMetadata(input.getMetaData()); + wfInputResource.save(); + } + } + List<OutputDataObjectType> workflowOutputs = workflow.getWorkflowOutputs(); + if (workflowOutputs != null && workflowOutputs.size() != 0){ + for (OutputDataObjectType output : workflowOutputs){ + WorkflowOutputResource outputResource = new WorkflowOutputResource(); + outputResource.setWorkflowResource(resource); + outputResource.setOutputKey(output.getName()); + outputResource.setOutputVal(output.getValue()); + outputResource.setWfTemplateId(resource.getWfTemplateId()); + outputResource.setDataType(output.getType().toString()); + outputResource.save(); + } + } + return resource.getWfTemplateId(); + } catch (Exception e) { + logger.error("Error while saving the workflow...", e); + throw new WorkflowCatalogException(e); + } + } + + @Override + public void updateWorkflow(String workflowTemplateId, Workflow workflow) throws WorkflowCatalogException { + try { + WorkflowResource resource = new WorkflowResource(); + WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId); + existingWF.setWfName(workflow.getName()); + existingWF.setGraph(workflow.getGraph()); + if (workflow.getImage() != null){ + existingWF.setImage(new String(workflow.getImage())); + } + existingWF.save(); + List<InputDataObjectType> existingwFInputs = workflow.getWorkflowInputs(); + if (existingwFInputs != null && existingwFInputs.size() != 0){ + for (InputDataObjectType input : existingwFInputs){ + WorkflowInputResource wfInputResource = new WorkflowInputResource(); + Map<String, String> ids = new HashMap<String, String>(); + ids.put(WorkflowCatAbstractResource.WorkflowInputConstants.WF_TEMPLATE_ID,existingWF.getWfTemplateId()); + ids.put(WorkflowCatAbstractResource.WorkflowInputConstants.INPUT_KEY,input.getName()); + WorkflowInputResource existingInput = (WorkflowInputResource)wfInputResource.get(ids); + existingInput.setWorkflowResource(existingWF); + existingInput.setInputKey(input.getName()); + existingInput.setInputVal(input.getValue()); + existingInput.setWfTemplateId(existingWF.getWfTemplateId()); + existingInput.setDataType(input.getType().toString()); + existingInput.setAppArgument(input.getApplicationArgument()); + existingInput.setStandardInput(input.isStandardInput()); + existingInput.setUserFriendlyDesc(input.getUserFriendlyDescription()); + existingInput.setMetadata(input.getMetaData()); + existingInput.save(); + } + } + List<OutputDataObjectType> workflowOutputs = workflow.getWorkflowOutputs(); + if (workflowOutputs != null && workflowOutputs.size() != 0){ + for (OutputDataObjectType output : workflowOutputs){ + WorkflowOutputResource outputResource = new WorkflowOutputResource(); + Map<String, String> ids = new HashMap<String, String>(); + ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.WF_TEMPLATE_ID,existingWF.getWfTemplateId()); + ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.OUTPUT_KEY,output.getName()); + WorkflowOutputResource existingOutput = (WorkflowOutputResource)outputResource.get(ids); + existingOutput.setWorkflowResource(existingWF); + existingOutput.setOutputKey(output.getName()); + existingOutput.setOutputVal(output.getValue()); + existingOutput.setWfTemplateId(existingWF.getWfTemplateId()); + existingOutput.setDataType(output.getType().toString()); + existingOutput.save(); + } + } + } catch (Exception e) { + logger.error("Error while updating the workflow...", e); + throw new WorkflowCatalogException(e); + } + } + + @Override + public String getWorkflowTemplateId(String workflowName) throws WorkflowCatalogException { + try { + WorkflowResource resource = new WorkflowResource(); + List<WorkflowCatalogResource> resourceList = resource.get(WorkflowCatAbstractResource.WorkflowConstants.WORKFLOW_NAME, workflowName); + if (resourceList != null && !resourceList.isEmpty()){ + WorkflowResource wfResource = (WorkflowResource)resourceList.get(0); + return wfResource.getWfTemplateId(); + } + } catch (Exception e) { + logger.error("Error while retrieving the workflow with the workflow name...", e); + throw new WorkflowCatalogException(e); + } + return null; + } + + @Override + public boolean isWorkflowExistWithName(String workflowName) throws WorkflowCatalogException { + try { + WorkflowResource resource = new WorkflowResource(); + List<WorkflowCatalogResource> resourceList = resource.get(WorkflowCatAbstractResource.WorkflowConstants.WORKFLOW_NAME, workflowName); + if (resourceList != null && !resourceList.isEmpty()){ + return true; + } + } catch (Exception e) { + logger.error("Error while retrieving the workflow with the workflow name...", e); + throw new WorkflowCatalogException(e); + } + return false; + } + + @Override + public void updateWorkflowOutputs(String workflowTemplateId, List<OutputDataObjectType> workflowOutputs) throws WorkflowCatalogException { + WorkflowResource resource = new WorkflowResource(); + WorkflowResource existingWF = (WorkflowResource)resource.get(workflowTemplateId); + if (workflowOutputs != null && workflowOutputs.size() != 0) { + for (OutputDataObjectType output : workflowOutputs) { + WorkflowOutputResource outputResource = new WorkflowOutputResource(); + Map<String, String> ids = new HashMap<String, String>(); + ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.WF_TEMPLATE_ID, existingWF.getWfTemplateId()); + ids.put(WorkflowCatAbstractResource.WorkflowOutputConstants.OUTPUT_KEY, output.getName()); + WorkflowOutputResource existingOutput = (WorkflowOutputResource) outputResource.get(ids); + existingOutput.setWorkflowResource(existingWF); + existingOutput.setOutputKey(output.getName()); + existingOutput.setOutputVal(output.getValue()); + existingOutput.setWfTemplateId(existingWF.getWfTemplateId()); + existingOutput.setDataType(output.getType().toString()); + existingOutput.save(); + } + } + } +} http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Edge_PK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Edge_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Edge_PK.java index dedbb45..8d472f0 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Edge_PK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Edge_PK.java @@ -24,11 +24,11 @@ package org.apache.airavata.registry.core.workflow.catalog.model; import java.io.Serializable; public class Edge_PK implements Serializable { - private String templateID; + private String templateId; private String edgeId; public Edge_PK(String templateId, String edgeId) { - this.templateID = templateId; + this.templateId = templateId; this.edgeId = edgeId; } @@ -47,11 +47,11 @@ public class Edge_PK implements Serializable { } public String getTemplateID() { - return templateID; + return templateId; } public void setTemplateID(String templateID) { - this.templateID = templateID; + this.templateId = templateID; } public String getEdgeId() { http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Node_PK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Node_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Node_PK.java index d9ee7a2..8f3c72f 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Node_PK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Node_PK.java @@ -24,11 +24,11 @@ package org.apache.airavata.registry.core.workflow.catalog.model; import java.io.Serializable; public class Node_PK implements Serializable { - private String templateID; + private String templateId; private String nodeId; public Node_PK(String templateId, String nodeId) { - this.templateID = templateId; + this.templateId = templateId; this.nodeId = nodeId; } @@ -47,11 +47,11 @@ public class Node_PK implements Serializable { } public String getTemplateID() { - return templateID; + return templateId; } public void setTemplateID(String templateID) { - this.templateID = templateID; + this.templateId = templateID; } public String getNodeId() { http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Port_PK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Port_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Port_PK.java index a0305ed..ff43ece 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Port_PK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/Port_PK.java @@ -24,11 +24,11 @@ package org.apache.airavata.registry.core.workflow.catalog.model; import java.io.Serializable; public class Port_PK implements Serializable { - private String templateID; + private String templateId; private String portId; public Port_PK(String templateId, String portId) { - this.templateID = templateId; + this.templateId = templateId; this.portId = portId; } @@ -47,11 +47,11 @@ public class Port_PK implements Serializable { } public String getTemplateID() { - return templateID; + return templateId; } public void setTemplateID(String templateID) { - this.templateID = templateID; + this.templateId = templateID; } public String getPortId() { http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowOutput_PK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowOutput_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowOutput_PK.java index d36f2ca..0c1552c 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowOutput_PK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowOutput_PK.java @@ -24,11 +24,11 @@ package org.apache.airavata.registry.core.workflow.catalog.model; import java.io.Serializable; public class WorkflowOutput_PK implements Serializable { - private String templateID; + private String templateId; private String outputKey; public WorkflowOutput_PK(String templateId, String outputKey) { - this.templateID = templateId; + this.templateId = templateId; this.outputKey = outputKey; } @@ -47,11 +47,11 @@ public class WorkflowOutput_PK implements Serializable { } public String getTemplateID() { - return templateID; + return templateId; } public void setTemplateID(String templateID) { - this.templateID = templateID; + this.templateId = templateID; } public String getOutputKey() { http://git-wip-us.apache.org/repos/asf/airavata/blob/14a566a4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowStatus_PK.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowStatus_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowStatus_PK.java index ac33cc9..4e1fbfa 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowStatus_PK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/workflow/catalog/model/WorkflowStatus_PK.java @@ -24,11 +24,11 @@ package org.apache.airavata.registry.core.workflow.catalog.model; import java.io.Serializable; public class WorkflowStatus_PK implements Serializable { - private String templateID; + private String templateId; private String statusId; public WorkflowStatus_PK(String templateId, String statusId) { - this.templateID = templateId; + this.templateId = templateId; this.statusId = statusId; } @@ -47,11 +47,11 @@ public class WorkflowStatus_PK implements Serializable { } public String getTemplateID() { - return templateID; + return templateId; } public void setTemplateID(String templateID) { - this.templateID = templateID; + this.templateId = templateID; } public String getStatusId() {
