Skip to content

Commit 88fd6ba

Browse files
yasithdevyasithdev
committed
run spotless:apply
1 parent 36f17b4 commit 88fd6ba

File tree

44 files changed

+481
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+481
-373
lines changed

‎airavata-api/src/main/java/org/apache/airavata/Main.java‎

Lines changed: 116 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -128,124 +128,127 @@ public static void main(String[] args) throws Exception {
128128
}
129129
}
130130

131-
132131
public static void postInit() {
133-
try {
134-
var defaultGatewayId = ServerSettings.getDefaultUserGateway();
135-
var defaultUsername = ServerSettings.getDefaultUser();
136-
var defaultPassword = ServerSettings.getDefaultUserPassword();
137-
var defaultOauthClientId = ServerSettings.getSetting("default.registry.oauth.client.id");
138-
var defaultOauthClientSecret = ServerSettings.getSetting("default.registry.oauth.client.secret");
139-
var credStore = AiravataServiceFactory.getCredentialStore();
140-
var domainRepository = new org.apache.airavata.catalog.sharing.db.repositories.DomainRepository();
141-
var gatewayRepository = new org.apache.airavata.registry.core.repositories.expcatalog.GatewayRepository();
142-
var expUserRepository = new org.apache.airavata.registry.core.repositories.expcatalog.UserRepository();
143-
var sharingUserRepository = new org.apache.airavata.catalog.sharing.db.repositories.UserRepository();
144-
var entityTypeRepository = new org.apache.airavata.catalog.sharing.db.repositories.EntityTypeRepository();
145-
var permissionTypeRepository = new org.apache.airavata.catalog.sharing.db.repositories.PermissionTypeRepository();
146-
var gwrpRepository = new org.apache.airavata.registry.core.repositories.appcatalog.GwyResourceProfileRepository();
147-
148-
// create default gateway if not exists
149-
if (!gatewayRepository.isGatewayExist(defaultGatewayId)) {
150-
var gateway = new Gateway();
151-
gateway.setGatewayId(defaultGatewayId);
152-
gateway.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED);
153-
gateway.setOauthClientId(defaultOauthClientId);
154-
gateway.setOauthClientSecret(defaultOauthClientSecret);
155-
gatewayRepository.addGateway(gateway);
156-
}
157-
158-
// create default user if not exists and add to default gateway
159-
if (!expUserRepository.isUserExists(defaultGatewayId, defaultUsername)) {
160-
var defaultUser = new UserProfile();
161-
defaultUser.setUserId(defaultUsername);
162-
defaultUser.setGatewayId(defaultGatewayId);
163-
expUserRepository.addUser(defaultUser);
164-
}
132+
try {
133+
var defaultGatewayId = ServerSettings.getDefaultUserGateway();
134+
var defaultUsername = ServerSettings.getDefaultUser();
135+
var defaultPassword = ServerSettings.getDefaultUserPassword();
136+
var defaultOauthClientId = ServerSettings.getSetting("default.registry.oauth.client.id");
137+
var defaultOauthClientSecret = ServerSettings.getSetting("default.registry.oauth.client.secret");
138+
var credStore = AiravataServiceFactory.getCredentialStore();
139+
var domainRepository = new org.apache.airavata.catalog.sharing.db.repositories.DomainRepository();
140+
var gatewayRepository = new org.apache.airavata.registry.core.repositories.expcatalog.GatewayRepository();
141+
var expUserRepository = new org.apache.airavata.registry.core.repositories.expcatalog.UserRepository();
142+
var sharingUserRepository = new org.apache.airavata.catalog.sharing.db.repositories.UserRepository();
143+
var entityTypeRepository = new org.apache.airavata.catalog.sharing.db.repositories.EntityTypeRepository();
144+
var permissionTypeRepository =
145+
new org.apache.airavata.catalog.sharing.db.repositories.PermissionTypeRepository();
146+
var gwrpRepository =
147+
new org.apache.airavata.registry.core.repositories.appcatalog.GwyResourceProfileRepository();
148+
149+
// create default gateway if not exists
150+
if (!gatewayRepository.isGatewayExist(defaultGatewayId)) {
151+
var gateway = new Gateway();
152+
gateway.setGatewayId(defaultGatewayId);
153+
gateway.setGatewayApprovalStatus(GatewayApprovalStatus.APPROVED);
154+
gateway.setOauthClientId(defaultOauthClientId);
155+
gateway.setOauthClientSecret(defaultOauthClientSecret);
156+
gatewayRepository.addGateway(gateway);
157+
}
165158

166-
// create default gateway resource profile if not exists
167-
if (!gwrpRepository.isGatewayResourceProfileExists(defaultGatewayId)) {
168-
var gatewayResourceProfile = new GatewayResourceProfile();
169-
gatewayResourceProfile.setGatewayID(defaultGatewayId);
170-
gwrpRepository.addGatewayResourceProfile(gatewayResourceProfile);
171-
}
172-
173-
// create password credential for default gateway resource profile if not exists
174-
var gwrp = gwrpRepository.getGatewayProfile(defaultGatewayId);
175-
if (gwrp != null && gwrp.getIdentityServerPwdCredToken() == null) {
176-
logger.debug("no password credential found for the default gateway: {}", defaultGatewayId);
177-
178-
var pw = new PasswordCredential();
179-
pw.setPortalUserName(defaultUsername);
180-
pw.setGatewayId(defaultGatewayId);
181-
pw.setLoginUserName(defaultUsername);
182-
pw.setPassword(defaultPassword);
183-
pw.setDescription("Credentials for default gateway");
184-
185-
String token = null;
186-
try {
187-
logger.info("adding new password credential for the default gateway: {}", defaultGatewayId);
188-
token = credStore.addPasswordCredential(pw);
189-
} catch (Exception ex) {
190-
logger.error("Failed to add the password credential for the default gateway: {}", defaultGatewayId, ex);
159+
// create default user if not exists and add to default gateway
160+
if (!expUserRepository.isUserExists(defaultGatewayId, defaultUsername)) {
161+
var defaultUser = new UserProfile();
162+
defaultUser.setUserId(defaultUsername);
163+
defaultUser.setGatewayId(defaultGatewayId);
164+
expUserRepository.addUser(defaultUser);
191165
}
192166

193-
if (token != null) {
194-
logger.debug("adding password credential token {} to the default gateway: {}", token, defaultGatewayId);
195-
gwrp.setIdentityServerPwdCredToken(token);
196-
gwrp.setIdentityServerTenant(defaultGatewayId);
197-
gwrpRepository.updateGatewayResourceProfile(gwrp);
167+
// create default gateway resource profile if not exists
168+
if (!gwrpRepository.isGatewayResourceProfileExists(defaultGatewayId)) {
169+
var gatewayResourceProfile = new GatewayResourceProfile();
170+
gatewayResourceProfile.setGatewayID(defaultGatewayId);
171+
gwrpRepository.addGatewayResourceProfile(gatewayResourceProfile);
172+
}
173+
174+
// create password credential for default gateway resource profile if not exists
175+
var gwrp = gwrpRepository.getGatewayProfile(defaultGatewayId);
176+
if (gwrp != null && gwrp.getIdentityServerPwdCredToken() == null) {
177+
logger.debug("no password credential found for the default gateway: {}", defaultGatewayId);
178+
179+
var pw = new PasswordCredential();
180+
pw.setPortalUserName(defaultUsername);
181+
pw.setGatewayId(defaultGatewayId);
182+
pw.setLoginUserName(defaultUsername);
183+
pw.setPassword(defaultPassword);
184+
pw.setDescription("Credentials for default gateway");
185+
186+
String token = null;
187+
try {
188+
logger.info("adding new password credential for the default gateway: {}", defaultGatewayId);
189+
token = credStore.addPasswordCredential(pw);
190+
} catch (Exception ex) {
191+
logger.error(
192+
"Failed to add the password credential for the default gateway: {}", defaultGatewayId, ex);
193+
}
194+
195+
if (token != null) {
196+
logger.debug(
197+
"adding password credential token {} to the default gateway: {}", token, defaultGatewayId);
198+
gwrp.setIdentityServerPwdCredToken(token);
199+
gwrp.setIdentityServerTenant(defaultGatewayId);
200+
gwrpRepository.updateGatewayResourceProfile(gwrp);
201+
}
198202
}
199-
}
200203

201-
if (domainRepository.get(defaultGatewayId) == null) {
202-
var domain = new org.apache.airavata.catalog.sharing.models.Domain();
203-
domain.setDomainId(defaultGatewayId);
204-
domain.setName(defaultGatewayId);
205-
domain.setDescription("Domain entry for " + domain.getName());
206-
domainRepository.create(domain);
207-
208-
var user = new org.apache.airavata.catalog.sharing.models.User();
209-
user.setDomainId(domain.getDomainId());
210-
user.setUserId(defaultUsername + "@" + defaultGatewayId);
211-
user.setUserName(defaultUsername);
212-
sharingUserRepository.create(user);
213-
214-
// Creating Entity Types for each domain
215-
String[][] entityTypes = {
216-
{ "PROJECT", "Project entity type" },
217-
{ "EXPERIMENT", "Experiment entity type" },
218-
{ "FILE", "File entity type" },
219-
{ ResourceType.APPLICATION_DEPLOYMENT.name(), "Application Deployment entity type" },
220-
{ ResourceType.GROUP_RESOURCE_PROFILE.name(), "Group Resource Profile entity type" },
221-
{ ResourceType.CREDENTIAL_TOKEN.name(), "Credential Store Token entity type" }
222-
};
223-
for (String[] et : entityTypes) {
224-
var entityType = new org.apache.airavata.catalog.sharing.models.EntityType();
225-
entityType.setEntityTypeId(domain.getDomainId() + ":" + et[0]);
226-
entityType.setDomainId(domain.getDomainId());
227-
entityType.setName(et[0]);
228-
entityType.setDescription(et[1]);
229-
entityTypeRepository.create(entityType);
230-
}
231-
232-
// Creating Permission Types for each domain
233-
String[][] permissionTypes = {
234-
{ "READ", "Read permission type" },
235-
{ "WRITE", "Write permission type" },
236-
{ "MANAGE_SHARING", "Sharing permission type" }
237-
};
238-
for (String[] pt : permissionTypes) {
239-
var permissionType = new org.apache.airavata.catalog.sharing.models.PermissionType();
240-
permissionType.setPermissionTypeId(domain.getDomainId() + ":" + pt[0]);
241-
permissionType.setDomainId(domain.getDomainId());
242-
permissionType.setName(pt[0]);
243-
permissionType.setDescription(pt[1]);
244-
permissionTypeRepository.create(permissionType);
245-
}
246-
}
247-
} catch (Exception e) {
248-
logger.error("Failed to add the password credentials for the default gateway", e);
204+
if (domainRepository.get(defaultGatewayId) == null) {
205+
var domain = new org.apache.airavata.catalog.sharing.models.Domain();
206+
domain.setDomainId(defaultGatewayId);
207+
domain.setName(defaultGatewayId);
208+
domain.setDescription("Domain entry for " + domain.getName());
209+
domainRepository.create(domain);
210+
211+
var user = new org.apache.airavata.catalog.sharing.models.User();
212+
user.setDomainId(domain.getDomainId());
213+
user.setUserId(defaultUsername + "@" + defaultGatewayId);
214+
user.setUserName(defaultUsername);
215+
sharingUserRepository.create(user);
216+
217+
// Creating Entity Types for each domain
218+
String[][] entityTypes = {
219+
{"PROJECT", "Project entity type"},
220+
{"EXPERIMENT", "Experiment entity type"},
221+
{"FILE", "File entity type"},
222+
{ResourceType.APPLICATION_DEPLOYMENT.name(), "Application Deployment entity type"},
223+
{ResourceType.GROUP_RESOURCE_PROFILE.name(), "Group Resource Profile entity type"},
224+
{ResourceType.CREDENTIAL_TOKEN.name(), "Credential Store Token entity type"}
225+
};
226+
for (String[] et : entityTypes) {
227+
var entityType = new org.apache.airavata.catalog.sharing.models.EntityType();
228+
entityType.setEntityTypeId(domain.getDomainId() + ":" + et[0]);
229+
entityType.setDomainId(domain.getDomainId());
230+
entityType.setName(et[0]);
231+
entityType.setDescription(et[1]);
232+
entityTypeRepository.create(entityType);
233+
}
234+
235+
// Creating Permission Types for each domain
236+
String[][] permissionTypes = {
237+
{"READ", "Read permission type"},
238+
{"WRITE", "Write permission type"},
239+
{"MANAGE_SHARING", "Sharing permission type"}
240+
};
241+
for (String[] pt : permissionTypes) {
242+
var permissionType = new org.apache.airavata.catalog.sharing.models.PermissionType();
243+
permissionType.setPermissionTypeId(domain.getDomainId() + ":" + pt[0]);
244+
permissionType.setDomainId(domain.getDomainId());
245+
permissionType.setName(pt[0]);
246+
permissionType.setDescription(pt[1]);
247+
permissionTypeRepository.create(permissionType);
248+
}
249+
}
250+
} catch (Exception e) {
251+
logger.error("Failed to add the password credentials for the default gateway", e);
252+
}
249253
}
250-
}
251254
}

‎airavata-api/src/main/java/org/apache/airavata/MigrationSchemaGenerator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.sql.DriverManager;
2424
import java.sql.SQLException;
2525
import java.util.Arrays;
26-
2726
import org.apache.airavata.common.utils.DBInitConfig;
2827
import org.apache.airavata.common.utils.DBInitializer;
2928
import org.apache.airavata.common.utils.JDBCConfig;

‎airavata-api/src/main/java/org/apache/airavata/api/AiravataAPIServer.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,20 @@
2020
package org.apache.airavata.api;
2121

2222
import java.net.InetSocketAddress;
23-
import java.util.Arrays;
2423
import org.apache.airavata.api.handler.AiravataAPIHandler;
25-
import org.apache.airavata.catalog.sharing.db.utils.SharingRegistryDBInitConfig;
2624
import org.apache.airavata.catalog.sharing.handler.SharingRegistryServerHandler;
2725
import org.apache.airavata.catalog.sharing.service.cpi.SharingRegistryService;
28-
import org.apache.airavata.common.utils.DBInitializer;
2926
import org.apache.airavata.common.utils.IServer;
3027
import org.apache.airavata.common.utils.ServerSettings;
3128
import org.apache.airavata.credential.store.cpi.CredentialStoreService;
3229
import org.apache.airavata.credential.store.handler.CredentialStoreServerHandler;
33-
import org.apache.airavata.credential.store.store.impl.util.CredentialStoreDBInitConfig;
3430
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
3531
import org.apache.airavata.orchestrator.handler.OrchestratorServerHandler;
3632
import org.apache.airavata.profile.handlers.GroupManagerServiceHandler;
3733
import org.apache.airavata.profile.handlers.IamAdminServicesHandler;
3834
import org.apache.airavata.profile.handlers.TenantProfileServiceHandler;
3935
import org.apache.airavata.profile.handlers.UserProfileServiceHandler;
40-
import org.apache.airavata.profile.user.core.utils.UserProfileCatalogDBInitConfig;
4136
import org.apache.airavata.registry.api.RegistryService;
42-
import org.apache.airavata.registry.core.utils.AppCatalogDBInitConfig;
43-
import org.apache.airavata.registry.core.utils.ExpCatalogDBInitConfig;
44-
import org.apache.airavata.registry.core.utils.ReplicaCatalogDBInitConfig;
45-
import org.apache.airavata.registry.core.utils.WorkflowCatalogDBInitConfig;
4637
import org.apache.airavata.registry.handler.RegistryServerHandler;
4738
import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService;
4839
import org.apache.airavata.service.profile.iam.admin.services.cpi.IamAdminServices;

‎airavata-api/src/main/java/org/apache/airavata/catalog/sharing/db/utils/SharingRegJPAUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
public class SharingRegJPAUtils {
2828
private static final String PERSISTENCE_UNIT_NAME = "airavata-sharing-registry";
2929
private static final JDBCConfig JDBC_CONFIG = new SharingRegistryJDBCConfig();
30-
private static final EntityManagerFactory factory = JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
30+
private static final EntityManagerFactory factory =
31+
JPAUtils.getEntityManagerFactory(PERSISTENCE_UNIT_NAME, JDBC_CONFIG);
3132
private static EntityManager entityManagerInstance = null;
3233

3334
public static synchronized EntityManager getEntityManager() {

‎airavata-api/src/main/java/org/apache/airavata/common/utils/DBInitializer.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import java.sql.Connection;
2323
import java.util.List;
24-
2524
import org.slf4j.Logger;
2625
import org.slf4j.LoggerFactory;
2726

@@ -45,11 +44,13 @@ public static void initializeDB(DBInitConfig dbInitConfig) {
4544
var dbUtil = new DBUtil(jdbcConfig);
4645
conn = dbUtil.getConnection();
4746
if (!DatabaseCreator.doesTableExist(checkTableName, conn)) {
48-
logger.info("Check failed, table: " + checkTableName + " not exists. Executing init script: " + initScriptPrefix);
49-
DatabaseCreator.initializeTables(initScriptPrefix, conn);
50-
logger.info("Executed init script: " + initScriptPrefix);
47+
logger.info("Check failed, table: " + checkTableName + " not exists. Executing init script: "
48+
+ initScriptPrefix);
49+
DatabaseCreator.initializeTables(initScriptPrefix, conn);
50+
logger.info("Executed init script: " + initScriptPrefix);
5151
} else {
52-
logger.info("Check passed, table: " + checkTableName + " exists. Skipping init script: " + initScriptPrefix);
52+
logger.info("Check passed, table: " + checkTableName + " exists. Skipping init script: "
53+
+ initScriptPrefix);
5354
}
5455
conn.commit();
5556

‎airavata-api/src/main/java/org/apache/airavata/common/utils/DatabaseCreator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.io.InputStreamReader;
2626
import java.sql.Connection;
2727
import java.sql.DatabaseMetaData;
28-
import java.sql.ResultSet;
2928
import java.sql.SQLException;
3029
import java.sql.SQLWarning;
3130
import java.sql.Statement;

‎airavata-api/src/main/java/org/apache/airavata/common/utils/ServerSettings.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public class ServerSettings extends ApplicationSettings {
7676
public static final String METASCHEDULER_USERNAME = "metascheduler.username";
7777
public static final String METASCHEDULER_JOB_SCANNING_INTERVAL = "metascheduler.job.scanning.interval";
7878
public static final String METASCHEDULER_CLUSTER_SCANNING_INTERVAL = "metascheduler.cluster.scanning.interval";
79-
public static final String METASCHEDULER_NO_OF_SCANNING_PARALLEL_JOBS = "metascheduler.cluster.scanning.parallel.jobs";
79+
public static final String METASCHEDULER_NO_OF_SCANNING_PARALLEL_JOBS =
80+
"metascheduler.cluster.scanning.parallel.jobs";
8081
public static final String COMPUTE_RESOURCE_RESCHEDULER_CLASS = "compute.resource.rescheduler.policy.class";
8182
public static final String METASCHEDULER_MAXIMUM_RESCHEDULED_THRESHOLD =
8283
"metascheduler.maximum.rescheduler.threshold";

‎airavata-api/src/main/java/org/apache/airavata/credential/store/credential/impl/certificate/CertificateAuditInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
*/
2020
package org.apache.airavata.credential.store.credential.impl.certificate;
2121

22-
import java.util.Date;
2322
import jakarta.xml.bind.annotation.XmlRootElement;
23+
import java.util.Date;
2424
import org.apache.airavata.credential.store.credential.AuditInfo;
2525
import org.apache.airavata.credential.store.credential.CommunityUser;
2626

‎airavata-api/src/main/java/org/apache/airavata/credential/store/repository/AbstractCredentialStoreRepository.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,22 @@
2121

2222
import jakarta.persistence.EntityManager;
2323
import jakarta.persistence.Query;
24+
import java.util.ArrayList;
25+
import java.util.List;
26+
import java.util.Map;
2427
import org.apache.airavata.credential.store.utils.CredentialStoreJPAUtils;
2528
import org.apache.airavata.credential.store.utils.CredentialStoreJPAUtils.Committer;
2629
import org.slf4j.Logger;
2730
import org.slf4j.LoggerFactory;
2831

29-
import java.util.ArrayList;
30-
import java.util.List;
31-
import java.util.Map;
32-
3332
/**
3433
* Abstract repository class for credential store entities.
3534
* Provides common CRUD operations and query methods.
3635
*/
3736
public abstract class AbstractCredentialStoreRepository<T, E, Id> {
38-
37+
3938
private static final Logger logger = LoggerFactory.getLogger(AbstractCredentialStoreRepository.class);
40-
39+
4140
private Class<T> thriftGenericClass;
4241
private Class<E> dbEntityGenericClass;
4342

0 commit comments

Comments
 (0)