Reduce public API footprint (keeping new API)
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
index afcc60b..c006d6f 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
@@ -734,7 +734,7 @@
@Override
public void writeImage(final BufferedImage src, final OutputStream os, final PngImagingParameters params)
throws ImagingException, IOException {
- new PngWriter().writeImage(src, os, params);
+ new PngWriter().writeImage(src, os, params, null);
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
index 12efd61..d83610d 100644
--- a/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
@@ -327,19 +327,6 @@
*
* @param src The image to write.
* @param os The output stream to write to.
- * @param params The parameters to use (can be {@code NULL} to use the default parameters).
- * @throws ImagingException When errors are detected.
- * @throws IOException When IO problems occur.
- */
- public void writeImage(final BufferedImage src, final OutputStream os, final PngImagingParameters params) throws ImagingException, IOException {
- writeImage(src, os, params, new PaletteFactory());
- }
-
- /**
- * Writes an image to an output stream.
- *
- * @param src The image to write.
- * @param os The output stream to write to.
* @param params The parameters to use (can be {@code NULL} to use the default {@link PngImagingParameters}).
* @param paletteFactory The palette factory to use (can be {@code NULL} to use the default {@link PaletteFactory}).
* @throws ImagingException When errors are detected.
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
index 1529817..74f2bfd 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
@@ -69,7 +69,7 @@
private static byte[] getPngImageBytes(final BufferedImage image, final PngImagingParameters params) throws IOException {
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- new PngWriter().writeImage(image, os, params);
+ new PngWriter().writeImage(image, os, params, null);
return os.toByteArray();
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
index ad759c6..9ec5040 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
@@ -42,14 +42,7 @@
return new PaletteFactory().makeExactRgbPaletteSimple(imageParsed, Integer.MAX_VALUE).length();
}
- private static byte[] getImageBytes(final BufferedImage image, final PngImagingParameters params) throws IOException {
- try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
- new PngWriter().writeImage(image, os, params);
- return os.toByteArray();
- }
- }
-
- private static byte[] getImageBytesWithPalette(final BufferedImage image, final PngImagingParameters params, final PaletteFactory paletteFactory) throws IOException {
+ private static byte[] getImageBytes(final BufferedImage image, final PngImagingParameters params, final PaletteFactory paletteFactory) throws IOException {
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
new PngWriter().writeImage(image, os, params, paletteFactory);
return os.toByteArray();
@@ -59,7 +52,6 @@
private List<File> getValidPngImages() throws IOException {
final List<File> result = new ArrayList<>();
for (final File imageFile : getPngImages()) {
-
if (!isInvalidPNGTestFile(imageFile)) {
result.add(imageFile);
}
@@ -89,7 +81,7 @@
final PngImagingParameters params = new PngImagingParameters();
params.setForceIndexedColor(true);
- final byte[] bytes = getImageBytes(image, params);
+ final byte[] bytes = getImageBytes(image, params, null);
final int numColors = countColors(bytes);
assertTrue(numColors > 1);
@@ -100,7 +92,7 @@
return new SimplePalette(new int[max]);
}
};
- final byte[] palettedBytes = getImageBytesWithPalette(image, params, factory);
+ final byte[] palettedBytes = getImageBytes(image, params, factory);
assertEquals(1, countColors(palettedBytes));
}
