Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BIGTOP-4303: Remove findByCondition in BaseDao #126

Merged
merged 1 commit into from
Dec 14, 2024
Merged

BIGTOP-4303: Remove findByCondition in BaseDao #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions ...p-manager-dao/src/main/java/org/apache/bigtop/manager/dao/annotations/QueryCondition.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/enums/QueryType.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/BaseDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ default Optional<Entity> findOptionalById(Serializable id) {
@SelectProvider(type = BaseSqlProvider.class, method = "selectAll")
List<Entity> findAll();

/**
* Query all entities.
*/
@SelectProvider(type = BaseSqlProvider.class, method = "findByCondition")
<Condition> List<Entity> findByCondition(Condition condition);

/**
* Delete the entity by primary key.
*/
Expand Down
10 changes: 0 additions & 10 deletions bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/BaseSqlProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,6 @@ public String selectAll(ProviderContext context) {
return SQLBuilder.selectAll(tableMetaData, databaseId);
}

public <Condition> String findByCondition(Condition condition, ProviderContext context)
throws IllegalAccessException {
String databaseId = context.getDatabaseId();

Class<?> entityClass = getEntityClass(context);
TableMetaData tableMetaData = TableMetaData.forClass(entityClass);

return SQLBuilder.findByCondition(tableMetaData, databaseId, condition);
}

public String deleteById(Serializable id, ProviderContext context) {
String databaseId = context.getDatabaseId();

Expand Down
121 changes: 0 additions & 121 deletions bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@

package org.apache.bigtop.manager.dao.sql;

import org.apache.bigtop.manager.common.utils.ClassUtils;
import org.apache.bigtop.manager.dao.annotations.CreateBy;
import org.apache.bigtop.manager.dao.annotations.CreateTime;
import org.apache.bigtop.manager.dao.annotations.QueryCondition;
import org.apache.bigtop.manager.dao.annotations.UpdateBy;
import org.apache.bigtop.manager.dao.annotations.UpdateTime;
import org.apache.bigtop.manager.dao.enums.DBType;
Expand Down Expand Up @@ -420,26 +418,6 @@ public static String deleteByIds(
return sql.toString();
}

public static <Condition> String findByCondition(
TableMetaData tableMetaData, String databaseId, Condition condition) throws IllegalAccessException {
String tableName = tableMetaData.getTableName();
log.info("databaseId: {}", databaseId);
SQL sql = new SQL();
switch (DBType.toType(databaseId)) {
case POSTGRESQL:
tableName = "\"" + tableName + "\"";
case MYSQL: {
sql = mysqlCondition(condition, tableMetaData);
break;
}
default: {
log.error("Unsupported data source");
}
}

return sql.toString();
}

private static String keywordsFormat(String keyword, DBType dbType) {
return switch (dbType) {
case MYSQL -> "`" + keyword + "`";
Expand All @@ -462,103 +440,4 @@ private static boolean checkBaseField(Field field) {
|| field.isAnnotationPresent(UpdateBy.class)
|| field.isAnnotationPresent(UpdateTime.class);
}

private static <Condition> SQL mysqlCondition(Condition condition, TableMetaData tableMetaData)
throws IllegalAccessException {

Class<?> loadClass;
try {
loadClass = condition.getClass();
} catch (Exception e) {
throw new RuntimeException("Get class Error!!!");
}

List<Field> fieldList = ClassUtils.getFields(loadClass);
/* Prepare SQL */
SQL sql = new SQL();
sql.SELECT("*");
sql.FROM(tableMetaData.getTableName());
for (Field field : fieldList) {
field.setAccessible(true);
String fieldName = field.getName();
log.debug("[requestField] {}, [requestValue] {}", fieldName, field.get(condition));
if (field.isAnnotationPresent(QueryCondition.class) && Objects.nonNull(field.get(condition))) {
QueryCondition annotation = field.getAnnotation(QueryCondition.class);

String property = fieldName;
if (!annotation.queryKey().isEmpty()) {
property = annotation.queryKey();
}

Object value = field.get(condition);
Map<String, String> fieldColumnMap = tableMetaData.getFieldColumnMap();

if (value != null && fieldColumnMap.containsKey(property)) {
String columnName = fieldColumnMap.get(property);

log.info(
"[queryKey] {}, [queryType] {}, [queryValue] {}",
property,
annotation.queryType().toString(),
field.get(condition));
switch (annotation.queryType()) {
case EQ:
sql.WHERE(getEquals(columnName, fieldName));
break;
case NOT_EQ:
sql.WHERE(columnName + " != " + getTokenParam(fieldName));
break;
case IN:
sql.WHERE(columnName + " IN ( REPLACE( " + getTokenParam(fieldName) + ", '"
+ annotation.multipleDelimiter() + "', ',') )");
break;
case NOT_IN:
sql.WHERE(columnName + " NOT IN ( REPLACE( " + getTokenParam(fieldName) + ", '"
+ annotation.multipleDelimiter() + "', ',') )");
break;
case GT:
sql.WHERE(columnName + " > " + getTokenParam(fieldName));
break;
case GTE:
sql.WHERE(columnName + " >= " + getTokenParam(fieldName));
break;
case LT:
sql.WHERE(columnName + " < " + getTokenParam(fieldName));
break;
case LTE:
sql.WHERE(columnName + " <= " + getTokenParam(fieldName));
break;
case BETWEEN:
sql.WHERE(columnName + " BETWEEN SUBSTRING_INDEX( " + getTokenParam(fieldName) + ", '"
+ annotation.pairDelimiter() + "', 1) AND SUBSTRING_INDEX( "
+ getTokenParam(fieldName) + ", '"
+ annotation.pairDelimiter() + "', 2)");
break;
case PREFIX_LIKE:
sql.WHERE(columnName + " LIKE CONCAT( " + getTokenParam(fieldName) + ", '%')");
break;
case SUFFIX_LIKE:
sql.WHERE(columnName + " LIKE CONCAT('%', " + getTokenParam(fieldName) + ")");
break;
case LIKE:
sql.WHERE(columnName + " LIKE CONCAT('%', " + getTokenParam(fieldName) + ", '%')");
break;
case NOT_LIKE:
sql.WHERE(columnName + " NOT LIKE CONCAT('%', " + getTokenParam(fieldName) + ", '%')");
break;
case NULL:
sql.WHERE(columnName + " IS NULL");
break;
case NOT_NULL:
sql.WHERE(columnName + " IS NOT NULL");
break;
default:
log.warn("Unknown query type: {}", annotation.queryType());
}
}
}
}

return sql;
}
}
Loading