edit

oneteme · Jul 23, 2024 · 7c57ec7 · 7c57ec7
1 parent 55bf5bf
commit 7c57ec7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/src/main/java/org/usf/inspect/core/Session.java b/src/main/java/org/usf/inspect/core/Session.java
@@ -40,28 +40,25 @@ public interface Session extends Metric {
 
 	default boolean append(SessionStage stage) {
 		if(stage instanceof RestRequest req) {
-			getRestRequests().add(req);
+			return getRestRequests().add(req);
 		}
-		else if(stage instanceof DatabaseRequest req) {
-			getDatabaseRequests().add(req);
+		if(stage instanceof DatabaseRequest req) {
+			return getDatabaseRequests().add(req);
 		}
-		else if(stage instanceof FtpRequest req) {
-			getFtpRequests().add(req);
+		if(stage instanceof FtpRequest req) {
+			return getFtpRequests().add(req);
 		}
-		else if(stage instanceof MailRequest req) {
-			getMailRequests().add(req);
+		if(stage instanceof MailRequest req) {
+			return getMailRequests().add(req);
 		}
-		else if(stage instanceof NamingRequest req) {
-			getLdapRequests().add(req);
+		if(stage instanceof NamingRequest req) {
+			return getLdapRequests().add(req);
 		}
-		else if(stage instanceof LocalRequest req) {
-			getLocalRequests().add(req);
+		if(stage instanceof LocalRequest req) {
+			return getLocalRequests().add(req);
 		}
-		else {
-			log.warn("unsupported session stage {}", stage);
-			return false;
-		}
-		return true;
+		log.warn("unsupported session stage {}", stage);
+		return false;
 	}
 
 	default void lock(){

diff --git a/src/main/java/org/usf/inspect/core/SessionManager.java b/src/main/java/org/usf/inspect/core/SessionManager.java
@@ -38,7 +38,7 @@ public static <S extends Session> S requireCurrentSession(Class<S> clazz) {
 		if(clazz.isInstance(ses)) { //nullable
 			return clazz.cast(ses);
 		}
-		log.warn("unexpected session type expected={}, but was {}", clazz.getSimpleName(), ses);
+		log.warn("unexpected session type: expected={}, but was={}", clazz.getSimpleName(), ses);
 		return null;
 	}