Skip to content

Commit

Permalink
clean code
Browse files Browse the repository at this point in the history
  • Loading branch information
@YoussefDahi
YoussefDahi committed May 24, 2024
1 parent bcbd193 commit 966064d
Show file tree
Hide file tree
Showing 12 changed files with 221 additions and 231 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/usf/trace/api/server/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static <T> T requireSingle(Collection<T> c){
return null;
}
if(c.size() > 1) {
throw new RuntimeException("too many results"); //custom exception
throw new IllegalArgumentException("too many results"); //custom exception
}
return c.iterator().next();
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/usf/trace/api/server/config/CommonRequestQueryResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import org.usf.jquery.web.RequestQueryParam;
import org.usf.jquery.web.RequestQueryParamResolver;

import java.util.Objects;

public class CommonRequestQueryResolver implements HandlerMethodArgumentResolver {

private final RequestQueryParamResolver resolver = new RequestQueryParamResolver();
Expand All @@ -21,8 +23,8 @@ public boolean supportsParameter(MethodParameter parameter) {

@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
var crp = parameter.getParameterAnnotation(RequestQueryParam.class);
NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
var crp = Objects.requireNonNull(parameter.getParameterAnnotation(RequestQueryParam.class));
return resolver.requestQuery(crp, webRequest.getParameterMap());
}
}
Expand Down
196 changes: 92 additions & 104 deletions src/main/java/org/usf/trace/api/server/config/DataConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
import static org.usf.jquery.core.ComparisonExpression.greaterOrEqual;
import static org.usf.jquery.core.ComparisonExpression.lessThan;
import static org.usf.jquery.core.DBColumn.count;
import static org.usf.trace.api.server.config.DbFields.*;
import static org.usf.trace.api.server.config.TraceApiColumn.COMPLETE;
import static org.usf.trace.api.server.config.TraceApiColumn.END;
import static org.usf.trace.api.server.config.TraceApiColumn.START;
import static org.usf.trace.api.server.config.TraceApiColumn.STATUS;

import java.sql.Timestamp;
import java.time.Instant;

import org.usf.jquery.core.ComparisonExpression;
import org.usf.jquery.core.DBColumn;
import org.usf.jquery.core.DBFunction;
Expand All @@ -26,140 +24,130 @@ public final class DataConstants {

public static String sessionColumns(TraceApiColumn column) {
return switch (column) {
case ID -> "id_ses";
case NAME -> "va_name";
case START -> "dh_dbt";
case END -> "dh_fin";
case USER -> "va_usr";
case OS -> "va_os";
case RE -> "va_re";
case TYPE -> "lnch";
case LOCATION -> "loc";
case THREAD -> "va_thred";
case APP_NAME -> "va_app_nme";
case VERSION -> "va_vrs";
case ADDRESS -> "va_adrs";
case ENVIRONEMENT -> "va_env";
case ERR_TYPE -> "va_err_cls";
case ERR_MSG -> "va_err_msg";
case ID -> ID_SES ;
case NAME -> VA_NAME ;
case START -> DH_DBT;
case END -> DH_FIN;
case USER -> VA_USR;
case OS -> VA_OS;
case RE -> VA_RE;
case TYPE -> LNCH;
case LOCATION -> LOC;
case THREAD -> VA_THRED;
case APP_NAME -> VA_APP_NME;
case VERSION -> VA_VRS;
case ADDRESS -> VA_ADRS;
case ENVIRONEMENT -> VA_ENV;
case ERR_TYPE -> VA_ERR_CLS;
case ERR_MSG -> VA_ERR_MSG;
default -> null;
};
}

public static String incReqColumns(TraceApiColumn column) {
return switch (column) {
case ID -> "id_ses";
case METHOD -> "va_mth";
case PROTOCOL -> "va_prtcl";
case HOST -> "va_hst";
case PORT -> "cd_prt";
case PATH -> "va_pth";
case QUERY -> "va_qry";
case MEDIA -> "va_cnt_typ";
case AUTH -> "va_auth";
case STATUS -> "cd_stt";
case SIZE_IN -> "va_i_sze";
case SIZE_OUT -> "va_o_sze";
case START -> "dh_dbt";
case END -> "dh_fin";
case THREAD -> "va_thred";
case API_NAME -> "va_api_nme";
case USER -> "va_usr";
case APP_NAME -> "va_app_nme";
case VERSION -> "va_vrs";
case ADDRESS -> "va_adrs";
case ENVIRONEMENT -> "va_env";
case OS -> "va_os";
case RE -> "va_re";
case ERR_TYPE -> "va_err_cls";
case ERR_MSG -> "va_err_msg";
case ID -> ID_SES;
case METHOD -> VA_MTH;
case PROTOCOL -> VA_PRTCL;
case HOST -> VA_HST;
case PORT -> CD_PRT;
case PATH -> VA_PTH;
case QUERY -> VA_QRY;
case MEDIA -> VA_CNT_TYP;
case AUTH -> VA_AUTH;
case STATUS -> CD_STT;
case SIZE_IN -> VA_I_SZE;
case SIZE_OUT -> VA_O_SZE;
case START -> DH_DBT;
case END -> DH_FIN;
case THREAD -> VA_THRED;
case API_NAME -> VA_API_NME;
case USER -> VA_USR;
case APP_NAME -> VA_APP_NME;
case VERSION -> VA_VRS;
case ADDRESS -> VA_ADRS;
case ENVIRONEMENT -> VA_ENV;
case OS -> VA_OS;
case RE -> VA_RE;
case ERR_TYPE -> VA_ERR_CLS;
case ERR_MSG -> VA_ERR_MSG;
default -> null;
};
}

public static String outReqColumns(TraceApiColumn column) {
return switch (column) {
case ID -> "cd_api";
case METHOD -> "va_mth";
case PROTOCOL -> "va_prtcl";
case HOST -> "va_hst";
case PORT -> "cd_prt";
case PATH -> "va_pth";
case QUERY -> "va_qry";
case MEDIA -> "va_cnt_typ";
case AUTH -> "va_auth";
case STATUS -> "cd_stt";
case SIZE_IN -> "va_i_sze";
case SIZE_OUT -> "va_o_sze";
case START -> "dh_dbt";
case END -> "dh_fin";
case THREAD -> "va_thred";
case ERR_TYPE -> "va_err_cls";
case ERR_MSG -> "va_err_msg";
case PARENT -> "cd_ses";
case ID -> CD_API;
case METHOD -> VA_MTH;
case PROTOCOL -> VA_PRTCL;
case HOST -> VA_HST;
case PORT -> CD_PRT;
case PATH -> VA_PTH;
case QUERY -> VA_QRY;
case MEDIA -> VA_CNT_TYP;
case AUTH -> VA_AUTH;
case STATUS -> CD_STT;
case SIZE_IN -> VA_I_SZE;
case SIZE_OUT -> VA_O_SZE;
case START -> DH_DBT;
case END -> DH_FIN;
case THREAD -> VA_THRED;
case ERR_TYPE -> VA_ERR_CLS;
case ERR_MSG -> VA_ERR_MSG;
case PARENT -> CD_SES;
default -> null;
};
}
public static String outQryColumns(TraceApiColumn column) {
return switch (column) {
case ID -> "id_out_qry";
case HOST -> "va_hst";
case PORT -> "cd_prt";
case DB -> "va_db";
case START -> "dh_dbt";
case END -> "dh_fin";
case USER -> "va_usr";
case THREAD -> "va_thred";
case DRIVER -> "va_drv";
case DB_NAME -> "va_db_nme";
case DB_VERSION -> "va_db_vrs";
case COMMANDS -> "va_cmd";
case NAME -> "va_nme";
case LOCATION -> "va_loc";
case COMPLETE -> "va_cmplt";
case PARENT -> "cd_ses";
case ID -> ID_OUT_QRY;
case HOST -> VA_HST;
case PORT -> CD_PRT;
case DB -> VA_DB;
case START -> DH_DBT;
case END -> DH_FIN;
case USER -> VA_USR;
case THREAD -> VA_THRED;
case DRIVER -> VA_DRV;
case DB_NAME -> VA_DB_NME;
case DB_VERSION -> VA_DB_VRS;
case COMMANDS -> VA_CMD;
case NAME -> VA_NME;
case LOCATION -> VA_LOC;
case COMPLETE -> VA_CMPLT;
case PARENT -> CD_SES;
default -> null;
};
}

public static String outStgColumns(TraceApiColumn column) {
return switch (column) {
case NAME -> "va_name";
case LOCATION -> "loc";
case START -> "dh_dbt";
case END -> "dh_fin";
case USER -> "va_usr";
case THREAD -> "va_thred";
case ERR_TYPE -> "va_err_cls";
case ERR_MSG -> "va_err_msg";
case PARENT -> "cd_ses";
case NAME -> VA_NAME;
case LOCATION -> LOC;
case START -> DH_DBT;
case END -> DH_FIN;
case USER -> VA_USR;
case THREAD -> VA_THRED;
case ERR_TYPE -> VA_ERR_CLS;
case ERR_MSG -> VA_ERR_MSG;
case PARENT -> CD_SES;
default -> null;
};
}

public static String dbActColumns(TraceApiColumn column){
return switch (column) {
case TYPE -> "va_typ";
case START -> "dh_dbt";
case END -> "dh_fin";
case ERR_TYPE -> "va_err_cls";
case ERR_MSG -> "va_err_msg";
case PARENT -> "cd_out_qry";
case ACTION_COUNT -> "cd_count";
case TYPE -> VA_TYP;
case START -> DH_DBT;
case END -> DH_FIN;
case ERR_TYPE -> VA_ERR_CLS;
case ERR_MSG -> VA_ERR_MSG;
case PARENT -> CD_OUT_QRY;
case ACTION_COUNT -> CD_COUNT;
default -> null;
};
}

@Deprecated(forRemoval = true)
public static ComparisonExpression greaterOrEqualsExpressions(String timestamp) {
return greaterOrEqual(Timestamp.from(Instant.parse(timestamp)));
}

@Deprecated(forRemoval = true)
public static ComparisonExpression lessThanExpressions(String timestamp) {
return lessThan(Timestamp.from(Instant.parse(timestamp)));
}

public static DBColumn elapsedtime2(TableDecorator table) {
return DBFunction.epoch().args(table.column(END).minus(table.column(START)));
}
Expand Down
52 changes: 52 additions & 0 deletions src/main/java/org/usf/trace/api/server/config/DbFields.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package org.usf.trace.api.server.config;



public class DbFields {
public static final String ID_SES = "id_ses";
public static final String CD_API = "cd_api";
public static final String CD_SES = "cd_ses";
public static final String CD_OUT_QRY = "cd_out_qry";
public static final String ID_OUT_QRY = "id_out_qry";
public static final String VA_MTH = "va_mth";
public static final String VA_PRTCL = "va_prtcl";
public static final String VA_HST = "va_hst";
public static final String CD_PRT = "cd_prt";
public static final String VA_PTH = "va_pth";
public static final String VA_QRY = "va_qry";
public static final String VA_CNT_TYP = "va_cnt_typ";
public static final String VA_AUTH = "va_auth";
public static final String CD_STT = "cd_stt";
public static final String VA_I_SZE = "va_i_sze";
public static final String VA_O_SZE = "va_o_sze";
public static final String VA_NAME = "va_name";
public static final String DH_DBT = "dh_dbt";
public static final String DH_FIN = "dh_fin";
public static final String VA_USR = "va_usr";
public static final String VA_OS = "va_os";
public static final String VA_RE = "va_re";
public static final String LNCH = "lnch";
public static final String LOC = "loc";
public static final String VA_THRED = "va_thred";
public static final String VA_API_NME = "va_api_nme";
public static final String VA_APP_NME = "va_app_nme";
public static final String VA_VRS = "va_vrs";
public static final String VA_ADRS = "va_adrs";
public static final String VA_ENV = "va_env";
public static final String VA_DB = "va_db";
public static final String VA_DRV = "va_drv";
public static final String VA_DB_NME = "va_db_nme";
public static final String VA_DB_VRS = "va_db_vrs";
public static final String VA_CMD = "va_cmd";
public static final String VA_NME = "va_nme";
public static final String VA_CMPLT = "va_cmplt";
public static final String VA_TYP = "va_typ";
public static final String CD_COUNT = "cd_count";
public static final String VA_LOC = "va_loc";
public static final String VA_ERR_CLS = "va_err_cls";
public static final String VA_ERR_MSG = "va_err_msg";

private DbFields() {
throw new IllegalStateException("Utility class");
}
}
Loading

0 comments on commit 966064d

Please sign in to comment.