Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove STARTUP_TIME because static fields are initialized at compile time in native mode

Browse Source
This commit is contained in:
Athou
2024-08-15 12:17:28 +02:00
parent 47d39831d3
commit 815093f1c6
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,5 @@
package com.commafeed; package com.commafeed;
import java.time.Instant;
import com.commafeed.backend.feed.FeedRefreshEngine; import com.commafeed.backend.feed.FeedRefreshEngine;
import com.commafeed.backend.service.db.DatabaseStartupService; import com.commafeed.backend.service.db.DatabaseStartupService;
import com.commafeed.backend.task.TaskScheduler; import com.commafeed.backend.task.TaskScheduler;
@@ -20,8 +18,6 @@ public class CommaFeedApplication {
public static final String USERNAME_ADMIN = "admin"; public static final String USERNAME_ADMIN = "admin";
public static final String USERNAME_DEMO = "demo"; public static final String USERNAME_DEMO = "demo";
public static final Instant STARTUP_TIME = Instant.now();
private final DatabaseStartupService databaseStartupService; private final DatabaseStartupService databaseStartupService;
private final FeedRefreshEngine feedRefreshEngine; private final FeedRefreshEngine feedRefreshEngine;
private final TaskScheduler taskScheduler; private final TaskScheduler taskScheduler;

20
commafeed-server/src/main/java/com/commafeed/frontend/resource/FeedREST.java
View File

@@ -3,15 +3,14 @@ package com.commafeed.frontend.resource;
import java.io.StringWriter; import java.io.StringWriter;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.time.Instant; import java.time.Instant;
import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
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.SystemUtils; import org.apache.commons.lang3.SystemUtils;
import org.jboss.resteasy.reactive.Cache;
import org.jboss.resteasy.reactive.RestForm; import org.jboss.resteasy.reactive.RestForm;
import com.commafeed.CommaFeedApplication; import com.commafeed.CommaFeedApplication;
@@ -80,10 +79,8 @@ import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces; import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.CacheControl;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.ResponseBuilder;
import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.Response.Status;
import jakarta.ws.rs.core.UriInfo; import jakarta.ws.rs.core.UriInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -343,6 +340,7 @@ public class FeedREST {
@GET @GET
@Path("/favicon/{id}") @Path("/favicon/{id}")
@Cache(maxAge = 2592000)
@Transactional @Transactional
@Operation(summary = "Fetch a feed's icon", description = "Fetch a feed's icon") @Operation(summary = "Fetch a feed's icon", description = "Fetch a feed's icon")
public Response getFeedFavicon(@Parameter(description = "subscription id", required = true) @PathParam("id") Long id) { public Response getFeedFavicon(@Parameter(description = "subscription id", required = true) @PathParam("id") Long id) {
@@ -356,19 +354,7 @@ public class FeedREST {
Feed feed = subscription.getFeed(); Feed feed = subscription.getFeed();
Favicon icon = feedService.fetchFavicon(feed); Favicon icon = feedService.fetchFavicon(feed);
ResponseBuilder builder = Response.ok(icon.getIcon(), icon.getMediaType()); return Response.ok(icon.getIcon(), icon.getMediaType()).build();
CacheControl cacheControl = new CacheControl();
cacheControl.setMaxAge(2592000);
cacheControl.setPrivate(false);
builder.cacheControl(cacheControl);
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.MONTH, 1);
builder.expires(calendar.getTime());
builder.lastModified(Date.from(CommaFeedApplication.STARTUP_TIME));
return builder.build();
} }
@POST @POST

2
commafeed-server/src/test/java/com/commafeed/integration/rest/FeedIT.java
View File

@@ -27,6 +27,7 @@ import com.commafeed.integration.BaseIT;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured; import io.restassured.RestAssured;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
@QuarkusTest @QuarkusTest
@@ -224,6 +225,7 @@ class FeedIT extends BaseIT {
.get("rest/feed/favicon/{id}", subscriptionId) .get("rest/feed/favicon/{id}", subscriptionId)
.then() .then()
.statusCode(HttpStatus.SC_OK) .statusCode(HttpStatus.SC_OK)
.header(HttpHeaders.CACHE_CONTROL, "max-age=2592000")
.extract() .extract()
.response() .response()
.asByteArray(); .asByteArray();