From fa98c03e9f526ab5ef3936d41c4c47ef3f151353 Mon Sep 17 00:00:00 2001 From: Jesse Costello-Good Date: Fri, 24 Jan 2025 13:16:17 -0800 Subject: [PATCH] No public description PiperOrigin-RevId: 719411351 --- .bazelrc | 2 +- .../template/soy/passes/AddDebugAttributesPass.java | 8 ++++---- .../template/soy/passes/BasicHtmlValidationPass.java | 4 ++-- .../google/template/soy/passes/CallAnnotationPass.java | 4 ++-- .../src/com/google/template/soy/passes/CheckSkipPass.java | 4 ++-- .../template/soy/passes/IncrementalDomKeysPass.java | 4 ++-- .../template/soy/passes/ResolveDeclaredTypesPass.java | 8 ++++---- .../template/soy/passes/StrictHtmlValidationPass.java | 4 ++-- pom.xml | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.bazelrc b/.bazelrc index 26e30074c8..a2616e6696 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1 +1 @@ -build --java_language_version=11 +build --java_language_version=16 diff --git a/java/src/com/google/template/soy/passes/AddDebugAttributesPass.java b/java/src/com/google/template/soy/passes/AddDebugAttributesPass.java index 7957eb260a..73fca9020f 100644 --- a/java/src/com/google/template/soy/passes/AddDebugAttributesPass.java +++ b/java/src/com/google/template/soy/passes/AddDebugAttributesPass.java @@ -138,10 +138,10 @@ protected void visitHtmlCloseTagNode(HtmlCloseTagNode node) { @Override protected void visitSoyNode(SoyNode node) { - if (node instanceof BlockNode) { - visitBlock((BlockNode) node); - } else if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof BlockNode block) { + visitBlock(block); + } else if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } diff --git a/java/src/com/google/template/soy/passes/BasicHtmlValidationPass.java b/java/src/com/google/template/soy/passes/BasicHtmlValidationPass.java index b109585799..ff5d327cbf 100644 --- a/java/src/com/google/template/soy/passes/BasicHtmlValidationPass.java +++ b/java/src/com/google/template/soy/passes/BasicHtmlValidationPass.java @@ -254,8 +254,8 @@ protected void visitLetContentNode(LetContentNode node) { @Override protected void visitSoyNode(SoyNode node) { - if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } } diff --git a/java/src/com/google/template/soy/passes/CallAnnotationPass.java b/java/src/com/google/template/soy/passes/CallAnnotationPass.java index 22c16634ea..9379710ab6 100644 --- a/java/src/com/google/template/soy/passes/CallAnnotationPass.java +++ b/java/src/com/google/template/soy/passes/CallAnnotationPass.java @@ -82,8 +82,8 @@ protected void visitHtmlCloseTagNode(HtmlCloseTagNode node) { @Override protected void visitSoyNode(SoyNode node) { - if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } } diff --git a/java/src/com/google/template/soy/passes/CheckSkipPass.java b/java/src/com/google/template/soy/passes/CheckSkipPass.java index 14b2f380c5..36e523ec29 100644 --- a/java/src/com/google/template/soy/passes/CheckSkipPass.java +++ b/java/src/com/google/template/soy/passes/CheckSkipPass.java @@ -73,8 +73,8 @@ public void visitSkipNode(SkipNode skipNode) { @Override public void visitSoyNode(SoyNode node) { - if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } } diff --git a/java/src/com/google/template/soy/passes/IncrementalDomKeysPass.java b/java/src/com/google/template/soy/passes/IncrementalDomKeysPass.java index 2724affc9f..2d3fd7cde9 100644 --- a/java/src/com/google/template/soy/passes/IncrementalDomKeysPass.java +++ b/java/src/com/google/template/soy/passes/IncrementalDomKeysPass.java @@ -131,8 +131,8 @@ public void visitSoyNode(SoyNode node) { visitBlockNode((ParentSoyNode) node); return; } - if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } diff --git a/java/src/com/google/template/soy/passes/ResolveDeclaredTypesPass.java b/java/src/com/google/template/soy/passes/ResolveDeclaredTypesPass.java index 22d9162a23..820d9e1e33 100644 --- a/java/src/com/google/template/soy/passes/ResolveDeclaredTypesPass.java +++ b/java/src/com/google/template/soy/passes/ResolveDeclaredTypesPass.java @@ -224,11 +224,11 @@ protected void visitTemplateElementNode(TemplateElementNode node) { @Override protected void visitSoyNode(SoyNode node) { - if (node instanceof ExprHolderNode) { - ((ExprHolderNode) node).getExprList().forEach(exprVisitor::exec); + if (node instanceof ExprHolderNode exprHolder) { + exprHolder.getExprList().forEach(exprVisitor::exec); } - if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } diff --git a/java/src/com/google/template/soy/passes/StrictHtmlValidationPass.java b/java/src/com/google/template/soy/passes/StrictHtmlValidationPass.java index 17b2686e42..12baeb5138 100644 --- a/java/src/com/google/template/soy/passes/StrictHtmlValidationPass.java +++ b/java/src/com/google/template/soy/passes/StrictHtmlValidationPass.java @@ -399,8 +399,8 @@ private void exitConditionBranch(HtmlMatcherConditionNode ifConditionNode) { @Override protected void visitSoyNode(SoyNode node) { - if (node instanceof ParentSoyNode) { - visitChildren((ParentSoyNode) node); + if (node instanceof ParentSoyNode parent) { + visitChildren(parent); } } } diff --git a/pom.xml b/pom.xml index 7a5fc7c4bb..c62ad4f0e7 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ UTF-8 UTF-8 - 11 + 23 7.0.0 32.1.1-jre 9.5