From 5e9ba1468136593ad6d52c2506e4c2a64d908fae Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 1 Feb 2024 10:39:18 +0100 Subject: [PATCH] [visualforce] Cleanup InternalApi methods Refs #4348 --- .../vf/ast/{VfAstInternals.java => InternalApiBridge.java} | 4 ++-- .../java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java | 3 --- .../sourceforge/pmd/lang/vf/ast/VfExpressionTypeVisitor.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) rename pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/{VfAstInternals.java => InternalApiBridge.java} (86%) diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfAstInternals.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/InternalApiBridge.java similarity index 86% rename from pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfAstInternals.java rename to pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/InternalApiBridge.java index e45aae08a2..5c43ff9dba 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfAstInternals.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/InternalApiBridge.java @@ -11,9 +11,9 @@ import net.sourceforge.pmd.lang.vf.DataType; * This is internal API, and can be changed at any time. */ @InternalApi -public final class VfAstInternals { +public final class InternalApiBridge { - private VfAstInternals() { + private InternalApiBridge() { // utility class } diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java index ece54ac717..efc1c33bd7 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java @@ -9,8 +9,6 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; -import net.sourceforge.pmd.annotation.InternalApi; - /** * Utility class to keep track of unclosed tags. The mechanism is rather simple. * If a end tag (</x>) is encountered, it will iterate through the open @@ -21,7 +19,6 @@ import net.sourceforge.pmd.annotation.InternalApi; * @author Victor Bucutea * */ -@InternalApi class OpenTagRegister { private List tagList = new ArrayList<>(); diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfExpressionTypeVisitor.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfExpressionTypeVisitor.java index e4f4dc7573..0177ebce33 100644 --- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfExpressionTypeVisitor.java +++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfExpressionTypeVisitor.java @@ -145,7 +145,7 @@ class VfExpressionTypeVisitor extends VfVisitorBase { } if (type != null) { - VfAstInternals.setDataType(entry.getKey(), type); + InternalApiBridge.setDataType(entry.getKey(), type); } else { LOG.debug("Unable to determine type for: {}", name); }