Merge branch 'master' into javaparser#2203

TQRG · Apr 19, 2020 · 7e32658 · 7e32658
2 parents 66edf42 + 669a856
commit 7e32658
Show file tree

Hide file tree

Showing 743 changed files with 4,377 additions and 2,282 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,15 +7,15 @@ install:
       Add-Type -AssemblyName System.IO.Compression.FileSystem
       if (!(Test-Path -Path "C:\maven" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
+          'http://www.us.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip',
           'C:\maven-bin.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
       }
-  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET PATH=C:\maven\apache-maven-3.6.3\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET MAVEN_OPTS=-Xmx1g
   - cmd: SET JAVA_OPTS=-Xmx1g
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
+  - cmd: SET M2_HOME=C:\maven\apache-maven-3.6.3
   - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk10
 build_script:
   - echo ignore this

diff --git a/changelog.md b/changelog.md
@@ -1,8 +1,94 @@
+Next Release (3.15.19)
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/172?closed=1)
+
+* DEPRECATED: Deprecated and documented `JarTypeSolver#getJarTypeSolver(String)`, with a view to later removal.
+    ([#2598](https://github.com/javaparser/javaparser/pull/2598))
+* FIXED: Fix issue #2552 : UnsupportedOperationException caused by resolving inner annotation
+    ([#2553](https://github.com/javaparser/javaparser/pull/2553))
+* FIXED: Parents of `NodeList`s now correctly retain their parent when a child is replaced 
+    ([#2594](https://github.com/javaparser/javaparser/pull/2594))
+* FIXED: Fix JavaParserClassDeclaration canBeAssignedTo() to not cause a recursion when a node is its own parent (e.g. `java.lang.Object`)
+    ([#2608](https://github.com/javaparser/javaparser/pull/2608))
+* FIXED: Fix replacing an expression preceded by a comment (`LexicalPreservation` would previously throw an `UnsupportedOperation`)
+    ([#2611](https://github.com/javaparser/javaparser/pull/2611))
+
+
+Version 3.15.18
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/170?closed=1)
+
+* CHANGED: Dependencies should now all be up-to-date. 
+  ([#2572](https://github.com/javaparser/javaparser/pull/2572) / [#2581](https://github.com/javaparser/javaparser/pull/2581))
+  - Note that the JavaCC update introduced a breaking change that now requires a StreamProvider to be passed a charset if using an InputStream source.
+* FIXED (possible CHANGED/BREAKING): 
+  Improvements have been made to method `PositionUtils#nodeContains()` for clarity and precision in behaviour.
+  ([#2502](https://github.com/javaparser/javaparser/pull/2502))
+  - It is believed that there are no changes to behaviour, but if you do see anything please do reach out.
+  - See some additional commentary/thoughts in #2502
+* FIXED: Resolving super methodcalls in anonymous inner classes (fixes #1962)
+    ([#2585](https://github.com/javaparser/javaparser/pull/2585))
+* ADDED: `NodeList#getFirst(): Optional<Node>`
+    ([#2502](https://github.com/javaparser/javaparser/pull/2502))
+* ADDED: `NodeList#getLast(): Optional<Node>`
+    ([#2502](https://github.com/javaparser/javaparser/pull/2502))
+
+Version 3.15.17
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/169?closed=1)
+
+* CHANGED: Merged symbol solver modules, for java 9 module compatibility
+    ([#2564](https://github.com/javaparser/javaparser/pull/2564))
+* CHANGED: Renamed the pretty printer configuration option `isSpacesBetweenOperators` to `isSpaceAroundOperators` 
+    ([#2555](https://github.com/javaparser/javaparser/pull/2555))
+
+Version 3.15.16
+------------------
+_Version skipped_
+
+Version 3.15.15
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/168?closed=1)
+
+* Often requested, finally implemented by [ReallyLiri](https://github.com/ReallyLiri):
+configurable cache sizes for the symbol solver.
+
+Version 3.15.14 (buggy)
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/167?closed=1)
+
+* a suggestion for a new Javadoc parsing API was merged too quickly,
+causing issues parsing Javadoc while parsing Java normally. 
+
+Version 3.15.13
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/166?closed=1)
+
+Version 3.15.12
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/165?closed=1)
+
+Version 3.15.11
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/164?closed=1)
+
+Version 3.15.10
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/163?closed=1)
+
+Version 3.15.9
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/161?closed=1)
+
+Version 3.15.8
+------------------
+[issues resolved](https://github.com/javaparser/javaparser/milestone/160?closed=1)
+
 Version 3.15.7
 ------------------
 * BREAKING: Range.overlapsWith works slightly different now.
 
-[issues resolved](https://github.com/javaparser/javaparser/milestone/160?closed=1)
+[issues resolved](https://github.com/javaparser/javaparser/milestone/162?closed=1)
 
 Version 3.15.6
 ------------------

diff --git a/javaparser-core-generators/pom.xml b/javaparser-core-generators/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>javaparser-parent</artifactId>
         <groupId>com.github.javaparser</groupId>
-        <version>3.15.8-SNAPSHOT</version>
+        <version>3.15.19-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/Generator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/Generator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/NodeGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/NodeGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...arser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java b/...arser-core-generators/src/main/java/com/github/javaparser/generator/VisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java b/...ser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...e-generators/src/main/java/com/github/javaparser/generator/core/node/AcceptGenerator.java b/...e-generators/src/main/java/com/github/javaparser/generator/core/node/AcceptGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...re-generators/src/main/java/com/github/javaparser/generator/core/node/CloneGenerator.java b/...re-generators/src/main/java/com/github/javaparser/generator/core/node/CloneGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rators/src/main/java/com/github/javaparser/generator/core/node/GetMetaModelGenerator.java b/...rators/src/main/java/com/github/javaparser/generator/core/node/GetMetaModelGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ors/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java b/...ors/src/main/java/com/github/javaparser/generator/core/node/MainConstructorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rators/src/main/java/com/github/javaparser/generator/core/node/NodeModifierGenerator.java b/...rators/src/main/java/com/github/javaparser/generator/core/node/NodeModifierGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java b/...generators/src/main/java/com/github/javaparser/generator/core/node/PropertyGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rators/src/main/java/com/github/javaparser/generator/core/node/RemoveMethodGenerator.java b/...rators/src/main/java/com/github/javaparser/generator/core/node/RemoveMethodGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ators/src/main/java/com/github/javaparser/generator/core/node/ReplaceMethodGenerator.java b/...ators/src/main/java/com/github/javaparser/generator/core/node/ReplaceMethodGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...erators/src/main/java/com/github/javaparser/generator/core/node/TypeCastingGenerator.java b/...erators/src/main/java/com/github/javaparser/generator/core/node/TypeCastingGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ore-generators/src/main/java/com/github/javaparser/generator/core/other/BndGenerator.java b/...ore-generators/src/main/java/com/github/javaparser/generator/core/other/BndGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...tors/src/main/java/com/github/javaparser/generator/core/other/GrammarLetterGenerator.java b/...tors/src/main/java/com/github/javaparser/generator/core/other/GrammarLetterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...nerators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java b/...nerators/src/main/java/com/github/javaparser/generator/core/other/TokenKindGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ors/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java b/...ors/src/main/java/com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...rs/src/main/java/com/github/javaparser/generator/core/visitor/EqualsVisitorGenerator.java b/...rs/src/main/java/com/github/javaparser/generator/core/visitor/EqualsVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...java/com/github/javaparser/generator/core/visitor/GenericListVisitorAdapterGenerator.java b/...java/com/github/javaparser/generator/core/visitor/GenericListVisitorAdapterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ain/java/com/github/javaparser/generator/core/visitor/GenericVisitorAdapterGenerator.java b/...ain/java/com/github/javaparser/generator/core/visitor/GenericVisitorAdapterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...s/src/main/java/com/github/javaparser/generator/core/visitor/GenericVisitorGenerator.java b/...s/src/main/java/com/github/javaparser/generator/core/visitor/GenericVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...ava/com/github/javaparser/generator/core/visitor/GenericVisitorWithDefaultsGenerator.java b/...ava/com/github/javaparser/generator/core/visitor/GenericVisitorWithDefaultsGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../src/main/java/com/github/javaparser/generator/core/visitor/HashCodeVisitorGenerator.java b/.../src/main/java/com/github/javaparser/generator/core/visitor/HashCodeVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../src/main/java/com/github/javaparser/generator/core/visitor/ModifierVisitorGenerator.java b/.../src/main/java/com/github/javaparser/generator/core/visitor/ModifierVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...in/java/com/github/javaparser/generator/core/visitor/NoCommentEqualsVisitorGenerator.java b/...in/java/com/github/javaparser/generator/core/visitor/NoCommentEqualsVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../java/com/github/javaparser/generator/core/visitor/NoCommentHashCodeVisitorGenerator.java b/.../java/com/github/javaparser/generator/core/visitor/NoCommentHashCodeVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...va/com/github/javaparser/generator/core/visitor/ObjectIdentityEqualsVisitorGenerator.java b/...va/com/github/javaparser/generator/core/visitor/ObjectIdentityEqualsVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/.../com/github/javaparser/generator/core/visitor/ObjectIdentityHashCodeVisitorGenerator.java b/.../com/github/javaparser/generator/core/visitor/ObjectIdentityHashCodeVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...c/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorAdapterGenerator.java b/...c/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorAdapterGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...tors/src/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorGenerator.java b/...tors/src/main/java/com/github/javaparser/generator/core/visitor/VoidVisitorGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/...n/java/com/github/javaparser/generator/core/visitor/VoidVisitorWithDefaultsGenerator.java b/...n/java/com/github/javaparser/generator/core/visitor/VoidVisitorWithDefaultsGenerator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2019 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2020 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *

diff --git a/javaparser-core-metamodel-generator/pom.xml b/javaparser-core-metamodel-generator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>javaparser-parent</artifactId>
         <groupId>com.github.javaparser</groupId>
-        <version>3.15.8-SNAPSHOT</version>
+        <version>3.15.19-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>