Skip to content

Commit 0f5e9fe

Browse files
jencisopyjencisopy
committed
Desarrollo e implementación en las clases del LogManager.
1 parent 6d205d0 commit 0f5e9fe

18 files changed

Lines changed: 526 additions & 296 deletions

File tree

‎business/src/main/java/org/javabeanstack/data/AbstractDAO.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@ public <T extends IDataRow> T findByQuery(String sessionId,
413413
}
414414
} catch (NoResultException exp) {
415415
result = null;
416-
} catch (Exception exp) {
417-
ErrorManager.showError(exp, LOGGER);
418-
throw exp;
416+
} catch (Exception e) {
417+
ErrorManager.showError(e, LOGGER);
418+
throw e;
419419
}
420420
LOGGER.debug("-RESULT-");
421421
LOGGER.debug(result);
@@ -973,17 +973,17 @@ public IDataResult update(String sessionId, IDataSet dataSet) {
973973
}
974974
}
975975
dataResult.put(entry.getKey(), ejbsRes);
976-
} catch (Exception ex) {
976+
} catch (Exception e) {
977977
dataResult.setRowUpdated(null);
978-
String msgError = ErrorManager.getStackCause(ex);
978+
String msgError = ErrorManager.getStackCause(e);
979979
if (lastEjb != null) {
980980
lastEjb.setErrors(msgError, "", 0);
981981
}
982982
dataResult.put(entry.getKey(), ejbsRes);
983983
dataResult.setSuccess(false);
984984
dataResult.setErrorMsg(msgError);
985985
dbRollBack();
986-
ErrorManager.showError(ex, LOGGER);
986+
ErrorManager.showError(e, LOGGER);
987987
break;
988988
}
989989
}
@@ -1083,7 +1083,7 @@ public <T extends IDataRow> boolean isAuditAble(T ejb) {
10831083
return true;
10841084
}
10851085
} catch (Exception e) {
1086-
ErrorManager.showError(e, Logger.getLogger(getClass()));
1086+
ErrorManager.showError(e, LOGGER);
10871087
}
10881088
return false;
10891089
}
@@ -1116,7 +1116,7 @@ public <T extends IDataRow> boolean isAuditAble(String entityName) {
11161116
return true;
11171117
}
11181118
} catch (Exception e) {
1119-
ErrorManager.showError(e, Logger.getLogger(getClass()));
1119+
ErrorManager.showError(e, LOGGER);
11201120
}
11211121
return false;
11221122
}
@@ -1343,8 +1343,8 @@ public Map<String, Object> getPersistUnitProp(String persistUnit) {
13431343
Object object = e.getValue().toString();
13441344
result.put(e.getKey(), object);
13451345
});
1346-
} catch (Exception ex) {
1347-
ErrorManager.showError(ex, LOGGER);
1346+
} catch (Exception e) {
1347+
ErrorManager.showError(e, LOGGER);
13481348
}
13491349
return result;
13501350
}
@@ -1611,8 +1611,8 @@ public boolean isCredentialValid(Long iduser, Long idcompany) {
16111611
return false;
16121612
}
16131613
return sessions.checkCompanyAccess(iduser, idcompany);
1614-
} catch (Exception exp) {
1615-
ErrorManager.showError(exp, LOGGER);
1614+
} catch (Exception e) {
1615+
ErrorManager.showError(e, LOGGER);
16161616
}
16171617
return false;
16181618
}

‎business/src/main/java/org/javabeanstack/data/DataNativeQuery.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,8 @@ public final String getFromExpr() {
528528
if (joinParams.isEmpty() && getEntityList().length > 1) {
529529
try {
530530
fromExpr = dataLink.getEntitiesRelation(entityExpr, "", schema);
531-
} catch (Exception exp) {
532-
ErrorManager.showError(exp, LOGGER);
531+
} catch (Exception ex) {
532+
ErrorManager.showError(ex, LOGGER);
533533
}
534534
} // Si existe los parámetros de join crear la expresión a partir de sus parámetros.
535535
else if (!joinParams.isEmpty()) {
@@ -743,7 +743,7 @@ public List<IDataQueryModel> execQuery(IDataLink dataLink) throws SessionError {
743743
} catch (SessionError ex) {
744744
throw new SessionError("La sesión expiró o es inválida");
745745
} catch (Exception ex) {
746-
ErrorManager.showError(ex, Logger.getLogger(DataNativeQuery.class));
746+
ErrorManager.showError(ex, LOGGER);
747747
}
748748
if (result == null){
749749
result = new ArrayList<>();

‎business/src/main/java/org/javabeanstack/data/DataRow.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public Object clone() {
9292
Object obj = null;
9393
try {
9494
obj = super.clone();
95-
} catch (CloneNotSupportedException ex) {
96-
ErrorManager.showError(ex, LOGGER);
95+
} catch (CloneNotSupportedException e) {
96+
ErrorManager.showError(e, LOGGER);
9797
}
9898
return obj;
9999
}

‎business/src/main/java/org/javabeanstack/data/services/AbstractDataService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ public <T extends IDataRow> boolean checkUniqueKey(String sessionId, T row) {
563563
}
564564
}
565565
} catch (Exception ex) {
566-
ErrorManager.showError(ex, Logger.getLogger(AbstractDataService.class));
566+
ErrorManager.showError(ex, LOGGER);
567567
}
568568
return true;
569569
}
@@ -652,7 +652,7 @@ public <T extends IDataRow> IErrorReg checkFieldValue(String sessionId, T row, S
652652
} catch (Exception ex) {
653653
row.setFieldChecked(fieldName, false);
654654
result = new ErrorReg(ErrorManager.getStackCause(ex), 50000, fieldName);
655-
ErrorManager.showError(ex, Logger.getLogger(AbstractDataService.class));
655+
ErrorManager.showError(ex, LOGGER);
656656
break;
657657
}
658658
}
@@ -735,8 +735,8 @@ public <T extends IDataRow> Map<String, IErrorReg> checkDataRow(String sessionId
735735
}
736736
}
737737
}
738-
} catch (Exception exp) {
739-
ErrorManager.showError(exp, LOGGER);
738+
} catch (Exception ex) {
739+
ErrorManager.showError(ex, LOGGER);
740740
}
741741
// Ejecutar metodos de chequeo de datos
742742
for (Method method : this.methodList) {
@@ -772,7 +772,7 @@ public <T extends IDataRow> Map<String, IErrorReg> checkDataRow(String sessionId
772772
row.setFieldChecked(fieldName, false);
773773
result = new ErrorReg(ErrorManager.getStackCause(ex), 50000, fieldName);
774774
errors.put(fieldName.toLowerCase(), result);
775-
ErrorManager.showError(ex, Logger.getLogger(AbstractDataService.class));
775+
ErrorManager.showError(ex, LOGGER);
776776
}
777777
}
778778
row.setErrors(errors);

‎business/src/main/java/org/javabeanstack/datactrl/DataFilter.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
* @author Jorge Enciso
4646
*/
4747
public class DataFilter {
48-
48+
private static final Logger LOGGER = Logger.getLogger(DataFilter.class);
49+
4950
private String filterExpression;
5051
private Map<String, Object> parameters = new HashMap();
5152

@@ -101,8 +102,8 @@ public Object getValue(String fieldname) {
101102
value = field.get(this);
102103
}
103104
return value;
104-
} catch (Exception exp) {
105-
ErrorManager.showError(exp, Logger.getLogger(getClass()));
105+
} catch (Exception e) {
106+
ErrorManager.showError(e, LOGGER);
106107
}
107108
return null;
108109
}
@@ -209,8 +210,8 @@ public final Map<String, Object> getSentence() {
209210
if (!annotation.expression().isEmpty()) {
210211
fields.add(annotation);
211212
}
212-
} catch (Exception ex) {
213-
ErrorManager.showError(ex, Logger.getLogger(getClass()));
213+
} catch (Exception e) {
214+
ErrorManager.showError(e, LOGGER);
214215
}
215216
}
216217
}

‎business/src/main/java/org/javabeanstack/security/OAuthConsumerBase.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,8 +1032,8 @@ public IAppUser getUserMapped(String token) {
10321032
Long iduser = Long.valueOf(getDataKeyValue(token, "idappuser"));
10331033
IAppUser user = dao.findByQuery(null, "select o from AppUserLight o where iduser = " + iduser, null);
10341034
return user;
1035-
} catch (Exception exp) {
1036-
ErrorManager.showError(exp, LOGGER);
1035+
} catch (Exception ex) {
1036+
ErrorManager.showError(ex, LOGGER);
10371037
}
10381038
return null;
10391039
}
@@ -1051,8 +1051,8 @@ public IAppUser getUserMapped(IAppAuthConsumerToken token) {
10511051
Long iduser = Long.valueOf(getDataKeyValue(token, "idappuser"));
10521052
IAppUser user = dao.findByQuery(null, "select o from AppUserLight o where iduser = " + iduser, null);
10531053
return user;
1054-
} catch (Exception exp) {
1055-
ErrorManager.showError(exp, LOGGER);
1054+
} catch (Exception ex) {
1055+
ErrorManager.showError(ex, LOGGER);
10561056
}
10571057
return null;
10581058
}
@@ -1070,8 +1070,8 @@ public IAppCompany getCompanyMapped(IAppAuthConsumerToken token) {
10701070
Long idcompany = Long.valueOf(getDataKeyValue(token, "idcompany"));
10711071
IAppCompany company = dao.findByQuery(null, "select o from AppCompanyLight o where idcompany = " + idcompany, null);
10721072
return company;
1073-
} catch (Exception exp) {
1074-
ErrorManager.showError(exp, LOGGER);
1073+
} catch (Exception ex) {
1074+
ErrorManager.showError(ex, LOGGER);
10751075
}
10761076
return null;
10771077
}
@@ -1089,8 +1089,8 @@ public IAppCompany getCompanyMapped(String token) {
10891089
Long idcompany = Long.valueOf(getDataKeyValue(token, "idcompany"));
10901090
IAppCompany company = dao.findByQuery(null, "select o from AppCompanyLight o where idcompany = " + idcompany, null);
10911091
return company;
1092-
} catch (Exception exp) {
1093-
ErrorManager.showError(exp, LOGGER);
1092+
} catch (Exception ex) {
1093+
ErrorManager.showError(ex, LOGGER);
10941094
}
10951095
return null;
10961096
}
@@ -1114,8 +1114,8 @@ public List<IAppCompany> getCompaniesAllowed(String userLogin) {
11141114
IUserSession userSession = new UserSession();
11151115
userSession.setUser(user);
11161116
return getAppCompanySrv().getAppCompanyLight(userSession);
1117-
} catch (Exception exp) {
1118-
ErrorManager.showError(exp, LOGGER);
1117+
} catch (Exception ex) {
1118+
ErrorManager.showError(ex, LOGGER);
11191119
}
11201120
return null;
11211121
}
@@ -1132,7 +1132,7 @@ public boolean checkAuthConsumerData(IOAuthConsumerData data) {
11321132
try {
11331133
dao.checkAuthConsumerData(data);
11341134
return true;
1135-
} catch (Exception exp) {
1135+
} catch (Exception ex) {
11361136
//
11371137
}
11381138
return false;

‎business/src/main/java/org/javabeanstack/security/Sessions.java‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@
5454
import org.javabeanstack.data.IGenericDAO;
5555
import org.javabeanstack.error.IErrorReg;
5656
import org.javabeanstack.exceptions.SessionError;
57+
import org.javabeanstack.log.ILogManager;
5758
import org.javabeanstack.model.IAppCompany;
5859
import org.javabeanstack.model.IAppCompanyAllowed;
5960
import org.javabeanstack.model.IAppUser;
6061
import org.javabeanstack.util.Fn;
6162
import org.javabeanstack.util.Strings;
6263
import org.javabeanstack.model.IAppAuthConsumerToken;
64+
import static org.javabeanstack.model.IAppLogRecord.*;
6365
import org.javabeanstack.security.model.ClientAuthRequestInfo;
6466
import org.javabeanstack.security.model.IClientAuthRequestInfo;
6567
import org.javabeanstack.util.LocalDates;
@@ -89,6 +91,9 @@ public class Sessions implements ISessions {
8991

9092
@EJB
9193
private IOAuthConsumer oAuthConsumer;
94+
95+
@EJB
96+
private ILogManager logMngr;
9297

9398
/**
9499
* Se ejecuta al instanciarse esta clase.
@@ -146,13 +151,14 @@ private void removeAllSessionInfo(String sessionId) {
146151
@Lock(LockType.WRITE)
147152
public IUserSession createSession(String userLogin, String password, Object idcompany, Integer idleSessionExpireInMinutes) {
148153
LOGGER.debug("CREATESESSION IN");
154+
IUserSession session;
149155
try {
150156
// Verifcar si coincide usuario, contraseña y pasar resultado para ser procesado
151-
IUserSession session = login(userLogin, password);
157+
session = login(userLogin, password);
152158
processCreateSession(session, idcompany, idleSessionExpireInMinutes);
153159
return session;
154-
} catch (Exception exp) {
155-
ErrorManager.showError(exp, LOGGER);
160+
} catch (Exception e) {
161+
ErrorManager.showError(e, LOGGER, logMngr, null);
156162
}
157163
return null;
158164
}
@@ -180,18 +186,26 @@ protected boolean processCreateSession(IUserSession session, Object idcompany, I
180186
IUserSession sessionCtrl = getUserSession(encrypt(sessionId));
181187
if (sessionCtrl != null && sessionCtrl.getUser() != null) {
182188
session.setUser(null);
183-
String mensaje = "Este usuario tiene una sesión activa";
189+
String mensaje = session.getUser().getLogin().trim().toUpperCase() + " tiene una sesión activa";
184190
LOGGER.debug(mensaje);
185191
session.setError(new ErrorReg(mensaje, 4, ""));
192+
session.getError().setEntity("SESSIONS.processCreateSession");
193+
session.getError().setEvent(EVENT_CREATESESSION);
194+
session.getError().setLevel(LEVEL_ALERT);
195+
logMngr.dbWrite(session.getError());
186196
return false;
187197
}
188198
}
189199
// Verificar si tiene permiso para acceder a los datos de la empresa
190200
if (!checkCompanyAccess(((IAppUser) session.getUser()).getIduser(), (Long) idcompany)) {
191201
session.setUser(null);
192-
String mensaje = "No tiene autorización para acceder a esta empresa";
202+
String mensaje = session.getUser().getLogin().trim().toUpperCase() + " no tiene autorización para acceder a esta empresa";
193203
LOGGER.debug(mensaje);
194204
session.setError(new ErrorReg(mensaje, 4, ""));
205+
session.getError().setEntity("SESSIONS.processCreateSession");
206+
session.getError().setEvent(EVENT_CREATESESSION);
207+
session.getError().setLevel(LEVEL_ALERT);
208+
logMngr.dbWrite(session.getError());
195209
return false;
196210
}
197211

@@ -270,8 +284,8 @@ public IUserSession createSessionFromToken(String token) {
270284
session.setUser(appUser);
271285
processCreateSessionFromToken(session, authToken, 30);
272286
return session;
273-
} catch (Exception exp) {
274-
ErrorManager.showError(exp, LOGGER);
287+
} catch (Exception e) {
288+
ErrorManager.showError(e, LOGGER, logMngr, null);
275289
}
276290
return null;
277291
}
@@ -372,8 +386,8 @@ public IUserSession reCreateSession(String sessionIdEncrypted, Object idcompany)
372386
//Crear nueva sesión
373387
processCreateSession(session, idcompany, null);
374388
return session;
375-
} catch (Exception exp) {
376-
ErrorManager.showError(exp, LOGGER);
389+
} catch (Exception e) {
390+
ErrorManager.showError(e, LOGGER, logMngr, null);
377391
}
378392
return null;
379393
}

0 commit comments

Comments
 (0)