From b132178228eafd73b7674f0a2c7bd1edace51faa Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 2 Jan 2022 21:31:05 +0100 Subject: [PATCH] remove warnings --- .../commafeed/backend/favicon/FacebookFaviconFetcher.java | 2 +- .../com/commafeed/frontend/auth/SecurityCheckFactory.java | 7 ++++--- .../java/com/commafeed/backend/opml/OPMLImporterTest.java | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java b/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java index 66e0083d..9b5511ef 100644 --- a/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java +++ b/src/main/java/com/commafeed/backend/favicon/FacebookFaviconFetcher.java @@ -67,7 +67,7 @@ public class FacebookFaviconFetcher extends AbstractFaviconFetcher { log.debug("could not parse url", e); return null; } - List params = URLEncodedUtils.parse(uri, StandardCharsets.UTF_8.name()); + List params = URLEncodedUtils.parse(uri, StandardCharsets.UTF_8); for (NameValuePair param : params) { if ("id".equals(param.getName())) { return param.getValue(); diff --git a/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java b/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java index 71b8dfc2..535d5aa5 100644 --- a/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java +++ b/src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java @@ -1,5 +1,7 @@ package com.commafeed.frontend.auth; +import java.nio.charset.StandardCharsets; +import java.util.Base64; import java.util.Optional; import java.util.Set; @@ -11,8 +13,6 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.eclipse.jetty.util.B64Code; -import org.eclipse.jetty.util.StringUtil; import org.glassfish.jersey.server.internal.inject.AbstractContainerRequestValueFactory; import com.commafeed.backend.model.User; @@ -79,7 +79,8 @@ public class SecurityCheckFactory extends AbstractContainerRequestValueFactory 0) { String method = header.substring(0, space); if (PREFIX.equalsIgnoreCase(method)) { - String decoded = B64Code.decode(header.substring(space + 1), StringUtil.__ISO_8859_1); + byte[] decodedBytes = Base64.getDecoder().decode(header.substring(space + 1)); + String decoded = new String(decodedBytes, StandardCharsets.ISO_8859_1); int i = decoded.indexOf(':'); if (i > 0) { String username = decoded.substring(0, i); diff --git a/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java b/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java index 14f75260..5f07bb51 100644 --- a/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java +++ b/src/test/java/com/commafeed/backend/opml/OPMLImporterTest.java @@ -1,6 +1,7 @@ package com.commafeed.backend.opml; import java.io.IOException; +import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; import org.junit.Test; @@ -40,13 +41,13 @@ public class OPMLImporterTest { CacheService cacheService = Mockito.mock(CacheService.class); User user = Mockito.mock(User.class); - String xml = IOUtils.toString(getClass().getResourceAsStream(fileName)); + String xml = IOUtils.toString(getClass().getResourceAsStream(fileName), StandardCharsets.UTF_8); OPMLImporter importer = new OPMLImporter(feedCategoryDAO, feedSubscriptionService, cacheService); importer.importOpml(user, xml); - Mockito.verify(feedSubscriptionService).subscribe(Mockito.eq(user), Mockito.anyString(), Mockito.anyString(), - Mockito.any(FeedCategory.class), Mockito.anyInt()); + Mockito.verify(feedSubscriptionService) + .subscribe(Mockito.eq(user), Mockito.anyString(), Mockito.anyString(), Mockito.any(FeedCategory.class), Mockito.anyInt()); } }