diff options
Diffstat (limited to 'bkucommon/src/main')
7 files changed, 15 insertions, 13 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java index 427e9c37..e9bfdf0b 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/CommandParamChecker.java @@ -31,15 +31,15 @@ import at.gv.egiz.bku.slcommands.SLCommand; public abstract class CommandParamChecker {
- protected List<Tupel<String, String>> paramList = new LinkedList<Tupel<String, String>>();
+ protected List<Pair<String, String>> paramList = new LinkedList<Pair<String, String>>();
- public static class Tupel<T, Q> {
+ public static class Pair<T, Q> {
private T key;
private Q val;
- public Tupel(T key, Q val) {
+ public Pair(T key, Q val) {
if ((key == null) || (val == null)) {
- throw new NullPointerException("Tupel key and value must not be null");
+ throw new NullPointerException("Pair key and value must not be null");
}
this.key = key;
this.val = val;
@@ -54,8 +54,8 @@ public abstract class CommandParamChecker { }
public boolean equals(Object other) {
- if (other instanceof Tupel) {
- Tupel ot = (Tupel) other;
+ if (other instanceof Pair) {
+ Pair<?, ?> ot = (Pair<?, ?>) other;
return (key.equals(ot.key) && val.equals(ot.val));
}
return false;
@@ -67,7 +67,7 @@ public abstract class CommandParamChecker { }
public void addParameter(String key, String value) {
- paramList.add(new Tupel<String, String>(key, value));
+ paramList.add(new Pair<String, String>(key, value));
}
public abstract boolean checkParameter(SLCommand cmd);
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java index e6f03234..6a10a116 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontroller/InfoboxParamChecker.java @@ -50,7 +50,7 @@ public class InfoboxParamChecker extends CommandParamChecker { if (cmd instanceof InfoboxReadCommand) { InfoboxReadCommand irc = (InfoboxReadCommand) cmd; - for (Tupel<String, String> param : paramList) { + for (Pair<String, String> param : paramList) { if (param.getKey().equals(INFOBOX_ID)) { if (!param.getVal().equals(irc.getInfoboxIdentifier())) { return false; diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java index 590a937c..2278bfa9 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/BindingProcessorManagerImpl.java @@ -286,11 +286,11 @@ public class BindingProcessorManagerImpl implements BindingProcessorManager, Com public void run() { Collection<BindingProcessorFuture> futures = submittedFutures.values(); List<Id> toBeRemoved = new ArrayList<Id>(); - int active = 0; +// int active = 0; for(BindingProcessorFuture future : futures) { BindingProcessor bindingProcessor = future.getBindingProcessor(); if (!future.isDone()) { - active++; +// active++; } if ((bindingProcessor.getLastAccessTime().getTime() - System .currentTimeMillis()) > maxAcceptedAge) { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpUtil.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpUtil.java index 1678c5ae..152b007b 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpUtil.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HttpUtil.java @@ -64,7 +64,7 @@ public class HttpUtil { boolean replaceNullWithDefault) {
ParameterParser pf = new ParameterParser();
pf.setLowerCaseNames(true);
- Map map = pf.parse(contentType, SEPERATOR);
+ Map<?, ?> map = pf.parse(contentType, SEPERATOR);
String retVal = (String) map.get(CHAR_SET);
if ((retVal == null) && (replaceNullWithDefault)) {
if (map.containsKey(APPLICATION_URL_ENCODED)) {
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKLogAdapterFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKLogAdapterFactory.java index 56719a77..0e9b9fe6 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKLogAdapterFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKLogAdapterFactory.java @@ -63,7 +63,7 @@ public class IAIKLogAdapterFactory extends LogFactory { * @see iaik.logging.LogFactory#getInstance(java.lang.Class) */ @Override - public synchronized Log getInstance(Class clazz) throws LogConfigurationException { + public synchronized Log getInstance(@SuppressWarnings("rawtypes") Class clazz) throws LogConfigurationException { Logger logger = LoggerFactory.getLogger(clazz); Log log = instances.get(logger); if (log == null) { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureLocation.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureLocation.java index bf8b738a..d2702635 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureLocation.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureLocation.java @@ -222,8 +222,9 @@ public class SignatureLocation { return namespaceContext.getPrefix(namespaceURI); } + @SuppressWarnings("unchecked") @Override - public Iterator getPrefixes(String namespaceURI) { + public Iterator<String> getPrefixes(String namespaceURI) { return namespaceContext.getPrefixes(namespaceURI); } diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/spring/PKIProfileFactoryBean.java b/bkucommon/src/main/java/at/gv/egiz/bku/spring/PKIProfileFactoryBean.java index 63b2ddeb..ee6583f7 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/spring/PKIProfileFactoryBean.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/spring/PKIProfileFactoryBean.java @@ -92,6 +92,7 @@ public class PKIProfileFactoryBean implements FactoryBean, ResourceLoaderAware { return getURL(SSL_CA_DIRECTORY); } + @SuppressWarnings("unchecked") public List<String> getRevocationServiceOrder() throws Exception { return configuration.getList(SSL_REVOCATION_SERVICE_ORDER); } |