garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Merge pull request #1861 from Athou/renovate/quarkus.version

Browse Source 
fix(deps): update quarkus.version to v3.25.0 (minor)
This commit is contained in:
Jérémie Panzer
2025-07-30 14:11:33 +02:00
committed by GitHub
parent 151a613dcc 58bf86d25d
commit d5c41a5167
9 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commafeed-server/pom.xml
View File

@@ -12,7 +12,7 @@
<name>CommaFeed Server</name> <name>CommaFeed Server</name>
<properties> <properties>
<quarkus.version>3.24.5</quarkus.version> <quarkus.version>3.25.0</quarkus.version>
<querydsl.version>7.0</querydsl.version> <querydsl.version>7.0</querydsl.version>
<rome.version>2.1.0</rome.version> <rome.version>2.1.0</rome.version>

4
commafeed-server/src/main/java/com/commafeed/backend/Urls.java
View File

@@ -3,7 +3,7 @@ package com.commafeed.backend;
import java.net.URI; import java.net.URI;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings;
import org.netpreserve.urlcanon.Canonicalizer; import org.netpreserve.urlcanon.Canonicalizer;
import org.netpreserve.urlcanon.ParsedUrl; import org.netpreserve.urlcanon.ParsedUrl;
@@ -87,7 +87,7 @@ public class Urls {
if (normalized.split(ESCAPED_QUESTION_MARK)[0].contains("feedburner.com")) { if (normalized.split(ESCAPED_QUESTION_MARK)[0].contains("feedburner.com")) {
normalized = normalized.replace("feeds2.feedburner.com", "feeds.feedburner.com"); normalized = normalized.replace("feeds2.feedburner.com", "feeds.feedburner.com");
normalized = normalized.split(ESCAPED_QUESTION_MARK)[0]; normalized = normalized.split(ESCAPED_QUESTION_MARK)[0];
normalized = StringUtils.removeEnd(normalized, "/"); normalized = Strings.CS.removeEnd(normalized, "/");
} }
return normalized; return normalized;

4
commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java
View File

@@ -6,7 +6,7 @@ import java.util.List;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings;
import com.commafeed.backend.model.Feed; import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.QFeed; import com.commafeed.backend.model.QFeed;
@@ -52,7 +52,7 @@ public class FeedDAO extends GenericDAO<Feed> {
.where(FEED.normalizedUrlHash.eq(normalizedUrlHash)) .where(FEED.normalizedUrlHash.eq(normalizedUrlHash))
.fetch() .fetch()
.stream() .stream()
.filter(f -> StringUtils.equals(normalizedUrl, f.getNormalizedUrl())) .filter(f -> Strings.CS.equals(normalizedUrl, f.getNormalizedUrl()))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
} }

5
commafeed-server/src/main/java/com/commafeed/backend/feed/FeedFetcher.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import com.commafeed.backend.Digests; import com.commafeed.backend.Digests;
import com.commafeed.backend.HttpGetter; import com.commafeed.backend.HttpGetter;
@@ -75,8 +76,8 @@ public class FeedFetcher {
throw new IOException("Feed content is empty."); throw new IOException("Feed content is empty.");
} }
boolean lastModifiedHeaderValueChanged = !StringUtils.equals(lastModified, result.getLastModifiedSince()); boolean lastModifiedHeaderValueChanged = !Strings.CS.equals(lastModified, result.getLastModifiedSince());
boolean etagHeaderValueChanged = !StringUtils.equals(eTag, result.getETag()); boolean etagHeaderValueChanged = !Strings.CS.equals(eTag, result.getETag());
String hash = Digests.sha1Hex(content); String hash = Digests.sha1Hex(content);
if (lastContentHash != null && lastContentHash.equals(hash)) { if (lastContentHash != null && lastContentHash.equals(hash)) {

4
commafeed-server/src/main/java/com/commafeed/backend/feed/FeedRefreshWorker.java
View File

@@ -8,7 +8,7 @@ import java.util.Optional;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings;
import com.codahale.metrics.Meter; import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricRegistry;
@@ -63,7 +63,7 @@ public class FeedRefreshWorker {
} }
String urlAfterRedirect = result.urlAfterRedirect(); String urlAfterRedirect = result.urlAfterRedirect();
if (StringUtils.equals(url, urlAfterRedirect)) { if (Strings.CS.equals(url, urlAfterRedirect)) {
urlAfterRedirect = null; urlAfterRedirect = null;
} }

10
commafeed-server/src/main/java/com/commafeed/backend/feed/parser/EncodingDetector.java
View File

@@ -5,7 +5,7 @@ import java.nio.charset.Charset;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings;
import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetDetector;
import com.ibm.icu.text.CharsetMatch; import com.ibm.icu.text.CharsetMatch;
@@ -20,11 +20,11 @@ class EncodingDetector {
*/ */
public Charset getEncoding(byte[] bytes) { public Charset getEncoding(byte[] bytes) {
String extracted = extractDeclaredEncoding(bytes); String extracted = extractDeclaredEncoding(bytes);
if (StringUtils.startsWithIgnoreCase(extracted, "iso-8859-")) { if (Strings.CI.startsWith(extracted, "iso-8859-")) {
if (!StringUtils.endsWith(extracted, "1")) { if (!Strings.CS.endsWith(extracted, "1")) {
return Charset.forName(extracted); return Charset.forName(extracted);
} }
} else if (StringUtils.startsWithIgnoreCase(extracted, "windows-")) { } else if (Strings.CI.startsWith(extracted, "windows-")) {
return Charset.forName(extracted); return Charset.forName(extracted);
} }
return detectEncoding(bytes); return detectEncoding(bytes);
@@ -40,7 +40,7 @@ class EncodingDetector {
} }
String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1)).replace('\'', '"'); String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1)).replace('\'', '"');
index = StringUtils.indexOf(pi, "encoding=\""); index = Strings.CS.indexOf(pi, "encoding=\"");
if (index == -1) { if (index == -1) {
return null; return null;
} }

4
commafeed-server/src/main/java/com/commafeed/backend/urlprovider/YoutubeFeedURLProvider.java
View File

@@ -4,7 +4,7 @@ import java.util.List;
import jakarta.inject.Singleton; import jakarta.inject.Singleton;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings;
/** /**
* Workaround for Youtube channels * Workaround for Youtube channels
@@ -20,7 +20,7 @@ public class YoutubeFeedURLProvider implements FeedURLProvider {
@Override @Override
public List<String> get(String url, String urlContent) { public List<String> get(String url, String urlContent) {
if (!StringUtils.startsWithIgnoreCase(url, PREFIX)) { if (!Strings.CI.startsWith(url, PREFIX)) {
return List.of(); return List.of();
} }

4
commafeed-server/src/main/java/com/commafeed/frontend/model/Entry.java
View File

@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.time.Instant; import java.time.Instant;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.media.Schema;
@@ -128,7 +128,7 @@ public class Entry implements Serializable {
entry.setAuthor(content.getAuthor()); entry.setAuthor(content.getAuthor());
entry.setEnclosureType(content.getEnclosureType()); entry.setEnclosureType(content.getEnclosureType());
entry.setEnclosureUrl(proxyImages && StringUtils.contains(content.getEnclosureType(), "image") entry.setEnclosureUrl(proxyImages && Strings.CS.contains(content.getEnclosureType(), "image")
? FeedUtils.proxyImage(content.getEnclosureUrl()) ? FeedUtils.proxyImage(content.getEnclosureUrl())
: content.getEnclosureUrl()); : content.getEnclosureUrl());

3
commafeed-server/src/main/java/com/commafeed/frontend/resource/CategoryREST.java
View File

@@ -28,6 +28,7 @@ import jakarta.ws.rs.core.UriInfo;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Content;
import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.media.Schema;
@@ -339,7 +340,7 @@ public class CategoryREST {
FeedCategory parent = null; FeedCategory parent = null;
if (req.getParentId() != null && !CategoryREST.ALL.equals(req.getParentId()) if (req.getParentId() != null && !CategoryREST.ALL.equals(req.getParentId())
&& !StringUtils.equals(req.getParentId(), String.valueOf(req.getId()))) { && !Strings.CS.equals(req.getParentId(), String.valueOf(req.getId()))) {
parent = feedCategoryDAO.findById(user, Long.valueOf(req.getParentId())); parent = feedCategoryDAO.findById(user, Long.valueOf(req.getParentId()));
} }
category.setParent(parent); category.setParent(parent);