From fc54c1940ff2eddd9b1da21dc0b707cd898083a9 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 3 Nov 2021 14:14:30 +0100 Subject: [PATCH] Revert "fix: instantiate the right inputStream instead of relying on the registry" This reverts commit 3c57598f7f7d7ac848a2700886e3304cf5878058. --- .../rest/api/portal/rest/resource/AbstractResource.java | 9 +-------- .../io/gravitee/rest/api/security/utils/ImageUtils.java | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/main/java/io/gravitee/rest/api/portal/rest/resource/AbstractResource.java b/gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/main/java/io/gravitee/rest/api/portal/rest/resource/AbstractResource.java index 38b0771917..70daca9e5b 100644 --- a/gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/main/java/io/gravitee/rest/api/portal/rest/resource/AbstractResource.java +++ b/gravitee-apim-rest-api/gravitee-apim-rest-api-portal/gravitee-apim-rest-api-portal-rest/src/main/java/io/gravitee/rest/api/portal/rest/resource/AbstractResource.java @@ -16,7 +16,6 @@ package io.gravitee.rest.api.portal.rest.resource; import com.fasterxml.jackson.annotation.JsonInclude; -import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream; import io.gravitee.rest.api.idp.api.authentication.UserDetails; import io.gravitee.rest.api.model.InlinePictureEntity; import io.gravitee.rest.api.model.MediaEntity; @@ -154,13 +153,7 @@ String checkAndScaleImage(final String encodedPicture) { } try { - /* - * For an unknown reason, when running APIM from jar/zip instead of sourcecode, com.twelvemonkeys.imageio.stream.ByteArrayImageInputStreamSpi - * is not registered in the IIORegistry used by ImageIO to manage stream. - * So basically the hack is to directly instantiate a ByteArrayImageInputStream - */ - //ImageInputStream imageInputStream = ImageIO.createImageInputStream(decodedPicture); - ImageInputStream imageInputStream = new ByteArrayImageInputStream(decodedPicture); + ImageInputStream imageInputStream = ImageIO.createImageInputStream(decodedPicture); Iterator imageReaders = ImageIO.getImageReaders(imageInputStream); while (imageReaders.hasNext()) { diff --git a/gravitee-apim-rest-api/gravitee-apim-rest-api-security/src/main/java/io/gravitee/rest/api/security/utils/ImageUtils.java b/gravitee-apim-rest-api/gravitee-apim-rest-api-security/src/main/java/io/gravitee/rest/api/security/utils/ImageUtils.java index b8545df18c..7f31339d56 100644 --- a/gravitee-apim-rest-api/gravitee-apim-rest-api-security/src/main/java/io/gravitee/rest/api/security/utils/ImageUtils.java +++ b/gravitee-apim-rest-api/gravitee-apim-rest-api-security/src/main/java/io/gravitee/rest/api/security/utils/ImageUtils.java @@ -15,7 +15,6 @@ */ package io.gravitee.rest.api.security.utils; -import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream; import io.gravitee.rest.api.exception.InvalidImageException; import java.awt.*; import java.awt.image.BufferedImage; @@ -115,13 +114,7 @@ private static Image decodePicture(String picture) throws InvalidImageException private static Image rescale(Image image, int width, int height) throws InvalidImageException { try { - /* - * For an unknown reason, when running APIM from jar/zip instead of sourcecode, com.twelvemonkeys.imageio.stream.ByteArrayImageInputStreamSpi - * is not registered in the IIORegistry used by ImageIO to manage stream. - * So basically the hack is to directly instantiate a ByteArrayImageInputStream - */ - //ImageInputStream imageInputStream = ImageIO.createImageInputStream(image.getData()); - ImageInputStream imageInputStream = new ByteArrayImageInputStream(image.getData()); + ImageInputStream imageInputStream = ImageIO.createImageInputStream(image.getData()); Iterator imageReaders = ImageIO.getImageReaders(imageInputStream); while (imageReaders.hasNext()) {