github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10579] JavaWriter::beforeClose shouldn't search for package

Browse Source 
using a regex
This commit is contained in:
Lukas Eder 2020-09-03 10:25:32 +02:00
parent 387912cbd1
commit 4a8078c3d5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java
View File

@ -197,13 +197,8 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {
string = super.beforeClose(string);
StringBuilder importString = new StringBuilder();
String pkg = "";
Matcher m = Pattern.compile("(?s:^.*?[\\r\\n]+package\\s+(.*?);?[\\r\\n]+.*?$)").matcher(string);
if (m.find())
pkg = m.group(1);
Pattern samePackagePattern = Pattern.compile(pkg + "\\.[^\\.]+");
Pattern samePackagePattern = Pattern.compile(packageName + "\\.[^\\.]+");
String dotClassName = "." + className;
String previous = "";
for (String imp : qualifiedTypes) {
@ -218,11 +213,11 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {
continue;
// Don't import the class itself
if (imp.endsWith("." + className))
if (imp.endsWith(dotClassName))
continue;
// [#4229] [#4531] Avoid warnings due to unnecessary same-package imports
if (pkg.length() > 0 && samePackagePattern.matcher(imp).matches())
if (packageName.length() > 0 && samePackagePattern.matcher(imp).matches())
continue;
String topLevelPackage = imp.split("\\.")[0];