diff --git a/commafeed-server/pom.xml b/commafeed-server/pom.xml index eef47bbd..cd114974 100644 --- a/commafeed-server/pom.xml +++ b/commafeed-server/pom.xml @@ -296,11 +296,6 @@ ${querydsl.version} - - commons-io - commons-io - 2.16.1 - org.apache.commons commons-collections4 diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java index c67c7148..69a5ecf2 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/FeedService.java @@ -2,10 +2,9 @@ package com.commafeed.backend.service; import java.io.IOException; import java.time.Instant; +import java.util.Objects; import java.util.Set; -import org.apache.commons.io.IOUtils; - import com.commafeed.backend.Digests; import com.commafeed.backend.dao.FeedDAO; import com.commafeed.backend.favicon.AbstractFaviconFetcher; @@ -13,6 +12,7 @@ import com.commafeed.backend.favicon.Favicon; import com.commafeed.backend.feed.FeedUtils; import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Models; +import com.google.common.io.Resources; import jakarta.inject.Inject; import jakarta.inject.Singleton; @@ -31,7 +31,8 @@ public class FeedService { this.faviconFetchers = faviconFetchers; try { - defaultFavicon = new Favicon(IOUtils.toByteArray(getClass().getResource("/images/default_favicon.gif")), "image/gif"); + defaultFavicon = new Favicon( + Resources.toByteArray(Objects.requireNonNull(getClass().getResource("/images/default_favicon.gif"))), "image/gif"); } catch (IOException e) { throw new RuntimeException("could not load default favicon", e); } diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java index 6e70824b..bc600bb4 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java @@ -11,7 +11,6 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.glassfish.jersey.media.multipart.FormDataParam; @@ -524,7 +523,7 @@ public class FeedREST { return Response.status(Status.FORBIDDEN).entity("Import is disabled for the demo account").build(); } try { - String opml = IOUtils.toString(input, StandardCharsets.UTF_8); + String opml = new String(input.readAllBytes(), StandardCharsets.UTF_8); opmlImporter.importOpml(user, opml); } catch (Exception e) { log.error(e.getMessage(), e);