PDF/UA-2. Fix differentTargetAnnotObjectKey calculation

Author: MaximPlusov

validation-model/src/main/java/org/verapdf/gf/model/impl/containers/StaticContainers.java

@@ -50,7 +50,7 @@ public class StaticContainers {
 
 	private static final ThreadLocal<Set<COSKey>> fileSpecificationKeys = new ThreadLocal<>();
 
-	private static final ThreadLocal<Map<COSKey, Set<COSKey>>> destinationToStructParentsMap = new ThreadLocal<>();
+	private static final ThreadLocal<Map<COSKey, Map<COSKey, String>>> structParentToDestinationToAnnotMap = new ThreadLocal<>();
 
 	private static final ThreadLocal<Stack<COSKey>> transparencyVisitedContentStreams = new ThreadLocal<>();
 
@@ -74,7 +74,7 @@ public static void clearAllContainers() {
 		cachedColorSpaces.set(new HashMap<>());
 		cachedFonts.set(new HashMap<>());
 		fileSpecificationKeys.set(new HashSet<>());
-		destinationToStructParentsMap.set(new HashMap<>());
+		structParentToDestinationToAnnotMap.set(new HashMap<>());
 		transparencyVisitedContentStreams.set(new Stack<>());
 		cachedGlyphs.set(new HashMap<>());
 		noteIDSet.set(new HashSet<>());
@@ -124,15 +124,15 @@ public static void setInconsistentSeparations(List<String> inconsistentSeparatio
 		StaticContainers.inconsistentSeparations.set(inconsistentSeparations);
 	}
 
-	public static Map<COSKey, Set<COSKey>> getDestinationToStructParentsMap() {
-		if (destinationToStructParentsMap.get() == null) {
-			destinationToStructParentsMap.set(new HashMap<>());
+	public static Map<COSKey, Map<COSKey, String>> getStructParentToDestinationToAnnotMap() {
+		if (structParentToDestinationToAnnotMap.get() == null) {
+			structParentToDestinationToAnnotMap.set(new HashMap<>());
 		}
-		return destinationToStructParentsMap.get();
+		return structParentToDestinationToAnnotMap.get();
 	}
 
-	public static void setDestinationToStructParentsMap(Map<COSKey, Set<COSKey>> destinationToStructParentsMap) {
-		StaticContainers.destinationToStructParentsMap.set(destinationToStructParentsMap);
+	public static void setStructParentToDestinationToAnnotMap(Map<COSKey, Map<COSKey, String>> structParentToDestinationToAnnotMap) {
+		StaticContainers.structParentToDestinationToAnnotMap.set(structParentToDestinationToAnnotMap);
 	}
 
 	public static Map<String, PDColorSpace> getCachedColorSpaces() {

validation-model/src/main/java/org/verapdf/gf/model/impl/external/GFEmbeddedFile.java

@@ -27,7 +27,6 @@
 import org.verapdf.gf.model.GFModelParser;
 import org.verapdf.gf.model.impl.containers.StaticContainers;
 import org.verapdf.gf.model.impl.pd.colors.GFPDSeparation;
-import org.verapdf.parser.PDFFlavour;
 import org.verapdf.tools.TaggedPDFRoleMapHelper;
 import org.verapdf.model.external.EmbeddedFile;
 import org.verapdf.model.operator.Glyph;
@@ -131,7 +130,7 @@ private static boolean isValidPdfaStream(final InputStream toValidate, final PDF
 	private Set<String> noteIDSet;
 	private Set<COSKey> xFormKeysSet;
 	private Set<COSKey> fileSpecificationKeys;
-	private Map<COSKey, Set<COSKey>> destinationToStructParentsMap;
+	private Map<COSKey, Map<COSKey, String>> structParentToDestinationToAnnotMap;
 	private Stack<COSKey> transparencyVisitedContentStreams;
 	private Map<String, PDFont> cachedPDFonts;
 	private Map<String, Map<String, Glyph>> cachedGlyphs;
@@ -157,7 +156,7 @@ private void saveStaticContainersState() {
 		this.cachedColorSpaces = StaticContainers.getCachedColorSpaces();
 		this.cachedPDFonts = StaticContainers.getCachedFonts();
 		this.fileSpecificationKeys = StaticContainers.getFileSpecificationKeys();
-		this.destinationToStructParentsMap = StaticContainers.getDestinationToStructParentsMap();
+		this.structParentToDestinationToAnnotMap = StaticContainers.getStructParentToDestinationToAnnotMap();
 		this.noteIDSet = StaticContainers.getNoteIDSet();
 		this.xFormKeysSet = StaticContainers.getXFormKeysSet();
 		this.transparencyVisitedContentStreams = StaticContainers.getTransparencyVisitedContentStreams();
@@ -187,7 +186,7 @@ private void restoreSavedSCState() {
 		StaticContainers.setCachedColorSpaces(this.cachedColorSpaces);
 		StaticContainers.setCachedFonts(this.cachedPDFonts);
 		StaticContainers.setFileSpecificationKeys(this.fileSpecificationKeys);
-		StaticContainers.setDestinationToStructParentsMap(this.destinationToStructParentsMap);
+		StaticContainers.setStructParentToDestinationToAnnotMap(this.structParentToDestinationToAnnotMap);
 		StaticContainers.setNoteIDSet(this.noteIDSet);
 		StaticContainers.setXFormKeysSet(this.xFormKeysSet);
 		StaticContainers.setTransparencyVisitedContentStreams(this.transparencyVisitedContentStreams);

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/annotations/GFPDLinkAnnot.java

@@ -94,22 +94,15 @@ private void calculateStructDestinationProperties() {
 			return;
 		}
 		COSKey structDestinationKey = structDestination.getKey();
-		for (Map.Entry<COSKey, Set<COSKey>> entry : StaticContainers.getDestinationToStructParentsMap().entrySet()) {
-			if (structDestinationKey.equals(entry.getKey())) {
-				continue;
-			}
-			for (COSKey structParentObjectKey : entry.getValue()) {
-				if (structParentKey.equals(structParentObjectKey)) {
-					differentTargetAnnotObjectKey = structParentObjectKey.toString();
-					break;
-				}
-			}
-			if (differentTargetAnnotObjectKey != null) {
+		Map<COSKey, String> destinationToAnnotMap = StaticContainers.getStructParentToDestinationToAnnotMap()
+				.computeIfAbsent(structParentKey, k -> new HashMap<>());
+		for (Map.Entry<COSKey, String> entry : destinationToAnnotMap.entrySet()) {
+			if (!structDestinationKey.equals(entry.getKey())) {
+				differentTargetAnnotObjectKey = entry.getValue();
 				break;
 			}
 		}
-		StaticContainers.getDestinationToStructParentsMap().computeIfAbsent(structDestinationKey,
-				k -> new HashSet<>()).add(structParentKey);
+		StaticContainers.getStructParentToDestinationToAnnotMap().get(structParentKey).put(structDestinationKey, getobjectKey());
 	}
 
 	private COSObject getStructureDestinationObject() {