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 2026/03/30 12:41:39 UTC
(airavata) 04/16: cleanup: remove deprecated CredentialOwnerType enum and field
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch worktree-cleanup+lean-core
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit ea91a90bb153035b1eae17fae817fc899cca8691
Author: yasithdev <ya...@icloud.com>
AuthorDate: Mon Mar 30 07:30:37 2026 -0400
cleanup: remove deprecated CredentialOwnerType enum and field
Removes the @Deprecated CredentialOwnerType enum (GATEWAY/USER) and the
corresponding credentialOwnerType field from Credential. Updates CredentialsDAO
to omit CREDENTIAL_OWNER_TYPE from INSERT/UPDATE and stop reading it on SELECT.
Removes owner-type filter logic from the two @Deprecated summary handler methods.
Co-Authored-By: Claude Sonnet 4.6 <no...@anthropic.com>
---
.../handler/CredentialStoreServerHandler.java | 8 ++----
.../airavata/credential/model/Credential.java | 10 --------
.../credential/model/CredentialOwnerType.java | 29 ----------------------
.../credential/repository/db/CredentialsDAO.java | 16 +++---------
.../repository/db/CredentialsDAOTest.java | 8 ------
5 files changed, 6 insertions(+), 65 deletions(-)
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java b/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java
index dbbd1b6211..6ce03b7b34 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/handler/CredentialStoreServerHandler.java
@@ -32,7 +32,6 @@ import org.apache.airavata.common.db.DBUtil;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.credential.model.CommunityUser;
import org.apache.airavata.credential.model.Credential;
-import org.apache.airavata.credential.model.CredentialOwnerType;
import org.apache.airavata.credential.repository.CertificateCredentialWriter;
import org.apache.airavata.credential.repository.CredentialReaderImpl;
import org.apache.airavata.credential.repository.CredentialStoreException;
@@ -105,7 +104,6 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
if (sshCredential.getPublicKey() == null || sshCredential.getPrivateKey() == null) {
credential = Utility.generateKeyPair(credential);
}
- credential.setCredentialOwnerType(CredentialOwnerType.GATEWAY);
sshCredentialWriter.writeCredentials(credential);
return token;
} catch (CredentialStoreException e) {
@@ -418,8 +416,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
if (allCredentials != null && !allCredentials.isEmpty()) {
for (Credential credential : allCredentials) {
if (credential instanceof org.apache.airavata.credential.model.SSHCredential
- && !(credential instanceof org.apache.airavata.credential.model.PasswordCredential)
- && credential.getCredentialOwnerType() == CredentialOwnerType.GATEWAY) {
+ && !(credential instanceof org.apache.airavata.credential.model.PasswordCredential)) {
org.apache.airavata.credential.model.SSHCredential sshCredential =
(org.apache.airavata.credential.model.SSHCredential) credential;
CredentialSummary sshCredentialSummary = new CredentialSummary();
@@ -465,8 +462,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
String gateway = sshCredential.getGateway();
if (portalUserName != null && gateway != null) {
if (portalUserName.equals(userId)
- && gateway.equals(gatewayId)
- && sshCredential.getCredentialOwnerType() == CredentialOwnerType.USER) {
+ && gateway.equals(gatewayId)) {
org.apache.airavata.credential.model.SSHCredential sshCredentialKey =
(org.apache.airavata.credential.model.SSHCredential) credential;
CredentialSummary sshCredentialSummary = new CredentialSummary();
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/model/Credential.java b/airavata-api/src/main/java/org/apache/airavata/credential/model/Credential.java
index 9d542347d5..eaf90a008d 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/model/Credential.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/model/Credential.java
@@ -34,9 +34,6 @@ public abstract class Credential implements Serializable {
private Date persistedTime;
private String token;
- @Deprecated
- private CredentialOwnerType credentialOwnerType = CredentialOwnerType.GATEWAY;
-
public String getDescription() {
return description;
}
@@ -71,11 +68,4 @@ public abstract class Credential implements Serializable {
return persistedTime;
}
- public CredentialOwnerType getCredentialOwnerType() {
- return credentialOwnerType;
- }
-
- public void setCredentialOwnerType(CredentialOwnerType credentialOwnerType) {
- this.credentialOwnerType = credentialOwnerType;
- }
}
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/model/CredentialOwnerType.java b/airavata-api/src/main/java/org/apache/airavata/credential/model/CredentialOwnerType.java
deleted file mode 100644
index 029cba05bd..0000000000
--- a/airavata-api/src/main/java/org/apache/airavata/credential/model/CredentialOwnerType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
-package org.apache.airavata.credential.model;
-
-/**
- * Created by marcus on 11/23/16.
- */
-@Deprecated
-public enum CredentialOwnerType {
- GATEWAY,
- USER;
-}
diff --git a/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java b/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java
index f464b32bc4..44f050c384 100644
--- a/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java
+++ b/airavata-api/src/main/java/org/apache/airavata/credential/repository/db/CredentialsDAO.java
@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
import org.apache.airavata.common.db.DBUtil;
import org.apache.airavata.common.server.KeyStorePasswordCallback;
import org.apache.airavata.credential.model.Credential;
-import org.apache.airavata.credential.model.CredentialOwnerType;
import org.apache.airavata.credential.repository.CredentialStoreException;
import org.apache.airavata.security.util.SecurityUtil;
@@ -85,7 +84,7 @@ public class CredentialsDAO extends ParentDAO {
throws CredentialStoreException {
String sql =
- "INSERT INTO CREDENTIALS (GATEWAY_ID, TOKEN_ID, CREDENTIAL, PORTAL_USER_ID, TIME_PERSISTED, DESCRIPTION, CREDENTIAL_OWNER_TYPE) VALUES (?, ?, ?, ?, ?, ?, ?)";
+ "INSERT INTO CREDENTIALS (GATEWAY_ID, TOKEN_ID, CREDENTIAL, PORTAL_USER_ID, TIME_PERSISTED, DESCRIPTION) VALUES (?, ?, ?, ?, ?, ?)";
PreparedStatement preparedStatement = null;
@@ -106,8 +105,6 @@ public class CredentialsDAO extends ParentDAO {
preparedStatement.setString(6, credential.getDescription());
- preparedStatement.setString(7, credential.getCredentialOwnerType().toString());
-
preparedStatement.executeUpdate();
} catch (SQLException e) {
@@ -163,7 +160,7 @@ public class CredentialsDAO extends ParentDAO {
throws CredentialStoreException {
String sql =
- "UPDATE CREDENTIALS set CREDENTIAL = ?, PORTAL_USER_ID = ?, TIME_PERSISTED = ?, DESCRIPTION = ?, CREDENTIAL_OWNER_TYPE = ? where GATEWAY_ID = ? and TOKEN_ID = ?";
+ "UPDATE CREDENTIALS set CREDENTIAL = ?, PORTAL_USER_ID = ?, TIME_PERSISTED = ?, DESCRIPTION = ? where GATEWAY_ID = ? and TOKEN_ID = ?";
PreparedStatement preparedStatement = null;
@@ -177,9 +174,8 @@ public class CredentialsDAO extends ParentDAO {
preparedStatement.setTimestamp(3, new Timestamp(System.currentTimeMillis()));
preparedStatement.setString(4, credential.getDescription());
- preparedStatement.setString(5, credential.getCredentialOwnerType().toString());
- preparedStatement.setString(6, gatewayId);
- preparedStatement.setString(7, credential.getToken());
+ preparedStatement.setString(5, gatewayId);
+ preparedStatement.setString(6, credential.getToken());
preparedStatement.executeUpdate();
@@ -231,8 +227,6 @@ public class CredentialsDAO extends ParentDAO {
certificateCredential.setPortalUserName(resultSet.getString("PORTAL_USER_ID"));
certificateCredential.setCertificateRequestedTime(resultSet.getTimestamp("TIME_PERSISTED"));
certificateCredential.setDescription(resultSet.getString("DESCRIPTION"));
- certificateCredential.setCredentialOwnerType(
- CredentialOwnerType.valueOf(resultSet.getString("CREDENTIAL_OWNER_TYPE")));
return certificateCredential;
}
@@ -396,8 +390,6 @@ public class CredentialsDAO extends ParentDAO {
certificateCredential.setPortalUserName(resultSet.getString("PORTAL_USER_ID"));
certificateCredential.setCertificateRequestedTime(resultSet.getTimestamp("TIME_PERSISTED"));
certificateCredential.setDescription(resultSet.getString("DESCRIPTION"));
- certificateCredential.setCredentialOwnerType(
- CredentialOwnerType.valueOf(resultSet.getString("CREDENTIAL_OWNER_TYPE")));
credentialList.add(certificateCredential);
}
diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java
index 586fa36f8f..941ce727de 100644
--- a/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java
+++ b/airavata-api/src/test/java/org/apache/airavata/credential/repository/db/CredentialsDAOTest.java
@@ -36,7 +36,6 @@ import org.apache.airavata.common.utils.DatabaseTestCases;
import org.apache.airavata.credential.model.CertificateCredential;
import org.apache.airavata.credential.model.CommunityUser;
import org.apache.airavata.credential.model.Credential;
-import org.apache.airavata.credential.model.CredentialOwnerType;
import org.apache.airavata.credential.repository.CredentialStoreException;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -175,7 +174,6 @@ public class CredentialsDAOTest extends DatabaseTestCases {
certificateCredential.setPortalUserName("jerry");
certificateCredential.setNotBefore("13 OCT 2012 5:34:23");
certificateCredential.setNotAfter("14 OCT 2012 5:34:23");
- certificateCredential.setCredentialOwnerType(CredentialOwnerType.GATEWAY);
return certificateCredential;
}
@@ -208,8 +206,6 @@ public class CredentialsDAOTest extends DatabaseTestCases {
assertEquals(certificateCredential.getNotAfter(), readCertificateCredential.getNotAfter());
assertEquals(certificateCredential.getNotBefore(), readCertificateCredential.getNotBefore());
assertEquals(certificateCredential.getPortalUserName(), readCertificateCredential.getPortalUserName());
- assertEquals(
- certificateCredential.getCredentialOwnerType(), readCertificateCredential.getCredentialOwnerType());
PrivateKey newKey = readCertificateCredential.getPrivateKey();
@@ -255,8 +251,6 @@ public class CredentialsDAOTest extends DatabaseTestCases {
assertEquals(certificateCredential.getNotAfter(), readCertificateCredential.getNotAfter());
assertEquals(certificateCredential.getNotBefore(), readCertificateCredential.getNotBefore());
assertEquals(certificateCredential.getPortalUserName(), readCertificateCredential.getPortalUserName());
- assertEquals(
- certificateCredential.getCredentialOwnerType(), readCertificateCredential.getCredentialOwnerType());
PrivateKey newKey = readCertificateCredential.getPrivateKey();
@@ -361,7 +355,6 @@ public class CredentialsDAOTest extends DatabaseTestCases {
certificateCredential.setLifeTime(50);
certificateCredential.setNotBefore("15 OCT 2012 5:34:23");
certificateCredential.setNotAfter("16 OCT 2012 5:34:23");
- certificateCredential.setCredentialOwnerType(CredentialOwnerType.USER);
credentialsDAO.updateCredentials(communityUser.getGatewayName(), certificateCredential, connection);
@@ -372,7 +365,6 @@ public class CredentialsDAOTest extends DatabaseTestCases {
certificateCredential.getCertificates()[0].getIssuerDN().toString());
// Assertions.assertNotNull(certificateCredential.getPrivateKey());
assertEquals("test2", certificateCredential.getPortalUserName());
- assertEquals(CredentialOwnerType.USER, certificateCredential.getCredentialOwnerType());
} finally {
connection.close();