You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/06/20 23:02:00 UTC
[09/11] airavata git commit: Fixing minor issues and fixing the
registry test cases
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
index f4bdcbc..537d2e5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
@@ -43,8 +43,8 @@ public class Experiment {
private String gatewayExecutionId;
private Boolean enableEmailNotification;
private String emailAddresses;
- private User user;
- private Project projectByProjectId;
+ private Users user;
+ private Project project;
private Collection<ExperimentError> experimentErrors;
private Collection<ExperimentInput> experimentInputs;
private Collection<ExperimentOutput> experimentOutputs;
@@ -172,70 +172,70 @@ public class Experiment {
this.emailAddresses = emailAddresses;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Experiment that = (Experiment) o;
-
- if (applicationId != null ? !applicationId.equals(that.applicationId) : that.applicationId != null)
- return false;
- if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
- if (description != null ? !description.equals(that.description) : that.description != null) return false;
- if (emailAddresses != null ? !emailAddresses.equals(that.emailAddresses) : that.emailAddresses != null)
- return false;
- if (enableEmailNotification != null ? !enableEmailNotification.equals(that.enableEmailNotification) : that.enableEmailNotification != null)
- return false;
- if (executionId != null ? !executionId.equals(that.executionId) : that.executionId != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (experimentName != null ? !experimentName.equals(that.experimentName) : that.experimentName != null)
- return false;
- if (experimentType != null ? !experimentType.equals(that.experimentType) : that.experimentType != null)
- return false;
- if (gatewayExecutionId != null ? !gatewayExecutionId.equals(that.gatewayExecutionId) : that.gatewayExecutionId != null)
- return false;
- if (projectId != null ? !projectId.equals(that.projectId) : that.projectId != null) return false;
- if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = experimentId != null ? experimentId.hashCode() : 0;
- result = 31 * result + (projectId != null ? projectId.hashCode() : 0);
- result = 31 * result + (experimentType != null ? experimentType.hashCode() : 0);
- result = 31 * result + (userName != null ? userName.hashCode() : 0);
- result = 31 * result + (applicationId != null ? applicationId.hashCode() : 0);
- result = 31 * result + (experimentName != null ? experimentName.hashCode() : 0);
- result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (executionId != null ? executionId.hashCode() : 0);
- result = 31 * result + (gatewayExecutionId != null ? gatewayExecutionId.hashCode() : 0);
- result = 31 * result + (enableEmailNotification != null ? enableEmailNotification.hashCode() : 0);
- result = 31 * result + (emailAddresses != null ? emailAddresses.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// Experiment that = (Experiment) o;
+//
+// if (applicationId != null ? !applicationId.equals(that.applicationId) : that.applicationId != null)
+// return false;
+// if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
+// if (description != null ? !description.equals(that.description) : that.description != null) return false;
+// if (emailAddresses != null ? !emailAddresses.equals(that.emailAddresses) : that.emailAddresses != null)
+// return false;
+// if (enableEmailNotification != null ? !enableEmailNotification.equals(that.enableEmailNotification) : that.enableEmailNotification != null)
+// return false;
+// if (executionId != null ? !executionId.equals(that.executionId) : that.executionId != null) return false;
+// if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+// if (experimentName != null ? !experimentName.equals(that.experimentName) : that.experimentName != null)
+// return false;
+// if (experimentType != null ? !experimentType.equals(that.experimentType) : that.experimentType != null)
+// return false;
+// if (gatewayExecutionId != null ? !gatewayExecutionId.equals(that.gatewayExecutionId) : that.gatewayExecutionId != null)
+// return false;
+// if (projectId != null ? !projectId.equals(that.projectId) : that.projectId != null) return false;
+// if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = experimentId != null ? experimentId.hashCode() : 0;
+// result = 31 * result + (projectId != null ? projectId.hashCode() : 0);
+// result = 31 * result + (experimentType != null ? experimentType.hashCode() : 0);
+// result = 31 * result + (userName != null ? userName.hashCode() : 0);
+// result = 31 * result + (applicationId != null ? applicationId.hashCode() : 0);
+// result = 31 * result + (experimentName != null ? experimentName.hashCode() : 0);
+// result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
+// result = 31 * result + (description != null ? description.hashCode() : 0);
+// result = 31 * result + (executionId != null ? executionId.hashCode() : 0);
+// result = 31 * result + (gatewayExecutionId != null ? gatewayExecutionId.hashCode() : 0);
+// result = 31 * result + (enableEmailNotification != null ? enableEmailNotification.hashCode() : 0);
+// result = 31 * result + (emailAddresses != null ? emailAddresses.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "USER_NAME", referencedColumnName = "USER_NAME", nullable = false)
- public User getUser() {
+ public Users getUser() {
return user;
}
- public void setUser(User userByUserName) {
+ public void setUser(Users userByUserName) {
this.user = userByUserName;
}
@ManyToOne
@JoinColumn(name = "PROJECT_ID", referencedColumnName = "PROJECT_ID", nullable = false)
- public Project getProjectByProjectId() {
- return projectByProjectId;
+ public Project getProject() {
+ return project;
}
- public void setProjectByProjectId(Project projectByProjectId) {
- this.projectByProjectId = projectByProjectId;
+ public void setProject(Project projectByProjectId) {
+ this.project = projectByProjectId;
}
@OneToMany(mappedBy = "experiment")
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentError.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentError.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentError.java
index b1e20ce..7bf9745 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentError.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentError.java
@@ -110,39 +110,39 @@ public class ExperimentError {
this.rootCauseErrorIdList = rootCauseErrorIdList;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ExperimentError that = (ExperimentError) o;
-
- if (errorId != that.errorId) return false;
- if (actualErrorMessage != null ? !actualErrorMessage.equals(that.actualErrorMessage) : that.actualErrorMessage != null)
- return false;
- if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (rootCauseErrorIdList != null ? !rootCauseErrorIdList.equals(that.rootCauseErrorIdList) : that.rootCauseErrorIdList != null)
- return false;
- if (transientOrPersistent != null ? !transientOrPersistent.equals(that.transientOrPersistent) : that.transientOrPersistent != null)
- return false;
- if (userFriendlyMessage != null ? !userFriendlyMessage.equals(that.userFriendlyMessage) : that.userFriendlyMessage != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = errorId != null ? errorId.hashCode() : 0;
- result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
- result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
- result = 31 * result + (actualErrorMessage != null ? actualErrorMessage.hashCode() : 0);
- result = 31 * result + (userFriendlyMessage != null ? userFriendlyMessage.hashCode() : 0);
- result = 31 * result + (transientOrPersistent != null ? transientOrPersistent.hashCode() : 0);
- result = 31 * result + (rootCauseErrorIdList != null ? rootCauseErrorIdList.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ExperimentError that = (ExperimentError) o;
+//
+// if (errorId != that.errorId) return false;
+// if (actualErrorMessage != null ? !actualErrorMessage.equals(that.actualErrorMessage) : that.actualErrorMessage != null)
+// return false;
+// if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
+// if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+// if (rootCauseErrorIdList != null ? !rootCauseErrorIdList.equals(that.rootCauseErrorIdList) : that.rootCauseErrorIdList != null)
+// return false;
+// if (transientOrPersistent != null ? !transientOrPersistent.equals(that.transientOrPersistent) : that.transientOrPersistent != null)
+// return false;
+// if (userFriendlyMessage != null ? !userFriendlyMessage.equals(that.userFriendlyMessage) : that.userFriendlyMessage != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = errorId != null ? errorId.hashCode() : 0;
+// result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
+// result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
+// result = 31 * result + (actualErrorMessage != null ? actualErrorMessage.hashCode() : 0);
+// result = 31 * result + (userFriendlyMessage != null ? userFriendlyMessage.hashCode() : 0);
+// result = 31 * result + (transientOrPersistent != null ? transientOrPersistent.hashCode() : 0);
+// result = 31 * result + (rootCauseErrorIdList != null ? rootCauseErrorIdList.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID", nullable = false)
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentErrorPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentErrorPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentErrorPK.java
index e9ac79e..4b48e27 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentErrorPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentErrorPK.java
@@ -52,6 +52,7 @@ public class ExperimentErrorPK implements Serializable {
this.experimentId = experimentId;
}
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -59,16 +60,16 @@ public class ExperimentErrorPK implements Serializable {
ExperimentErrorPK that = (ExperimentErrorPK) o;
- if (errorId != null ? !errorId.equals(that.errorId) : that.errorId != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+ if (getErrorId() != null ? !getErrorId().equals(that.getErrorId()) : that.getErrorId() != null) return false;
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = errorId != null ? errorId.hashCode() : 0;
- result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
+ int result = getErrorId() != null ? getErrorId().hashCode() : 0;
+ result = 31 * result + (getExperimentId() != null ? getExperimentId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInput.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInput.java
index b331f21..dbd57ab 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInput.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInput.java
@@ -164,49 +164,49 @@ public class ExperimentInput {
this.dataStaged = dataStaged;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ExperimentInput that = (ExperimentInput) o;
-
- if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
- return false;
- if (dataStaged != null ? !dataStaged.equals(that.dataStaged) : that.dataStaged != null) return false;
- if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (inputName != null ? !inputName.equals(that.inputName) : that.inputName != null) return false;
- if (inputOrder != null ? !inputOrder.equals(that.inputOrder) : that.inputOrder != null) return false;
- if (inputValue != null ? !inputValue.equals(that.inputValue) : that.inputValue != null) return false;
- if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
- if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) return false;
- if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
- return false;
- if (standardInput != null ? !standardInput.equals(that.standardInput) : that.standardInput != null)
- return false;
- if (userFriendlyDescription != null ? !userFriendlyDescription.equals(that.userFriendlyDescription) : that.userFriendlyDescription != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = experimentId != null ? experimentId.hashCode() : 0;
- result = 31 * result + (inputName != null ? inputName.hashCode() : 0);
- result = 31 * result + (inputValue != null ? inputValue.hashCode() : 0);
- result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
- result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
- result = 31 * result + (standardInput != null ? standardInput.hashCode() : 0);
- result = 31 * result + (userFriendlyDescription != null ? userFriendlyDescription.hashCode() : 0);
- result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
- result = 31 * result + (inputOrder != null ? inputOrder.hashCode() : 0);
- result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
- result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
- result = 31 * result + (dataStaged != null ? dataStaged.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ExperimentInput that = (ExperimentInput) o;
+//
+// if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
+// return false;
+// if (dataStaged != null ? !dataStaged.equals(that.dataStaged) : that.dataStaged != null) return false;
+// if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
+// if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+// if (inputName != null ? !inputName.equals(that.inputName) : that.inputName != null) return false;
+// if (inputOrder != null ? !inputOrder.equals(that.inputOrder) : that.inputOrder != null) return false;
+// if (inputValue != null ? !inputValue.equals(that.inputValue) : that.inputValue != null) return false;
+// if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
+// if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) return false;
+// if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
+// return false;
+// if (standardInput != null ? !standardInput.equals(that.standardInput) : that.standardInput != null)
+// return false;
+// if (userFriendlyDescription != null ? !userFriendlyDescription.equals(that.userFriendlyDescription) : that.userFriendlyDescription != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = experimentId != null ? experimentId.hashCode() : 0;
+// result = 31 * result + (inputName != null ? inputName.hashCode() : 0);
+// result = 31 * result + (inputValue != null ? inputValue.hashCode() : 0);
+// result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
+// result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
+// result = 31 * result + (standardInput != null ? standardInput.hashCode() : 0);
+// result = 31 * result + (userFriendlyDescription != null ? userFriendlyDescription.hashCode() : 0);
+// result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
+// result = 31 * result + (inputOrder != null ? inputOrder.hashCode() : 0);
+// result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
+// result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
+// result = 31 * result + (dataStaged != null ? dataStaged.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInputPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInputPK.java
index 1db370e..3ff3fc1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInputPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentInputPK.java
@@ -59,16 +59,16 @@ public class ExperimentInputPK implements Serializable {
ExperimentInputPK that = (ExperimentInputPK) o;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (inputName != null ? !inputName.equals(that.inputName) : that.inputName != null) return false;
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
+ if (getInputName() != null ? !getInputName().equals(that.getInputName()) : that.getInputName() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = experimentId != null ? experimentId.hashCode() : 0;
- result = 31 * result + (inputName != null ? inputName.hashCode() : 0);
+ int result = getExperimentId() != null ? getExperimentId().hashCode() : 0;
+ result = 31 * result + (getInputName() != null ? getInputName().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java
index 9962429..98c1d44 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutput.java
@@ -142,44 +142,44 @@ public class ExperimentOutput {
this.searchQuery = searchQuery;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ExperimentOutput that = (ExperimentOutput) o;
- if (outputName != null ? !outputName.equals(that.outputName) : that.outputName != null)
- return false;
- if (outputValue != null ? !outputValue.equals(that.outputValue) : that.outputValue != null)
- return false;
- if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
- return false;
- if (dataMovement != null ? !dataMovement.equals(that.dataMovement) : that.dataMovement != null) return false;
- if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
- if (location != null ? !location.equals(that.location) : that.location != null) return false;
- if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
- return false;
- if (searchQuery != null ? !searchQuery.equals(that.searchQuery) : that.searchQuery != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = experimentId != null ? experimentId.hashCode() : 0;
- result = 31 * result + (outputName != null ? outputName.hashCode() : 0);
- result = 31 * result + (outputValue != null ? outputValue.hashCode() : 0);
- result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
- result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
- result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
- result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
- result = 31 * result + (dataMovement != null ? dataMovement.hashCode() : 0);
- result = 31 * result + (location != null ? location.hashCode() : 0);
- result = 31 * result + (searchQuery != null ? searchQuery.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ExperimentOutput that = (ExperimentOutput) o;
+// if (outputName != null ? !outputName.equals(that.outputName) : that.outputName != null)
+// return false;
+// if (outputValue != null ? !outputValue.equals(that.outputValue) : that.outputValue != null)
+// return false;
+// if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
+// return false;
+// if (dataMovement != null ? !dataMovement.equals(that.dataMovement) : that.dataMovement != null) return false;
+// if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
+// if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+// if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
+// if (location != null ? !location.equals(that.location) : that.location != null) return false;
+// if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
+// return false;
+// if (searchQuery != null ? !searchQuery.equals(that.searchQuery) : that.searchQuery != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = experimentId != null ? experimentId.hashCode() : 0;
+// result = 31 * result + (outputName != null ? outputName.hashCode() : 0);
+// result = 31 * result + (outputValue != null ? outputValue.hashCode() : 0);
+// result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
+// result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
+// result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
+// result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
+// result = 31 * result + (dataMovement != null ? dataMovement.hashCode() : 0);
+// result = 31 * result + (location != null ? location.hashCode() : 0);
+// result = 31 * result + (searchQuery != null ? searchQuery.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutputPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutputPK.java
index ac52859..a73b00e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutputPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentOutputPK.java
@@ -23,7 +23,6 @@ package org.apache.airavata.registry.core.experiment.catalog.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
@@ -60,16 +59,16 @@ public class ExperimentOutputPK implements Serializable {
ExperimentOutputPK that = (ExperimentOutputPK) o;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (outputName != null ? !outputName.equals(that.outputName) : that.outputName != null) return false;
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
+ if (getOutputName() != null ? !getOutputName().equals(that.getOutputName()) : that.getOutputName() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = experimentId != null ? experimentId.hashCode() : 0;
- result = 31 * result + (outputName != null ? outputName.hashCode() : 0);
+ int result = getExperimentId() != null ? getExperimentId().hashCode() : 0;
+ result = 31 * result + (getOutputName() != null ? getOutputName().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatus.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatus.java
index 4db87e0..7e892f0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatus.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatus.java
@@ -88,31 +88,31 @@ public class ExperimentStatus {
this.reason = reason;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ExperimentStatus that = (ExperimentStatus) o;
- if (statusId != null ? !statusId.equals(that.statusId) : that.statusId != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
- if (state != null ? !state.equals(that.state) : that.state != null) return false;
- if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = statusId != null ? statusId.hashCode() : 0;
- result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
- result = 31 * result + (state != null ? state.hashCode() : 0);
- result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
- result = 31 * result + (reason != null ? reason.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ExperimentStatus that = (ExperimentStatus) o;
+// if (statusId != null ? !statusId.equals(that.statusId) : that.statusId != null) return false;
+// if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+// if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
+// if (state != null ? !state.equals(that.state) : that.state != null) return false;
+// if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = statusId != null ? statusId.hashCode() : 0;
+// result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
+// result = 31 * result + (state != null ? state.hashCode() : 0);
+// result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
+// result = 31 * result + (reason != null ? reason.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID", nullable = false)
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatusPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatusPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatusPK.java
index 98d928d..e84e2ca 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatusPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentStatusPK.java
@@ -59,16 +59,16 @@ public class ExperimentStatusPK implements Serializable {
ExperimentStatusPK that = (ExperimentStatusPK) o;
- if (statusId != null ? !statusId.equals(that.statusId) : that.statusId != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+ if (getStatusId() != null ? !getStatusId().equals(that.getStatusId()) : that.getStatusId() != null) return false;
+ if (getExperimentId() != null ? !getExperimentId().equals(that.getExperimentId()) : that.getExperimentId() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = statusId != null ? statusId.hashCode() : 0;
- result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
+ int result = getStatusId() != null ? getStatusId().hashCode() : 0;
+ result = 31 * result + (getExperimentId() != null ? getExperimentId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentSummary.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentSummary.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentSummary.java
index bc88d93..c1455ff 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentSummary.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ExperimentSummary.java
@@ -141,43 +141,43 @@ public class ExperimentSummary {
this.timeOfStateChange = timeOfStateChange;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ExperimentSummary that = (ExperimentSummary) o;
-
- if (applicationId != null ? !applicationId.equals(that.applicationId) : that.applicationId != null)
- return false;
- if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
- if (description != null ? !description.equals(that.description) : that.description != null) return false;
- if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
- if (experimentName != null ? !experimentName.equals(that.experimentName) : that.experimentName != null)
- return false;
- if (projectId != null ? !projectId.equals(that.projectId) : that.projectId != null) return false;
- if (resourceHostId != null ? !resourceHostId.equals(that.resourceHostId) : that.resourceHostId != null)
- return false;
- if (state != null ? !state.equals(that.state) : that.state != null) return false;
- if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
- return false;
- if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = experimentId != null ? experimentId.hashCode() : 0;
- result = 31 * result + (projectId != null ? projectId.hashCode() : 0);
- result = 31 * result + (userName != null ? userName.hashCode() : 0);
- result = 31 * result + (applicationId != null ? applicationId.hashCode() : 0);
- result = 31 * result + (experimentName != null ? experimentName.hashCode() : 0);
- result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
- result = 31 * result + (description != null ? description.hashCode() : 0);
- result = 31 * result + (state != null ? state.hashCode() : 0);
- result = 31 * result + (resourceHostId != null ? resourceHostId.hashCode() : 0);
- result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ExperimentSummary that = (ExperimentSummary) o;
+//
+// if (applicationId != null ? !applicationId.equals(that.applicationId) : that.applicationId != null)
+// return false;
+// if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
+// if (description != null ? !description.equals(that.description) : that.description != null) return false;
+// if (experimentId != null ? !experimentId.equals(that.experimentId) : that.experimentId != null) return false;
+// if (experimentName != null ? !experimentName.equals(that.experimentName) : that.experimentName != null)
+// return false;
+// if (projectId != null ? !projectId.equals(that.projectId) : that.projectId != null) return false;
+// if (resourceHostId != null ? !resourceHostId.equals(that.resourceHostId) : that.resourceHostId != null)
+// return false;
+// if (state != null ? !state.equals(that.state) : that.state != null) return false;
+// if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
+// return false;
+// if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = experimentId != null ? experimentId.hashCode() : 0;
+// result = 31 * result + (projectId != null ? projectId.hashCode() : 0);
+// result = 31 * result + (userName != null ? userName.hashCode() : 0);
+// result = 31 * result + (applicationId != null ? applicationId.hashCode() : 0);
+// result = 31 * result + (experimentName != null ? experimentName.hashCode() : 0);
+// result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
+// result = 31 * result + (description != null ? description.hashCode() : 0);
+// result = 31 * result + (state != null ? state.hashCode() : 0);
+// result = 31 * result + (resourceHostId != null ? resourceHostId.hashCode() : 0);
+// result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
+// return result;
+// }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
index 6e2b86c..b8ee5f5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Gateway.java
@@ -77,33 +77,33 @@ public class Gateway {
this.emailAddress = emailAddress;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// Gateway gateway = (Gateway) o;
+//
+// if (domain != null ? !domain.equals(gateway.domain) : gateway.domain != null) return false;
+// if (emailAddress != null ? !emailAddress.equals(gateway.emailAddress) : gateway.emailAddress != null)
+// return false;
+// if (gatewayId != null ? !gatewayId.equals(gateway.gatewayId) : gateway.gatewayId != null) return false;
+// if (gatewayName != null ? !gatewayName.equals(gateway.gatewayName) : gateway.gatewayName != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = gatewayId != null ? gatewayId.hashCode() : 0;
+// result = 31 * result + (gatewayName != null ? gatewayName.hashCode() : 0);
+// result = 31 * result + (domain != null ? domain.hashCode() : 0);
+// result = 31 * result + (emailAddress != null ? emailAddress.hashCode() : 0);
+// return result;
+// }
- Gateway gateway = (Gateway) o;
-
- if (domain != null ? !domain.equals(gateway.domain) : gateway.domain != null) return false;
- if (emailAddress != null ? !emailAddress.equals(gateway.emailAddress) : gateway.emailAddress != null)
- return false;
- if (gatewayId != null ? !gatewayId.equals(gateway.gatewayId) : gateway.gatewayId != null) return false;
- if (gatewayName != null ? !gatewayName.equals(gateway.gatewayName) : gateway.gatewayName != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = gatewayId != null ? gatewayId.hashCode() : 0;
- result = 31 * result + (gatewayName != null ? gatewayName.hashCode() : 0);
- result = 31 * result + (domain != null ? domain.hashCode() : 0);
- result = 31 * result + (emailAddress != null ? emailAddress.hashCode() : 0);
- return result;
- }
-
- @OneToMany(mappedBy = "gateways")
+ @OneToMany(mappedBy = "gateway")
public Collection<GatewayWorker> getGatewayWorkers() {
return gatewayWorkers;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorker.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorker.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorker.java
index 270bbfe..7097209 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorker.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorker.java
@@ -32,7 +32,7 @@ public class GatewayWorker {
private final static Logger logger = LoggerFactory.getLogger(GatewayWorker.class);
private String gatewayId;
private String userName;
- private User user;
+ private Users user;
private Gateway gateway;
@Id
@@ -55,33 +55,33 @@ public class GatewayWorker {
this.userName = userName;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- GatewayWorker that = (GatewayWorker) o;
-
- if (gatewayId != null ? !gatewayId.equals(that.gatewayId) : that.gatewayId != null) return false;
- if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = gatewayId != null ? gatewayId.hashCode() : 0;
- result = 31 * result + (userName != null ? userName.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// GatewayWorker that = (GatewayWorker) o;
+//
+// if (gatewayId != null ? !gatewayId.equals(that.gatewayId) : that.gatewayId != null) return false;
+// if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = gatewayId != null ? gatewayId.hashCode() : 0;
+// result = 31 * result + (userName != null ? userName.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "USER_NAME", referencedColumnName = "USER_NAME", nullable = false)
- public User getUser() {
+ public Users getUser() {
return user;
}
- public void setUser(User userByUserName) {
+ public void setUser(Users userByUserName) {
this.user = userByUserName;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorkerPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorkerPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorkerPK.java
index 1820042..9c8d6ed 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorkerPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/GatewayWorkerPK.java
@@ -60,16 +60,16 @@ public class GatewayWorkerPK implements Serializable {
GatewayWorkerPK that = (GatewayWorkerPK) o;
- if (gatewayId != null ? !gatewayId.equals(that.gatewayId) : that.gatewayId != null) return false;
- if (userName != null ? !userName.equals(that.userName) : that.userName != null) return false;
+ if (getGatewayId() != null ? !getGatewayId().equals(that.getGatewayId()) : that.getGatewayId() != null) return false;
+ if (getUserName() != null ? !getUserName().equals(that.getUserName()) : that.getUserName() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = gatewayId != null ? gatewayId.hashCode() : 0;
- result = 31 * result + (userName != null ? userName.hashCode() : 0);
+ int result = getGatewayId() != null ? getGatewayId().hashCode() : 0;
+ result = 31 * result + (getUserName() != null ? getUserName().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
index 9330530..71c561f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
@@ -116,40 +116,40 @@ public class Process {
this.taskDag = taskDag;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Process process = (Process) o;
-
- if (applicationInterfaceId != null ? !applicationInterfaceId.equals(process.applicationInterfaceId) : process.applicationInterfaceId != null)
- return false;
- if (creationTime != null ? !creationTime.equals(process.creationTime) : process.creationTime != null)
- return false;
- if (experimentId != null ? !experimentId.equals(process.experimentId) : process.experimentId != null)
- return false;
- if (lastUpdateTime != null ? !lastUpdateTime.equals(process.lastUpdateTime) : process.lastUpdateTime != null)
- return false;
- if (processDetail != null ? !processDetail.equals(process.processDetail) : process.processDetail != null)
- return false;
- if (processId != null ? !processId.equals(process.processId) : process.processId != null) return false;
- if (taskDag != null ? !taskDag.equals(process.taskDag) : process.taskDag != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = processId != null ? processId.hashCode() : 0;
- result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
- result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
- result = 31 * result + (lastUpdateTime != null ? lastUpdateTime.hashCode() : 0);
- result = 31 * result + (processDetail != null ? processDetail.hashCode() : 0);
- result = 31 * result + (applicationInterfaceId != null ? applicationInterfaceId.hashCode() : 0);
- result = 31 * result + (taskDag != null ? taskDag.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// Process process = (Process) o;
+//
+// if (applicationInterfaceId != null ? !applicationInterfaceId.equals(process.applicationInterfaceId) : process.applicationInterfaceId != null)
+// return false;
+// if (creationTime != null ? !creationTime.equals(process.creationTime) : process.creationTime != null)
+// return false;
+// if (experimentId != null ? !experimentId.equals(process.experimentId) : process.experimentId != null)
+// return false;
+// if (lastUpdateTime != null ? !lastUpdateTime.equals(process.lastUpdateTime) : process.lastUpdateTime != null)
+// return false;
+// if (processDetail != null ? !processDetail.equals(process.processDetail) : process.processDetail != null)
+// return false;
+// if (processId != null ? !processId.equals(process.processId) : process.processId != null) return false;
+// if (taskDag != null ? !taskDag.equals(process.taskDag) : process.taskDag != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = processId != null ? processId.hashCode() : 0;
+// result = 31 * result + (experimentId != null ? experimentId.hashCode() : 0);
+// result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
+// result = 31 * result + (lastUpdateTime != null ? lastUpdateTime.hashCode() : 0);
+// result = 31 * result + (processDetail != null ? processDetail.hashCode() : 0);
+// result = 31 * result + (applicationInterfaceId != null ? applicationInterfaceId.hashCode() : 0);
+// result = 31 * result + (taskDag != null ? taskDag.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "EXPERIMENT_ID", referencedColumnName = "EXPERIMENT_ID")
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessError.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessError.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessError.java
index fa6f45e..141c4bb 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessError.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessError.java
@@ -111,39 +111,39 @@ public class ProcessError {
this.rootCauseErrorIdList = rootCauseErrorIdList;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ProcessError that = (ProcessError) o;
-
- if (errorId != that.errorId) return false;
- if (actualErrorMessage != null ? !actualErrorMessage.equals(that.actualErrorMessage) : that.actualErrorMessage != null)
- return false;
- if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
- if (rootCauseErrorIdList != null ? !rootCauseErrorIdList.equals(that.rootCauseErrorIdList) : that.rootCauseErrorIdList != null)
- return false;
- if (transientOrPersistent != null ? !transientOrPersistent.equals(that.transientOrPersistent) : that.transientOrPersistent != null)
- return false;
- if (userFriendlyMessage != null ? !userFriendlyMessage.equals(that.userFriendlyMessage) : that.userFriendlyMessage != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = errorId != null ? errorId.hashCode() : 0;
- result = 31 * result + (processId != null ? processId.hashCode() : 0);
- result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
- result = 31 * result + (actualErrorMessage != null ? actualErrorMessage.hashCode() : 0);
- result = 31 * result + (userFriendlyMessage != null ? userFriendlyMessage.hashCode() : 0);
- result = 31 * result + (transientOrPersistent != null ? transientOrPersistent.hashCode() : 0);
- result = 31 * result + (rootCauseErrorIdList != null ? rootCauseErrorIdList.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ProcessError that = (ProcessError) o;
+//
+// if (errorId != that.errorId) return false;
+// if (actualErrorMessage != null ? !actualErrorMessage.equals(that.actualErrorMessage) : that.actualErrorMessage != null)
+// return false;
+// if (creationTime != null ? !creationTime.equals(that.creationTime) : that.creationTime != null) return false;
+// if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+// if (rootCauseErrorIdList != null ? !rootCauseErrorIdList.equals(that.rootCauseErrorIdList) : that.rootCauseErrorIdList != null)
+// return false;
+// if (transientOrPersistent != null ? !transientOrPersistent.equals(that.transientOrPersistent) : that.transientOrPersistent != null)
+// return false;
+// if (userFriendlyMessage != null ? !userFriendlyMessage.equals(that.userFriendlyMessage) : that.userFriendlyMessage != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = errorId != null ? errorId.hashCode() : 0;
+// result = 31 * result + (processId != null ? processId.hashCode() : 0);
+// result = 31 * result + (creationTime != null ? creationTime.hashCode() : 0);
+// result = 31 * result + (actualErrorMessage != null ? actualErrorMessage.hashCode() : 0);
+// result = 31 * result + (userFriendlyMessage != null ? userFriendlyMessage.hashCode() : 0);
+// result = 31 * result + (transientOrPersistent != null ? transientOrPersistent.hashCode() : 0);
+// result = 31 * result + (rootCauseErrorIdList != null ? rootCauseErrorIdList.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID", nullable = false)
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessErrorPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessErrorPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessErrorPK.java
index 5dd05dc..fc061d1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessErrorPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessErrorPK.java
@@ -59,16 +59,16 @@ public class ProcessErrorPK implements Serializable {
ProcessErrorPK that = (ProcessErrorPK) o;
- if (errorId != null ? !errorId.equals(that.errorId) : that.errorId != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+ if (getErrorId() != null ? !getErrorId().equals(that.getErrorId()) : that.getErrorId() != null) return false;
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = errorId != null ? errorId.hashCode() : 0;
- result = 31 * result + (processId != null ? processId.hashCode() : 0);
+ int result = getErrorId() != null ? getErrorId().hashCode() : 0;
+ result = 31 * result + (getProcessId() != null ? getProcessId().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInput.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInput.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInput.java
index ed99b64..d176d1f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInput.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInput.java
@@ -165,49 +165,49 @@ public class ProcessInput {
this.dataStaged = dataStaged;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ProcessInput that = (ProcessInput) o;
-
- if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
- return false;
- if (dataStaged != null ? !dataStaged.equals(that.dataStaged) : that.dataStaged != null) return false;
- if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
- if (inputName != null ? !inputName.equals(that.inputName) : that.inputName != null) return false;
- if (inputOrder != null ? !inputOrder.equals(that.inputOrder) : that.inputOrder != null) return false;
- if (inputValue != null ? !inputValue.equals(that.inputValue) : that.inputValue != null) return false;
- if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
- if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
- if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
- return false;
- if (standardInput != null ? !standardInput.equals(that.standardInput) : that.standardInput != null)
- return false;
- if (userFriendlyDescription != null ? !userFriendlyDescription.equals(that.userFriendlyDescription) : that.userFriendlyDescription != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = processId != null ? processId.hashCode() : 0;
- result = 31 * result + (inputName != null ? inputName.hashCode() : 0);
- result = 31 * result + (inputValue != null ? inputValue.hashCode() : 0);
- result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
- result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
- result = 31 * result + (standardInput != null ? standardInput.hashCode() : 0);
- result = 31 * result + (userFriendlyDescription != null ? userFriendlyDescription.hashCode() : 0);
- result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
- result = 31 * result + (inputOrder != null ? inputOrder.hashCode() : 0);
- result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
- result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
- result = 31 * result + (dataStaged != null ? dataStaged.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ProcessInput that = (ProcessInput) o;
+//
+// if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
+// return false;
+// if (dataStaged != null ? !dataStaged.equals(that.dataStaged) : that.dataStaged != null) return false;
+// if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
+// if (inputName != null ? !inputName.equals(that.inputName) : that.inputName != null) return false;
+// if (inputOrder != null ? !inputOrder.equals(that.inputOrder) : that.inputOrder != null) return false;
+// if (inputValue != null ? !inputValue.equals(that.inputValue) : that.inputValue != null) return false;
+// if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
+// if (metadata != null ? !metadata.equals(that.metadata) : that.metadata != null) return false;
+// if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+// if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
+// return false;
+// if (standardInput != null ? !standardInput.equals(that.standardInput) : that.standardInput != null)
+// return false;
+// if (userFriendlyDescription != null ? !userFriendlyDescription.equals(that.userFriendlyDescription) : that.userFriendlyDescription != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = processId != null ? processId.hashCode() : 0;
+// result = 31 * result + (inputName != null ? inputName.hashCode() : 0);
+// result = 31 * result + (inputValue != null ? inputValue.hashCode() : 0);
+// result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
+// result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
+// result = 31 * result + (standardInput != null ? standardInput.hashCode() : 0);
+// result = 31 * result + (userFriendlyDescription != null ? userFriendlyDescription.hashCode() : 0);
+// result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
+// result = 31 * result + (inputOrder != null ? inputOrder.hashCode() : 0);
+// result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
+// result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
+// result = 31 * result + (dataStaged != null ? dataStaged.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInputPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInputPK.java
index 6650e07..d6f6efd 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInputPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessInputPK.java
@@ -59,16 +59,16 @@ public class ProcessInputPK implements Serializable {
ProcessInputPK that = (ProcessInputPK) o;
- if (inputName != null ? !inputName.equals(that.inputName) : that.inputName != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+ if (getInputName() != null ? !getInputName().equals(that.getInputName()) : that.getInputName() != null) return false;
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = processId != null ? processId.hashCode() : 0;
- result = 31 * result + (inputName != null ? inputName.hashCode() : 0);
+ int result = getProcessId() != null ? getProcessId().hashCode() : 0;
+ result = 31 * result + (getInputName() != null ? getInputName().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java
index 7e38311..3bc8689 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutput.java
@@ -143,44 +143,44 @@ public class ProcessOutput {
this.searchQuery = searchQuery;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ProcessOutput that = (ProcessOutput) o;
- if (outputName != null ? !outputName.equals(that.outputName) : that.outputName != null)
- return false;
- if (outputValue != null ? !outputValue.equals(that.outputValue) : that.outputValue != null)
- return false;
- if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
- return false;
- if (dataMovement != null ? !dataMovement.equals(that.dataMovement) : that.dataMovement != null) return false;
- if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
- if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
- if (location != null ? !location.equals(that.location) : that.location != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
- if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
- return false;
- if (searchQuery != null ? !searchQuery.equals(that.searchQuery) : that.searchQuery != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = processId != null ? processId.hashCode() : 0;
- result = 31 * result + (outputName != null ? outputName.hashCode() : 0);
- result = 31 * result + (outputValue != null ? outputValue.hashCode() : 0);
- result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
- result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
- result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
- result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
- result = 31 * result + (dataMovement != null ? dataMovement.hashCode() : 0);
- result = 31 * result + (location != null ? location.hashCode() : 0);
- result = 31 * result + (searchQuery != null ? searchQuery.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ProcessOutput that = (ProcessOutput) o;
+// if (outputName != null ? !outputName.equals(that.outputName) : that.outputName != null)
+// return false;
+// if (outputValue != null ? !outputValue.equals(that.outputValue) : that.outputValue != null)
+// return false;
+// if (applicationArgument != null ? !applicationArgument.equals(that.applicationArgument) : that.applicationArgument != null)
+// return false;
+// if (dataMovement != null ? !dataMovement.equals(that.dataMovement) : that.dataMovement != null) return false;
+// if (dataType != null ? !dataType.equals(that.dataType) : that.dataType != null) return false;
+// if (isRequired != null ? !isRequired.equals(that.isRequired) : that.isRequired != null) return false;
+// if (location != null ? !location.equals(that.location) : that.location != null) return false;
+// if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+// if (requiredToAddedToCmd != null ? !requiredToAddedToCmd.equals(that.requiredToAddedToCmd) : that.requiredToAddedToCmd != null)
+// return false;
+// if (searchQuery != null ? !searchQuery.equals(that.searchQuery) : that.searchQuery != null) return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = processId != null ? processId.hashCode() : 0;
+// result = 31 * result + (outputName != null ? outputName.hashCode() : 0);
+// result = 31 * result + (outputValue != null ? outputValue.hashCode() : 0);
+// result = 31 * result + (dataType != null ? dataType.hashCode() : 0);
+// result = 31 * result + (applicationArgument != null ? applicationArgument.hashCode() : 0);
+// result = 31 * result + (isRequired != null ? isRequired.hashCode() : 0);
+// result = 31 * result + (requiredToAddedToCmd != null ? requiredToAddedToCmd.hashCode() : 0);
+// result = 31 * result + (dataMovement != null ? dataMovement.hashCode() : 0);
+// result = 31 * result + (location != null ? location.hashCode() : 0);
+// result = 31 * result + (searchQuery != null ? searchQuery.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutputPK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutputPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutputPK.java
index 0d98d4d..6d09f2d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutputPK.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessOutputPK.java
@@ -23,7 +23,6 @@ package org.apache.airavata.registry.core.experiment.catalog.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Id;
import java.io.Serializable;
@@ -60,16 +59,16 @@ public class ProcessOutputPK implements Serializable {
ProcessOutputPK that = (ProcessOutputPK) o;
- if (outputName != null ? !outputName.equals(that.outputName) : that.outputName != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+ if (getOutputName() != null ? !getOutputName().equals(that.getOutputName()) : that.getOutputName() != null) return false;
+ if (getProcessId() != null ? !getProcessId().equals(that.getProcessId()) : that.getProcessId() != null) return false;
return true;
}
@Override
public int hashCode() {
- int result = processId != null ? processId.hashCode() : 0;
- result = 31 * result + (outputName != null ? outputName.hashCode() : 0);
+ int result = getProcessId() != null ? getProcessId().hashCode() : 0;
+ result = 31 * result + (getOutputName() != null ? getOutputName().hashCode() : 0);
return result;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessResourceSchedule.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessResourceSchedule.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessResourceSchedule.java
index 9c49ffb..a473271 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessResourceSchedule.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessResourceSchedule.java
@@ -120,42 +120,42 @@ public class ProcessResourceSchedule {
this.totalPhysicalMemory = totalPhysicalMemory;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ProcessResourceSchedule that = (ProcessResourceSchedule) o;
-
- if (nodeCount != null ? !nodeCount.equals(that.nodeCount) : that.nodeCount != null) return false;
- if (numberOfThreads != null ? !numberOfThreads.equals(that.numberOfThreads) : that.numberOfThreads != null)
- return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
- if (queueName != null ? !queueName.equals(that.queueName) : that.queueName != null) return false;
- if (resourceHostId != null ? !resourceHostId.equals(that.resourceHostId) : that.resourceHostId != null)
- return false;
- if (totalCpuCount != null ? !totalCpuCount.equals(that.totalCpuCount) : that.totalCpuCount != null)
- return false;
- if (totalPhysicalMemory != null ? !totalPhysicalMemory.equals(that.totalPhysicalMemory) : that.totalPhysicalMemory != null)
- return false;
- if (wallTimeLimit != null ? !wallTimeLimit.equals(that.wallTimeLimit) : that.wallTimeLimit != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = processId != null ? processId.hashCode() : 0;
- result = 31 * result + (resourceHostId != null ? resourceHostId.hashCode() : 0);
- result = 31 * result + (totalCpuCount != null ? totalCpuCount.hashCode() : 0);
- result = 31 * result + (nodeCount != null ? nodeCount.hashCode() : 0);
- result = 31 * result + (numberOfThreads != null ? numberOfThreads.hashCode() : 0);
- result = 31 * result + (queueName != null ? queueName.hashCode() : 0);
- result = 31 * result + (wallTimeLimit != null ? wallTimeLimit.hashCode() : 0);
- result = 31 * result + (totalPhysicalMemory != null ? totalPhysicalMemory.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ProcessResourceSchedule that = (ProcessResourceSchedule) o;
+//
+// if (nodeCount != null ? !nodeCount.equals(that.nodeCount) : that.nodeCount != null) return false;
+// if (numberOfThreads != null ? !numberOfThreads.equals(that.numberOfThreads) : that.numberOfThreads != null)
+// return false;
+// if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+// if (queueName != null ? !queueName.equals(that.queueName) : that.queueName != null) return false;
+// if (resourceHostId != null ? !resourceHostId.equals(that.resourceHostId) : that.resourceHostId != null)
+// return false;
+// if (totalCpuCount != null ? !totalCpuCount.equals(that.totalCpuCount) : that.totalCpuCount != null)
+// return false;
+// if (totalPhysicalMemory != null ? !totalPhysicalMemory.equals(that.totalPhysicalMemory) : that.totalPhysicalMemory != null)
+// return false;
+// if (wallTimeLimit != null ? !wallTimeLimit.equals(that.wallTimeLimit) : that.wallTimeLimit != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = processId != null ? processId.hashCode() : 0;
+// result = 31 * result + (resourceHostId != null ? resourceHostId.hashCode() : 0);
+// result = 31 * result + (totalCpuCount != null ? totalCpuCount.hashCode() : 0);
+// result = 31 * result + (nodeCount != null ? nodeCount.hashCode() : 0);
+// result = 31 * result + (numberOfThreads != null ? numberOfThreads.hashCode() : 0);
+// result = 31 * result + (queueName != null ? queueName.hashCode() : 0);
+// result = 31 * result + (wallTimeLimit != null ? wallTimeLimit.hashCode() : 0);
+// result = 31 * result + (totalPhysicalMemory != null ? totalPhysicalMemory.hashCode() : 0);
+// return result;
+// }
@OneToOne
@JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID", nullable = false)
http://git-wip-us.apache.org/repos/asf/airavata/blob/cb5d3aef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessStatus.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessStatus.java
index ced0135..c727953 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessStatus.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/ProcessStatus.java
@@ -89,31 +89,31 @@ public class ProcessStatus {
this.reason = reason;
}
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ProcessStatus that = (ProcessStatus) o;
- if (statusId != null ? !statusId.equals(that.statusId) : that.statusId != null) return false;
- if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
- if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
- if (state != null ? !state.equals(that.state) : that.state != null) return false;
- if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = statusId != null ? statusId.hashCode() : 0;
- result = 31 * result + (processId != null ? processId.hashCode() : 0);
- result = 31 * result + (state != null ? state.hashCode() : 0);
- result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
- result = 31 * result + (reason != null ? reason.hashCode() : 0);
- return result;
- }
+// @Override
+// public boolean equals(Object o) {
+// if (this == o) return true;
+// if (o == null || getClass() != o.getClass()) return false;
+//
+// ProcessStatus that = (ProcessStatus) o;
+// if (statusId != null ? !statusId.equals(that.statusId) : that.statusId != null) return false;
+// if (processId != null ? !processId.equals(that.processId) : that.processId != null) return false;
+// if (reason != null ? !reason.equals(that.reason) : that.reason != null) return false;
+// if (state != null ? !state.equals(that.state) : that.state != null) return false;
+// if (timeOfStateChange != null ? !timeOfStateChange.equals(that.timeOfStateChange) : that.timeOfStateChange != null)
+// return false;
+//
+// return true;
+// }
+//
+// @Override
+// public int hashCode() {
+// int result = statusId != null ? statusId.hashCode() : 0;
+// result = 31 * result + (processId != null ? processId.hashCode() : 0);
+// result = 31 * result + (state != null ? state.hashCode() : 0);
+// result = 31 * result + (timeOfStateChange != null ? timeOfStateChange.hashCode() : 0);
+// result = 31 * result + (reason != null ? reason.hashCode() : 0);
+// return result;
+// }
@ManyToOne
@JoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID", nullable = false)