Krish - Research Api v2

.gitignore

@@ -60,3 +60,4 @@ logs/
 **/generated-sources/
 /distribution
 /vault*
+/airavata-api/distribution/

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppEnvironmentEntity.java

@@ -34,7 +34,7 @@ public class AppEnvironmentEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "DEPLOYMENT_ID")
+    @Column(name = "DEPLOYMENT_ID", insertable = false, updatable = false)
     private String deploymentId;
 
     @Column(name = "VALUE")

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/AppModuleMappingEntity.java

@@ -33,11 +33,11 @@ public class AppModuleMappingEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "INTERFACE_ID")
+    @Column(name = "INTERFACE_ID", insertable = false, updatable = false)
     private String interfaceId;
 
     @Id
-    @Column(name = "MODULE_ID")
+    @Column(name = "MODULE_ID", insertable = false, updatable = false)
     private String moduleId;
 
     @ManyToOne(targetEntity = ApplicationInterfaceEntity.class)

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java

@@ -36,7 +36,7 @@ public class ApplicationInputEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "INTERFACE_ID")
+    @Column(name = "INTERFACE_ID", insertable = false, updatable = false)
     private String interfaceId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationOutputEntity.java

@@ -35,7 +35,7 @@ public class ApplicationOutputEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "INTERFACE_ID")
+    @Column(name = "INTERFACE_ID", insertable = false, updatable = false)
     private String interfaceId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueEntity.java

@@ -32,7 +32,7 @@ public class BatchQueueEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "COMPUTE_RESOURCE_ID")
+    @Column(name = "COMPUTE_RESOURCE_ID", insertable = false, updatable = false)
     private String computeResourceId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/BatchQueueResourcePolicyEntity.java

@@ -45,7 +45,7 @@ public class BatchQueueResourcePolicyEntity implements Serializable {
     @Column(name = "COMPUTE_RESOURCE_ID")
     private String computeResourceId;
 
-    @Column(name = "GROUP_RESOURCE_PROFILE_ID")
+    @Column(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, updatable = false)
     private String groupResourceProfileId;
 
     @Column(name = "QUEUE_NAME")

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceEntity.java

@@ -33,10 +33,11 @@ public class ComputeResourceEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "RESOURCE_ID")
+    @Column(name = "RESOURCE_ID", nullable = false, length = 255)
     private String computeResourceId;
 
-    @Column(name = "CREATION_TIME")
+    @Column(name = "CREATION_TIME", nullable = false)
+    @Temporal(TemporalType.TIMESTAMP)
     private Timestamp creationTime;
 
     @Column(name = "ENABLED")
@@ -49,9 +50,9 @@ public class ComputeResourceEntity implements Serializable {
     private String gatewayUsageModuleLoadCommand;
 
     @Column(name = "GATEWAY_USAGE_REPORTING")
-    private boolean gatewayUsageReporting;
+    private Boolean gatewayUsageReporting;
 
-    @Column(name = "HOST_NAME")
+    @Column(name = "HOST_NAME", nullable = false, length = 255)
     private String hostName;
 
     @Column(name = "MAX_MEMORY_NODE")
@@ -60,7 +61,8 @@ public class ComputeResourceEntity implements Serializable {
     @Column(name = "RESOURCE_DESCRIPTION")
     private String resourceDescription;
 
-    @Column(name = "UPDATE_TIME")
+    @Column(name = "UPDATE_TIME", nullable = false)
+    @Temporal(TemporalType.TIMESTAMP)
     private Timestamp updateTime;
 
     @Column(name = "CPUS_PER_NODE")
@@ -75,35 +77,43 @@ public class ComputeResourceEntity implements Serializable {
     @Column(name = "DEFAULT_WALLTIME")
     private Integer defaultWalltime;
 
-    @ElementCollection(fetch = FetchType.EAGER)
-    @CollectionTable(name = "HOST_ALIAS", joinColumns = @JoinColumn(name = "RESOURCE_ID"))
+    @ElementCollection(fetch = FetchType.LAZY)
+    @CollectionTable(
+        name = "HOST_ALIAS",
+        joinColumns = @JoinColumn(name = "RESOURCE_ID"),
+        foreignKey = @ForeignKey(name = "host_alias_ibfk_1")
+    )
     @Column(name = "ALIAS")
     private List<String> hostAliases;
 
-    @ElementCollection(fetch = FetchType.EAGER)
-    @CollectionTable(name = "HOST_IPADDRESS", joinColumns = @JoinColumn(name = "RESOURCE_ID"))
+    @ElementCollection(fetch = FetchType.LAZY)
+    @CollectionTable(
+        name = "HOST_IPADDRESS",
+        joinColumns = @JoinColumn(name = "RESOURCE_ID"),
+        foreignKey = @ForeignKey(name = "host_ipaddress_ibfk_1")
+    )
     @Column(name = "IP_ADDRESS")
     private List<String> ipAddresses;
 
     @OneToMany(
             targetEntity = BatchQueueEntity.class,
             cascade = CascadeType.ALL,
             mappedBy = "computeResource",
-            fetch = FetchType.EAGER)
+            fetch = FetchType.LAZY)
     private List<BatchQueueEntity> batchQueues;
 
     @OneToMany(
             targetEntity = JobSubmissionInterfaceEntity.class,
             cascade = CascadeType.ALL,
             mappedBy = "computeResource",
-            fetch = FetchType.EAGER)
+            fetch = FetchType.LAZY)
     private List<JobSubmissionInterfaceEntity> jobSubmissionInterfaces;
 
     @OneToMany(
             targetEntity = DataMovementInterfaceEntity.class,
             cascade = CascadeType.ALL,
             mappedBy = "computeResource",
-            fetch = FetchType.EAGER)
+            fetch = FetchType.LAZY)
     private List<DataMovementInterfaceEntity> dataMovementInterfaces;
 
     public ComputeResourceEntity() {}
@@ -132,11 +142,11 @@ public void setGatewayUsageExecutable(String gatewayUsageExecutable) {
         this.gatewayUsageExecutable = gatewayUsageExecutable;
     }
 
-    public boolean isGatewayUsageReporting() {
+    public Boolean isGatewayUsageReporting() {
         return gatewayUsageReporting;
     }
 
-    public void setGatewayUsageReporting(boolean gatewayUsageReporting) {
+    public void setGatewayUsageReporting(Boolean gatewayUsageReporting) {
         this.gatewayUsageReporting = gatewayUsageReporting;
     }
 

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourceFileSystemEntity.java

@@ -33,7 +33,7 @@
 public class ComputeResourceFileSystemEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Column(name = "COMPUTE_RESOURCE_ID")
+    @Column(name = "COMPUTE_RESOURCE_ID", insertable = false, updatable = false)
     @Id
     private String computeResourceId;
 

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePolicyEntity.java

@@ -49,7 +49,7 @@ public class ComputeResourcePolicyEntity implements Serializable {
     @Column(name = "COMPUTE_RESOURCE_ID")
     private String computeResourceId;
 
-    @Column(name = "GROUP_RESOURCE_PROFILE_ID")
+    @Column(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, updatable = false)
     private String groupResourceProfileId;
 
     // TODO: Store COMPUTE_RESOURCE_ID and QUEUE_NAME in table so it can FK to BATCH_QUEUE

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ComputeResourcePreferenceEntity.java

@@ -35,7 +35,7 @@
 public class ComputeResourcePreferenceEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Column(name = "GATEWAY_ID")
+    @Column(name = "GATEWAY_ID", insertable = false, updatable = false)
     @Id
     private String gatewayId;
 

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/DataMovementInterfaceEntity.java

@@ -33,7 +33,7 @@
 public class DataMovementInterfaceEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Column(name = "COMPUTE_RESOURCE_ID")
+    @Column(name = "COMPUTE_RESOURCE_ID", insertable = false, updatable = false)
     @Id
     private String computeResourceId;
 

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GridftpEndpointEntity.java

@@ -33,7 +33,7 @@ public class GridftpEndpointEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "DATA_MOVEMENT_INTERFACE_ID")
+    @Column(name = "DATA_MOVEMENT_INTERFACE_ID", insertable = false, updatable = false)
     private String dataMovementInterfaceId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java

@@ -55,7 +55,7 @@ public abstract class GroupComputeResourcePrefEntity implements Serializable {
     @Id
     private String computeResourceId;
 
-    @Column(name = "GROUP_RESOURCE_PROFILE_ID")
+    @Column(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, updatable = false)
     @Id
     private String groupResourceProfileId;
 

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupSSHAccountProvisionerConfig.java

@@ -42,11 +42,11 @@ public class GroupSSHAccountProvisionerConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "RESOURCE_ID")
+    @Column(name = "RESOURCE_ID", insertable = false, updatable = false)
     private String resourceId;
 
     @Id
-    @Column(name = "GROUP_RESOURCE_PROFILE_ID")
+    @Column(name = "GROUP_RESOURCE_PROFILE_ID", insertable = false, updatable = false)
     private String groupResourceProfileId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobManagerCommandEntity.java

@@ -33,7 +33,7 @@ public class JobManagerCommandEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "RESOURCE_JOB_MANAGER_ID")
+    @Column(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false)
     private String resourceJobManagerId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/JobSubmissionInterfaceEntity.java

@@ -33,7 +33,7 @@
 public class JobSubmissionInterfaceEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @Column(name = "COMPUTE_RESOURCE_ID")
+    @Column(name = "COMPUTE_RESOURCE_ID", insertable = false, updatable = false)
     @Id
     private String computeResourceId;
 

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryApendPathEntity.java

@@ -34,7 +34,7 @@ public class LibraryApendPathEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "DEPLOYMENT_ID")
+    @Column(name = "DEPLOYMENT_ID", insertable = false, updatable = false)
     private String deploymentId;
 
     @Column(name = "VALUE")

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LibraryPrependPathEntity.java

@@ -35,7 +35,7 @@ public class LibraryPrependPathEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "DEPLOYMENT_ID")
+    @Column(name = "DEPLOYMENT_ID", insertable = false, updatable = false)
     private String deploymentId;
 
     @Column(name = "VALUE")

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/LocalSubmissionEntity.java

@@ -42,7 +42,7 @@ public class LocalSubmissionEntity implements Serializable {
     @Column(name = "UPDATE_TIME")
     private Timestamp updateTime;
 
-    @Column(name = "RESOURCE_JOB_MANAGER_ID")
+    @Column(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false)
     private String resourceJobManagerId;
 
     @Column(name = "SECURITY_PROTOCOL")

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ModuleLoadCmdEntity.java

@@ -34,7 +34,7 @@ public class ModuleLoadCmdEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "APP_DEPLOYMENT_ID")
+    @Column(name = "APP_DEPLOYMENT_ID", insertable = false, updatable = false)
     private String appdeploymentId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParallelismCommandEntity.java

@@ -33,7 +33,7 @@ public class ParallelismCommandEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "RESOURCE_JOB_MANAGER_ID")
+    @Column(name = "RESOURCE_JOB_MANAGER_ID", insertable = false, updatable = false)
     private String resourceJobManagerId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorEntity.java

@@ -32,13 +32,13 @@ public class ParserConnectorEntity implements Serializable {
     @Column(name = "PARSER_CONNECTOR_ID")
     private String id;
 
-    @Column(name = "PARENT_PARSER_ID")
+    @Column(name = "PARENT_PARSER_ID", insertable = false, updatable = false)
     private String parentParserId;
 
-    @Column(name = "CHILD_PARSER_ID")
+    @Column(name = "CHILD_PARSER_ID", insertable = false, updatable = false)
     private String childParserId;
 
-    @Column(name = "PARSING_TEMPLATE_ID")
+    @Column(name = "PARSING_TEMPLATE_ID", insertable = false, updatable = false)
     private String parsingTemplateId;
 
     @OneToMany(

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserConnectorInputEntity.java

@@ -31,16 +31,16 @@ public class ParserConnectorInputEntity implements Serializable {
     @Column(name = "PARSER_CONNECTOR_INPUT_ID")
     private String id;
 
-    @Column(name = "PARSER_INPUT_ID")
+    @Column(name = "PARSER_INPUT_ID", insertable = false, updatable = false)
     private String inputId;
 
-    @Column(name = "PARSER_OUTPUT_ID")
+    @Column(name = "PARSER_OUTPUT_ID", insertable = false, updatable = false)
     private String parentOutputId;
 
     @Column(name = "VALUE")
     private String value;
 
-    @Column(name = "PARSER_CONNECTOR_ID")
+    @Column(name = "PARSER_CONNECTOR_ID", insertable = false, updatable = false)
     private String parserConnectorId;
 
     @ManyToOne(targetEntity = ParserInputEntity.class, cascade = CascadeType.MERGE)

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserInputEntity.java

@@ -37,7 +37,7 @@ public class ParserInputEntity implements Serializable {
     @Column(name = "PARSER_INPUT_REQUIRED")
     private boolean requiredInput;
 
-    @Column(name = "PARSER_ID")
+    @Column(name = "PARSER_ID", insertable = false, updatable = false)
     private String parserId;
 
     @ManyToOne(targetEntity = ParserEntity.class, cascade = CascadeType.MERGE)

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParserOutputEntity.java

@@ -37,7 +37,7 @@ public class ParserOutputEntity implements Serializable {
     @Column(name = "PARSER_OUTPUT_REQUIRED")
     private boolean requiredOutput;
 
-    @Column(name = "PARSER_ID")
+    @Column(name = "PARSER_ID", insertable = false, updatable = false)
     private String parserId;
 
     @ManyToOne(targetEntity = ParserEntity.class, cascade = CascadeType.MERGE)

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java

@@ -31,7 +31,7 @@ public class ParsingTemplateInputEntity implements Serializable {
     @Column(name = "PARSING_TEMPLATE_INPUT_ID")
     private String id;
 
-    @Column(name = "TARGET_PARSER_INPUT_ID")
+    @Column(name = "TARGET_PARSER_INPUT_ID", insertable = false, updatable = false)
     private String targetInputId;
 
     @Column(name = "APPLICATION_OUTPUT_NAME")
@@ -40,7 +40,7 @@ public class ParsingTemplateInputEntity implements Serializable {
     @Column(name = "VALUE")
     private String value;
 
-    @Column(name = "PARSING_TEMPLATE_ID")
+    @Column(name = "PARSING_TEMPLATE_ID", insertable = false, updatable = false)
     private String parsingTemplateId;
 
     @ManyToOne(targetEntity = ParserInputEntity.class, cascade = CascadeType.MERGE)

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PostjobCommandEntity.java

@@ -34,7 +34,7 @@ public class PostjobCommandEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "APPDEPLOYMENT_ID")
+    @Column(name = "APPDEPLOYMENT_ID", insertable = false, updatable = false)
     private String appdeploymentId;
 
     @Id

airavata-api/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/PrejobCommandEntity.java

@@ -34,7 +34,7 @@ public class PrejobCommandEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @Column(name = "APPDEPLOYMENT_ID")
+    @Column(name = "APPDEPLOYMENT_ID", insertable = false, updatable = false)
     private String appdeploymentId;
 
     @Id