Correct code smells

This commit is contained in:
2026-01-05 18:24:14 +01:00
parent 7c0b3eaff1
commit efada6753e
5 changed files with 10 additions and 13 deletions

View File

@@ -238,7 +238,7 @@ public class ChannelApiController {
.map(ResponseEntity::ok) .map(ResponseEntity::ok)
.orElseThrow(() -> { .orElseThrow(() -> {
LOG.warn("Transform request for missing asset {} on {} by {}", assetId, broadcaster, sessionUsername); LOG.warn("Transform request for missing asset {} on {} by {}", assetId, broadcaster, sessionUsername);
return new ResponseStatusException(NOT_FOUND, "Asset not found"); return createAsset404();
}); });
} }
@@ -290,7 +290,7 @@ public class ChannelApiController {
broadcaster.replaceAll("[\n\r]", "_"), broadcaster.replaceAll("[\n\r]", "_"),
sessionUsername sessionUsername
); );
return new ResponseStatusException(NOT_FOUND, "Asset not found"); return createAsset404();
}); });
} }
@@ -309,7 +309,7 @@ public class ChannelApiController {
.contentType(MediaType.parseMediaType(content.mediaType())) .contentType(MediaType.parseMediaType(content.mediaType()))
.body(content.bytes()) .body(content.bytes())
) )
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Asset not found")); .orElseThrow(() -> createAsset404());
} }
@GetMapping("/assets/{assetId}/preview") @GetMapping("/assets/{assetId}/preview")
@@ -326,7 +326,7 @@ public class ChannelApiController {
.contentType(MediaType.parseMediaType(content.mediaType())) .contentType(MediaType.parseMediaType(content.mediaType()))
.body(content.bytes()) .body(content.bytes())
) )
.orElseThrow(() -> new ResponseStatusException(NOT_FOUND, "Preview not found")); .orElseThrow(() -> createAsset404());
} }
private String contentDispositionFor(String mediaType) { private String contentDispositionFor(String mediaType) {
@@ -353,12 +353,16 @@ public class ChannelApiController {
boolean removed = channelDirectoryService.deleteAsset(assetId); boolean removed = channelDirectoryService.deleteAsset(assetId);
if (!removed) { if (!removed) {
LOG.warn("Attempt to delete missing asset {} on {} by {}", assetId, broadcaster, sessionUsername); LOG.warn("Attempt to delete missing asset {} on {} by {}", assetId, broadcaster, sessionUsername);
throw new ResponseStatusException(NOT_FOUND, "Asset not found"); throw createAsset404();
} }
LOG.info("Asset {} deleted on {} by {}", assetId, broadcaster, sessionUsername); LOG.info("Asset {} deleted on {} by {}", assetId, broadcaster, sessionUsername);
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
private ResponseStatusException createAsset404() {
return new ResponseStatusException(NOT_FOUND, "Asset not found");
}
private OAuth2AuthorizedClient resolveAuthorizedClient( private OAuth2AuthorizedClient resolveAuthorizedClient(
OAuth2AuthenticationToken oauthToken, OAuth2AuthenticationToken oauthToken,
OAuth2AuthorizedClient authorizedClient, OAuth2AuthorizedClient authorizedClient,

View File

@@ -36,8 +36,7 @@ import org.springframework.web.server.ResponseStatusException;
@RequestMapping("/api/settings") @RequestMapping("/api/settings")
@SecurityRequirement(name = "administrator") @SecurityRequirement(name = "administrator")
public class SettingsApiController { public class SettingsApiController {
private static final Logger LOG = LoggerFactory.getLogger(SettingsApiController.class);
private static final Logger LOG = LoggerFactory.getLogger(ChannelApiController.class);
private final SettingsService settingsService; private final SettingsService settingsService;
private final AuthorizationService authorizationService; private final AuthorizationService authorizationService;

View File

@@ -1,6 +1,5 @@
package dev.kruhlmann.imgfloat.controller; package dev.kruhlmann.imgfloat.controller;
import static org.springframework.http.HttpStatus.FORBIDDEN;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
@@ -14,11 +13,9 @@ import dev.kruhlmann.imgfloat.service.VersionService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.util.unit.DataSize;
import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ResponseStatusException;
@Controller @Controller

View File

@@ -3,8 +3,6 @@ package dev.kruhlmann.imgfloat.model;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.PrePersist;
import jakarta.persistence.PreUpdate;
import jakarta.persistence.Table; import jakarta.persistence.Table;
@Entity @Entity

View File

@@ -7,7 +7,6 @@ import jakarta.persistence.PrePersist;
import jakarta.persistence.PreUpdate; import jakarta.persistence.PreUpdate;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint; import jakarta.persistence.UniqueConstraint;
import java.time.Instant;
import java.util.Locale; import java.util.Locale;
import java.util.UUID; import java.util.UUID;