Skip to content

Commit

Permalink
removing unnecessary comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@BojithaPiyathilake
BojithaPiyathilake committed May 26, 2022
1 parent e1023c3 commit b4224c6
Showing 1 changed file with 3 additions and 218 deletions.
221 changes: 3 additions & 218 deletions ....user.core/src/main/java/org/wso2/carbon/user/core/jdbc/UniqueIDJDBCUserStoreManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3326,11 +3326,11 @@ protected UniqueIDPaginatedSearchResult doGetUserListWithID(Condition condition,
limit = initialOffset + 1;
}

sqlBuilder = getQueryStringCursor(isGroupFiltering, isUsernameFiltering, isClaimFiltering,
sqlBuilder = getQueryString(isGroupFiltering, isUsernameFiltering, isClaimFiltering,
expressionConditions, limit, offset, null, null, sortBy, sortOrder, profileName,
type, totalMultiGroupFilters, totalMultiClaimFilters);
} else {
sqlBuilder = getQueryStringCursor(isGroupFiltering, isUsernameFiltering, isClaimFiltering,
sqlBuilder = getQueryString(isGroupFiltering, isUsernameFiltering, isClaimFiltering,
expressionConditions, limit, null, cursor, direction, sortBy, sortOrder, profileName,
type, totalMultiGroupFilters, totalMultiClaimFilters);
}
Expand Down Expand Up @@ -3421,222 +3421,7 @@ private void populatePrepareStatement(SqlBuilder sqlBuilder, PreparedStatement p
}
}

// protected SqlBuilder getQueryString(boolean isGroupFiltering, boolean isUsernameFiltering, boolean isClaimFiltering,
// List<ExpressionCondition> expressionConditions, int limit, int offset, String sortBy, String sortOrder,
// String profileName, String dbType, int totalMultiGroupFilters, int totalMultiClaimFilters)
// throws UserStoreException {
//
// StringBuilder sqlStatement;
// SqlBuilder sqlBuilder;
// boolean hitGroupFilter = false;
// boolean hitClaimFilter = false;
// int groupFilterCount = 0;
// int claimFilterCount = 0;
//
// if (isGroupFiltering && isUsernameFiltering && isClaimFiltering || isGroupFiltering && isClaimFiltering) {
//
// if (DB2.equals(dbType)) {
// sqlStatement = new StringBuilder("SELECT U.UM_USER_ID, U.UM_USER_NAME FROM (SELECT "
// + "ROW_NUMBER() OVER (ORDER BY UM_USER_NAME) AS rn, p.* FROM (SELECT DISTINCT UM_USER_NAME "
// + "FROM UM_ROLE R INNER JOIN UM_USER_ROLE UR ON R.UM_ID = UR.UM_ROLE_ID INNER JOIN UM_USER U "
// + "ON UR.UM_USER_ID =U.UM_ID INNER JOIN UM_USER_ATTRIBUTE UA ON U.UM_ID = UA.UM_USER_ID");
// } else if (MSSQL.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT UM_USER_ID, UM_USER_NAME, ROW_NUMBER() OVER "
// + "(ORDER BY UM_USER_NAME) AS RowNum FROM (SELECT DISTINCT U.UM_USER_ID, " +
// "UM_USER_NAME FROM UM_ROLE R INNER JOIN UM_USER_ROLE UR ON R.UM_ID = UR.UM_ROLE_ID " +
// "INNER JOIN UM_USER U ON UR.UM_USER_ID =U.UM_ID INNER JOIN UM_USER_ATTRIBUTE UA ON" +
// " U.UM_ID = UA.UM_USER_ID");
// } else if (ORACLE.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT U.UM_USER_ID, U.UM_USER_NAME FROM (SELECT UM_USER_NAME, rownum AS rnum "
// + "FROM (SELECT UM_USER_NAME FROM UM_ROLE R INNER JOIN UM_USER_ROLE UR ON R.UM_ID = UR"
// + ".UM_ROLE_ID INNER JOIN UM_USER U ON UR.UM_USER_ID =U.UM_ID INNER JOIN "
// + "UM_USER_ATTRIBUTE UA ON U.UM_ID = UA.UM_USER_ID");
// } else if (POSTGRE_SQL.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT DISTINCT U.UM_USER_ID, U.UM_USER_NAME FROM UM_ROLE R INNER JOIN " +
// "UM_USER_ROLE UR ON R.UM_ID = UR.UM_ROLE_ID INNER JOIN" +
// " UM_USER U ON UR.UM_USER_ID =U.UM_ID INNER JOIN " +
// "UM_USER_ATTRIBUTE UA ON U.UM_ID = UA.UM_USER_ID");
// } else {
// sqlStatement = new StringBuilder(
// "SELECT DISTINCT U.UM_USER_ID, U.UM_USER_NAME FROM UM_ROLE R INNER JOIN "
// + "UM_USER_ROLE UR INNER JOIN UM_USER U INNER JOIN UM_USER_ATTRIBUTE UA ON R.UM_ID = "
// + "UR.UM_ROLE_ID AND UR.UM_USER_ID =" + " U.UM_ID AND U.UM_ID = UA.UM_USER_ID");
// }
// sqlBuilder = new SqlBuilder(sqlStatement).where("R.UM_TENANT_ID = ?", tenantId)
// .where("U.UM_TENANT_ID = ?", tenantId).where("UR.UM_TENANT_ID = ?", tenantId)
// .where("UA.UM_TENANT_ID = ?", tenantId).where("UA.UM_PROFILE_ID = ?", profileName);
// } else if (isGroupFiltering && isUsernameFiltering || isGroupFiltering) {
// if (DB2.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT U.UM_USER_ID, U.UM_USER_NAME FROM (SELECT ROW_NUMBER() OVER (ORDER BY "
// + "UM_USER_NAME) AS rn, p.* FROM (SELECT DISTINCT UM_USER_NAME FROM UM_ROLE R INNER"
// + " JOIN UM_USER_ROLE UR ON R.UM_ID = UR.UM_ROLE_ID INNER JOIN UM_USER U ON UR"
// + ".UM_USER_ID "
// + "=U.UM_ID ");
// } else if (MSSQL.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT UM_USER_ID, UM_USER_NAME, ROW_NUMBER() OVER "
// + "(ORDER BY UM_USER_NAME) AS RowNum FROM (SELECT DISTINCT U.UM_USER_ID, " +
// "UM_USER_NAME FROM UM_ROLE R INNER JOIN UM_USER_ROLE UR ON R.UM_ID = UR.UM_ROLE_ID " +
// "INNER JOIN UM_USER U ON UR.UM_USER_ID =U.UM_ID");
// } else if (ORACLE.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT U.UM_USER_ID, U.UM_USER_NAME FROM (SELECT UM_USER_NAME, rownum AS rnum "
// + "FROM (SELECT UM_USER_NAME FROM UM_ROLE R INNER JOIN UM_USER_ROLE UR ON R.UM_ID = UR"
// + ".UM_ROLE_ID INNER JOIN UM_USER U ON UR.UM_USER_ID =U.UM_ID");
// } else if (POSTGRE_SQL.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT DISTINCT U.UM_USER_ID, U.UM_USER_NAME FROM UM_ROLE R INNER JOIN " +
// "UM_USER_ROLE UR ON R.UM_ID = UR.UM_ROLE_ID INNER JOIN " +
// "UM_USER U ON UR.UM_USER_ID=U.UM_ID");
// } else {
// sqlStatement = new StringBuilder(
// "SELECT DISTINCT U.UM_USER_ID, U.UM_USER_NAME FROM UM_ROLE R INNER JOIN "
// + "UM_USER_ROLE UR INNER JOIN UM_USER U ON R.UM_ID = UR.UM_ROLE_ID AND UR.UM_USER_ID "
// + "=U.UM_ID");
// }
//
// sqlBuilder = new SqlBuilder(sqlStatement).where("R.UM_TENANT_ID = ?", tenantId)
// .where("U.UM_TENANT_ID = ?", tenantId).where("UR.UM_TENANT_ID = ?", tenantId);
// } else if (isUsernameFiltering && isClaimFiltering || isClaimFiltering) {
// if (DB2.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT U.UM_USER_ID, U.UM_USER_NAME FROM (SELECT ROW_NUMBER() OVER (ORDER BY "
// + "UM_USER_NAME) AS rn, p.* FROM (SELECT DISTINCT UM_USER_NAME FROM UM_USER U "
// + "INNER JOIN UM_USER_ATTRIBUTE UA ON U.UM_ID = UA.UM_USER_ID");
// } else if (MSSQL.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT UM_USER_ID, UM_USER_NAME, ROW_NUMBER() OVER " +
// "(ORDER BY UM_USER_NAME) AS RowNum FROM " +
// "(SELECT DISTINCT U.UM_USER_ID, U.UM_USER_NAME FROM UM_USER U " +
// "INNER JOIN UM_USER_ATTRIBUTE UA ON U.UM_ID = UA.UM_USER_ID");
// } else if (ORACLE.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT UM_USER_ID, UM_USER_NAME, rownum AS rnum FROM "
// + "(SELECT U.UM_USER_ID, UM_USER_NAME FROM UM_USER U INNER JOIN UM_USER_ATTRIBUTE UA "
// + "ON U.UM_ID = UA.UM_USER_ID");
// } else {
// sqlStatement = new StringBuilder(
// "SELECT DISTINCT U.UM_USER_ID, U.UM_USER_NAME FROM UM_USER U INNER JOIN "
// + "UM_USER_ATTRIBUTE UA ON U.UM_ID = UA.UM_USER_ID");
// }
// sqlBuilder = new SqlBuilder(sqlStatement).where("U.UM_TENANT_ID = ?", tenantId)
// .where("UA.UM_TENANT_ID = ?", tenantId).where("UA.UM_PROFILE_ID = ?", profileName);
// } else if (isUsernameFiltering) {
// if (DB2.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT ROW_NUMBER() OVER (ORDER BY "
// + "UM_USER_NAME) AS rn, p.* FROM (SELECT DISTINCT UM_USER_ID, UM_USER_NAME FROM " +
// "UM_USER U");
// } else if (MSSQL.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT UM_USER_ID, UM_USER_NAME, ROW_NUMBER() OVER "
// + "(ORDER BY UM_USER_NAME) AS RowNum FROM (SELECT DISTINCT UM_USER_NAME, UM_USER_ID" +
// " FROM UM_USER U");
// } else if (ORACLE.equals(dbType)) {
// sqlStatement = new StringBuilder(
// "SELECT UM_USER_ID, UM_USER_NAME FROM (SELECT UM_USER_ID, UM_USER_NAME, rownum AS rnum "
// + "FROM (SELECT UM_USER_ID, UM_USER_NAME FROM UM_USER U");
// } else {
// sqlStatement = new StringBuilder("SELECT U.UM_USER_ID, U.UM_USER_NAME FROM UM_USER U");
// }
//
// sqlBuilder = new SqlBuilder(sqlStatement).where("U.UM_TENANT_ID = ?", tenantId);
// } else {
// throw new UserStoreException("Condition is not valid.");
// }
//
// SqlBuilder header = new SqlBuilder(new StringBuilder(sqlBuilder.getSql()));
// addingWheres(sqlBuilder, header);
//
// for (ExpressionCondition expressionCondition : expressionConditions) {
// if (ExpressionAttribute.ROLE.toString().equals(expressionCondition.getAttributeName())) {
// if (!(MYSQL.equals(dbType) || MARIADB.equals(dbType)) || totalMultiGroupFilters > 1
// && totalMultiClaimFilters > 1) {
// multiGroupQueryBuilder(sqlBuilder, header, hitGroupFilter, expressionCondition);
// hitGroupFilter = true;
// } else {
// multiGroupMySqlQueryBuilder(sqlBuilder, groupFilterCount, expressionCondition);
// groupFilterCount++;
// }
// } else if (ExpressionOperation.EQ.toString().equals(expressionCondition.getOperation())
// && ExpressionAttribute.USERNAME.toString().equals(expressionCondition.getAttributeName())) {
// if (isCaseSensitiveUsername()) {
// sqlBuilder.where("U.UM_USER_NAME = ?", expressionCondition.getAttributeValue());
// } else {
// sqlBuilder.where("U.UM_USER_NAME = LOWER(?)", expressionCondition.getAttributeValue());
// }
// } else if (ExpressionOperation.CO.toString().equals(expressionCondition.getOperation())
// && ExpressionAttribute.USERNAME.toString().equals(expressionCondition.getAttributeName())) {
// if (isCaseSensitiveUsername()) {
// sqlBuilder.where("U.UM_USER_NAME LIKE ?", "%" + expressionCondition.getAttributeValue() + "%");
// } else {
// sqlBuilder
// .where("U.UM_USER_NAME LIKE LOWER(?)", "%" + expressionCondition.getAttributeValue() + "%");
// }
// } else if (ExpressionOperation.EW.toString().equals(expressionCondition.getOperation())
// && ExpressionAttribute.USERNAME.toString().equals(expressionCondition.getAttributeName())) {
// if (isCaseSensitiveUsername()) {
// sqlBuilder.where("U.UM_USER_NAME LIKE ?", "%" + expressionCondition.getAttributeValue());
// } else {
// sqlBuilder.where("U.UM_USER_NAME LIKE LOWER(?)", "%" + expressionCondition.getAttributeValue());
// }
// } else if (ExpressionOperation.SW.toString().equals(expressionCondition.getOperation())
// && ExpressionAttribute.USERNAME.toString().equals(expressionCondition.getAttributeName())) {
// if (isCaseSensitiveUsername()) {
// sqlBuilder.where("U.UM_USER_NAME LIKE ?", expressionCondition.getAttributeValue() + "%");
// } else {
// sqlBuilder.where("U.UM_USER_NAME LIKE LOWER(?)", expressionCondition.getAttributeValue() + "%");
// }
// } else {
// // Claim filtering
// if (!(MYSQL.equals(dbType) || MARIADB.equals(dbType)) || totalMultiGroupFilters > 1
// && totalMultiClaimFilters > 1) {
// multiClaimQueryBuilder(sqlBuilder, header, hitClaimFilter, expressionCondition);
// hitClaimFilter = true;
// } else {
// multiClaimMySqlQueryBuilder(sqlBuilder, claimFilterCount, expressionCondition);
// claimFilterCount++;
// }
// }
// }
//
// if (MYSQL.equals(dbType) || MARIADB.equals(dbType)) {
// sqlBuilder.updateSql(" GROUP BY U.UM_USER_NAME, U.UM_USER_ID ");
// if (groupFilterCount > 0 && claimFilterCount > 0) {
// sqlBuilder.updateSql(" HAVING (COUNT(DISTINCT R.UM_ROLE_NAME) = " + groupFilterCount +
// " AND COUNT(DISTINCT UA.UM_ATTR_VALUE) = " + claimFilterCount + ")");
// } else if (groupFilterCount > 0) {
// sqlBuilder.updateSql(" HAVING COUNT(DISTINCT R.UM_ROLE_NAME) = " + groupFilterCount);
// } else if (claimFilterCount > 0) {
// sqlBuilder.updateSql(" HAVING COUNT(DISTINCT UA.UM_ATTR_VALUE) = " + claimFilterCount);
// }
// }
//
// if (!((MYSQL.equals(dbType) || MARIADB.equals(dbType)) && totalMultiGroupFilters > 1
// && totalMultiClaimFilters > 1)) {
// if (DB2.equals(dbType)) {
// sqlBuilder.setTail(") AS p) WHERE rn BETWEEN ? AND ?", limit, offset);
// } else if (MSSQL.equals(dbType)) {
// if (isClaimFiltering && !isGroupFiltering && totalMultiClaimFilters > 1) {
// // Handle multi attribute filtering without group filtering.
// sqlBuilder.setTail(") AS Q) AS S) AS R) AS P WHERE P.RowNum BETWEEN ? AND ?", limit, offset);
// } else {
// sqlBuilder.setTail(") AS R) AS P WHERE P.RowNum BETWEEN ? AND ?", limit, offset);
// }
// } else if (ORACLE.equals(dbType)) {
// sqlBuilder.setTail(" ORDER BY UM_USER_NAME) where rownum <= ?) WHERE rnum > ?", limit, offset);
// } else {
// sqlBuilder.setTail(" ORDER BY UM_USER_NAME ASC LIMIT ? OFFSET ?", limit, offset);
// }
// }
// return sqlBuilder;
// }

protected SqlBuilder getQueryStringCursor(boolean isGroupFiltering, boolean isUsernameFiltering,
protected SqlBuilder getQueryString(boolean isGroupFiltering, boolean isUsernameFiltering,
boolean isClaimFiltering, List<ExpressionCondition> expressionConditions, int limit,
Integer offset, String cursor, String direction, String sortBy, String sortOrder,
String profileName, String dbType, int totalMultiGroupFilters, int totalMultiClaimFilters)
Expand Down

0 comments on commit b4224c6

Please sign in to comment.