You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/08/22 14:54:07 UTC
[4/4] karaf git commit: Fix warnings
Fix warnings
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3db554d4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3db554d4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3db554d4
Branch: refs/heads/master
Commit: 3db554d453e3f80dc5ffb71d2cbcb655b2ddc277
Parents: d6edb10
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Aug 22 16:34:21 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Aug 22 16:34:21 2017 +0200
----------------------------------------------------------------------
.../karaf/jaas/modules/audit/AbstractAuditLoginModule.java | 2 +-
.../karaf/jaas/modules/audit/EventAdminAuditLoginModule.java | 2 +-
.../apache/karaf/jaas/modules/audit/FileAuditLoginModule.java | 2 +-
.../apache/karaf/jaas/modules/audit/LogAuditLoginModule.java | 2 +-
.../java/org/apache/karaf/jaas/modules/impl/KarafRealm.java | 2 --
.../org/apache/karaf/jaas/modules/krb5/Krb5LoginModule.java | 1 +
.../apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java | 2 +-
.../jaas/modules/properties/DigestPasswordLoginModule.java | 4 ++--
.../karaf/jaas/modules/properties/PropertiesLoginModule.java | 2 +-
.../jaas/modules/publickey/PublickeyBackingEngineFactory.java | 7 +++----
10 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/AbstractAuditLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/AbstractAuditLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/AbstractAuditLoginModule.java
index 5349246..140ba40 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/AbstractAuditLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/AbstractAuditLoginModule.java
@@ -38,7 +38,7 @@ public abstract class AbstractAuditLoginModule implements LoginModule {
private boolean enabled;
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options) {
+ Map<String, ?> sharedState, Map<String, ?> options) {
this.subject = subject;
enabled = Boolean.parseBoolean((String) options.get("enabled"));
handler = callbackHandler;
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java
index 8375013..54ce6aa 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/EventAdminAuditLoginModule.java
@@ -38,7 +38,7 @@ public class EventAdminAuditLoginModule extends AbstractAuditLoginModule {
private String topic;
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options) {
+ Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, sharedState, options);
bundleContext = (BundleContext) options.get(BundleContext.class.getName());
topic = (String) options.get("topic");
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/FileAuditLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/FileAuditLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/FileAuditLoginModule.java
index eda7c71..6134964 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/FileAuditLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/FileAuditLoginModule.java
@@ -36,7 +36,7 @@ public class FileAuditLoginModule extends AbstractAuditLoginModule {
private String logFile;
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options) {
+ Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, sharedState, options);
logFile = (String) options.get(LOG_FILE_OPTION);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/LogAuditLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/LogAuditLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/LogAuditLoginModule.java
index f9e6915..41db1ba 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/LogAuditLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/audit/LogAuditLoginModule.java
@@ -30,7 +30,7 @@ public class LogAuditLoginModule extends AbstractAuditLoginModule {
private Logger logger;
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options) {
+ Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, sharedState, options);
level = (String) options.get(LOG_LEVEL_OPTION);
logger = LoggerFactory.getLogger((String) options.get(LOG_LOGGER_OPTION));
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
index eaabbac..6fe764c 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/KarafRealm.java
@@ -34,8 +34,6 @@ public class KarafRealm implements JaasRealm {
private static final String LOG_AUDIT_MODULE = "org.apache.karaf.jaas.modules.audit.LogAuditLoginModule";
private static final String EVENTADMIN_AUDIT_MODULE = "org.apache.karaf.jaas.modules.audit.EventAdminAuditLoginModule";
- private static final String MODULE = "org.apache.karaf.jaas.module";
-
private final BundleContext bundleContext;
private volatile Map<String, Object> properties;
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModule.java
index 28a6e11..3d7ad47 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/krb5/Krb5LoginModule.java
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
/**
* Karaf Kerberos login module.
*/
+@SuppressWarnings("restriction")
public class Krb5LoginModule implements LoginModule {
private com.sun.security.auth.module.Krb5LoginModule loginModule = new com.sun.security.auth.module.Krb5LoginModule();
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
index 8ce320e..dd4aa4d 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
@@ -49,7 +49,7 @@ public class OsgiConfigLoginModule extends AbstractKarafLoginModule {
try {
String pid = (String) options.get(PID);
Configuration config = ConfigAdminHolder.getService().getConfiguration(pid, null);
- Dictionary properties = config.getProperties();
+ Dictionary<String, Object> properties = config.getProperties();
Callback[] callbacks = new Callback[2];
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java
index 4ae2afa..1e01761 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/DigestPasswordLoginModule.java
@@ -54,7 +54,7 @@ public class DigestPasswordLoginModule extends AbstractKarafLoginModule {
private String usersFile;
- public void initialize(Subject sub, CallbackHandler handler, Map sharedState, Map options) {
+ public void initialize(Subject sub, CallbackHandler handler, Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(sub,handler,options);
usersFile = (String) options.get(USER_FILE);
if (debug) {
@@ -89,7 +89,7 @@ public class DigestPasswordLoginModule extends AbstractKarafLoginModule {
System.arraycopy(b3, 0, b4, offset, b3.length);
byte[] digestBytes = generateDigest(b4);
- passwdDigest = new String(new Base64().encodeBase64(digestBytes));
+ passwdDigest = new String(Base64.encodeBase64(digestBytes));
} catch (Exception e) {
LOGGER.debug(e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
index 9fe11ed..fd3f5b6 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
@@ -49,7 +49,7 @@ public class PropertiesLoginModule extends AbstractKarafLoginModule {
private String usersFile;
- public void initialize(Subject sub, CallbackHandler handler, Map sharedState, Map options) {
+ public void initialize(Subject sub, CallbackHandler handler, Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(sub,handler,options);
usersFile = (String) options.get(USER_FILE);
if (debug) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/3db554d4/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngineFactory.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngineFactory.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngineFactory.java
index 990965a..70f11db 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngineFactory.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyBackingEngineFactory.java
@@ -31,7 +31,7 @@ public class PublickeyBackingEngineFactory implements BackingEngineFactory {
private static final String USER_FILE = "users";
- public BackingEngine build(Map options) {
+ public BackingEngine build(Map<String, ?> options) {
PublickeyBackingEngine engine = null;
String usersFile = (String) options.get(USER_FILE);
@@ -39,12 +39,11 @@ public class PublickeyBackingEngineFactory implements BackingEngineFactory {
Properties users;
try {
users = new Properties(f);
- engine = new PublickeyBackingEngine(users);
+ return new PublickeyBackingEngine(users);
} catch (IOException ioe) {
logger.warn("Cannot open keys file:" + usersFile);
- } finally {
- return engine;
}
+ return engine;
}
public String getModuleClass() {