diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManager.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManager.java index 8d6fdf825..8b8f5444c 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManager.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManager.java @@ -189,7 +189,7 @@ default Map getChildAppIds(String parentAppId, String parentOrgI * @return List of DiscoverableApplicationBasicInfo of applications matching the given criteria. * @throws OrganizationManagementException If an error occurred when retrieving the discoverable applications. */ - default List getDiscoverableApplicationBasicInfo(int limit, int offset, String filter, + default List getDiscoverableSharedApplicationBasicInfo(int limit, int offset, String filter, String sortOrder, String sortBy, String tenantDomain) throws OrganizationManagementException { @@ -205,7 +205,7 @@ default List getDiscoverableApplicationBasicInfo(int limit * @throws OrganizationManagementException If an error occurred when retrieving the count of * discoverable applications. */ - default int getCountOfDiscoverableApplications(String filter, String tenantDomain) + default int getCountOfDiscoverableSharedApplications(String filter, String tenantDomain) throws OrganizationManagementException { return 0; diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManagerImpl.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManagerImpl.java index 3494efd95..73c0f06d9 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManagerImpl.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/OrgApplicationManagerImpl.java @@ -60,7 +60,6 @@ import org.wso2.carbon.identity.organization.management.application.model.SharedApplicationDO; import org.wso2.carbon.identity.organization.management.ext.Constants; import org.wso2.carbon.identity.organization.management.service.OrganizationManager; -import org.wso2.carbon.identity.organization.management.service.OrganizationManagerImpl; import org.wso2.carbon.identity.organization.management.service.constant.OrganizationManagementConstants; import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementClientException; import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException; @@ -712,26 +711,24 @@ public Map getChildAppIds(String parentAppId, String parentOrgId } @Override - public List getDiscoverableApplicationBasicInfo(int limit, int offset, String filter, + public List getDiscoverableSharedApplicationBasicInfo(int limit, int offset, String filter, String sortOrder, String sortBy, String tenantDomain) throws OrganizationManagementException { - OrganizationManagerImpl organizationManager = new OrganizationManagerImpl(); - String rootOrgId = organizationManager.getPrimaryOrganizationId(tenantDomain); + String rootOrgId = getOrganizationManager().getParentOrganizationId(tenantDomain); - return getOrgApplicationMgtDAO().getDiscoverableApplicationBasicInfo(limit, offset, filter, sortOrder, + return getOrgApplicationMgtDAO().getDiscoverableSharedApplicationBasicInfo(limit, offset, filter, sortOrder, sortBy, tenantDomain, rootOrgId); } @Override - public int getCountOfDiscoverableApplications(String filter, String tenantDomain) + public int getCountOfDiscoverableSharedApplications(String filter, String tenantDomain) throws OrganizationManagementException { - OrganizationManagerImpl organizationManager = new OrganizationManagerImpl(); - String rootOrgId = organizationManager.getPrimaryOrganizationId(tenantDomain); + String rootOrgId = getOrganizationManager().getParentOrganizationId(tenantDomain); - return getOrgApplicationMgtDAO().getCountOfDiscoverableApplications(filter, tenantDomain, rootOrgId); + return getOrgApplicationMgtDAO().getCountOfDiscoverableSharedApplications(filter, tenantDomain, rootOrgId); } /** diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/constant/SQLConstants.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/constant/SQLConstants.java index 8227d097b..6d85a8e93 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/constant/SQLConstants.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/constant/SQLConstants.java @@ -73,7 +73,7 @@ public class SQLConstants { SQLPlaceholders.DB_SCHEMA_COLUMN_NAME_OWNER_ORG_ID + "; AND SHARED_ORG_ID IN (" + SQLPlaceholders.SHARED_ORG_ID_LIST_PLACEHOLDER + ")"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_MYSQL = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_MYSQL = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -82,7 +82,7 @@ public class SQLConstants { "DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM DiscoverableApps WHERE " + "rn = 1 ORDER BY ID DESC LIMIT ?, ?"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_POSTGRES = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_POSTGRES = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -91,7 +91,7 @@ public class SQLConstants { "DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM DiscoverableApps WHERE " + "rn = 1 ORDER BY ID DESC OFFSET ? LIMIT ?"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_ORACLE = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_ORACLE = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY " + "sa.APP_NAME ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn " + @@ -100,7 +100,7 @@ public class SQLConstants { "DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM DiscoverableApps WHERE " + "rn = 1 BETWEEN ? AND ? ORDER BY ID DESC"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_MSSQL = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_MSSQL = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -109,7 +109,7 @@ public class SQLConstants { "DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM DiscoverableApps WHERE " + "rn = 1 ORDER BY ID DESC OFFSET ? ROWS FETCH NEXT ? ROWS ONLY"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_INFORMIX = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_INFORMIX = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -118,7 +118,7 @@ public class SQLConstants { "DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM DiscoverableApps WHERE " + "rn = 1 ORDER BY ID DESC SKIP ? LIMIT ?"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_MYSQL = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_MYSQL = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -127,7 +127,7 @@ public class SQLConstants { "SELECT ID, APP_NAME, DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM " + "DiscoverableApps WHERE rn = 1 ORDER BY ID DESC LIMIT ?, ?"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_POSTGRESL = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_POSTGRESL = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -136,7 +136,7 @@ public class SQLConstants { "SELECT ID, APP_NAME, DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM " + "DiscoverableApps WHERE rn = 1 ORDER BY ID DESC OFFSET ? LIMIT ?"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_ORACLE = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_ORACLE = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -145,7 +145,7 @@ public class SQLConstants { "SELECT ID, APP_NAME, DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM " + "DiscoverableApps WHERE rn = 1 BETWEEN ? AND ? ORDER BY ID DESC"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_MSSQL = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_MSSQL = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -154,7 +154,7 @@ public class SQLConstants { "SELECT ID, APP_NAME, DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM " + "DiscoverableApps WHERE rn = 1 ORDER BY ID DESC OFFSET ? ROWS FETCH NEXT ? ROWS ONLY"; - public static final String LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_INFORMIX = + public static final String LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_INFORMIX = "WITH DiscoverableApps AS ( SELECT sa.ID, sa.APP_NAME, sa.DESCRIPTION, sa.UUID, sa.IMAGE_URL, " + "sa.ACCESS_URL, sa.USERNAME, sa.USER_STORE, sa.TENANT_ID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + @@ -163,14 +163,14 @@ public class SQLConstants { "SELECT ID, APP_NAME, DESCRIPTION, UUID, IMAGE_URL, ACCESS_URL, USERNAME, USER_STORE, TENANT_ID FROM " + "DiscoverableApps WHERE rn = 1 ORDER BY ID DESC SKIP ? LIMIT ?"; - public static final String LOAD_DISCOVERABLE_APP_COUNT_BY_TENANT = + public static final String LOAD_DISCOVERABLE_SHARED_APP_COUNT_BY_TENANT = "WITH DiscoverableApps AS ( SELECT sa.UUID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME " + "ORDER BY CASE WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa " + "JOIN SP_SHARED_APP ssa ON sa.UUID = ssa.SHARED_APP_ID OR sa.UUID = ssa.MAIN_APP_ID WHERE " + "ssa.SHARED_ORG_ID = ? AND sa.IS_DISCOVERABLE = '1' AND ssa.OWNER_ORG_ID = ? ) SELECT count(UUID) " + "FROM DiscoverableApps WHERE rn = 1"; - public static final String LOAD_DISCOVERABLE_APP_COUNT_BY_APP_NAME_AND_TENANT = + public static final String LOAD_DISCOVERABLE_SHARED_APP_COUNT_BY_APP_NAME_AND_TENANT = "WITH DiscoverableApps AS ( SELECT sa.UUID, ROW_NUMBER() OVER ( PARTITION BY sa.APP_NAME ORDER BY CASE " + "WHEN sa.UUID = ssa.SHARED_APP_ID THEN 1 ELSE 2 END, sa.ID DESC ) AS rn FROM SP_APP sa JOIN " + "SP_SHARED_APP ssa ON sa.UUID = ssa.SHARED_APP_ID OR sa.UUID = ssa.MAIN_APP_ID WHERE " + diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/OrgApplicationMgtDAO.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/OrgApplicationMgtDAO.java index b137fd593..f055a3e80 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/OrgApplicationMgtDAO.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/OrgApplicationMgtDAO.java @@ -153,13 +153,10 @@ default List getSharedApplications(String mainAppId, String * @throws OrganizationManagementException The server exception is thrown in a failure when retrieving the * discoverable applications. */ - default List getDiscoverableApplicationBasicInfo(int limit, int offset, String filter, + List getDiscoverableSharedApplicationBasicInfo(int limit, int offset, String filter, String sortOrder, String sortBy, String tenantDomain, String rootOrgId) - throws OrganizationManagementException { - - return null; - } + throws OrganizationManagementException; /* * Returns the count of discoverable applications matching given filter. @@ -170,9 +167,6 @@ default List getDiscoverableApplicationBasicInfo(int limit * @throws OrganizationManagementException The server exception is thrown in a failure when retrieving the * discoverable applications count. */ - default int getCountOfDiscoverableApplications(String filter, String tenantDomain, String rootOrgId) - throws OrganizationManagementException { - - return 0; - } + int getCountOfDiscoverableSharedApplications(String filter, String tenantDomain, String rootOrgId) + throws OrganizationManagementException; } diff --git a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/impl/OrgApplicationMgtDAOImpl.java b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/impl/OrgApplicationMgtDAOImpl.java index 0a5f3a9ea..f86099eb5 100644 --- a/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/impl/OrgApplicationMgtDAOImpl.java +++ b/components/org.wso2.carbon.identity.organization.management.application/src/main/java/org/wso2/carbon/identity/organization/management/application/dao/impl/OrgApplicationMgtDAOImpl.java @@ -66,18 +66,18 @@ import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.INSERT_SHARED_APP; import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.IS_FRAGMENT_APPLICATION; import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.IS_FRAGMENT_APPLICATION_H2; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_INFORMIX; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_MSSQL; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_MYSQL; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_ORACLE; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_POSTGRESL; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_INFORMIX; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_MSSQL; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_MYSQL; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_ORACLE; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APPS_BY_TENANT_POSTGRES; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APP_COUNT_BY_APP_NAME_AND_TENANT; -import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_APP_COUNT_BY_TENANT; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_INFORMIX; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_MSSQL; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_MYSQL; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_ORACLE; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_POSTGRESL; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_INFORMIX; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_MSSQL; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_MYSQL; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_ORACLE; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_POSTGRES; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APP_COUNT_BY_APP_NAME_AND_TENANT; +import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.LOAD_DISCOVERABLE_SHARED_APP_COUNT_BY_TENANT; import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.SQLPlaceholders.DB_SCHEMA_COLUMN_NAME_MAIN_APP_ID; import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.SQLPlaceholders.DB_SCHEMA_COLUMN_NAME_METADATA_NAME; import static org.wso2.carbon.identity.organization.management.application.constant.SQLConstants.SQLPlaceholders.DB_SCHEMA_COLUMN_NAME_METADATA_VALUE; @@ -301,7 +301,7 @@ public List getSharedApplications(String mainAppId, String } @Override - public List getDiscoverableApplicationBasicInfo(int limit, int offset, String filter, + public List getDiscoverableSharedApplicationBasicInfo(int limit, int offset, String filter, String sortOrder, String sortBy, String tenantDomain, String rootOrgId) throws OrganizationManagementException { @@ -311,7 +311,7 @@ public List getDiscoverableApplicationBasicInfo(int limit, // TODO: 17/9/24 : Enforce a max limit if (StringUtils.isBlank(filter) || ASTERISK.equals(filter)) { - return getDiscoverableApplicationBasicInfo(limit, offset, tenantDomain, rootOrgId); + return getDiscoverableSharedApplicationBasicInfo(limit, offset, tenantDomain, rootOrgId); } String filterResolvedForSQL = resolveSQLFilter(filter); @@ -323,7 +323,7 @@ public List getDiscoverableApplicationBasicInfo(int limit, try (NamedPreparedStatement statement = new NamedPreparedStatement(connection, - getDBVendorSpecificDiscoverableAppRetrievalQueryByAppName(databaseVendorType))) { + getDBVendorSpecificDiscoverableSharedAppRetrievalQueryByAppName(databaseVendorType))) { statement.setString(1, tenantDomain); statement.setString(2, filterResolvedForSQL); statement.setString(3, rootOrgId); @@ -345,16 +345,16 @@ public List getDiscoverableApplicationBasicInfo(int limit, } @Override - public int getCountOfDiscoverableApplications(String filter, String tenantDomain, String rootOrgId) + public int getCountOfDiscoverableSharedApplications(String filter, String tenantDomain, String rootOrgId) throws OrganizationManagementException { if (log.isDebugEnabled()) { - log.debug("Getting count of discoverable applications matching filter: " + filter + " in tenantDomain: " - + tenantDomain); + log.debug("Getting count of discoverable shared applications matching filter: " + filter + " in " + + "tenantDomain: " + tenantDomain); } if (StringUtils.isBlank(filter) || ASTERISK.equals(filter)) { - return getCountOfDiscoverableApplications(tenantDomain, rootOrgId); + return getCountOfDiscoverableSharedApplications(tenantDomain, rootOrgId); } int count = 0; @@ -363,7 +363,7 @@ public int getCountOfDiscoverableApplications(String filter, String tenantDomain try (NamedPreparedStatement statement = new NamedPreparedStatement(connection, - LOAD_DISCOVERABLE_APP_COUNT_BY_APP_NAME_AND_TENANT)) { + LOAD_DISCOVERABLE_SHARED_APP_COUNT_BY_APP_NAME_AND_TENANT)) { statement.setString(1, tenantDomain); statement.setString(2, filterResolvedForSQL); statement.setString(3, rootOrgId); @@ -382,7 +382,7 @@ public int getCountOfDiscoverableApplications(String filter, String tenantDomain return count; } - private int getCountOfDiscoverableApplications(String tenantDomain, String rootOrgId) + private int getCountOfDiscoverableSharedApplications(String tenantDomain, String rootOrgId) throws OrganizationManagementException { int count; @@ -390,7 +390,7 @@ private int getCountOfDiscoverableApplications(String tenantDomain, String rootO try (NamedPreparedStatement statement = new NamedPreparedStatement(connection, - LOAD_DISCOVERABLE_APP_COUNT_BY_TENANT)) { + LOAD_DISCOVERABLE_SHARED_APP_COUNT_BY_TENANT)) { statement.setString(1, tenantDomain); statement.setString(2, rootOrgId); @@ -401,13 +401,13 @@ private int getCountOfDiscoverableApplications(String tenantDomain, String rootO } } catch (SQLException e) { throw new OrganizationManagementServerException("Error while getting count of discoverable " + - "applications in tenantDomain: " + tenantDomain); + "shared applications in tenantDomain: " + tenantDomain); } return count; } - private List getDiscoverableApplicationBasicInfo(int limit, int offset, + private List getDiscoverableSharedApplicationBasicInfo(int limit, int offset, String tenantDomain, String rootOrgId) throws OrganizationManagementException { @@ -418,7 +418,7 @@ private List getDiscoverableApplicationBasicInfo(int limit try (NamedPreparedStatement statement = new NamedPreparedStatement(connection, - getDBVendorSpecificDiscoverableAppRetrievalQuery(databaseVendorType))) { + getDBVendorSpecificDiscoverableSharedAppRetrievalQuery(databaseVendorType))) { statement.setString(1, tenantDomain); statement.setString(2, rootOrgId); statement.setInt(3, offset); @@ -562,42 +562,42 @@ private String resolveSQLFilter(String filter) { return sqlfilter; } - private String getDBVendorSpecificDiscoverableAppRetrievalQuery(String dbVendorType) + private String getDBVendorSpecificDiscoverableSharedAppRetrievalQuery(String dbVendorType) throws OrganizationManagementServerException { if ("MySQL".equals(dbVendorType) || "MariaDB".equals(dbVendorType) || "H2".equals(dbVendorType) || "DB2".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_MYSQL; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_MYSQL; } else if ("Oracle".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_ORACLE; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_ORACLE; } else if ("PostgreSQL".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_POSTGRES; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_POSTGRES; } else if ("Microsoft SQL Server".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_MSSQL; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_MSSQL; } else if ("INFORMIX".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_INFORMIX; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_INFORMIX; } throw new OrganizationManagementServerException("Error while loading discoverable applications from " + "DB. Database driver for " + dbVendorType + "could not be identified or not supported."); } - private String getDBVendorSpecificDiscoverableAppRetrievalQueryByAppName(String dbVendorType) + private String getDBVendorSpecificDiscoverableSharedAppRetrievalQueryByAppName(String dbVendorType) throws OrganizationManagementServerException { if ("MySQL".equals(dbVendorType) || "MariaDB".equals(dbVendorType) || "H2".equals(dbVendorType) || "DB2".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_MYSQL; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_MYSQL; } else if ("Oracle".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_ORACLE; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_ORACLE; } else if ("PostgreSQL".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_POSTGRESL; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_POSTGRESL; } else if ("Microsoft SQL Server".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_MSSQL; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_MSSQL; } else if ("INFORMIX".equals(dbVendorType)) { - return LOAD_DISCOVERABLE_APPS_BY_TENANT_AND_APP_NAME_INFORMIX; + return LOAD_DISCOVERABLE_SHARED_APPS_BY_TENANT_AND_APP_NAME_INFORMIX; } throw new OrganizationManagementServerException("Error while loading discoverable applications from " +