diff --git a/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java b/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java index e92fc297b..e6e43af59 100644 --- a/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java +++ b/smack-android/src/main/java/org/jivesoftware/smack/util/stringencoder/android/AndroidBase64UrlSafeEncoder.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2014 Florian Schmaus + * Copyright © 2014-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import org.jivesoftware.smack.util.stringencoder.StringEncoder; import android.util.Base64; -public final class AndroidBase64UrlSafeEncoder implements StringEncoder { +public final class AndroidBase64UrlSafeEncoder implements StringEncoder { private static AndroidBase64UrlSafeEncoder instance = new AndroidBase64UrlSafeEncoder(); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java index c8239f5d2..868dd4a63 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base32.java @@ -34,7 +34,7 @@ import org.jivesoftware.smack.util.StringUtils; */ public class Base32 { - private static final StringEncoder base32Stringencoder = new StringEncoder() { + private static final StringEncoder base32Stringencoder = new StringEncoder() { @Override public String encode(String string) { @@ -49,7 +49,7 @@ public class Base32 { }; private static final String ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ2345678"; - public static StringEncoder getStringEncoder() { + public static StringEncoder getStringEncoder() { return base32Stringencoder; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64UrlSafeEncoder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64UrlSafeEncoder.java index 93c3e53f1..713aeb223 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64UrlSafeEncoder.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/Base64UrlSafeEncoder.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2014-2015 Florian Schmaus + * Copyright © 2014-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,14 +20,14 @@ import org.jivesoftware.smack.util.Objects; public class Base64UrlSafeEncoder { - private static StringEncoder base64UrlSafeEncoder; + private static StringEncoder base64UrlSafeEncoder; - public static void setEncoder(StringEncoder encoder) { + public static void setEncoder(StringEncoder encoder) { Objects.requireNonNull(encoder, "encoder must no be null"); base64UrlSafeEncoder = encoder; } - public static StringEncoder getStringEncoder() { + public static StringEncoder getStringEncoder() { return base64UrlSafeEncoder; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/StringEncoder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/StringEncoder.java index d181eafa9..cabd23973 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/StringEncoder.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/stringencoder/StringEncoder.java @@ -1,6 +1,6 @@ /** * - * Copyright 2013-2014 Florian Schmaus + * Copyright 2013-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,20 +21,20 @@ package org.jivesoftware.smack.util.stringencoder; * * @author Florian Schmaus */ -public interface StringEncoder { +public interface StringEncoder { /** - * Encodes an string to another representation. + * Encodes an object to another representation. * - * @param string + * @param object the object to encode. * @return the encoded String */ - String encode(String string); + String encode(O object); /** - * Decodes an string back to it's initial representation. + * Decodes a string back to it's initial representation. * - * @param string - * @return the decoded String + * @param string the string to decode. + * @return the decoded object */ - String decode(String string); + O decode(String string); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java index f6a60b960..da9ff22c9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2011-2014 Florian Schmaus + * Copyright © 2011-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache private static final Logger LOGGER = Logger.getLogger(SimpleDirectoryPersistentCache.class.getName()); private final File cacheDir; - private final StringEncoder filenameEncoder; + private final StringEncoder filenameEncoder; /** * Creates a new SimpleDirectoryPersistentCache Object. Make sure that the @@ -69,7 +69,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache * @param cacheDir The directory where the cache will be stored. * @param filenameEncoder Encodes the node string into a filename. */ - public SimpleDirectoryPersistentCache(File cacheDir, StringEncoder filenameEncoder) { + public SimpleDirectoryPersistentCache(File cacheDir, StringEncoder filenameEncoder) { if (!cacheDir.exists()) throw new IllegalStateException("Cache directory \"" + cacheDir + "\" does not exist"); if (!cacheDir.isDirectory()) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java index b912f8544..2810e8494 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java @@ -75,7 +75,7 @@ public class EntityCapsManagerTest extends InitExtensions { assertTrue(di.containsDuplicateIdentities()); } - private static void testSimpleDirectoryCache(StringEncoder stringEncoder) throws IOException { + private static void testSimpleDirectoryCache(StringEncoder stringEncoder) throws IOException { EntityCapsPersistentCache cache = new SimpleDirectoryPersistentCache(createTempDirectory()); EntityCapsManager.setPersistentCache(cache); diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java index b266fb09f..5b724501a 100644 --- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java +++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java @@ -33,7 +33,7 @@ import org.jivesoftware.smack.util.stringencoder.StringEncoder; * * @author Robin Collier */ -public final class Java7Base64UrlSafeEncoder implements StringEncoder { +public final class Java7Base64UrlSafeEncoder implements StringEncoder { private static final Java7Base64UrlSafeEncoder instance = new Java7Base64UrlSafeEncoder();