You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/03/21 21:40:37 UTC
[commons-imaging] 03/03: Better internal class name
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 1f48a6196d47b052b73bdb3674aa9e8802c98e1c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Mar 21 17:35:01 2023 -0400
Better internal class name
---
.../java/org/apache/commons/imaging/Imaging.java | 22 +++++++++++-----------
.../{Util.java => ImageParserFactory.java} | 8 ++++----
.../common/bytesource/ByteSourceImageTest.java | 4 ++--
.../commons/imaging/formats/xmp/XmpUpdateTest.java | 4 ++--
.../commons/imaging/roundtrip/RoundtripBase.java | 8 ++++----
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/Imaging.java b/src/main/java/org/apache/commons/imaging/Imaging.java
index b973b0ea..3e6fd062 100644
--- a/src/main/java/org/apache/commons/imaging/Imaging.java
+++ b/src/main/java/org/apache/commons/imaging/Imaging.java
@@ -24,7 +24,7 @@ import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
import org.apache.commons.imaging.icc.IccProfileInfo;
import org.apache.commons.imaging.icc.IccProfileParser;
-import org.apache.commons.imaging.internal.Util;
+import org.apache.commons.imaging.internal.ImageParserFactory;
import java.awt.Dimension;
import java.awt.color.ICC_Profile;
@@ -400,7 +400,7 @@ public final class Imaging {
}
private static byte[] getICCProfileBytes(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.getICCProfileBytes(byteSource, null);
}
@@ -479,7 +479,7 @@ public final class Imaging {
}
private static ImageInfo getImageInfo(final ByteSource byteSource) throws ImageReadException, IOException {
- return Util.getImageParser(byteSource).getImageInfo(byteSource, null);
+ return ImageParserFactory.getImageParser(byteSource).getImageInfo(byteSource, null);
}
/**
@@ -528,7 +528,7 @@ public final class Imaging {
* @throws IOException if it fails to read the image data
*/
public static Dimension getImageSize(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.getImageSize(byteSource, null);
}
@@ -578,7 +578,7 @@ public final class Imaging {
* @throws IOException if it fails to read the image data
*/
public static String getXmpXml(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
if (imageParser instanceof XmpEmbeddable) {
return ((XmpEmbeddable) imageParser).getXmpXml(byteSource, null);
}
@@ -649,7 +649,7 @@ public final class Imaging {
}
private static ImageMetadata getMetadata(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.getMetadata(byteSource, null);
}
@@ -678,7 +678,7 @@ public final class Imaging {
}
private static String dumpImageFile(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.dumpImageFile(byteSource);
}
@@ -712,7 +712,7 @@ public final class Imaging {
}
private static FormatCompliance getFormatCompliance(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.getFormatCompliance(byteSource);
}
@@ -754,7 +754,7 @@ public final class Imaging {
}
private static List<BufferedImage> getAllBufferedImages(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.getAllBufferedImages(byteSource);
}
@@ -836,7 +836,7 @@ public final class Imaging {
}
private static BufferedImage getBufferedImage(final ByteSource byteSource) throws ImageReadException, IOException {
- final ImageParser<?> imageParser = Util.getImageParser(byteSource);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(byteSource);
return imageParser.getBufferedImage(byteSource, null);
}
@@ -912,7 +912,7 @@ public final class Imaging {
Objects.requireNonNull(outputStream, "outputStream");
Objects.requireNonNull(format, "format");
- final ImageParser<?> imageParser = Util.getImageParser(format);
+ final ImageParser<?> imageParser = ImageParserFactory.getImageParser(format);
imageParser.writeImage(src, outputStream, null);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/internal/Util.java b/src/main/java/org/apache/commons/imaging/internal/ImageParserFactory.java
similarity index 93%
rename from src/main/java/org/apache/commons/imaging/internal/Util.java
rename to src/main/java/org/apache/commons/imaging/internal/ImageParserFactory.java
index 355063cf..2923e289 100644
--- a/src/main/java/org/apache/commons/imaging/internal/Util.java
+++ b/src/main/java/org/apache/commons/imaging/internal/ImageParserFactory.java
@@ -32,9 +32,9 @@ import org.apache.commons.imaging.common.bytesource.ByteSource;
*
* @since 1.0-alpha3
*/
-public class Util {
+public class ImageParserFactory {
- private Util() {}
+ private ImageParserFactory() {}
public static <T extends ImagingParameters<T>> ImageParser<T> getImageParser(final ImageFormat format) {
return getImageParser(parser -> parser.canAcceptType(format), () -> new IllegalArgumentException("Unknown Format: " + format));
@@ -60,12 +60,12 @@ public class Util {
// TODO: circular dependency between Imaging and internal Util class below.
final ImageFormat format = Imaging.guessFormat(byteSource);
if (!format.equals(ImageFormats.UNKNOWN)) {
- return Util.getImageParser(format);
+ return ImageParserFactory.getImageParser(format);
}
final String fileName = byteSource.getFileName();
if (fileName != null) {
- return Util.getImageParser(fileName);
+ return ImageParserFactory.getImageParser(fileName);
}
throw new IllegalArgumentException("Can't parse this format.");
diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
index c9bb876a..dd42e596 100644
--- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.imaging.ImagingParameters;
import org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
import org.apache.commons.imaging.formats.tiff.TiffImagingParameters;
import org.apache.commons.imaging.internal.Debug;
-import org.apache.commons.imaging.internal.Util;
+import org.apache.commons.imaging.internal.ImageParserFactory;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -172,7 +172,7 @@ public class ByteSourceImageTest extends ByteSourceTest {
params = new JpegImagingParameters();
}
- final ImageParser imageParser = Util.getImageParser(imageFormat);
+ final ImageParser imageParser = ImageParserFactory.getImageParser(imageFormat);
final ImageInfo imageInfoFile = imageParser.getImageInfo(imageFile, params);
diff --git a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
index 13ddafe9..8bee7faa 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.imaging.ImagingParameters;
import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.common.XmpImagingParameters;
import org.apache.commons.imaging.internal.Debug;
-import org.apache.commons.imaging.internal.Util;
+import org.apache.commons.imaging.internal.ImageParserFactory;
import org.junit.jupiter.api.Test;
public class XmpUpdateTest<E extends XmpImagingParameters<E>> extends ImagingTest {
@@ -68,7 +68,7 @@ public class XmpUpdateTest<E extends XmpImagingParameters<E>> extends ImagingTes
final File tempFile = Files.createTempFile(imageFile.getName() + ".", "." + imageFormat.getDefaultExtension()).toFile();
final BufferedImage image = Imaging.getBufferedImage(imageFile);
- final ImageParser<E> parser = Util.getImageParser("." + imageFormat.getDefaultExtension());
+ final ImageParser<E> parser = ImageParserFactory.getImageParser("." + imageFormat.getDefaultExtension());
final E params = parser.getDefaultParameters();
params.setXmpXml(xmpXml);
try (FileOutputStream fos = new FileOutputStream(tempFile)) {
diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java b/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java
index a466618a..12a8b5d7 100644
--- a/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java
+++ b/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java
@@ -22,7 +22,7 @@ import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.ImagingParameters;
import org.apache.commons.imaging.common.RgbBufferedImageFactory;
import org.apache.commons.imaging.internal.Debug;
-import org.apache.commons.imaging.internal.Util;
+import org.apache.commons.imaging.internal.ImageParserFactory;
import org.junit.jupiter.params.provider.Arguments;
import java.awt.image.BufferedImage;
@@ -43,14 +43,14 @@ public class RoundtripBase {
+ formatInfo.format.getDefaultExtension()).toFile();
Debug.debug("tempFile: " + temp1.getName());
- final ImageParser imageParser = Util.getImageParser(formatInfo.format);
+ final ImageParser imageParser = ImageParserFactory.getImageParser(formatInfo.format);
- final ImagingParameters params = Util.getImageParser(formatInfo.format).getDefaultParameters();
+ final ImagingParameters params = ImageParserFactory.getImageParser(formatInfo.format).getDefaultParameters();
try (FileOutputStream fos = new FileOutputStream(temp1)) {
imageParser.writeImage(testImage, fos, params);
}
- final ImagingParameters readParams = Util.getImageParser(formatInfo.format).getDefaultParameters();
+ final ImagingParameters readParams = ImageParserFactory.getImageParser(formatInfo.format).getDefaultParameters();
readParams.setBufferedImageFactory(new RgbBufferedImageFactory());
final BufferedImage image2 = imageParser.getBufferedImage(temp1, readParams);
assertNotNull(image2);