Fix review issues

DEVSIX-8576

Author: Dmitry Radchuk

kernel/src/main/java/com/itextpdf/kernel/pdf/OcgPropertiesCopier.java

@@ -91,7 +91,7 @@ public static Set<PdfIndirectReference> getOCGsFromPage(PdfPage page) {
         final List<PdfAnnotation> annotations = page.getAnnotations();
         for (PdfAnnotation annotation : annotations) {
             //Pass null instead of catalog OCProperties value, to include ocg clashing with catalog
-            getUsedNonFlushedOCGsFromAnnotation(null, ocgs, annotation, annotation);
+            getUsedNonFlushedOCGsFromAnnotation(annotation, annotation, ocgs, null);
         }
         final PdfDictionary resources = page.getPdfObject().getAsDictionary(PdfName.Resources);
         OcgPropertiesCopier.getUsedNonFlushedOCGsFromResources(resources, resources, ocgs,
@@ -117,7 +117,7 @@ private static Set<PdfIndirectReference> getAllUsedNonFlushedOCGs(Map<PdfPage, P
                     final PdfAnnotation toAnnot = toAnnotations.get(j);
                     final PdfAnnotation fromAnnot = fromAnnotations.get(j);
                     if (!toAnnot.getPdfObject().isFlushed()) {
-                        getUsedNonFlushedOCGsFromAnnotation(toOcProperties, fromUsedOcgs, toAnnot, fromAnnot);
+                        getUsedNonFlushedOCGsFromAnnotation(toAnnot, fromAnnot, fromUsedOcgs, toOcProperties);
                     }
                 }
             }
@@ -130,7 +130,7 @@ private static Set<PdfIndirectReference> getAllUsedNonFlushedOCGs(Map<PdfPage, P
         return fromUsedOcgs;
     }
 
-    private static void getUsedNonFlushedOCGsFromAnnotation(PdfDictionary toOcProperties, Set<PdfIndirectReference> fromUsedOcgs, PdfAnnotation toAnnot, PdfAnnotation fromAnnot) {
+    private static void getUsedNonFlushedOCGsFromAnnotation(PdfAnnotation toAnnot, PdfAnnotation fromAnnot, Set<PdfIndirectReference> fromUsedOcgs, PdfDictionary toOcProperties) {
         OcgPropertiesCopier.getUsedNonFlushedOCGsFromOcDict(toAnnot.getPdfObject().getAsDictionary(PdfName.OC),
                 fromAnnot.getPdfObject().getAsDictionary(PdfName.OC), fromUsedOcgs, toOcProperties);
         OcgPropertiesCopier.getUsedNonFlushedOCGsFromXObject(toAnnot.getNormalAppearanceObject(),

kernel/src/test/java/com/itextpdf/kernel/pdf/layer/PdfLayerTest.java

@@ -474,19 +474,6 @@ public void testReadAllLayersFromPage1() throws IOException, InterruptedExceptio
         Assertions.assertNull(new CompareTool().compareByContent(destinationFolder + "output_layered_2.pdf", sourceFolder + "cmp_output_layered_2.pdf", destinationFolder, "diff"));
     }
 
-    @Test
-    public void testReadAllLayersFromPage2() throws IOException, InterruptedException {
-        PdfDocument pdfDoc = new PdfDocument(new PdfReader(sourceFolder + "input_layers_in_resources_xobject.pdf"));
-
-        List<PdfLayer> layersFromCatalog = pdfDoc.getCatalog().getOCProperties(true).getLayers();
-        Assertions.assertEquals(16, layersFromCatalog.size());
-        PdfPage page = pdfDoc.getPage(2);
-        Set<PdfLayer> layersFromPage = page.getPdfLayers();
-        //There is 8 ocgs nested under the resources xobject on 2nd page
-        Assertions.assertEquals(8, layersFromPage.size());
-        pdfDoc.close();
-    }
-
     @Test
     public void testReadAllLayersFromDocumentWithComplexOCG() throws IOException, InterruptedException {
         PdfDocument pdfDoc = new PdfDocument(new PdfReader(sourceFolder + "input_complex_layers.pdf"),