You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/12/11 16:09:54 UTC
(airavata) 04/19: remove unused functions and fix warnings
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch service-layer-improvements
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit f36a66ab65cc3d174ccffbe2a9c4249bd776289f
Author: yasithdev <ya...@icloud.com>
AuthorDate: Sat Dec 6 17:20:54 2025 -0600
remove unused functions and fix warnings
---
.../agents/streaming/VirtualStreamProducer.java | 2 -
.../api/thrift/server/CredentialServiceServer.java | 3 +-
.../api/thrift/server/SharingRegistryServer.java | 3 +-
.../airavata/api/thrift/util/ThriftUtils.java | 4 +-
.../airavata/common/context/WorkflowContext.java | 8 +-
.../airavata/common/utils/LocalEventPublisher.java | 3 -
.../credential/notifier/NotifierBootstrap.java | 6 +-
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 28 -----
.../apache/airavata/helix/core/AbstractTask.java | 4 +-
.../airavata/helix/core/util/MonitoringUtil.java | 4 -
.../apache/airavata/helix/core/util/TaskUtil.java | 4 -
.../impl/controller/WorkflowCleanupAgent.java | 9 +-
.../airavata/helix/impl/task/TaskContext.java | 1 -
.../task/cancel/RemoteJobCancellationTask.java | 16 +++
.../helix/impl/task/staging/DataStagingTask.java | 2 +-
.../impl/task/staging/OutputDataStagingTask.java | 8 +-
.../helix/impl/workflow/ParserWorkflowManager.java | 41 ++++---
.../helix/impl/workflow/PostWorkflowManager.java | 2 +-
.../messaging/client/RabbitMQListener.java | 136 ---------------------
.../airavata/messaging/core/MessageContext.java | 8 +-
.../messaging/core/impl/MessageConsumer.java | 15 ---
.../metadata/analyzer/DataInterpreterService.java | 4 +-
.../compute/job/output/OutputParserImpl.java | 21 ++--
.../core/entities/expcatalog/TaskErrorPK.java | 2 +-
.../apache/airavata/security/IdentityContext.java | 4 +-
.../sharing/db/repositories/EntityRepository.java | 23 ++--
.../messaging/SharingServiceDBEventHandler.java | 5 +
.../airavata/common/utils/DerbyTestUtil.java | 4 +-
.../cpi/SSHSummaryTest/SSHSummaryTest.java | 2 -
.../appcatalog/ComputeResourceRepositoryTest.java | 2 +-
.../GroupResourceProfileRepositoryTest.java | 2 +-
.../UserResourceProfileRepositoryTest.java | 2 +-
.../expcatalog/ExperimentErrorRepositoryTest.java | 2 +-
.../expcatalog/ExperimentInputRepositoryTest.java | 2 +-
.../expcatalog/ExperimentOutputRepositoryTest.java | 2 +-
.../expcatalog/ExperimentRepositoryTest.java | 2 +-
.../expcatalog/ExperimentStatusRepositoryTest.java | 2 +-
.../ExperimentSummaryRepositoryTest.java | 2 +-
.../repositories/expcatalog/JobRepositoryTest.java | 2 +-
.../expcatalog/JobStatusRepositoryTest.java | 2 +-
.../expcatalog/NotificationRepositoryTest.java | 2 +-
.../expcatalog/ProcessErrorRepositoryTest.java | 2 +-
.../expcatalog/ProcessInputRepositoryTest.java | 2 +-
.../expcatalog/ProcessOutputRepositoryTest.java | 2 +-
.../expcatalog/ProcessRepositoryTest.java | 2 +-
.../expcatalog/ProcessStatusRepositoryTest.java | 2 +-
.../expcatalog/ProjectRepositoryTest.java | 2 +-
.../expcatalog/QueueStatusRepositoryTest.java | 2 +-
.../expcatalog/TaskErrorRepositoryTest.java | 2 +-
.../expcatalog/TaskRepositoryTest.java | 2 +-
.../expcatalog/TaskStatusRepositoryTest.java | 2 +-
.../security/GatewayGroupsInitializerTest.java | 8 +-
.../service/handlers/AgentConnectionHandler.java | 6 +
.../connection/service/handlers/FuseFSHandler.java | 2 -
.../file/server/controller/FileController.java | 4 +-
.../apache/airavata/registry/tool/DBMigrator.java | 35 +++---
.../src/main/java/generators/SQLGenerator.java | 3 -
.../service/controller/ResourceController.java | 4 -
.../service/handlers/ResearchHubHandler.java | 2 -
.../research/service/handlers/ResourceHandler.java | 2 -
60 files changed, 165 insertions(+), 317 deletions(-)
diff --git a/airavata-api/src/main/java/org/apache/airavata/agents/streaming/VirtualStreamProducer.java b/airavata-api/src/main/java/org/apache/airavata/agents/streaming/VirtualStreamProducer.java
index b82fa76c5c..4fc1ab0fcd 100644
--- a/airavata-api/src/main/java/org/apache/airavata/agents/streaming/VirtualStreamProducer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/agents/streaming/VirtualStreamProducer.java
@@ -22,7 +22,6 @@ package org.apache.airavata.agents.streaming;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.LinkedBlockingQueue;
public class VirtualStreamProducer {
@@ -31,7 +30,6 @@ public class VirtualStreamProducer {
private OutputStream outputStream;
public VirtualStreamProducer(int bufferSize, long streamLength) {
- ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
BlockingQueue<Integer> queue = new LinkedBlockingQueue<>(bufferSize);
inputStream = new VirtualInputStream(queue, streamLength);
outputStream = new VirtualOutputStream(queue, streamLength);
diff --git a/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/CredentialServiceServer.java b/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/CredentialServiceServer.java
index 1f94866a17..4fc299aaac 100644
--- a/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/CredentialServiceServer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/CredentialServiceServer.java
@@ -68,7 +68,8 @@ public class CredentialServiceServer implements IServer {
final int serverPort = Integer.parseInt(ServerSettings.getCredentialStoreServerPort());
final String serverHost = ServerSettings.getCredentialStoreServerHost();
CredentialServiceHandler handler = applicationContext.getBean(CredentialServiceHandler.class);
- CredentialStoreService.Processor processor = new CredentialStoreService.Processor(handler);
+ CredentialStoreService.Processor<CredentialServiceHandler> processor =
+ new CredentialStoreService.Processor<>(handler);
TServerTransport serverTransport;
diff --git a/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/SharingRegistryServer.java b/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/SharingRegistryServer.java
index ea1e002e76..86ebc7b76f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/SharingRegistryServer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/api/thrift/server/SharingRegistryServer.java
@@ -85,7 +85,8 @@ public class SharingRegistryServer implements IServer {
final String serverHost = properties.getSharing().getServerHost();
// SharingRegistryServerHandler doesn't need DBInitConfig anymore - it's a Spring bean
SharingRegistryServerHandler handler = applicationContext.getBean(SharingRegistryServerHandler.class);
- SharingRegistryService.Processor processor = new SharingRegistryService.Processor(handler);
+ SharingRegistryService.Processor<SharingRegistryServerHandler> processor =
+ new SharingRegistryService.Processor<>(handler);
TServerTransport serverTransport;
TThreadPoolServer.Args options;
diff --git a/airavata-api/src/main/java/org/apache/airavata/api/thrift/util/ThriftUtils.java b/airavata-api/src/main/java/org/apache/airavata/api/thrift/util/ThriftUtils.java
index 182a4f40de..4a54c831da 100644
--- a/airavata-api/src/main/java/org/apache/airavata/api/thrift/util/ThriftUtils.java
+++ b/airavata-api/src/main/java/org/apache/airavata/api/thrift/util/ThriftUtils.java
@@ -23,11 +23,11 @@ import org.apache.airavata.model.task.*;
import org.apache.thrift.*;
public class ThriftUtils {
- public static byte[] serializeThriftObject(TBase object) throws TException {
+ public static byte[] serializeThriftObject(TBase<?, ?> object) throws TException {
return new TSerializer().serialize(object);
}
- public static void createThriftFromBytes(byte[] bytes, TBase object) throws TException {
+ public static void createThriftFromBytes(byte[] bytes, TBase<?, ?> object) throws TException {
new TDeserializer().deserialize(object, bytes);
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java b/airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
index 24db589101..eee20af5b7 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/context/WorkflowContext.java
@@ -26,7 +26,7 @@ package org.apache.airavata.common.context;
*/
public class WorkflowContext {
- private static final ThreadLocal userThreadLocal = new InheritableThreadLocal();
+ private static final ThreadLocal<RequestContext> userThreadLocal = new InheritableThreadLocal<>();
/**
* Sets the context.
@@ -52,7 +52,7 @@ public class WorkflowContext {
* @return The context associated with current thread.
*/
public static RequestContext get() {
- return (RequestContext) userThreadLocal.get();
+ return userThreadLocal.get();
}
/**
@@ -62,7 +62,7 @@ public class WorkflowContext {
*/
public static synchronized String getRequestUser() {
- RequestContext requestContext = (RequestContext) userThreadLocal.get();
+ RequestContext requestContext = userThreadLocal.get();
if (requestContext != null) {
return requestContext.getUserIdentity();
@@ -73,7 +73,7 @@ public class WorkflowContext {
public static synchronized String getGatewayId() {
- RequestContext requestContext = (RequestContext) userThreadLocal.get();
+ RequestContext requestContext = userThreadLocal.get();
if (requestContext != null) {
return requestContext.getGatewayId();
diff --git a/airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java b/airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java
index 0316c4d8f2..636c2d5e9c 100644
--- a/airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java
+++ b/airavata-api/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java
@@ -20,11 +20,8 @@
package org.apache.airavata.common.utils;
import com.google.common.eventbus.EventBus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class LocalEventPublisher {
- private static final Logger logger = LoggerFactory.getLogger(LocalEventPublisher.class);
private EventBus eventBus;
public LocalEventPublisher(EventBus eventBus) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/notifier/NotifierBootstrap.java b/airavata-api/src/main/java/org/apache/airavata/credential/notifier/NotifierBootstrap.java
index d2116236d6..e2250060ab 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/notifier/NotifierBootstrap.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/notifier/NotifierBootstrap.java
@@ -26,6 +26,7 @@ package org.apache.airavata.credential.notifier;
*/
import java.text.ParseException;
import java.util.*;
+import java.util.Calendar;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.DBUtil;
import org.apache.airavata.credential.CommunityUser;
@@ -105,7 +106,10 @@ public class NotifierBootstrap extends TimerTask {
CertificateCredential certificateCredential = (CertificateCredential) credential;
Date date = Utility.convertStringToDate(certificateCredential.getNotAfter());
- date.setDate(date.getDate() + 1); // gap is 1 days
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(Calendar.DAY_OF_MONTH, 1); // gap is 1 days
+ date = cal.getTime();
Date currentDate = new Date();
if (currentDate.after(date)) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java b/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
index 626a28d49e..dd6a6081af 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/adaptor/SSHJAgentAdaptor.java
@@ -611,34 +611,6 @@ public class SSHJAgentAdaptor implements AgentAdaptor {
}
}
- private boolean isMatch(String s, String p) {
- int i = 0;
- int j = 0;
- int starIndex = -1;
- int iIndex = -1;
-
- while (i < s.length()) {
- if (j < p.length() && (p.charAt(j) == '?' || p.charAt(j) == s.charAt(i))) {
- ++i;
- ++j;
- } else if (j < p.length() && p.charAt(j) == '*') {
- starIndex = j;
- iIndex = i;
- j++;
- } else if (starIndex != -1) {
- j = starIndex + 1;
- i = iIndex + 1;
- iIndex++;
- } else {
- return false;
- }
- }
- while (j < p.length() && p.charAt(j) == '*') {
- ++j;
- }
- return j == p.length();
- }
-
@Override
public StorageVolumeInfo getStorageVolumeInfo(String location) throws AgentException {
try {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
index 5df6cb167c..8a2e0a0723 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
@@ -229,9 +229,9 @@ public abstract class AbstractTask extends UserContentStore implements Task {
if (curatorClient == null) {
RetryPolicy retryPolicy = new ExponentialBackoffRetry(1000, 3);
try {
- this.curatorClient =
+ AbstractTask.curatorClient =
CuratorFrameworkFactory.newClient(ServerSettings.getZookeeperConnection(), retryPolicy);
- this.curatorClient.start();
+ AbstractTask.curatorClient.start();
} catch (ApplicationSettingsException e) {
logger.error("Failed to create curator client ", e);
throw new RuntimeException(e);
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java b/airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java
index e1813b30cd..2bb777487b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/core/util/MonitoringUtil.java
@@ -21,13 +21,9 @@ package org.apache.airavata.helix.core.util;
import org.apache.curator.framework.CuratorFramework;
import org.apache.zookeeper.CreateMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class MonitoringUtil {
- private static final Logger logger = LoggerFactory.getLogger(MonitoringUtil.class);
-
private static final String PATH_PREFIX = "/airavata";
private static final String TASK = "/task";
private static final String RETRY = "/retry";
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java b/airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
index 9d2317f75d..5113d664ac 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/core/util/TaskUtil.java
@@ -28,8 +28,6 @@ import org.apache.airavata.helix.core.OutPort;
import org.apache.airavata.helix.task.api.TaskParamType;
import org.apache.airavata.helix.task.api.annotation.TaskOutPort;
import org.apache.airavata.helix.task.api.annotation.TaskParam;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* TODO: Class level comments please
@@ -39,8 +37,6 @@ import org.slf4j.LoggerFactory;
*/
public class TaskUtil {
- private static final Logger logger = LoggerFactory.getLogger(TaskUtil.class);
-
public static <T extends AbstractTask> List<OutPort> getOutPortsOfTask(T taskObj) throws IllegalAccessException {
List<OutPort> outPorts = new ArrayList<>();
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java
index 618cc86c3e..2afe507489 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/controller/WorkflowCleanupAgent.java
@@ -79,7 +79,7 @@ public class WorkflowCleanupAgent implements Runnable {
switch (workflowContext.getWorkflowState()) {
case COMPLETED:
- // case FAILED:
+ case FAILED:
case STOPPED:
case TIMED_OUT:
case ABORTED:
@@ -87,6 +87,13 @@ public class WorkflowCleanupAgent implements Runnable {
+ workflowContext.getWorkflowState().name());
taskDriver.delete(id);
break;
+ case STOPPING:
+ case FAILING:
+ case NOT_STARTED:
+ case IN_PROGRESS:
+ default:
+ // These states are not terminal, so don't delete
+ break;
}
}
});
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
index 004a9218bf..5e08dfdd15 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
@@ -92,7 +92,6 @@ public class TaskContext {
private String gatewayId;
private String taskId;
- private ExperimentModel experimentModel;
private ProcessModel processModel;
private JobModel jobModel;
private Object subTaskModel = null;
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
index f84ed387e5..b905ee5d31 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
@@ -108,6 +108,14 @@ public class RemoteJobCancellationTask extends AiravataTask {
logger.warn("Job " + job.getJobId()
+ " already is in a saturated state according to monitoring");
continue;
+ case SUBMITTED:
+ case ACTIVE:
+ case UNKNOWN:
+ case NON_CRITICAL_FAIL:
+ case QUEUED:
+ default:
+ // Continue with cancellation attempt for these states
+ break;
}
}
@@ -133,6 +141,14 @@ public class RemoteJobCancellationTask extends AiravataTask {
logger.warn("Job " + job.getJobId()
+ " already is in a saturated state according to cluster");
continue;
+ case SUBMITTED:
+ case ACTIVE:
+ case UNKNOWN:
+ case NON_CRITICAL_FAIL:
+ case QUEUED:
+ default:
+ // Continue with cancellation attempt for these states
+ break;
}
} else {
logger.warn("Job status for job " + job.getJobId() + " is null. Std out "
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
index 8ceeb3346d..ebcaaedb30 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
@@ -372,7 +372,7 @@ public abstract class DataStagingTask extends AiravataTask {
}
}
- if (failed > 0) {
+ if (failed > 0 && failedResult != null) {
logger.error(
"Transfer from " + sourceFile + " to " + destFile + " failed. " + failedResult.getMessage(),
failedResult.getError());
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
index 1eade5397f..5ee41d95b5 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
@@ -173,7 +173,9 @@ public class OutputDataStagingTask extends DataStagingTask {
+ sourceFileName);
// Wildcard support is only enabled for output data staging
- assert processOutput != null;
+ if (processOutput == null) {
+ throw new TaskOnFailException("processOutput is null", false);
+ }
logger.info("Transferring file " + sourceFileName);
boolean transferred = transferFileToStorage(
newSourceURI.getPath(),
@@ -240,7 +242,9 @@ public class OutputDataStagingTask extends DataStagingTask {
} else {
// Uploading output file to the storage resource
- assert processOutput != null;
+ if (processOutput == null) {
+ throw new TaskOnFailException("processOutput is null", false);
+ }
boolean transferred = transferFileToStorage(
sourceURI.getPath(), destinationURI.getPath(), sourceFileName, adaptor, storageResourceAdaptor);
if (transferred) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
index e6533dca81..eb3c042804 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/ParserWorkflowManager.java
@@ -455,25 +455,34 @@ public class ParserWorkflowManager extends WorkflowManager {
logger.info("Starting the kafka consumer..");
- while (true) {
- final ConsumerRecords<String, ProcessCompletionMessage> consumerRecords = consumer.poll(Long.MAX_VALUE);
-
- for (TopicPartition partition : consumerRecords.partitions()) {
- List<ConsumerRecord<String, ProcessCompletionMessage>> partitionRecords =
- consumerRecords.records(partition);
- for (ConsumerRecord<String, ProcessCompletionMessage> record : partitionRecords) {
- boolean success = process(record.value());
- logger.info("Status of processing parser for experiment : "
- + record.value().getExperimentId() + " : " + success);
- if (success) {
- consumer.commitSync(
- Collections.singletonMap(partition, new OffsetAndMetadata(record.offset() + 1)));
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+ logger.info("Shutting down Kafka consumer...");
+ consumer.close();
+ }));
+
+ try {
+ while (true) {
+ final ConsumerRecords<String, ProcessCompletionMessage> consumerRecords = consumer.poll(Long.MAX_VALUE);
+
+ for (TopicPartition partition : consumerRecords.partitions()) {
+ List<ConsumerRecord<String, ProcessCompletionMessage>> partitionRecords =
+ consumerRecords.records(partition);
+ for (ConsumerRecord<String, ProcessCompletionMessage> record : partitionRecords) {
+ boolean success = process(record.value());
+ logger.info("Status of processing parser for experiment : "
+ + record.value().getExperimentId() + " : " + success);
+ if (success) {
+ consumer.commitSync(
+ Collections.singletonMap(partition, new OffsetAndMetadata(record.offset() + 1)));
+ }
}
}
- }
- consumerRecords.forEach(record -> process(record.value()));
- consumer.commitAsync();
+ consumerRecords.forEach(record -> process(record.value()));
+ consumer.commitAsync();
+ }
+ } finally {
+ consumer.close();
}
}
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
index a5110df12d..33f05274d2 100644
--- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
+++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
@@ -379,7 +379,7 @@ public class PostWorkflowManager extends WorkflowManager {
}
}
- for (var f : processingFutures) {
+ for (var ignored : processingFutures) {
try {
executorCompletionService.take().get();
} catch (Exception e) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java b/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
index c44fb68e7b..4007540400 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/client/RabbitMQListener.java
@@ -19,16 +19,6 @@
*/
package org.apache.airavata.messaging.client;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.airavata.api.thrift.util.ThriftUtils;
-import org.apache.airavata.messaging.core.MessageHandler;
-import org.apache.airavata.model.messaging.event.ExperimentStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.JobStatusChangeEvent;
-import org.apache.airavata.model.messaging.event.MessageType;
-import org.apache.airavata.model.messaging.event.TaskStatusChangeEvent;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
@@ -44,124 +34,6 @@ public class RabbitMQListener {
private static String gatewayId = "*";
private static String experimentId = "*";
private static String jobId = "*";
- private static LEVEL level = LEVEL.ALL;
-
- private static MessageHandler getMessageHandler(final BufferedWriter bw) {
- return message -> {
- try {
- long latency =
- System.currentTimeMillis() - message.getUpdatedTime().getTime();
- bw.write(message.getMessageId() + " :" + latency);
- bw.newLine();
- bw.flush();
- } catch (IOException e) {
- e.printStackTrace();
- }
- if (message.getType().equals(MessageType.EXPERIMENT)) {
- try {
- ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent();
- var messageEvent = message.getEvent();
- byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
- ThriftUtils.createThriftFromBytes(bytes, event);
- logger.info(
- " Message Received with message id '{}' and with message type '{}' and with state : '{}' for Gateway {}",
- message.getMessageId(),
- message.getType(),
- event.getState().toString(),
- event.getGatewayId());
- } catch (Exception e) {
- String msg = String.format(
- "Error while processing experiment status change event: messageId=%s, type=%s, error=%s",
- message.getMessageId(), message.getType(), e.getMessage());
- logger.error(msg, e);
- }
- } else if (message.getType().equals(MessageType.PROCESS)) {
- /*try {
- WorkflowNodeStatusChangeEvent event = new WorkflowNodeStatusChangeEvent();
- TBase messageEvent = message.getEvent();
- byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
- ThriftUtils.createThriftFromBytes(bytes, event);
- logger.info(" Message Received with message id '{}' and with message type '{}' and with state : '{}' for Gateway {}", message.getMessageId(), message.getType(), event.getState().toString(), event.getWorkflowNodeIdentity().getGatewayId());
- } catch (Exception e) {
- String msg = String.format("Error while processing workflow node status change event: messageId=%s, type=%s, error=%s", message.getMessageId(), message.getType(), e.getMessage());
- logger.error(msg, e);
- }*/
- } else if (message.getType().equals(MessageType.TASK)) {
- try {
- TaskStatusChangeEvent event = new TaskStatusChangeEvent();
- var messageEvent = message.getEvent();
- byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
- ThriftUtils.createThriftFromBytes(bytes, event);
- logger.info(
- " Message Received with message id '{}' and with message type '{}' and with state : '{}' for Gateway {}",
- message.getMessageId(),
- message.getType(),
- event.getState().toString(),
- event.getTaskIdentity().getGatewayId());
- } catch (Exception e) {
- String msg = String.format(
- "Error while processing task status change event: messageId=%s, type=%s, error=%s",
- message.getMessageId(), message.getType(), e.getMessage());
- logger.error(msg, e);
- }
- } else if (message.getType().equals(MessageType.JOB)) {
- try {
- JobStatusChangeEvent event = new JobStatusChangeEvent();
- var messageEvent = message.getEvent();
- byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
- ThriftUtils.createThriftFromBytes(bytes, event);
- logger.info(
- " Message Received with message id '{}' and with message type '{}' and with state : '{}' for Gateway {}",
- message.getMessageId(),
- message.getType(),
- event.getState().toString(),
- event.getJobIdentity().getGatewayId());
- } catch (Exception e) {
- String msg = String.format(
- "Error while processing job status change event: messageId=%s, type=%s, error=%s",
- message.getMessageId(), message.getType(), e.getMessage());
- logger.error(msg, e);
- }
- }
- };
- }
-
- private static List<String> getRoutingKeys(LEVEL level) {
- List<String> routingKeys = new ArrayList<String>();
- switch (level) {
- case ALL:
- routingKeys.add("*");
- routingKeys.add("*.*");
- routingKeys.add("*.*.*");
- routingKeys.add("*.*.*.*");
- routingKeys.add("*.*.*.*.*");
- break;
- case GATEWAY:
- routingKeys.add(gatewayId);
- routingKeys.add(gatewayId + ".*");
- routingKeys.add(gatewayId + ".*.*");
- routingKeys.add(gatewayId + ".*.*.*");
- routingKeys.add(gatewayId + ".*.*.*.*");
- break;
- case EXPERIMENT:
- routingKeys.add(gatewayId);
- routingKeys.add(gatewayId + "." + experimentId);
- routingKeys.add(gatewayId + "." + experimentId + ".*");
- routingKeys.add(gatewayId + "." + experimentId + ".*.*");
- routingKeys.add(gatewayId + "." + experimentId + ".*.*.*");
- break;
- case JOB:
- routingKeys.add(gatewayId);
- routingKeys.add(gatewayId + "." + experimentId);
- routingKeys.add(gatewayId + "." + experimentId + ".*");
- routingKeys.add(gatewayId + "." + experimentId + ".*.*");
- routingKeys.add(gatewayId + "." + experimentId + ".*." + jobId);
- break;
- default:
- break;
- }
- return routingKeys;
- }
public static void parseArguments(String[] args) {
try {
@@ -176,12 +48,10 @@ public class RabbitMQListener {
CommandLine cmd = parser.parse(options, args);
if (cmd.getOptions() == null || cmd.getOptions().length == 0) {
logger.info("You have not specified any options. We assume you need to listen to all the messages...");
- level = LEVEL.ALL;
gatewayId = "*";
}
if (cmd.hasOption("a")) {
logger.info("Listening to all the messages...");
- level = LEVEL.ALL;
gatewayId = "*";
} else {
gatewayId = cmd.getOptionValue("gId");
@@ -189,8 +59,6 @@ public class RabbitMQListener {
gatewayId = "*";
logger.info(
"You have not specified a gateway id. We assume you need to listen to all the messages...");
- } else {
- level = LEVEL.GATEWAY;
}
experimentId = cmd.getOptionValue("eId");
if (experimentId == null && !gatewayId.equals("*")) {
@@ -202,8 +70,6 @@ public class RabbitMQListener {
experimentId = "*";
logger.info(
"You have not specified a experiment id and a gateway id. We assume you need to listen to all the messages...");
- } else {
- level = LEVEL.EXPERIMENT;
}
jobId = cmd.getOptionValue("jId");
if (jobId == null && !gatewayId.equals("*") && !experimentId.equals("*")) {
@@ -215,8 +81,6 @@ public class RabbitMQListener {
jobId = "*";
logger.info(
"You have not specified a job Id or experiment Id or a gateway Id. We assume you need to listen to all the messages...");
- } else {
- level = LEVEL.JOB;
}
}
} catch (ParseException e) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java
index ad2009c99a..150355afd9 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/core/MessageContext.java
@@ -24,7 +24,7 @@ import org.apache.airavata.model.messaging.event.MessageType;
import org.apache.thrift.TBase;
public class MessageContext {
- private final TBase event;
+ private final TBase<?, ?> event;
private final MessageType type;
private final String messageId;
private final String gatewayId;
@@ -32,14 +32,14 @@ public class MessageContext {
private long deliveryTag;
private boolean isRedeliver;
- public MessageContext(TBase event, MessageType type, String messageId, String gatewayId) {
+ public MessageContext(TBase<?, ?> event, MessageType type, String messageId, String gatewayId) {
this.event = event;
this.type = type;
this.messageId = messageId;
this.gatewayId = gatewayId;
}
- public MessageContext(TBase event, MessageType type, String messageId, String gatewayId, long deliveryTag) {
+ public MessageContext(TBase<?, ?> event, MessageType type, String messageId, String gatewayId, long deliveryTag) {
this.event = event;
this.type = type;
this.messageId = messageId;
@@ -47,7 +47,7 @@ public class MessageContext {
this.deliveryTag = deliveryTag;
}
- public TBase getEvent() {
+ public TBase<?, ?> getEvent() {
return event;
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
index 7b019d948f..a39924228f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
+++ b/airavata-api/src/main/java/org/apache/airavata/messaging/core/impl/MessageConsumer.java
@@ -70,19 +70,4 @@ public class MessageConsumer extends DefaultConsumer {
logger.error("handleDelivery() -> Error handling delivery. Consumer Tag : " + consumerTag, e);
}
}
-
- private void sendAck(long deliveryTag) {
- logger.info("sendAck() -> Sending ack. Delivery Tag : " + deliveryTag);
- try {
- if (channel.isOpen()) {
- channel.basicAck(deliveryTag, false);
- } else {
- channel = connection.createChannel();
- channel.basicQos(20);
- channel.basicAck(deliveryTag, false);
- }
- } catch (IOException e) {
- logger.error("sendAck() -> Error sending ack. Delivery Tag : " + deliveryTag, e);
- }
- }
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java b/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java
index a4198df4fa..fb82a6f7a4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java
+++ b/airavata-api/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java
@@ -104,10 +104,10 @@ public class DataInterpreterService implements IServer {
@Override
public ServerStatus getStatus() throws Exception {
- return status;
+ return DataInterpreterService.status;
}
public void setServerStatus(ServerStatus status) {
- this.status = status;
+ DataInterpreterService.status = status;
}
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/monitor/compute/job/output/OutputParserImpl.java b/airavata-api/src/main/java/org/apache/airavata/monitor/compute/job/output/OutputParserImpl.java
index af06c75258..e8446bcf0f 100644
--- a/airavata-api/src/main/java/org/apache/airavata/monitor/compute/job/output/OutputParserImpl.java
+++ b/airavata-api/src/main/java/org/apache/airavata/monitor/compute/job/output/OutputParserImpl.java
@@ -32,16 +32,17 @@ public class OutputParserImpl implements OutputParser {
public boolean isComputeResourceAvailable(CommandOutput commandOutput, String type) {
if (commandOutput.getStdOut() != null && !commandOutput.getStdOut().isEmpty()) {
if (type.equals(Constants.JOB_SUBMISSION_PROTOCOL_SLURM)) {
- Scanner scanner = new Scanner(commandOutput.getStdOut());
- if (scanner.hasNextLine()) {
- String firstLine = scanner.nextLine();
- }
- while (scanner.hasNextLine()) {
- String line = scanner.nextLine();
- String[] splittedString = line.split(" ");
- for (String splitted : splittedString) {
- if (splitted.trim().equals("up")) {
- return true;
+ try (Scanner scanner = new Scanner(commandOutput.getStdOut())) {
+ if (scanner.hasNextLine()) {
+ scanner.nextLine();
+ }
+ while (scanner.hasNextLine()) {
+ String line = scanner.nextLine();
+ String[] splittedString = line.split(" ");
+ for (String splitted : splittedString) {
+ if (splitted.trim().equals("up")) {
+ return true;
+ }
}
}
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java b/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
index af10ca6b76..8ef5ee22f6 100644
--- a/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
+++ b/airavata-api/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorPK.java
@@ -46,7 +46,7 @@ public class TaskErrorPK implements Serializable {
}
public void setTaskId(String processId) {
- this.taskId = taskId;
+ this.taskId = processId;
}
public boolean equals(Object other) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/security/IdentityContext.java b/airavata-api/src/main/java/org/apache/airavata/security/IdentityContext.java
index 0c5d30339d..c8eb8ef64b 100644
--- a/airavata-api/src/main/java/org/apache/airavata/security/IdentityContext.java
+++ b/airavata-api/src/main/java/org/apache/airavata/security/IdentityContext.java
@@ -25,7 +25,7 @@ import org.apache.airavata.model.security.AuthzToken;
* This provides a thread local container for AuthzToken through out the execution of a particular thread.
*/
public class IdentityContext {
- private static ThreadLocal authzTokenContainer = new ThreadLocal();
+ private static ThreadLocal<AuthzToken> authzTokenContainer = new ThreadLocal<>();
public static void set(AuthzToken authzToken) {
authzTokenContainer.set(authzToken);
@@ -36,6 +36,6 @@ public class IdentityContext {
}
public static AuthzToken get() {
- return (AuthzToken) authzTokenContainer.get();
+ return authzTokenContainer.get();
}
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/db/repositories/EntityRepository.java b/airavata-api/src/main/java/org/apache/airavata/sharing/db/repositories/EntityRepository.java
index 80f81e7249..4ccdf060a4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/db/repositories/EntityRepository.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/db/repositories/EntityRepository.java
@@ -71,23 +71,14 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
+ (new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId) + "') AND ";
}
} else if (searchCriteria.getSearchField().equals(EntitySearchField.FULL_TEXT)) {
- // Check driver from properties - this is a legacy check for Derby
- // In practice, this should use the injected EntityManagerFactory from JpaConfig
- if (false) { // Derby check removed - use JpaConfig EntityManagerFactory instead
- query += "E.FULL_TEXT LIKE '%" + searchCriteria.getValue() + "%' AND ";
- } else {
- // FULL TEXT Search with Query Expansion
- String queryTerms = "";
- for (String word : searchCriteria
- .getValue()
- .trim()
- .replaceAll(" +", " ")
- .split(" ")) {
- queryTerms += queryTerms + " +" + word;
- }
- queryTerms = queryTerms.trim();
- query += "MATCH(E.FULL_TEXT) AGAINST ('" + queryTerms + "' IN BOOLEAN MODE) AND ";
+ // FULL TEXT Search with Query Expansion
+ String queryTerms = "";
+ for (String word :
+ searchCriteria.getValue().trim().replaceAll(" +", " ").split(" ")) {
+ queryTerms += queryTerms + " +" + word;
}
+ queryTerms = queryTerms.trim();
+ query += "MATCH(E.FULL_TEXT) AGAINST ('" + queryTerms + "' IN BOOLEAN MODE) AND ";
} else if (searchCriteria.getSearchField().equals(EntitySearchField.PARRENT_ENTITY_ID)) {
if (searchCriteria.getSearchCondition() != null
&& searchCriteria.getSearchCondition().equals(SearchCondition.NOT)) {
diff --git a/airavata-api/src/main/java/org/apache/airavata/sharing/messaging/SharingServiceDBEventHandler.java b/airavata-api/src/main/java/org/apache/airavata/sharing/messaging/SharingServiceDBEventHandler.java
index 891a951910..59b44675f4 100644
--- a/airavata-api/src/main/java/org/apache/airavata/sharing/messaging/SharingServiceDBEventHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/sharing/messaging/SharingServiceDBEventHandler.java
@@ -146,6 +146,11 @@ public class SharingServiceDBEventHandler implements MessageHandler {
if (sharingRegistryService.isDomainExists(gateway.getGatewayId())) {
break;
}
+ case READ:
+ case DELETE:
+ default:
+ // READ and DELETE operations don't require domain creation
+ break;
/*
Following set of DB operations should happen in a transaction
As these are thrift calls we cannot enforce this restriction
diff --git a/airavata-api/src/test/java/org/apache/airavata/common/utils/DerbyTestUtil.java b/airavata-api/src/test/java/org/apache/airavata/common/utils/DerbyTestUtil.java
index cf83944961..e431b64145 100644
--- a/airavata-api/src/test/java/org/apache/airavata/common/utils/DerbyTestUtil.java
+++ b/airavata-api/src/test/java/org/apache/airavata/common/utils/DerbyTestUtil.java
@@ -131,7 +131,9 @@ public class DerbyTestUtil {
// drop were dropped, so nothing more to do.
if (sqle == null) return;
}
- throw sqle;
+ if (sqle != null) {
+ throw sqle;
+ }
}
private static void removeRoles(Connection conn) throws SQLException {
diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/cpi/SSHSummaryTest/SSHSummaryTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/cpi/SSHSummaryTest/SSHSummaryTest.java
index fd00501996..8397959e58 100644
--- a/airavata-api/src/test/java/org/apache/airavata/credential/cpi/SSHSummaryTest/SSHSummaryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/credential/cpi/SSHSummaryTest/SSHSummaryTest.java
@@ -143,8 +143,6 @@ public class SSHSummaryTest extends DatabaseTestCases {
}
}
- fis.close();
-
privateKey = (PrivateKey) ks.getKey("selfsigned", password);
x509Certificates[0] = (X509Certificate) ks.getCertificate("selfsigned");
}
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepositoryTest.java
index 59f1421854..5ce3adfb8f 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ComputeResourceRepositoryTest.java
@@ -636,7 +636,7 @@ public class ComputeResourceRepositoryTest extends TestBase {
return true;
}
- if (expected.size() != actual.size()) {
+ if (actual == null || expected.size() != actual.size()) {
return false;
}
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java
index 406df36c88..60b310ac95 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java
@@ -120,7 +120,7 @@ public class GroupResourceProfileRepositoryTest extends TestBase {
}
@Test
- public void GroupResourceProfileRepositoryTest() throws AppCatalogException {
+ public void testGroupResourceProfileRepository() throws AppCatalogException {
GroupResourceProfile groupResourceProfile = new GroupResourceProfile();
groupResourceProfile.setGatewayId(gatewayId);
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java
index 913db2fe77..3c47882f3e 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java
@@ -46,7 +46,7 @@ public class UserResourceProfileRepositoryTest extends TestBase {
}
@Test
- public void UserResourceProfileRepositoryTest() throws AppCatalogException {
+ public void testUserResourceProfileRepository() throws AppCatalogException {
UserComputeResourcePreference userComputeResourcePreference = new UserComputeResourcePreference();
userComputeResourcePreference.setComputeResourceId("computeResource1");
userComputeResourcePreference.setLoginUserName(userId);
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java
index 001b56c6dd..1e9070e5a2 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java
@@ -52,7 +52,7 @@ public class ExperimentErrorRepositoryTest extends TestBase {
}
@Test
- public void ExperimentRepositoryTest() throws RegistryException {
+ public void testExperimentRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
index a502dd61f8..338ec43cf6 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java
@@ -54,7 +54,7 @@ public class ExperimentInputRepositoryTest extends TestBase {
}
@Test
- public void ExperimentInputRepositoryTest() throws RegistryException {
+ public void testExperimentInputRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
index 02310a5cec..e2344d2a4c 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java
@@ -54,7 +54,7 @@ public class ExperimentOutputRepositoryTest extends TestBase {
}
@Test
- public void ExperimentInputRepositoryTest() throws RegistryException {
+ public void testExperimentInputRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
index 33499575a6..24b2085a3d 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentRepositoryTest.java
@@ -74,7 +74,7 @@ public class ExperimentRepositoryTest extends TestBase {
}
@Test
- public void ExperimentRepositoryTest() throws RegistryException {
+ public void testExperimentRepository() throws RegistryException {
ExperimentModel experimentModel = new ExperimentModel();
experimentModel.setProjectId(projectId);
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepositoryTest.java
index 9940d49a6d..13fdb09097 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentStatusRepositoryTest.java
@@ -52,7 +52,7 @@ public class ExperimentStatusRepositoryTest extends TestBase {
}
@Test
- public void ExperimentStatusRepositoryTest() throws RegistryException {
+ public void testExperimentStatusRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
index 3b3a946748..55408bb141 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentSummaryRepositoryTest.java
@@ -60,7 +60,7 @@ public class ExperimentSummaryRepositoryTest extends TestBase {
}
@Test
- public void ExperimentSummaryRepositoryTest() throws RegistryException {
+ public void testExperimentSummaryRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java
index b206dad4e1..17a4cba0ed 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java
@@ -64,7 +64,7 @@ public class JobRepositoryTest extends TestBase {
}
@Test
- public void JobRepositoryTest() throws RegistryException {
+ public void testJobRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepositoryTest.java
index 54ecffb89a..77f8cc9504 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepositoryTest.java
@@ -63,7 +63,7 @@ public class JobStatusRepositoryTest extends TestBase {
}
@Test
- public void JobStatusRepositoryTest() throws RegistryException {
+ public void testJobStatusRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepositoryTest.java
index ff6ae68d98..fdf725e815 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/NotificationRepositoryTest.java
@@ -43,7 +43,7 @@ public class NotificationRepositoryTest extends TestBase {
}
@Test
- public void NotificationRepositoryTest() throws RegistryException {
+ public void testNotificationRepository() throws RegistryException {
Notification notification = new Notification();
notification.setNotificationId("notificationId");
notification.setGatewayId(testGateway);
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java
index 6e15c8a0fb..8eab626274 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java
@@ -57,7 +57,7 @@ public class ProcessErrorRepositoryTest extends TestBase {
}
@Test
- public void ProcessErrorRepositoryTest() throws RegistryException {
+ public void testProcessErrorRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
index fb8ec5cdb6..bd1543816d 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java
@@ -59,7 +59,7 @@ public class ProcessInputRepositoryTest extends TestBase {
}
@Test
- public void ProcessInputRepositoryTest() throws RegistryException {
+ public void testProcessInputRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
index a6e826e44a..e231ebc80c 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java
@@ -59,7 +59,7 @@ public class ProcessOutputRepositoryTest extends TestBase {
}
@Test
- public void ProcessOutputRepositoryTest() throws RegistryException {
+ public void testProcessOutputRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
index 04993d2797..f8c4818cf0 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessRepositoryTest.java
@@ -59,7 +59,7 @@ public class ProcessRepositoryTest extends TestBase {
}
@Test
- public void ProcessRepositoryTest() throws RegistryException {
+ public void testProcessRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java
index e74f43e7a2..1cb964c078 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java
@@ -58,7 +58,7 @@ public class ProcessStatusRepositoryTest extends TestBase {
}
@Test
- public void ProcessStatusRepositoryTest() throws RegistryException {
+ public void testProcessStatusRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepositoryTest.java
index f79419875e..a031335d32 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProjectRepositoryTest.java
@@ -49,7 +49,7 @@ public class ProjectRepositoryTest extends TestBase {
}
@Test
- public void ProjectRepositoryTest() throws RegistryException {
+ public void testProjectRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId(testGateway);
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java
index 82e2f3adc5..5c79fb5646 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java
@@ -42,7 +42,7 @@ public class QueueStatusRepositoryTest extends TestBase {
}
@Test
- public void QueueStatusRepositoryTest() throws RegistryException {
+ public void testQueueStatusRepository() throws RegistryException {
QueueStatusModel queueStatusModel = new QueueStatusModel();
queueStatusModel.setHostName("host");
queueStatusModel.setQueueName("queue");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepositoryTest.java
index eea1addab5..2d796e7ddd 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskErrorRepositoryTest.java
@@ -60,7 +60,7 @@ public class TaskErrorRepositoryTest extends TestBase {
}
@Test
- public void TaskErrorRepositoryTest() throws RegistryException {
+ public void testTaskErrorRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepositoryTest.java
index f15c89ef18..8e637d33fd 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskRepositoryTest.java
@@ -61,7 +61,7 @@ public class TaskRepositoryTest extends TestBase {
}
@Test
- public void TaskRepositoryTest() throws RegistryException {
+ public void testTaskRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepositoryTest.java
index 3e805d6b03..f46c114a4b 100644
--- a/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepositoryTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/TaskStatusRepositoryTest.java
@@ -60,7 +60,7 @@ public class TaskStatusRepositoryTest extends TestBase {
}
@Test
- public void TaskStatusRepositoryTest() throws RegistryException {
+ public void testTaskStatusRepository() throws RegistryException {
Gateway gateway = new Gateway();
gateway.setGatewayId("gateway");
gateway.setDomain("SEAGRID");
diff --git a/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java b/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java
index 84d4423b2d..1f43b29870 100644
--- a/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java
@@ -110,9 +110,11 @@ public class GatewayGroupsInitializerTest {
if (!doesAdminUserExist) {
User adminUser = withCapture();
mockSharingRegistryService.createUser(adminUser);
- assertEquals(adminUser.getUserId(), ADMIN_OWNER_ID);
- assertEquals(adminUser.getUserName(), TEST_ADMIN_USERNAME);
- assertEquals(adminUser.getDomainId(), GATEWAY_ID);
+ if (adminUser != null) {
+ assertEquals(adminUser.getUserId(), ADMIN_OWNER_ID);
+ assertEquals(adminUser.getUserName(), TEST_ADMIN_USERNAME);
+ assertEquals(adminUser.getDomainId(), GATEWAY_ID);
+ }
}
List<UserGroup> groups = new ArrayList<>();
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java
index 56a8f54fce..25160ebd4f 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentConnectionHandler.java
@@ -659,6 +659,12 @@ public class AgentConnectionHandler extends AgentCommunicationServiceGrpc.AgentC
case ASYNCCOMMANDTERMINATERESPONSE -> {
handleAsyncCommandTerminateResponse(request.getAsyncCommandTerminateResponse());
}
+ case MESSAGE_NOT_SET:
+ case CREATEAGENTRESPONSE:
+ case TERMINATEAGENTRESPONSE:
+ default:
+ // Unhandled message types - log and ignore
+ break;
}
}
diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java
index 409c99d76d..b2bc9eae5a 100644
--- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java
+++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/FuseFSHandler.java
@@ -22,7 +22,6 @@ package org.apache.airavata.agent.connection.service.handlers;
import com.google.protobuf.ByteString;
import com.google.protobuf.Timestamp;
import io.grpc.stub.StreamObserver;
-import java.io.File;
import java.nio.charset.Charset;
import net.devh.boot.grpc.server.service.GrpcService;
import org.apache.airavata.fuse.*;
@@ -53,7 +52,6 @@ public class FuseFSHandler extends FuseServiceGrpc.FuseServiceImplBase {
public void fileInfo(FileInfoReq request, StreamObserver<FileInfoRes> responseObserver) {
LOGGER.info("Calling fileInfo {}", request.getName());
- File f = new File(request.getName());
responseObserver.onNext(FileInfoRes.newBuilder()
.setResult(FileInfo.newBuilder()
.setName(request.getName())
diff --git a/modules/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java b/modules/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java
index c433817021..74326f982b 100644
--- a/modules/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java
+++ b/modules/file-server/src/main/java/org/apache/airavata/file/server/controller/FileController.java
@@ -74,7 +74,7 @@ public class FileController {
@GetMapping("/download/{live}/{processId}/{*subPath}")
@ResponseBody
- public ResponseEntity downloadFile(
+ public ResponseEntity<?> downloadFile(
@PathVariable String live, @PathVariable String processId, @PathVariable String subPath) {
String relPath = subPath.startsWith("/") ? subPath : "/" + subPath;
String fileName = new File(relPath).getName();
@@ -93,7 +93,7 @@ public class FileController {
@PostMapping("/upload/{live}/{processId}/{*subPath}")
@ResponseBody
- public ResponseEntity uploadFile(
+ public ResponseEntity<?> uploadFile(
@PathVariable String live,
@PathVariable String processId,
@PathVariable String subPath,
diff --git a/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java b/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
index 7a2c59e94d..710d730449 100644
--- a/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
+++ b/modules/registry-db-migrator/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java
@@ -66,18 +66,26 @@ public class DBMigrator {
public static void updateDB(String jdbcUrl, String jdbcUser, String jdbcPwd) {
relativePath = "db-scripts/" + getIncrementedVersion(currentAiravataVersion) + "/";
InputStream sqlStream = null;
- Scanner in = new Scanner(System.in);
- if (jdbcUrl == null || jdbcUrl.equals("")) {
- System.out.println("Enter JDBC URL : ");
- jdbcUrl = in.next();
- }
- if (jdbcUser == null || jdbcUser.equals("")) {
- System.out.println("Enter JDBC Username : ");
- jdbcUser = in.next();
- }
- if (jdbcPwd == null || jdbcPwd.equals("")) {
- System.out.println("Enter JDBC password : ");
- jdbcPwd = in.next();
+ Scanner in = null;
+ try {
+ in = new Scanner(System.in);
+ if (jdbcUrl == null || jdbcUrl.equals("")) {
+ System.out.println("Enter JDBC URL : ");
+ jdbcUrl = in.next();
+ }
+ if (jdbcUser == null || jdbcUser.equals("")) {
+ System.out.println("Enter JDBC Username : ");
+ jdbcUser = in.next();
+ }
+ if (jdbcPwd == null || jdbcPwd.equals("")) {
+ System.out.println("Enter JDBC password : ");
+ jdbcPwd = in.next();
+ }
+ } finally {
+ // Note: System.in should not be closed, but Scanner is closed to satisfy resource leak detection
+ if (in != null) {
+ in.close();
+ }
}
String dbType = getDBType(jdbcUrl);
@@ -85,7 +93,6 @@ public class DBMigrator {
Connection connection;
try {
- File file = null;
if (dbType.contains("derby")) {
jdbcDriver = "org.apache.derby.jdbc.ClientDriver";
sqlStream = DBMigrator.class.getClassLoader().getResourceAsStream(relativePath + MIGRATE_SQL_DERBY);
@@ -93,7 +100,7 @@ public class DBMigrator {
jdbcDriver = "com.mysql.jdbc.Driver";
sqlStream = DBMigrator.class.getClassLoader().getResourceAsStream(relativePath + MIGRATE_SQL_MYSQL);
}
- Class.forName(jdbcDriver).newInstance();
+ Class.forName(jdbcDriver).getDeclaredConstructor().newInstance();
connection = DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPwd);
if (canUpdated(connection)) {
executeSQLScript(connection, sqlStream);
diff --git a/modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java b/modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java
index 77f877e504..4c560bbcc8 100644
--- a/modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java
+++ b/modules/registry-jpa-generator/src/main/java/generators/SQLGenerator.java
@@ -22,8 +22,6 @@ package generators;
import java.util.ArrayList;
import java.util.List;
import model.SQLData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/*
*
@@ -47,7 +45,6 @@ import org.slf4j.LoggerFactory;
*/
public class SQLGenerator extends AbstractGenerator {
- private static final Logger log = LoggerFactory.getLogger(SQLGenerator.class);
public static enum DataTypes {
VARCHAR,
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ResourceController.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ResourceController.java
index f02cf7cac5..2c154bc5bc 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ResourceController.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/controller/ResourceController.java
@@ -35,8 +35,6 @@ import org.apache.airavata.research.service.model.entity.NotebookResource;
import org.apache.airavata.research.service.model.entity.Project;
import org.apache.airavata.research.service.model.entity.RepositoryResource;
import org.apache.airavata.research.service.model.entity.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -54,8 +52,6 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "Resources", description = "Datasets, notebooks, repositories, models")
public class ResourceController {
- private static final Logger LOGGER = LoggerFactory.getLogger(ResourceController.class);
-
private final ResourceHandler resourceHandler;
private final ProjectHandler projectHandler;
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResearchHubHandler.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResearchHubHandler.java
index 3cecf1c512..afde62f5df 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResearchHubHandler.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResearchHubHandler.java
@@ -52,7 +52,6 @@ public class ResearchHubHandler {
private final ProjectHandler projectHandler;
private final SessionHandler sessionHandler;
- private final ProjectRepository projectRepository;
@Value("${airavata.research-hub.url}")
private String csHubUrl;
@@ -67,7 +66,6 @@ public class ResearchHubHandler {
ProjectHandler projectHandler, SessionHandler sessionHandler, ProjectRepository projectRepository) {
this.projectHandler = projectHandler;
this.sessionHandler = sessionHandler;
- this.projectRepository = projectRepository;
}
public boolean stopSession(String sessionId) {
diff --git a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResourceHandler.java b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResourceHandler.java
index d76b11aae6..ba05971139 100644
--- a/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResourceHandler.java
+++ b/modules/research-framework/research-service/src/main/java/org/apache/airavata/research/service/handlers/ResourceHandler.java
@@ -59,7 +59,6 @@ public class ResourceHandler {
private final AiravataService airavataService;
private final TagRepository tagRepository;
private final ResourceRepository resourceRepository;
- private final ProjectRepository projectRepository;
private final ResourceStarRepository resourceStarRepository;
public ResourceHandler(
@@ -71,7 +70,6 @@ public class ResourceHandler {
this.airavataService = airavataService;
this.tagRepository = tagRepository;
this.resourceRepository = resourceRepository;
- this.projectRepository = projectRepository;
this.resourceStarRepository = resourceStarRepository;
}