diff options
Diffstat (limited to 'juick-server')
4 files changed, 10 insertions, 7 deletions
diff --git a/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java b/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java index 7be9ec09..9e1de074 100644 --- a/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java +++ b/juick-server/src/main/java/com/juick/server/api/rss/MessagesView.java @@ -62,6 +62,7 @@ public class MessagesView extends AbstractRssFeedView { setContentType("application/rss+xml;charset=UTF-8"); } + @SuppressWarnings("unchecked") @Override protected List<Item> buildFeedItems(@Nonnull Map<String, Object> model, @Nonnull HttpServletRequest request, diff --git a/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java b/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java index a5411397..b1e813c4 100644 --- a/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java +++ b/juick-server/src/main/java/com/juick/server/api/rss/RepliesView.java @@ -56,8 +56,9 @@ public class RepliesView extends AbstractRssFeedView { setContentType("application/rss+xml;charset=UTF-8"); } + @SuppressWarnings("unchecked") @Override - protected List<Item> buildFeedItems(@Nonnull Map<String, Object> model, + protected @Nonnull List<Item> buildFeedItems(@Nonnull Map<String, Object> model, @Nonnull HttpServletRequest request, @Nonnull HttpServletResponse response) { List<ResponseReply> msgs = (List<ResponseReply>)model.get("messages"); diff --git a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java b/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java index eb103136..90dec35f 100644 --- a/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java +++ b/juick-server/src/main/java/com/juick/server/api/rss/extension/JuickModuleGenerator.java @@ -38,16 +38,16 @@ public class JuickModuleGenerator implements ModuleGenerator { return JuickModule.URI; } - private static final Set NAMESPACES; + private static final Set<Namespace> NAMESPACES; static { - Set nss = new HashSet(); + Set<Namespace> nss = new HashSet<>(); nss.add(JUICK_NS); NAMESPACES = Collections.unmodifiableSet(nss); } @Override - public Set getNamespaces() { + public Set<Namespace> getNamespaces() { return NAMESPACES; } @@ -56,7 +56,7 @@ public class JuickModuleGenerator implements ModuleGenerator { // this is not necessary, it is done to avoid the namespace definition in every item. Element root = element; while (root.getParent()!=null && root.getParent() instanceof Element) { - root = (Element) element.getParent(); + root = element.getParentElement(); } root.addNamespaceDeclaration(JUICK_NS); diff --git a/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java b/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java index 71405f34..d25dbad8 100644 --- a/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java +++ b/juick-server/src/main/java/com/juick/server/xmpp/s2s/util/DialbackUtils.java @@ -18,6 +18,7 @@ package com.juick.server.xmpp.s2s.util; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.codec.digest.HmacAlgorithms; import org.apache.commons.codec.digest.HmacUtils; import rocks.xmpp.addr.Jid; @@ -30,7 +31,7 @@ public class DialbackUtils { } public static String generateDialbackKey(String secret, Jid to, Jid from, String id) { - return HmacUtils.hmacSha256Hex(DigestUtils.sha256(secret), - (to.toEscapedString() + " " + from.toEscapedString() + " " + id).getBytes()); + return new HmacUtils(HmacAlgorithms.HMAC_SHA_256, DigestUtils.sha256(secret)) + .hmacHex(to.toEscapedString() + " " + from.toEscapedString() + " " + id); } } |