fix merge errors

Author: wadoon

javaparser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java

@@ -21,7 +21,7 @@
 
 package com.github.javaparser.generator;
 
-import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC;
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;

javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java

@@ -22,8 +22,8 @@
 package com.github.javaparser.generator.core.node;
 
 import static com.github.javaparser.StaticJavaParser.parseType;
-import static com.github.javaparser.ast.Modifier.Keyword.FINAL;
-import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC;
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.FINAL;
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC;
 import static com.github.javaparser.ast.Modifier.createModifierList;
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.Utils.camelCaseToScreaming;

javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java

@@ -25,6 +25,11 @@
 import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.jml.expr.*;
+import com.github.javaparser.ast.jml.clauses.*;
+import com.github.javaparser.ast.jml.stmt.*;
+import com.github.javaparser.ast.jml.body.*;
+import com.github.javaparser.ast.jml.doc.*;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.CompactConstructorDeclaration;
@@ -151,18 +156,18 @@ public class MetaModelGenerator extends AbstractGenerator {
             add(com.github.javaparser.ast.expr.UnaryExpr.class);
             add(com.github.javaparser.ast.expr.VariableDeclarationExpr.class);
 
-        add(JmlDoc.class);
-        add(JmlDocDeclaration.class);
-        add(JmlDocStmt.class);
-        add(JmlDocType.class);
+            add(JmlDoc.class);
+            add(JmlDocDeclaration.class);
+            add(JmlDocStmt.class);
+            add(JmlDocType.class);
 
-        add(JmlQuantifiedExpr.class);
-        add(JmlTypeExpr.class);
-        add(JmlBinaryInfixExpr.class);
-        add(JmlLetExpr.class);
-        add(JmlMultiCompareExpr.class);
-        add(JmlLabelExpr.class);
-        add(JmlSetComprehensionExpr.class);
+            add(JmlQuantifiedExpr.class);
+            add(JmlTypeExpr.class);
+            add(JmlBinaryInfixExpr.class);
+            add(JmlLetExpr.class);
+            add(JmlMultiCompareExpr.class);
+            add(JmlLabelExpr.class);
+            add(JmlSetComprehensionExpr.class);
 
             add(com.github.javaparser.ast.stmt.AssertStmt.class);
             add(com.github.javaparser.ast.stmt.BlockStmt.class);
@@ -189,36 +194,36 @@ public class MetaModelGenerator extends AbstractGenerator {
             add(com.github.javaparser.ast.stmt.WhileStmt.class);
             add(com.github.javaparser.ast.stmt.YieldStmt.class);
 
-        add(JmlStatement.class);
-        add(JmlGhostStmt.class);
-        add(JmlExpressionStmt.class);
-        add(JmlRefiningStmt.class);
-        add(JmlUnreachableStmt.class);
-        add(JmlLabelStmt.class);
-        add(JmlBeginStmt.class);
-        add(JmlEndStmt.class);
-
-        add(JmlClassLevelDeclaration.class);
-        add(JmlMethodDeclaration.class);
-        add(JmlFieldDeclaration.class);
-        add(JmlClause.class);
-        add(JmlSimpleExprClause.class);
-        add(JmlMultiExprClause.class);
-        add(JmlSignalsClause.class);
-        add(JmlSignalsOnlyClause.class);
-        add(JmlClauseLabel.class);
-        add(JmlForallClause.class);
-        add(JmlOldClause.class);
-        add(JmlCallableClause.class);
-        add(JmlClauseIf.class);
-        add(JmlMethodSignature.class);
-        add(com.github.javaparser.ast.jml.clauses.JmlContract.class);
-
-        //add(com.github.javaparser.ast.JmlBoundVariable.class);
-
-        add(JmlClassExprDeclaration.class);
-        add(JmlRepresentsDeclaration.class);
-        add(JmlClassAccessibleDeclaration.class);
+            add(JmlStatement.class);
+            add(JmlGhostStmt.class);
+            add(JmlExpressionStmt.class);
+            add(JmlRefiningStmt.class);
+            add(JmlUnreachableStmt.class);
+            add(JmlLabelStmt.class);
+            add(JmlBeginStmt.class);
+            add(JmlEndStmt.class);
+
+            add(JmlClassLevelDeclaration.class);
+            add(JmlMethodDeclaration.class);
+            add(JmlFieldDeclaration.class);
+            add(JmlClause.class);
+            add(JmlSimpleExprClause.class);
+            add(JmlMultiExprClause.class);
+            add(JmlSignalsClause.class);
+            add(JmlSignalsOnlyClause.class);
+            add(JmlClauseLabel.class);
+            add(JmlForallClause.class);
+            add(JmlOldClause.class);
+            add(JmlCallableClause.class);
+            add(JmlClauseIf.class);
+            add(JmlMethodSignature.class);
+            add(com.github.javaparser.ast.jml.clauses.JmlContract.class);
+
+            //add(com.github.javaparser.ast.JmlBoundVariable.class);
+
+            add(JmlClassExprDeclaration.class);
+            add(JmlRepresentsDeclaration.class);
+            add(JmlClassAccessibleDeclaration.class);
 
             add(com.github.javaparser.ast.type.ArrayType.class);
             add(com.github.javaparser.ast.type.ClassOrInterfaceType.class);

javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java

@@ -36,7 +36,7 @@
 import java.util.*;
 
 import static com.github.javaparser.StaticJavaParser.*;
-import static com.github.javaparser.ast.Modifier.Keyword.*;
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.CodeGenerationUtils.optionalOf;
 import static com.github.javaparser.utils.Utils.decapitalize;

javaparser-core-serialization/pom.xml

@@ -23,10 +23,6 @@
 		</license>
 	</licenses>
 
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -59,6 +55,11 @@
 			<artifactId>jakarta.json-api</artifactId>
 			<version>2.1.3</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.truth</groupId>
+			<artifactId>truth</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- The jakarta.json variant of Glassfish is now available under a new name, Eclipse Parsson -->
 		<dependency>
 			<groupId>org.eclipse.parsson</groupId>

javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java

@@ -22,6 +22,7 @@
 
 import com.github.javaparser.*;
 import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.comments.Comment;
@@ -108,7 +109,7 @@ private Node deserializeObject(JsonObject nodeJson) {
                         parameters.put(name, Boolean.parseBoolean(nodeJson.getString(name)));
                     } else if (Enum.class.isAssignableFrom(type)) {
                         parameters.put(name, Enum.valueOf((Class<? extends Enum>) type, nodeJson.getString(name)));
-                    } else if (type == Modifier.Keyword.class) {
+                    } else if (type == Modifier.DefaultKeyword.class) {
                         //TODO weigl handle JmlDocModifier?
                         parameters.put(name, Enum.valueOf(Modifier.DefaultKeyword.class, nodeJson.getString(name)));
                     } else {

javaparser-core-serialization/src/test/java/com/github/javaparser/serialization/JavaParserJsonSerializerTest.java

@@ -23,18 +23,22 @@
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
 
+import com.google.common.truth.Truth;
 import jakarta.json.Json;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.json.stream.JsonGeneratorFactory;
 
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.javaparser.StaticJavaParser.parse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 class JavaParserJsonSerializerTest {
     @Test
@@ -45,7 +49,7 @@ void test() throws IOException {
         InputStream is = getClass().getResourceAsStream("/example.json");
         byte[] buffer = new byte[1024 * 1024];
         int len = is.read(buffer);
-        Assume.assumeTrue(len > 0);
+        Assumptions.assumeTrue(len > 0);
         String expected = new String(buffer, 0, len);
         System.out.println(serialized);
         Truth.assertThat(serialized).isEqualTo(expected);

javaparser-core-testing-bdd/src/test/java/com/github/javaparser/steps/ManipulationSteps.java

@@ -22,7 +22,7 @@
 package com.github.javaparser.steps;
 
 import static com.github.javaparser.StaticJavaParser.*;
-import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC;
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC;
 import static com.github.javaparser.ast.Modifier.createModifierList;
 import static com.github.javaparser.ast.Modifier.staticModifier;
 import static com.github.javaparser.ast.NodeList.nodeList;

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

@@ -98,7 +98,7 @@ void sealedClass() {
         assertFalse(x.isInnerClass());
         assertFalse(x.isNestedType());
         assertFalse(x.isLocalClassDeclaration());
-        assertTrue(x.hasModifier(Modifier.Keyword.SEALED));
+        assertTrue(x.hasModifier(Modifier.DefaultKeyword.SEALED));
         assertEquals(x.getPermittedTypes().size(), 2);
         assertEquals(x.getPermittedTypes().get(0).getNameAsString(), "Y");
         assertEquals(x.getPermittedTypes().get(1).getNameAsString(), "Z");
@@ -113,7 +113,7 @@ void nonSealedClass() {
         assertFalse(x.isInnerClass());
         assertFalse(x.isNestedType());
         assertFalse(x.isLocalClassDeclaration());
-        assertTrue(x.hasModifier(Modifier.Keyword.NON_SEALED));
+        assertTrue(x.hasModifier(Modifier.DefaultKeyword.NON_SEALED));
     }
 
     @ParameterizedTest

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

@@ -341,7 +341,7 @@ void record_isImplicitlyFinal() {
 
         RecordDeclaration recordDeclaration =
                 cu.findFirst(RecordDeclaration.class).get();
-        assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.FINAL));
+        assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.FINAL));
         assertTrue(recordDeclaration.isFinal(), "Records are implicitly final.");
     }
 
@@ -356,7 +356,7 @@ void record_isImplicitlyFinalWithoutExplicit() {
 
         RecordDeclaration recordDeclaration =
                 cu.findFirst(RecordDeclaration.class).get();
-        assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.FINAL));
+        assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.FINAL));
         assertTrue(recordDeclaration.isFinal(), "Records are implicitly final.");
     }
 
@@ -541,7 +541,7 @@ void record_topLevelRecordsAreNotStatic() {
 
         RecordDeclaration recordDeclaration =
                 cu.findAll(RecordDeclaration.class).get(0);
-        assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.STATIC));
+        assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.STATIC));
         assertFalse(recordDeclaration.isStatic(), "Top level Records are NOT implicitly static.");
     }
 
@@ -557,7 +557,7 @@ void record_nestedRecordsAreImplicitlyStatic() {
 
         RecordDeclaration recordDeclaration =
                 cu.findAll(RecordDeclaration.class).get(0);
-        assertFalse(recordDeclaration.hasModifier(Modifier.Keyword.STATIC));
+        assertFalse(recordDeclaration.hasModifier(Modifier.DefaultKeyword.STATIC));
         assertTrue(recordDeclaration.isStatic(), "Nested Records are implicitly static.");
     }