[airavata] branch group-based-auth updated: Revert "AIRAVATA-2758 Setting default values on ComputeResourceEntity fields"

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/group-based-auth by this push:
     new 743bbb1  Revert "AIRAVATA-2758 Setting default values on ComputeResourceEntity fields"
743bbb1 is described below

commit 743bbb1140c10e5302d84ea8a6df4b23dfe9e9bd
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri May 4 10:52:56 2018 -0400

    Revert "AIRAVATA-2758 Setting default values on ComputeResourceEntity fields"
    
    This reverts commit ca0f1f0e54010b7c7f389416ec7cb07df75a0cb1.
---
 .../entities/appcatalog/ComputeResourceEntity.java | 25 +++++++---------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
index c6cfdc4..313a5db 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java
@@ -20,20 +20,11 @@
 */
 package org.apache.airavata.registry.core.entities.appcatalog;
 
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 
 /**
  * The persistent class for the compute_resource database table.
@@ -48,7 +39,7 @@ public class ComputeResourceEntity implements Serializable {
     private String computeResourceId;
 
     @Column(name = "CREATION_TIME")
-    private Timestamp creationTime = Timestamp.from(Instant.now());
+    private Timestamp creationTime;
 
     @Column(name = "ENABLED")
     private short enabled;
@@ -72,19 +63,19 @@ public class ComputeResourceEntity implements Serializable {
     private String resourceDescription;
 
     @Column(name = "UPDATE_TIME")
-    private Timestamp updateTime = Timestamp.from(Instant.now());
+    private Timestamp updateTime;
 
     @Column(name = "CPUS_PER_NODE")
-    private Integer cpusPerNode = 0;
+    private Integer cpusPerNode;
 
     @Column(name = "DEFAULT_NODE_COUNT")
-    private Integer defaultNodeCount = 0;
+    private Integer defaultNodeCount;
 
     @Column(name = "DEFAULT_CPU_COUNT")
-    private Integer defaultCPUCount = 0;
+    private Integer defaultCPUCount;
 
     @Column(name = "DEFAULT_WALLTIME")
-    private Integer defaultWalltime = 0;
+    private Integer defaultWalltime;
 
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name="HOST_ALIAS", joinColumns = @JoinColumn(name="RESOURCE_ID"))

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.