Skip to content

Commit

Permalink
Simplify and improve ResultsetColumnHeaderData class
Browse files Browse the repository at this point in the history
  • Loading branch information
a7med3del1973 committed Feb 10, 2025
1 parent aad99d3 commit b68b45b
Showing 1 changed file with 7 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
package org.apache.fineract.infrastructure.dataqueries.data;

import jakarta.validation.constraints.NotNull;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;

import lombok.Getter;
import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
import org.apache.fineract.infrastructure.core.service.database.DatabaseType;
Expand Down Expand Up @@ -68,15 +66,15 @@ public static ResultsetColumnHeaderData basic(final String columnName, final Str
}

public static ResultsetColumnHeaderData detailed(final String columnName, final String columnType, final Long columnLength,
final boolean columnNullable, final boolean columnIsPrimaryKey, final List<ResultsetColumnValueData> columnValues,
final String columnCode, final boolean columnIsUnique, final boolean columnIsIndexed, DatabaseType dialect) {
final boolean columnNullable, final boolean columnIsPrimaryKey, final List<ResultsetColumnValueData> columnValues,
final String columnCode, final boolean columnIsUnique, final boolean columnIsIndexed, DatabaseType dialect) {
return new ResultsetColumnHeaderData(columnName, columnType, columnLength, columnNullable, columnIsPrimaryKey, columnValues,
columnCode, columnIsUnique, columnIsIndexed, dialect);
}

private ResultsetColumnHeaderData(final String columnName, String columnType, final Long columnLength, final boolean columnNullable,
final boolean columnIsPrimaryKey, final List<ResultsetColumnValueData> columnValues, final String columnCode,
final boolean columnIsUnique, final boolean columnIsIndexed, DatabaseType dialect) {
final boolean columnIsPrimaryKey, final List<ResultsetColumnValueData> columnValues, final String columnCode,
final boolean columnIsUnique, final boolean columnIsIndexed, DatabaseType dialect) {
this.columnName = columnName;
this.columnLength = columnLength;
this.isColumnNullable = columnNullable;
Expand Down Expand Up @@ -233,16 +231,11 @@ public static DisplayType calcColumnDisplayType(JdbcJavaType columnType) {
typeMap.put(JdbcJavaType::isBooleanType, DisplayType.BOOLEAN);
typeMap.put(JdbcJavaType::isBinaryType, DisplayType.BINARY);

return typeMap.entrySet()
.stream()
.filter(entry -> entry.getKey().test(columnType))
.map(Map.Entry::getValue)
.findFirst()
return typeMap.entrySet().stream().filter(entry -> entry.getKey().test(columnType)).map(Map.Entry::getValue).findFirst()
.orElse(null);
}


public enum DisplayType {
TEXT, STRING, INTEGER, FLOAT, DECIMAL, DATE, TIME, DATETIME, BOOLEAN, BINARY, CODELOOKUP, CODEVALUE;
}
}
}

0 comments on commit b68b45b

Please sign in to comment.