Skip to content

Commit 54a11df

Browse files
wadoonwadoon
committed
release 3.26.2-b7
1 parent 870b5ce commit 54a11df

File tree

18 files changed

+32
-24
lines changed

18 files changed

+32
-24
lines changed

‎javaparser-core-generators/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>jmlparser-parent</artifactId>
55
<groupId>io.github.jmltoolkit</groupId>
6-
<version>3.26.2-b6-SNAPSHOT</version>
6+
<version>3.26.2-b7-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javaparser-core-metamodel-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>jmlparser-parent</artifactId>
55
<groupId>io.github.jmltoolkit</groupId>
6-
<version>3.26.2-b6-SNAPSHOT</version>
6+
<version>3.26.2-b7-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javaparser-core-serialization/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>jmlparser-parent</artifactId>
44
<groupId>io.github.jmltoolkit</groupId>
5-
<version>3.26.2-b6-SNAPSHOT</version>
5+
<version>3.26.2-b7-SNAPSHOT</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88

‎javaparser-core-testing-bdd/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>jmlparser-parent</artifactId>
55
<groupId>io.github.jmltoolkit</groupId>
6-
<version>3.26.2-b6-SNAPSHOT</version>
6+
<version>3.26.2-b7-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javaparser-core-testing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>jmlparser-parent</artifactId>
55
<groupId>io.github.jmltoolkit</groupId>
6-
<version>3.26.2-b6-SNAPSHOT</version>
6+
<version>3.26.2-b7-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void testChangingModifiers(FieldDeclaration field) {
7171
modifiers = field.getModifiers();
7272
assertEquals(0, modifiers.size());
7373

74-
field.setModifiers(Keyword.PRIVATE, Keyword.SYNCHRONIZED);
74+
field.setModifiers(Modifier.DefaultKeyword.PRIVATE, Modifier.DefaultKeyword.SYNCHRONIZED);
7575
modifiers = field.getModifiers();
7676
assertTrue(modifiers.contains(Modifier.privateModifier()));
7777
assertTrue(modifiers.contains(Modifier.synchronizedModifier()));

‎javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1467Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* GNU Lesser General Public License for more details.
2222
*/
2323

24+
import com.github.javaparser.ast.Modifier;
2425
import com.github.javaparser.ast.Modifier.Keyword;
2526
import com.github.javaparser.ast.NodeList;
2627
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
@@ -46,7 +47,7 @@ public void test() {
4647
+ " throw new UnsupportedOperationException(\"Not supported yet.\");\n" + " }";
4748
// add method declaration
4849
MethodDeclaration decl =
49-
cu.getChildNodesByType(ClassOrInterfaceDeclaration.class).get(0).addMethod("f", Keyword.PUBLIC);
50+
cu.getChildNodesByType(ClassOrInterfaceDeclaration.class).get(0).addMethod("f", Modifier.DefaultKeyword.PUBLIC);
5051
// create body
5152
BlockStmt body = new BlockStmt();
5253
NodeList<Statement> statements = new NodeList<>();

‎javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3358Test.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void testArrayTypeWithBracketAfterTypeWithoutWhitespace() {
3535
considerVariableDeclaration(def);
3636
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
3737
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
38-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
38+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
3939
assertTrue(LexicalPreservingPrinter.print(expression).equals("private int[] i"));
4040
}
4141

@@ -45,7 +45,7 @@ void testArrayTypeWithWhitespaceBeforeTypeAndBracket() {
4545
considerVariableDeclaration(def);
4646
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
4747
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
48-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
48+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
4949
assertTrue(LexicalPreservingPrinter.print(expression).equals("private int [] i"));
5050
}
5151

@@ -55,7 +55,7 @@ void testArrayTypeWithWhitespaceBeforeEachToken() {
5555
considerVariableDeclaration(def);
5656
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
5757
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
58-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
58+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
5959
assertTrue(LexicalPreservingPrinter.print(expression).equals("private int [ ] i"));
6060
}
6161

@@ -65,7 +65,7 @@ void testArrayTypeWithMultipleWhitespaces() {
6565
considerVariableDeclaration(def);
6666
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
6767
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
68-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
68+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
6969
assertTrue(LexicalPreservingPrinter.print(expression).equals("private int [ ] i"));
7070
}
7171

‎javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void test() {
4040
List<Modifier.Keyword> kws =
4141
field.getModifiers().stream().map(Modifier::getKeyword).collect(Collectors.toList());
4242
kws.add(0, Modifier.DefaultKeyword.PROTECTED);
43-
field.setModifiers(kws.toArray(new Modifier.Keyword[] {}));
43+
field.setModifiers();
4444

4545
String expected = "class C { \r\n" + " protected static String S = \"s\";\r\n" + "}";
4646

‎javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2340Test.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void printingVariableDeclarationWithAddedModifier() {
3535
considerVariableDeclaration(def2);
3636
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
3737
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
38-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
38+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
3939
}
4040

4141
@Test
@@ -44,7 +44,7 @@ void printingGenericVariableDeclarationWithAddedModifier() {
4444
considerVariableDeclaration(def2);
4545
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
4646
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
47-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
47+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
4848
}
4949

5050
@Test
@@ -53,7 +53,7 @@ void printingGenericVariableDeclarationWithAddedModifierWithAnotherSyntaxe() {
5353
considerVariableDeclaration(def2);
5454
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
5555
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
56-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
56+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
5757
}
5858

5959
@Test
@@ -62,7 +62,7 @@ void printingGeneric2VariableDeclarationWithAddedModifier() {
6262
considerVariableDeclaration(def2);
6363
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
6464
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
65-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
65+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
6666
}
6767

6868
@Test
@@ -71,6 +71,6 @@ void printingGeneric2VariableDeclarationWithAddedModifierWithAnotherSyntaxe() {
7171
considerVariableDeclaration(def2);
7272
expression.asVariableDeclarationExpr().getModifiers().addFirst(Modifier.privateModifier());
7373
assertTrue(LexicalPreservingPrinter.getOrCreateNodeText(expression).getElements().stream()
74-
.anyMatch(elem -> elem.expand().equals(Keyword.PRIVATE.asString())));
74+
.anyMatch(elem -> elem.expand().equals(Modifier.DefaultKeyword.PRIVATE.asString())));
7575
}
7676
}

‎javaparser-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>jmlparser-parent</artifactId>
55
<groupId>io.github.jmltoolkit</groupId>
6-
<version>3.26.2-b6-SNAPSHOT</version>
6+
<version>3.26.2-b7-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

‎javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,4 +548,9 @@ private static <T extends Node> T handleResult(ParseResult<T> result) {
548548

549549
private StaticJavaParser() {
550550
}
551+
552+
public static <T extends Expression> T parseJmlExpression(String expression) {
553+
return (T) handleResult(newParser().parseJmlExpression(expression));
554+
}
555+
551556
}

‎javaparser-symbol-solver-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>jmlparser-parent</artifactId>
66
<groupId>io.github.jmltoolkit</groupId>
7-
<version>3.26.2-b6-SNAPSHOT</version>
7+
<version>3.26.2-b7-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎javaparser-symbol-solver-testing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>jmlparser-parent</artifactId>
66
<groupId>io.github.jmltoolkit</groupId>
7-
<version>3.26.2-b6-SNAPSHOT</version>
7+
<version>3.26.2-b7-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ public abstract class AbstractClassDeclarationTest extends AbstractTypeDeclarati
2727
implements ResolvedClassDeclarationTest, MethodResolutionCapabilityTest {
2828

2929
@Override
30-
public abstractClassDeclaration createValue();
30+
public abstract AbstractClassDeclaration createValue();
3131
}

‎javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import static org.junit.jupiter.api.Assertions.assertEquals;
2525

26+
import com.github.javaparser.ast.body.TypeDeclaration;
27+
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclaration;
2628
import com.github.javaparser.resolution.declarations.ResolvedReferenceTypeDeclarationTest;
2729
import com.github.javaparser.symbolsolver.AbstractSymbolResolutionTest;
2830
import org.junit.jupiter.api.Disabled;
@@ -32,7 +34,7 @@ public abstract class AbstractTypeDeclarationTest extends AbstractSymbolResoluti
3234
implements ResolvedReferenceTypeDeclarationTest {
3335

3436
@Override
35-
public abstractTypeDeclaration createValue();
37+
public abstract AbstractTypeDeclaration createValue();
3638

3739
/**
3840
* Should say if an {@link AbstractTypeDeclaration} is functional interface.

‎jmlparser-jml-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>jmlparser-parent</artifactId>
44
<groupId>io.github.jmltoolkit</groupId>
5-
<version>3.26.2-b6-SNAPSHOT</version>
5+
<version>3.26.2-b7-SNAPSHOT</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<groupId>io.github.jmltoolkit</groupId>
1717
<artifactId>jmlparser-parent</artifactId>
1818
<packaging>pom</packaging>
19-
<version>3.26.2-b6-SNAPSHOT</version>
19+
<version>3.26.2-b7-SNAPSHOT</version>
2020

2121
<name>jmlparser-parent</name>
2222
<url>https://github.com/wadoon/jmlparser</url>

0 commit comments

Comments
 (0)