Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump com.spotify.fmt:fmt-maven-plugin from 2.20 to 2.21.1 #390

Merged
merged 2 commits into from
Sep 28, 2023
Merged

build(deps): bump com.spotify.fmt:fmt-maven-plugin from 2.20 to 2.21.1 #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f98c6ae
build(deps): bump com.spotify.fmt:fmt-maven-plugin from 2.20 to 2.21.1
dependabot[bot] Sep 25, 2023
bc15ae1
Fix code style
morpheus-87 Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
<plugin>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.20</version>
<version>2.21.1</version>
<executions>
<execution>
<goals>
Expand Down
19 changes: 14 additions & 5 deletions src/main/java/de/digitalcollections/iiif/hymir/image/business/ImageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ private ImageReader getReader(String identifier)
@Override
public void readImageInfo(
String identifier, de.digitalcollections.iiif.model.image.ImageService info)
throws UnsupportedFormatException, UnsupportedOperationException, ResourceNotFoundException,
throws UnsupportedFormatException,
UnsupportedOperationException,
ResourceNotFoundException,
IOException {
ImageReader r = null;
int metricKey = metrics.startImageOp();
Expand Down Expand Up @@ -270,8 +272,11 @@ static ImageReadParam getReadParam(ImageReader reader, ImageApiSelector selector
/** Decode an image * */
private DecodedImage readImage(
String identifier, ImageApiSelector selector, ImageApiProfile profile)
throws IOException, ResourceNotFoundException, UnsupportedFormatException,
InvalidParametersException, ScalingException {
throws IOException,
ResourceNotFoundException,
UnsupportedFormatException,
InvalidParametersException,
ScalingException {
int metricKey = metrics.startImageOp();
ImageReader reader = null;
try {
Expand Down Expand Up @@ -416,8 +421,12 @@ private BufferedImage transformImage(
@Override
public void processImage(
String identifier, ImageApiSelector selector, ImageApiProfile profile, OutputStream os)
throws InvalidParametersException, UnsupportedOperationException, UnsupportedFormatException,
ResourceNotFoundException, IOException, ScalingException {
throws InvalidParametersException,
UnsupportedOperationException,
UnsupportedFormatException,
ResourceNotFoundException,
IOException,
ScalingException {

Rectangle2D region = selector.getRegion().getRegion();
if (region != null && (region.getWidth() < 1 || region.getHeight() < 1)) {
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/de/digitalcollections/iiif/hymir/image/business/api/ImageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ default Instant getImageModificationDate(String identifier) throws ResourceNotFo
}

void readImageInfo(String identifier, de.digitalcollections.iiif.model.image.ImageService info)
throws UnsupportedFormatException, UnsupportedOperationException, ResourceNotFoundException,
throws UnsupportedFormatException,
UnsupportedOperationException,
ResourceNotFoundException,
IOException;

void processImage(
String identifier, ImageApiSelector selector, ImageApiProfile profile, OutputStream os)
throws InvalidParametersException, UnsupportedOperationException, UnsupportedFormatException,
ResourceNotFoundException, IOException, ScalingException;
throws InvalidParametersException,
UnsupportedOperationException,
UnsupportedFormatException,
ResourceNotFoundException,
IOException,
ScalingException;
}
8 changes: 6 additions & 2 deletions src/main/java/de/digitalcollections/iiif/hymir/image/frontend/IIIFImageApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@ public ResponseEntity<byte[]> getImageRepresentation(
HttpServletRequest request,
HttpServletResponse response,
WebRequest webRequest)
throws UnsupportedFormatException, UnsupportedOperationException, IOException,
InvalidParametersException, ResourceNotFoundException, ScalingException {
throws UnsupportedFormatException,
UnsupportedOperationException,
IOException,
InvalidParametersException,
ResourceNotFoundException,
ScalingException {
if (UrlRules.isInsecure(identifier)) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new byte[] {});
}
Expand Down