Skip to content

Commit 37e9f9f

Browse files
jlgager24jlgager24
committed
Fixed Some Codacy Issues
Signed-off-by: Joshua Gager <jlgager@jgcomptech.com>
1 parent ceb93ff commit 37e9f9f

File tree

13 files changed

+63
-80
lines changed

13 files changed

+63
-80
lines changed

‎src/main/java/com/jgcomptech/tools/HWInfo.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static final class Network {
7575
public static String getInternalIPAddress() {
7676
try {
7777
final var ip = (InetAddress.getLocalHost().getHostAddress()).trim();
78-
return ip.equals("127.0.0.1") ? "N/A" : ip;
78+
return "127.0.0.1".equals(ip) ? "N/A" : ip;
7979
} catch(final UnknownHostException ex) { return ex.getMessage(); }
8080
}
8181

@@ -189,10 +189,8 @@ public static int Cores() throws IOException {
189189
if(line.contains("Socket(s):")) {
190190
sockets = Integer.parseInt(line.split("\\s+")[line.split("\\s+").length - 1]);
191191
}
192-
} else if(isWindows()) {
193-
if(line.contains("NumberOfCores")) {
194-
numberOfCores = Integer.parseInt(line.split("=")[1]);
195-
}
192+
} else if(isWindows() && line.contains("NumberOfCores")) {
193+
numberOfCores = Integer.parseInt(line.split("=")[1]);
196194
}
197195
}
198196
}

‎src/main/java/com/jgcomptech/tools/authc/SessionManager.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -664,27 +664,25 @@ public boolean loginUser(final String username, final boolean multiSession)
664664
throw new IllegalArgumentException("Username cannot be null or empty!");
665665
}
666666

667-
if(isNewSessionAllowed(username, multiSession)) {
668-
if (userManager.userExists(username)) {
669-
final var account = userManager.getUser(username);
670-
if(!account.isLocked()) {
671-
if(!account.isPasswordExpired()) {
672-
eventLoginSuccess.fireEvent(this, account);
673-
final var role = userManager.getUserRole(username);
674-
if (role.isEnabled()) {
675-
final var newSession = new Session(username, role);
676-
if (multiSession) multiUserSessions.put(username, newSession);
677-
else {
678-
PermissionManager.getInstance().loadPermissions(role);
679-
currentSession = newSession;
680-
}
681-
if (multiSession) eventMultiSessionOpened.fireEvent(this, account, newSession);
682-
else eventSessionOpened.fireEvent(this, account, newSession);
683-
return true;
684-
} else throw new IllegalStateException("User Role " + role + " Is Disabled!");
685-
} else throw new ExpiredCredentialsException("User " + username + "'s password has expired!");
686-
} else throw new LockedAccountException("User " + username + " is locked!");
687-
}
667+
if(isNewSessionAllowed(username, multiSession) && userManager.userExists(username)) {
668+
final var account = userManager.getUser(username);
669+
if(!account.isLocked()) {
670+
if(!account.isPasswordExpired()) {
671+
eventLoginSuccess.fireEvent(this, account);
672+
final var role = userManager.getUserRole(username);
673+
if (role.isEnabled()) {
674+
final var newSession = new Session(username, role);
675+
if (multiSession) multiUserSessions.put(username, newSession);
676+
else {
677+
PermissionManager.getInstance().loadPermissions(role);
678+
currentSession = newSession;
679+
}
680+
if (multiSession) eventMultiSessionOpened.fireEvent(this, account, newSession);
681+
else eventSessionOpened.fireEvent(this, account, newSession);
682+
return true;
683+
} else throw new IllegalStateException("User Role " + role + " Is Disabled!");
684+
} else throw new ExpiredCredentialsException("User " + username + "'s password has expired!");
685+
} else throw new LockedAccountException("User " + username + " is locked!");
688686
}
689687
return false;
690688
}

‎src/main/java/com/jgcomptech/tools/authc/Subject.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ public boolean login(final UsernamePasswordToken token, final boolean multiSessi
6060
if(authManager.userExists(token.getUsername())) {
6161
final var account = authManager.getUser(token.getUsername());
6262
username = token.getUsername();
63+
final var password = token.getPassword();
6364
if (getSession(multiSession) == null) {
64-
if (authManager.checkPasswordMatches(token.getUsername(), new String(token.getPassword()))) {
65-
if(authManager.loginUser(token.getUsername())) {
66-
if(token.isRememberMe()) {
67-
remembered = true;
68-
this.token = new UsernamePasswordToken(token.getUsername(), token.getPassword());
69-
}
70-
token.clear();
71-
return true;
65+
if (authManager.checkPasswordMatches(username, new String(password))
66+
&& authManager.loginUser(username)) {
67+
if(token.isRememberMe()) {
68+
remembered = true;
69+
this.token = new UsernamePasswordToken(username, password);
7270
}
71+
token.clear();
72+
return true;
7373
}
7474
authManager.getSessionManager().getEvents().getEventLoginFailure().fireEvent(this, account);
7575
token.clear();

‎src/main/java/com/jgcomptech/tools/authc/UserManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public boolean userExists(final String username) {
240240
if(db.getInfo().tableExists(TABLE_NAME)) {
241241
try (final var rs = TypedStatement.newQuery().SELECT_ALL().FROM(TABLE_NAME).buildAndExecute(db)) {
242242
while(rs.next()) {
243-
if (rs.getString(USERNAME_FIELD).toLowerCase().equals(username)) return true;
243+
if (rs.getString(USERNAME_FIELD).equalsIgnoreCase(username)) return true;
244244
}
245245
}
246246
} else throw new TableNotFoundException(TABLE_NAME);

‎src/main/java/com/jgcomptech/tools/authz/Permission.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,14 @@ public boolean removeChildPermission(final String name) {
229229
*/
230230
public boolean copyToNewParent(final String newParentName) {
231231
final var baseName = getBaseName(name.get());
232-
if(!manager.getPermissions().containsKey(newParentName + ":" + baseName)) {
233-
if(manager.addCustomPermission(baseName, newParentName)) {
234-
final var newPermission = manager.getPermission(newParentName + ":" + baseName);
235-
newPermission.setOnEnabled(getOnEnabled());
236-
newPermission.setOnDisabled(getOnDisabled());
237-
copyChildPermissions(newParentName + ":" + baseName,
238-
childPermissions, newPermission.childPermissions);
239-
return true;
240-
}
232+
if(!manager.getPermissions().containsKey(newParentName + ":" + baseName)
233+
&& manager.addCustomPermission(baseName, newParentName)) {
234+
final var newPermission = manager.getPermission(newParentName + ":" + baseName);
235+
newPermission.setOnEnabled(getOnEnabled());
236+
newPermission.setOnDisabled(getOnDisabled());
237+
copyChildPermissions(newParentName + ":" + baseName,
238+
childPermissions, newPermission.childPermissions);
239+
return true;
241240
}
242241
return false;
243242
}

‎src/main/java/com/jgcomptech/tools/dialogs/MessageBoxImpl.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,8 @@ private static DialogResult showOK(final String text,
336336
alert.setHeaderText(headerText);
337337
alert.setTitle(title);
338338
result = alert.showAndWait();
339-
if(result.isPresent()) {
340-
if(result.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
341-
return DialogResult.OK;
342-
}
339+
if(result.isPresent() && result.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
340+
return DialogResult.OK;
343341
}
344342

345343
return DialogResult.NONE;
@@ -523,7 +521,7 @@ private static DialogResult showYesNoCancel(final String text,
523521
private static Alert setDefaultButton(final Alert alert, final ButtonType type) {
524522
final var pane = alert.getDialogPane();
525523
for (final var t : alert.getButtonTypes())
526-
((Button) pane.lookupButton(t)).setDefaultButton(t == type);
524+
((Button) pane.lookupButton(t)).setDefaultButton(t.equals(type));
527525
return alert;
528526
}
529527

‎src/main/java/com/jgcomptech/tools/events/Event.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public final Object clone() {
172172
return super.clone();
173173
} catch (final CloneNotSupportedException e) {
174174
// we implement Cloneable, this shouldn't happen
175-
throw new RuntimeException("Can't clone Event");
175+
throw new IllegalStateException("Can't clone Event");
176176
}
177177
}
178178

‎src/main/java/com/jgcomptech/tools/events/EventManager.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,6 @@ public static EventManager getInstance() {
2323
return instance;
2424
}
2525

26-
private Event registerNewEvent(final String eventName,
27-
final EventTarget<? extends Event> target) {
28-
if (eventName == null || eventName.trim().isEmpty()) {
29-
throw new IllegalArgumentException("Event name cannot be null!");
30-
}
31-
if (target == null) {
32-
throw new IllegalArgumentException("Event target cannot be null!");
33-
}
34-
35-
return events.put(eventName, new Event(target));
36-
}
37-
3826
public <T extends Event> T registerNewEvent(final String eventName,
3927
final Class<T> classRef,
4028
final EventType<? extends T> eventType)

‎src/main/java/com/jgcomptech/tools/events/PermissionEvent.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* @since 1.4.0
1010
*/
1111
public class PermissionEvent extends Event {
12-
private Permission permission;
13-
public Permission getPermission() { return permission; }
1412
/** Common supertype for all permission event types. */
1513
public static final EventType<PermissionEvent> ANY = new EventType<>(Event.ANY, "PERMISSION");
1614

@@ -26,6 +24,9 @@ public class PermissionEvent extends Event {
2624
public static final EventType<PermissionEvent> PERMISSIONS_ALL_DISABLED =
2725
ANY.createSubType("PERMISSIONS_ALL_DISABLED");
2826

27+
private Permission permission;
28+
public Permission getPermission() { return permission; }
29+
2930
/**
3031
* Construct a new {@code Event} with the specified event target, type and args.
3132
* @param target the event target to associate with the event

‎src/main/java/com/jgcomptech/tools/events/SessionEvent.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
* @since 1.4.0
1111
*/
1212
public class SessionEvent extends Event {
13-
private Session session;
14-
public Session getSession() { return session; }
15-
private UserAccount user;
16-
public UserAccount getUser() { return user; }
1713
/** Common supertype for all permission event types. */
1814
public static final EventType<SessionEvent> ANY = new EventType<>(Event.ANY, "SESSION");
1915

@@ -47,6 +43,13 @@ public class SessionEvent extends Event {
4743
public static final EventType<SessionEvent> SESSION_USER_VERIFY_FAILURE
4844
= ANY.createSubType("SESSION_USER_VERIFY_FAILURE");
4945

46+
47+
private Session session;
48+
private UserAccount user;
49+
50+
public Session getSession() { return session; }
51+
public UserAccount getUser() { return user; }
52+
5053
/**
5154
* Construct a new {@code Event} with the specified event target and type.
5255
* @param target the event target to associate with the event

0 commit comments

Comments
 (0)