(#130) Unify Object and Page interfaces

fabriciofx · Jan 24, 2024 · 1599950 · 1599950
1 parent 450c9d3
commit 1599950
Show file tree

Hide file tree

Showing 23 changed files with 107 additions and 67 deletions.
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/Object.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/Object.java
@@ -34,16 +34,18 @@ public interface Object {
     /**
      * Object indirect.
      *
+     * @param parent Parent number, if there is one
      * @return An object indirect
      * @throws Exception if fails
      */
-    Indirect indirect() throws Exception;
+    Indirect indirect(int... parent) throws Exception;
 
     /**
      * Print object.
      *
      * @param output Output to print
+     * @param parent Parent number, if there is one
      * @throws Exception if fails
      */
-    void print(OutputStream output) throws Exception;
+    void print(OutputStream output, int... parent) throws Exception;
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/Page.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/Page.java
@@ -25,15 +25,14 @@
 
 import com.github.fabriciofx.cactoos.pdf.content.Contents;
 import com.github.fabriciofx.cactoos.pdf.resource.Resources;
-import java.io.OutputStream;
 
 /**
  * PageDefault.
  *
  * @since 0.0.1
  */
 @SuppressWarnings("PMD.ExtendsObject")
-public interface Page {
+public interface Page extends Object {
     /**
      * Page Resources.
      *
@@ -47,22 +46,4 @@ public interface Page {
      * @return Contents
      */
     Contents contents();
-
-    /**
-     * Build an Indirect.
-     *
-     * @param parent Page's parent
-     * @return An indirect
-     * @throws Exception if fails
-     */
-    Indirect indirect(int parent) throws Exception;
-
-    /**
-     * Print object.
-     *
-     * @param output Output to print
-     * @param parent Parent number
-     * @throws Exception if fails
-     */
-    void print(OutputStream output, int parent) throws Exception;
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Contents.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Contents.java
@@ -56,14 +56,17 @@ public Contents(final List<Content> list) {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         throw new UnsupportedOperationException(
             "there is no indirect to contents"
         );
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         for (final Content content : this) {
             content.print(output);
         }

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/FlateEncode.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/FlateEncode.java
@@ -87,7 +87,7 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final byte[] stream = this.asStream();
         final Dictionary dictionary = new Dictionary()
             .add("Length", new Int(stream.length))
@@ -102,7 +102,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Image.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Image.java
@@ -159,7 +159,7 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final byte[] stream = this.asStream();
         final Dictionary dictionary = new Dictionary()
             .add("Length", new Int(stream.length))
@@ -168,7 +168,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
         this.fmt.print(output);
     }

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Justify.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Justify.java
@@ -130,7 +130,7 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final Indirect indirect = this.origin.indirect();
         final byte[] stream = this.asStream();
         return new DefaultIndirect(
@@ -143,7 +143,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Text.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Text.java
@@ -243,7 +243,7 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final byte[] stream = this.asStream();
         final Dictionary dictionary = new Dictionary()
             .add("Length", new Int(stream.length))
@@ -252,7 +252,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/image/format/Jpeg.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/image/format/Jpeg.java
@@ -113,7 +113,7 @@ public int height() throws Exception {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final Header header = this.raw.header();
         final byte[] stream = this.asStream();
         final Dictionary dictionary = new Dictionary()
@@ -130,7 +130,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
     }
 

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/image/format/Png.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/image/format/Png.java
@@ -118,7 +118,7 @@ public int height() throws Exception {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final Header header = this.raw.header();
         final Palette palette = this.raw.palette();
         final Indirect pal = palette.indirect();
@@ -161,7 +161,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
         this.raw.palette().print(output);
     }

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/image/jpeg/JpegBody.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/image/jpeg/JpegBody.java
@@ -62,14 +62,17 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         throw new UnsupportedOperationException(
             "there is not indirect in jpeg body"
         );
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         // Empty of purpose.
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/image/png/PngBody.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/image/png/PngBody.java
@@ -98,14 +98,17 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         throw new UnsupportedOperationException(
             "There is no indirect into PNG body"
         );
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         // Empty of purpose.
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/image/png/PngPalette.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/image/png/PngPalette.java
@@ -123,7 +123,7 @@ public List<Resource> resource() {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final byte[] stream = this.asStream();
         final Dictionary dictionary = new Dictionary()
             .add("Length", new Int(stream.length))
@@ -136,7 +136,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/object/Catalog.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/object/Catalog.java
@@ -78,7 +78,7 @@ public Catalog(final int number, final int generation, final Pages pages) {
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final Indirect indirect = this.pages.indirect();
         final Dictionary dictionary = new Dictionary()
             .add("Type", new Name("Catalog"))
@@ -91,7 +91,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
         this.pages.print(output);
     }

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/object/Information.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/object/Information.java
@@ -395,12 +395,15 @@ public Information(
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         return new DefaultIndirect(this.number, this.generation, this.metadata);
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
     }
 }
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/page/DefaultPage.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/page/DefaultPage.java
@@ -127,7 +127,7 @@ public Contents contents() {
     }
 
     @Override
-    public Indirect indirect(final int parent) throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final Indirect resrcs = this.resources().indirect();
         Array refs = new Array();
         for (final Content content : this.contents) {
@@ -137,7 +137,7 @@ public Indirect indirect(final int parent) throws Exception {
             .add("Type", new Name("Page"))
             .add("Resources", new Text(resrcs.reference().asString()))
             .add("Contents", refs)
-            .add("Parent", new Text(new Reference(parent, 0).asString()));
+            .add("Parent", new Text(new Reference(parent[0], 0).asString()));
         return new DefaultIndirect(
             this.number,
             this.generation,
@@ -148,7 +148,7 @@ public Indirect indirect(final int parent) throws Exception {
     @Override
     public void print(
         final OutputStream output,
-        final int parent
+        final int... parent
     ) throws Exception {
         output.write(this.indirect(parent).asBytes());
         this.resources().print(output);

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/page/RotateEnvelope.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/page/RotateEnvelope.java
@@ -71,8 +71,8 @@ public Contents contents() {
     }
 
     @Override
-    public Indirect indirect(final int parent) throws Exception {
-        final Indirect indirect = this.origin.indirect(parent);
+    public Indirect indirect(final int... parent) throws Exception {
+        final Indirect indirect = this.origin.indirect(parent[0]);
         final Dictionary dictionary = indirect.dictionary().add(
             "Rotate",
             new Int(this.angle)
@@ -87,9 +87,9 @@ public Indirect indirect(final int parent) throws Exception {
     @Override
     public void print(
         final OutputStream output,
-        final int parent
+        final int... parent
     ) throws Exception {
-        output.write(this.indirect(parent).asBytes());
+        output.write(this.indirect(parent[0]).asBytes());
         this.resources().print(output);
         this.contents().print(output);
     }

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/pages/DefaultPages.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/pages/DefaultPages.java
@@ -110,7 +110,7 @@ public DefaultPages(
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         Array kds = new Array();
         for (final Page page : this) {
             final Indirect indirect = page.indirect(this.number);
@@ -136,7 +136,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
         for (final Page page : this) {
             page.print(output, this.number);

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/pages/Margins.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/pages/Margins.java
@@ -115,7 +115,7 @@ public Margins(
     }
 
     @Override
-    public Indirect indirect() throws Exception {
+    public Indirect indirect(final int... parent) throws Exception {
         final Indirect indirect = this.origin.indirect();
         final Pattern pattern = Pattern.compile("BT.*TL");
         final Matcher matcher = pattern.matcher(
@@ -154,7 +154,10 @@ public Indirect indirect() throws Exception {
     }
 
     @Override
-    public void print(final OutputStream output) throws Exception {
+    public void print(
+        final OutputStream output,
+        final int... parent
+    ) throws Exception {
         output.write(this.indirect().asBytes());
         this.origin.print(output);
     }