Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adopt Rewrite snapshots. Upgrade antlr to 4.11

Browse Source
This commit is contained in:
aboyko
2023-02-07 14:01:58 -05:00
parent e2134dd186
commit 3a337427ac
12 changed files with 159 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/LoadUtils.java
View File

@@ -123,22 +123,24 @@ public class LoadUtils {
}
private static Object getOptionValue(Class<?> type, Object v) {
if (type.equals(int.class) || type.equals(Integer.class)) {
return ((Number) v).intValue();
} else if (type.equals(long.class) || type.equals(Long.class)) {
return ((Number) v).longValue();
} else if (type.equals(short.class) || type.equals(Short.class)) {
return ((Number) v).shortValue();
} else if (type.equals(float.class) || type.equals(Float.class)) {
return ((Number) v).floatValue();
} else if (type.equals(double.class) || type.equals(Double.class)) {
return ((Number) v).shortValue();
} else if (Enum.class.isAssignableFrom(type) && v instanceof String) {
try {
return type.getMethod("valueOf").invoke(v);
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
throw new RuntimeException(e);
}
if (v != null) {
if (type.equals(int.class) || type.equals(Integer.class)) {
return ((Number) v).intValue();
} else if (type.equals(long.class) || type.equals(Long.class)) {
return ((Number) v).longValue();
} else if (type.equals(short.class) || type.equals(Short.class)) {
return ((Number) v).shortValue();
} else if (type.equals(float.class) || type.equals(Float.class)) {
return ((Number) v).floatValue();
} else if (type.equals(double.class) || type.equals(Double.class)) {
return ((Number) v).shortValue();
} else if (Enum.class.isAssignableFrom(type) && v instanceof String) {
try {
return type.getMethod("valueOf").invoke(v);
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
throw new RuntimeException(e);
}
}
}
return v;
}

18
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/config/StsClasspathScanningLoader.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2022 VMware, Inc.
* Copyright (c) 2022, 2023 VMware, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -33,6 +33,8 @@ import org.openrewrite.config.ResourceLoader;
import org.openrewrite.config.YamlResourceLoader;
import org.openrewrite.internal.RecipeIntrospectionUtils;
import org.openrewrite.style.NamedStyles;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ClassInfo;
@@ -40,6 +42,8 @@ import io.github.classgraph.ScanResult;
public class StsClasspathScanningLoader implements ResourceLoader, StsResourceLoader {
final static Logger log = LoggerFactory.getLogger(StsClasspathScanningLoader.class);
private final List<Recipe> recipes = new ArrayList<>();
private final List<NamedStyles> styles = new ArrayList<>();
@@ -143,8 +147,8 @@ public class StsClasspathScanningLoader implements ResourceLoader, StsResourceLo
Recipe recipe = constructRecipe(recipeClass);
recipeDescriptors.add(recipeDescriptorFromRecipe(recipe));
recipes.add(recipe);
} catch (Exception e) {
// logger.warn("Unable to configure {}", recipeClass.getName(), e);
} catch (Throwable t) {
log.warn("Unable to configure " + recipeClass.getName(), t);
}
}
for (ClassInfo classInfo : result.getSubclasses(NamedStyles.class.getName())) {
@@ -155,8 +159,8 @@ public class StsClasspathScanningLoader implements ResourceLoader, StsResourceLo
constructor.setAccessible(true);
styles.add((NamedStyles) constructor.newInstance());
}
} catch (Exception e) {
// logger.warn("Unable to configure {}", styleClass.getName(), e);
} catch (Throwable t) {
log.warn("Unable to configure " + styleClass.getName(), t);
}
}
@@ -169,8 +173,8 @@ public class StsClasspathScanningLoader implements ResourceLoader, StsResourceLo
try {
CodeActionRepository repo = (CodeActionRepository) primaryConstructor.newInstance();
codeActionRepos.add(repo);
} catch (Exception e) {
e.printStackTrace();
} catch (Throwable t) {
log.warn("Unable to configure " + codeActionRepoClass.getName(), t);
}
}

4
headless-services/commons/commons-rewrite/src/test/java/org/springframework/ide/vscode/commons/rewrite/LoadUtilsTest.java
View File

@@ -64,9 +64,9 @@ public class LoadUtilsTest {
+ "",
r.getDescription());
assertEquals("Migrate to Spring Boot 3.0", r.getDisplayName());
assertEquals(9, r.getRecipeList().size());
assertEquals(12, r.getRecipeList().size());
Recipe pomRecipe = r.getRecipeList().get(0);
Recipe pomRecipe = r.getRecipeList().get(2);
assertTrue(pomRecipe instanceof DeclarativeRecipe);
assertEquals("org.openrewrite.java.spring.boot3.MavenPomUpgrade", pomRecipe.getName());
assertEquals("Upgrade Maven Pom to Spring Boot 3.0 from prior 2.x version.", pomRecipe.getDescription());

2
headless-services/commons/java-properties/generate-parser.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
set -e
ANTLR_VERSION=4.9.3
ANTLR_VERSION=4.11.1
if [ ! -f antlr-${ANTLR_VERSION}.jar ]; then
curl https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar --output antlr-${ANTLR_VERSION}.jar
fi

2
headless-services/commons/java-properties/pom.xml
View File

@@ -28,7 +28,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.9.3</version>
<version>4.11.1</version>
</dependency>
</dependencies>

3
headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java
View File

@@ -1,4 +1,4 @@
// Generated from JavaProperties.g4 by ANTLR 4.9.3
// Generated from java-escape by ANTLR 4.11.1
package org.springframework.ide.vscode.java.properties.antlr.parser;
import org.antlr.v4.runtime.ParserRuleContext;
@@ -10,6 +10,7 @@ import org.antlr.v4.runtime.tree.TerminalNode;
* which can be extended to create a listener which only needs to handle a subset
* of the available methods.
*/
@SuppressWarnings("CheckReturnValue")
public class JavaPropertiesBaseListener implements JavaPropertiesListener {
/**
* {@inheritDoc}

45
headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java
View File

@@ -1,4 +1,4 @@
// Generated from JavaProperties.g4 by ANTLR 4.9.3
// Generated from java-escape by ANTLR 4.11.1
package org.springframework.ide.vscode.java.properties.antlr.parser;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
@@ -9,9 +9,9 @@ import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
public class JavaPropertiesLexer extends Lexer {
static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); }
static { RuntimeMetaData.checkVersion("4.11.1", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =
@@ -106,18 +106,33 @@ public class JavaPropertiesLexer extends Lexer {
public ATN getATN() { return _ATN; }
public static final String _serializedATN =
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\n(\b\1\4\2\t\2\4"+
"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\3\2\3\2\3\3\3\3"+
"\3\4\3\4\3\5\3\5\3\6\3\6\3\7\5\7\37\n\7\3\7\3\7\5\7#\n\7\3\b\3\b\3\t\3"+
"\t\2\2\n\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\3\2\4\5\2\13\13\16\16\"\""+
"\7\2\f\f\17\17\"\"<<??\2)\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2"+
"\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\3\23\3\2\2\2\5"+
"\25\3\2\2\2\7\27\3\2\2\2\t\31\3\2\2\2\13\33\3\2\2\2\r\"\3\2\2\2\17$\3"+
"\2\2\2\21&\3\2\2\2\23\24\7^\2\2\24\4\3\2\2\2\25\26\7<\2\2\26\6\3\2\2\2"+
"\27\30\7?\2\2\30\b\3\2\2\2\31\32\7#\2\2\32\n\3\2\2\2\33\34\7%\2\2\34\f"+
"\3\2\2\2\35\37\7\17\2\2\36\35\3\2\2\2\36\37\3\2\2\2\37 \3\2\2\2 #\7\f"+
"\2\2!#\7\17\2\2\"\36\3\2\2\2\"!\3\2\2\2#\16\3\2\2\2$%\t\2\2\2%\20\3\2"+
"\2\2&\'\n\3\2\2\'\22\3\2\2\2\5\2\36\"\2";
"\u0004\u0000\b&\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
"\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+
"\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+
"\u0007\u0007\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0002"+
"\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0005"+
"\u0003\u0005\u001d\b\u0005\u0001\u0005\u0001\u0005\u0003\u0005!\b\u0005"+
"\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0000\u0000\b\u0001\u0001"+
"\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f"+
"\b\u0001\u0000\u0002\u0003\u0000\t\t\f\f \u0005\u0000\n\n\r\r ::==\'"+
"\u0000\u0001\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000"+
"\u0000\u0005\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000"+
"\u0000\t\u0001\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000"+
"\r\u0001\u0000\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0001\u0011"+
"\u0001\u0000\u0000\u0000\u0003\u0013\u0001\u0000\u0000\u0000\u0005\u0015"+
"\u0001\u0000\u0000\u0000\u0007\u0017\u0001\u0000\u0000\u0000\t\u0019\u0001"+
"\u0000\u0000\u0000\u000b \u0001\u0000\u0000\u0000\r\"\u0001\u0000\u0000"+
"\u0000\u000f$\u0001\u0000\u0000\u0000\u0011\u0012\u0005\\\u0000\u0000"+
"\u0012\u0002\u0001\u0000\u0000\u0000\u0013\u0014\u0005:\u0000\u0000\u0014"+
"\u0004\u0001\u0000\u0000\u0000\u0015\u0016\u0005=\u0000\u0000\u0016\u0006"+
"\u0001\u0000\u0000\u0000\u0017\u0018\u0005!\u0000\u0000\u0018\b\u0001"+
"\u0000\u0000\u0000\u0019\u001a\u0005#\u0000\u0000\u001a\n\u0001\u0000"+
"\u0000\u0000\u001b\u001d\u0005\r\u0000\u0000\u001c\u001b\u0001\u0000\u0000"+
"\u0000\u001c\u001d\u0001\u0000\u0000\u0000\u001d\u001e\u0001\u0000\u0000"+
"\u0000\u001e!\u0005\n\u0000\u0000\u001f!\u0005\r\u0000\u0000 \u001c\u0001"+
"\u0000\u0000\u0000 \u001f\u0001\u0000\u0000\u0000!\f\u0001\u0000\u0000"+
"\u0000\"#\u0007\u0000\u0000\u0000#\u000e\u0001\u0000\u0000\u0000$%\b\u0001"+
"\u0000\u0000%\u0010\u0001\u0000\u0000\u0000\u0003\u0000\u001c \u0000";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {

2
headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java
View File

@@ -1,4 +1,4 @@
// Generated from JavaProperties.g4 by ANTLR 4.9.3
// Generated from java-escape by ANTLR 4.11.1
package org.springframework.ide.vscode.java.properties.antlr.parser;
import org.antlr.v4.runtime.tree.ParseTreeListener;

113
headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java
View File

@@ -1,4 +1,4 @@
// Generated from JavaProperties.g4 by ANTLR 4.9.3
// Generated from java-escape by ANTLR 4.11.1
package org.springframework.ide.vscode.java.properties.antlr.parser;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
@@ -9,9 +9,9 @@ import java.util.List;
import java.util.Iterator;
import java.util.ArrayList;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
public class JavaPropertiesParser extends Parser {
static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); }
static { RuntimeMetaData.checkVersion("4.11.1", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =
@@ -78,7 +78,7 @@ public class JavaPropertiesParser extends Parser {
}
@Override
public String getGrammarFileName() { return "JavaProperties.g4"; }
public String getGrammarFileName() { return "java-escape"; }
@Override
public String[] getRuleNames() { return ruleNames; }
@@ -94,6 +94,7 @@ public class JavaPropertiesParser extends Parser {
_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
}
@SuppressWarnings("CheckReturnValue")
public static class ParseContext extends ParserRuleContext {
public TerminalNode EOF() { return getToken(JavaPropertiesParser.EOF, 0); }
public List<LineContext> line() {
@@ -126,7 +127,7 @@ public class JavaPropertiesParser extends Parser {
setState(25);
_errHandler.sync(this);
_la = _input.LA(1);
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Exclamation) | (1L << Number) | (1L << LineBreak) | (1L << Space) | (1L << IdentifierChar))) != 0)) {
while (((_la) & ~0x3f) == 0 && ((1L << _la) & 498L) != 0) {
{
{
setState(22);
@@ -152,6 +153,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class LineContext extends ParserRuleContext {
public PropertyLineContext propertyLine() {
return getRuleContext(PropertyLineContext.class,0);
@@ -217,6 +219,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class PropertyLineContext extends ParserRuleContext {
public KeyValuePairContext keyValuePair() {
return getRuleContext(KeyValuePairContext.class,0);
@@ -275,6 +278,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class CommentLineContext extends ParserRuleContext {
public TerminalNode Exclamation() { return getToken(JavaPropertiesParser.Exclamation, 0); }
public TerminalNode Number() { return getToken(JavaPropertiesParser.Number, 0); }
@@ -335,7 +339,7 @@ public class JavaPropertiesParser extends Parser {
setState(53);
_errHandler.sync(this);
_la = _input.LA(1);
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Colon) | (1L << Equals) | (1L << Exclamation) | (1L << Number) | (1L << Space) | (1L << IdentifierChar))) != 0)) {
while (((_la) & ~0x3f) == 0 && ((1L << _la) & 446L) != 0) {
{
{
setState(50);
@@ -377,6 +381,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class EmptyLineContext extends ParserRuleContext {
public TerminalNode LineBreak() { return getToken(JavaPropertiesParser.LineBreak, 0); }
public List<TerminalNode> Space() { return getTokens(JavaPropertiesParser.Space); }
@@ -433,6 +438,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class KeyValuePairContext extends ParserRuleContext {
public KeyContext key() {
return getRuleContext(KeyContext.class,0);
@@ -490,6 +496,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class KeyContext extends ParserRuleContext {
public List<KeyCharContext> keyChar() {
return getRuleContexts(KeyCharContext.class);
@@ -545,6 +552,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class KeyCharContext extends ParserRuleContext {
public TerminalNode IdentifierChar() { return getToken(JavaPropertiesParser.IdentifierChar, 0); }
public TerminalNode Backslash() { return getToken(JavaPropertiesParser.Backslash, 0); }
@@ -611,6 +619,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class SeparatorAndValueContext extends ParserRuleContext {
public TerminalNode Space() { return getToken(JavaPropertiesParser.Space, 0); }
public TerminalNode Colon() { return getToken(JavaPropertiesParser.Colon, 0); }
@@ -644,7 +653,7 @@ public class JavaPropertiesParser extends Parser {
{
setState(80);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Colon) | (1L << Equals) | (1L << Space))) != 0)) ) {
if ( !(((_la) & ~0x3f) == 0 && ((1L << _la) & 140L) != 0) ) {
_errHandler.recoverInline(this);
}
else {
@@ -655,7 +664,7 @@ public class JavaPropertiesParser extends Parser {
setState(84);
_errHandler.sync(this);
_la = _input.LA(1);
while ((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Colon) | (1L << Equals) | (1L << Exclamation) | (1L << Number) | (1L << Space) | (1L << IdentifierChar))) != 0)) {
while (((_la) & ~0x3f) == 0 && ((1L << _la) & 446L) != 0) {
{
{
setState(81);
@@ -679,6 +688,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class ValueCharContext extends ParserRuleContext {
public TerminalNode IdentifierChar() { return getToken(JavaPropertiesParser.IdentifierChar, 0); }
public TerminalNode Exclamation() { return getToken(JavaPropertiesParser.Exclamation, 0); }
@@ -777,6 +787,7 @@ public class JavaPropertiesParser extends Parser {
return _localctx;
}
@SuppressWarnings("CheckReturnValue")
public static class AnyCharContext extends ParserRuleContext {
public TerminalNode LineBreak() { return getToken(JavaPropertiesParser.LineBreak, 0); }
public TerminalNode IdentifierChar() { return getToken(JavaPropertiesParser.IdentifierChar, 0); }
@@ -809,7 +820,7 @@ public class JavaPropertiesParser extends Parser {
{
setState(97);
_la = _input.LA(1);
if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << Backslash) | (1L << Colon) | (1L << Equals) | (1L << Exclamation) | (1L << Number) | (1L << LineBreak) | (1L << Space) | (1L << IdentifierChar))) != 0)) ) {
if ( !(((_la) & ~0x3f) == 0 && ((1L << _la) & 510L) != 0) ) {
_errHandler.recoverInline(this);
}
else {
@@ -831,32 +842,64 @@ public class JavaPropertiesParser extends Parser {
}
public static final String _serializedATN =
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\nf\4\2\t\2\4\3\t"+
"\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t\13\4"+
"\f\t\f\3\2\7\2\32\n\2\f\2\16\2\35\13\2\3\2\3\2\3\3\3\3\3\3\5\3$\n\3\3"+
"\4\7\4\'\n\4\f\4\16\4*\13\4\3\4\3\4\3\5\7\5/\n\5\f\5\16\5\62\13\5\3\5"+
"\3\5\7\5\66\n\5\f\5\16\59\13\5\3\5\3\5\3\6\7\6>\n\6\f\6\16\6A\13\6\3\6"+
"\3\6\3\7\3\7\3\7\3\7\3\b\6\bJ\n\b\r\b\16\bK\3\t\3\t\3\t\5\tQ\n\t\3\n\3"+
"\n\7\nU\n\n\f\n\16\nX\13\n\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\5\13"+
"b\n\13\3\f\3\f\3\f\2\2\r\2\4\6\b\n\f\16\20\22\24\26\2\b\3\2\6\7\3\2\b"+
"\b\3\3\b\b\3\2\4\5\4\2\4\5\t\t\3\2\3\n\2j\2\33\3\2\2\2\4#\3\2\2\2\6(\3"+
"\2\2\2\b\60\3\2\2\2\n?\3\2\2\2\fD\3\2\2\2\16I\3\2\2\2\20P\3\2\2\2\22R"+
"\3\2\2\2\24a\3\2\2\2\26c\3\2\2\2\30\32\5\4\3\2\31\30\3\2\2\2\32\35\3\2"+
"\2\2\33\31\3\2\2\2\33\34\3\2\2\2\34\36\3\2\2\2\35\33\3\2\2\2\36\37\7\2"+
"\2\3\37\3\3\2\2\2 $\5\6\4\2!$\5\b\5\2\"$\5\n\6\2# \3\2\2\2#!\3\2\2\2#"+
"\"\3\2\2\2$\5\3\2\2\2%\'\7\t\2\2&%\3\2\2\2\'*\3\2\2\2(&\3\2\2\2()\3\2"+
"\2\2)+\3\2\2\2*(\3\2\2\2+,\5\f\7\2,\7\3\2\2\2-/\7\t\2\2.-\3\2\2\2/\62"+
"\3\2\2\2\60.\3\2\2\2\60\61\3\2\2\2\61\63\3\2\2\2\62\60\3\2\2\2\63\67\t"+
"\2\2\2\64\66\n\3\2\2\65\64\3\2\2\2\669\3\2\2\2\67\65\3\2\2\2\678\3\2\2"+
"\28:\3\2\2\29\67\3\2\2\2:;\t\4\2\2;\t\3\2\2\2<>\7\t\2\2=<\3\2\2\2>A\3"+
"\2\2\2?=\3\2\2\2?@\3\2\2\2@B\3\2\2\2A?\3\2\2\2BC\7\b\2\2C\13\3\2\2\2D"+
"E\5\16\b\2EF\5\22\n\2FG\t\4\2\2G\r\3\2\2\2HJ\5\20\t\2IH\3\2\2\2JK\3\2"+
"\2\2KI\3\2\2\2KL\3\2\2\2L\17\3\2\2\2MQ\7\n\2\2NO\7\3\2\2OQ\t\5\2\2PM\3"+
"\2\2\2PN\3\2\2\2Q\21\3\2\2\2RV\t\6\2\2SU\5\24\13\2TS\3\2\2\2UX\3\2\2\2"+
"VT\3\2\2\2VW\3\2\2\2W\23\3\2\2\2XV\3\2\2\2Yb\7\n\2\2Zb\7\6\2\2[b\7\7\2"+
"\2\\b\7\t\2\2]^\7\3\2\2^b\5\26\f\2_b\7\5\2\2`b\7\4\2\2aY\3\2\2\2aZ\3\2"+
"\2\2a[\3\2\2\2a\\\3\2\2\2a]\3\2\2\2a_\3\2\2\2a`\3\2\2\2b\25\3\2\2\2cd"+
"\t\7\2\2d\27\3\2\2\2\f\33#(\60\67?KPVa";
"\u0004\u0001\bd\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
"\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+
"\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+
"\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0001\u0000\u0005\u0000\u0018"+
"\b\u0000\n\u0000\f\u0000\u001b\t\u0000\u0001\u0000\u0001\u0000\u0001\u0001"+
"\u0001\u0001\u0001\u0001\u0003\u0001\"\b\u0001\u0001\u0002\u0005\u0002"+
"%\b\u0002\n\u0002\f\u0002(\t\u0002\u0001\u0002\u0001\u0002\u0001\u0003"+
"\u0005\u0003-\b\u0003\n\u0003\f\u00030\t\u0003\u0001\u0003\u0001\u0003"+
"\u0005\u00034\b\u0003\n\u0003\f\u00037\t\u0003\u0001\u0003\u0001\u0003"+
"\u0001\u0004\u0005\u0004<\b\u0004\n\u0004\f\u0004?\t\u0004\u0001\u0004"+
"\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006"+
"\u0004\u0006H\b\u0006\u000b\u0006\f\u0006I\u0001\u0007\u0001\u0007\u0001"+
"\u0007\u0003\u0007O\b\u0007\u0001\b\u0001\b\u0005\bS\b\b\n\b\f\bV\t\b"+
"\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0003"+
"\t`\b\t\u0001\n\u0001\n\u0001\n\u0000\u0000\u000b\u0000\u0002\u0004\u0006"+
"\b\n\f\u000e\u0010\u0012\u0014\u0000\u0006\u0001\u0000\u0004\u0005\u0001"+
"\u0000\u0006\u0006\u0001\u0001\u0006\u0006\u0001\u0000\u0002\u0003\u0002"+
"\u0000\u0002\u0003\u0007\u0007\u0001\u0000\u0001\bh\u0000\u0019\u0001"+
"\u0000\u0000\u0000\u0002!\u0001\u0000\u0000\u0000\u0004&\u0001\u0000\u0000"+
"\u0000\u0006.\u0001\u0000\u0000\u0000\b=\u0001\u0000\u0000\u0000\nB\u0001"+
"\u0000\u0000\u0000\fG\u0001\u0000\u0000\u0000\u000eN\u0001\u0000\u0000"+
"\u0000\u0010P\u0001\u0000\u0000\u0000\u0012_\u0001\u0000\u0000\u0000\u0014"+
"a\u0001\u0000\u0000\u0000\u0016\u0018\u0003\u0002\u0001\u0000\u0017\u0016"+
"\u0001\u0000\u0000\u0000\u0018\u001b\u0001\u0000\u0000\u0000\u0019\u0017"+
"\u0001\u0000\u0000\u0000\u0019\u001a\u0001\u0000\u0000\u0000\u001a\u001c"+
"\u0001\u0000\u0000\u0000\u001b\u0019\u0001\u0000\u0000\u0000\u001c\u001d"+
"\u0005\u0000\u0000\u0001\u001d\u0001\u0001\u0000\u0000\u0000\u001e\"\u0003"+
"\u0004\u0002\u0000\u001f\"\u0003\u0006\u0003\u0000 \"\u0003\b\u0004\u0000"+
"!\u001e\u0001\u0000\u0000\u0000!\u001f\u0001\u0000\u0000\u0000! \u0001"+
"\u0000\u0000\u0000\"\u0003\u0001\u0000\u0000\u0000#%\u0005\u0007\u0000"+
"\u0000$#\u0001\u0000\u0000\u0000%(\u0001\u0000\u0000\u0000&$\u0001\u0000"+
"\u0000\u0000&\'\u0001\u0000\u0000\u0000\')\u0001\u0000\u0000\u0000(&\u0001"+
"\u0000\u0000\u0000)*\u0003\n\u0005\u0000*\u0005\u0001\u0000\u0000\u0000"+
"+-\u0005\u0007\u0000\u0000,+\u0001\u0000\u0000\u0000-0\u0001\u0000\u0000"+
"\u0000.,\u0001\u0000\u0000\u0000./\u0001\u0000\u0000\u0000/1\u0001\u0000"+
"\u0000\u00000.\u0001\u0000\u0000\u000015\u0007\u0000\u0000\u000024\b\u0001"+
"\u0000\u000032\u0001\u0000\u0000\u000047\u0001\u0000\u0000\u000053\u0001"+
"\u0000\u0000\u000056\u0001\u0000\u0000\u000068\u0001\u0000\u0000\u0000"+
"75\u0001\u0000\u0000\u000089\u0007\u0002\u0000\u00009\u0007\u0001\u0000"+
"\u0000\u0000:<\u0005\u0007\u0000\u0000;:\u0001\u0000\u0000\u0000<?\u0001"+
"\u0000\u0000\u0000=;\u0001\u0000\u0000\u0000=>\u0001\u0000\u0000\u0000"+
">@\u0001\u0000\u0000\u0000?=\u0001\u0000\u0000\u0000@A\u0005\u0006\u0000"+
"\u0000A\t\u0001\u0000\u0000\u0000BC\u0003\f\u0006\u0000CD\u0003\u0010"+
"\b\u0000DE\u0007\u0002\u0000\u0000E\u000b\u0001\u0000\u0000\u0000FH\u0003"+
"\u000e\u0007\u0000GF\u0001\u0000\u0000\u0000HI\u0001\u0000\u0000\u0000"+
"IG\u0001\u0000\u0000\u0000IJ\u0001\u0000\u0000\u0000J\r\u0001\u0000\u0000"+
"\u0000KO\u0005\b\u0000\u0000LM\u0005\u0001\u0000\u0000MO\u0007\u0003\u0000"+
"\u0000NK\u0001\u0000\u0000\u0000NL\u0001\u0000\u0000\u0000O\u000f\u0001"+
"\u0000\u0000\u0000PT\u0007\u0004\u0000\u0000QS\u0003\u0012\t\u0000RQ\u0001"+
"\u0000\u0000\u0000SV\u0001\u0000\u0000\u0000TR\u0001\u0000\u0000\u0000"+
"TU\u0001\u0000\u0000\u0000U\u0011\u0001\u0000\u0000\u0000VT\u0001\u0000"+
"\u0000\u0000W`\u0005\b\u0000\u0000X`\u0005\u0004\u0000\u0000Y`\u0005\u0005"+
"\u0000\u0000Z`\u0005\u0007\u0000\u0000[\\\u0005\u0001\u0000\u0000\\`\u0003"+
"\u0014\n\u0000]`\u0005\u0003\u0000\u0000^`\u0005\u0002\u0000\u0000_W\u0001"+
"\u0000\u0000\u0000_X\u0001\u0000\u0000\u0000_Y\u0001\u0000\u0000\u0000"+
"_Z\u0001\u0000\u0000\u0000_[\u0001\u0000\u0000\u0000_]\u0001\u0000\u0000"+
"\u0000_^\u0001\u0000\u0000\u0000`\u0013\u0001\u0000\u0000\u0000ab\u0007"+
"\u0005\u0000\u0000b\u0015\u0001\u0000\u0000\u0000\n\u0019!&.5=INT_";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {

6
headless-services/commons/pom.xml
View File

@@ -108,9 +108,9 @@
<commons-codec-version>1.13</commons-codec-version>
<!-- Rewrite specific properties -->
<rewrite-version>7.35.0</rewrite-version>
<rewrite-spring-version>4.32.0</rewrite-spring-version>
<rewrite-java-migration.version>1.16.0</rewrite-java-migration.version>
<rewrite-version>7.36.0-SNAPSHOT</rewrite-version>
<rewrite-spring-version>4.33.0-SNAPSHOT</rewrite-spring-version>
<rewrite-java-migration.version>1.17.0-SNAPSHOT</rewrite-java-migration.version>
<signing.skip>true</signing.skip>
<signing.alias>vmware</signing.alias>

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java
View File

@@ -309,7 +309,11 @@ public class RewriteRecipeRepository implements ApplicationContextAware {
for (RecipeCodeActionDescriptor d : descriptors) {
TreeVisitor<?, ExecutionContext> markVisitor = d.getMarkerVisitor(applicationContext);
if (markVisitor != null) {
cu = (CompilationUnit) markVisitor.visit(cu, new InMemoryExecutionContext(e -> log.error("Marker visitor failed!", e)));
try {
cu = (CompilationUnit) markVisitor.visit(cu, new InMemoryExecutionContext(e -> log.error("Marker visitor failed!", e)));
} catch (Exception e) {
// ignore - would happen in sources with compiler errors
}
}
}
return cu;

14
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java
View File

@@ -110,13 +110,13 @@ public class SpringBootUpgrade {
String recipeId = recipedIds.get(recipedIds.size() - 1);
// TODO: Review after new rewrite adoption
// Special case is UpgradeSpringBoot_3_0 which doesn't upgrade project to the latest 2.x if necessary. Therefore add 2.(latest) recipe (it chains all previous 2.x)
if (targetVersion.getMajor() == 3) {
int i = recipedIds.size() - 1;
for (; i>=0 && !getVersionFromRecipeId(recipedIds.get(i)).startsWith("2."); i--) {}
if (i >= 0) {
getRecipeFromId(recipedIds.get(i)).ifPresent(recipe::doNext);
}
}
// if (targetVersion.getMajor() == 3) {
// int i = recipedIds.size() - 1;
// for (; i>=0 && !getVersionFromRecipeId(recipedIds.get(i)).startsWith("2."); i--) {}
// if (i >= 0) {
// getRecipeFromId(recipedIds.get(i)).ifPresent(recipe::doNext);
// }
// }
getRecipeFromId(recipeId).ifPresent(recipe::doNext);
}
}