You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/07/23 15:16:07 UTC
[tomee] branch master updated: Fix checkstyle issues
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 3f7b2cf Fix checkstyle issues
3f7b2cf is described below
commit 3f7b2cf1681281af500cc0ba0029d57932a64cba
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Thu Jul 23 17:15:50 2020 +0200
Fix checkstyle issues
---
.../security/provider/CallbackHandlerImpl.java | 23 ++++++++++------------
.../TomEESecurityServletContainerInitializer.java | 4 +++-
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/provider/CallbackHandlerImpl.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/provider/CallbackHandlerImpl.java
index 0890a0f..3b704ff 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/provider/CallbackHandlerImpl.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/provider/CallbackHandlerImpl.java
@@ -16,26 +16,23 @@
*/
package org.apache.tomee.security.provider;
-import java.io.IOException;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.res.StringManager;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.LoginContext;
import javax.security.auth.message.callback.CallerPrincipalCallback;
import javax.security.auth.message.callback.GroupPrincipalCallback;
-
-import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.res.StringManager;
-import org.ietf.jgss.GSSCredential;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
/**
* This is a clone of Tomcat default callback handler but with a better handling of the Generic Principals when more than
diff --git a/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java b/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
index b835c41..73e6c3b 100644
--- a/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
+++ b/tomee/tomee-security/src/main/java/org/apache/tomee/security/servlet/TomEESecurityServletContainerInitializer.java
@@ -34,7 +34,9 @@ public class TomEESecurityServletContainerInitializer implements ServletContaine
// this needs to be investigated because the BeanManager is not yet available in TomEE at this moment and time
// we are still deploying the app
- if (true) return;
+ if (true) {
+ return;
+ }
BeanManager beanManager;
try {