Skip to content

Filter package-private imports from generated code #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2024
Merged

Filter package-private imports from generated code #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5706d6e
filter package-private imports
SentryMan Jul 2, 2024
ed0e84b
remove star imports
SentryMan Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion validator-generator/src/main/java/io/avaje/validation/generator/BeanReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface BeanReader {

void read();

void writeImports(Append writer);
void writeImports(Append writer, String adapterPackage);

void writeFields(Append writer);

Expand Down
8 changes: 3 additions & 5 deletions validator-generator/src/main/java/io/avaje/validation/generator/ClassReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,17 @@ public void read() {
}

private Set<String> importTypes() {
if (Util.validImportType(type)) {
importTypes.add(type);
}
importTypes.add(type);
for (final FieldReader allField : allFields) {
allField.addImports(importTypes);
}
return importTypes;
}

@Override
public void writeImports(Append writer) {
public void writeImports(Append writer, String adapterPackage) {
for (final String importType : importTypes()) {
if (Util.validImportType(importType)) {
if (Util.validImportType(importType, adapterPackage)) {
writer.append("import %s;", importType).eol();
}
}
Expand Down
13 changes: 7 additions & 6 deletions validator-generator/src/main/java/io/avaje/validation/generator/ComponentMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,20 @@ List<TypeElement> allAnnotationAdapters() {
Collection<String> allImports() {
final Set<String> packageImports = new TreeSet<>();
for (final String adapterFullName : allTypes) {
packageImports.add(ProcessorUtils.packageOf(adapterFullName) + ".*");
packageImports.add(adapterFullName);
packageImports.add(ProcessorUtils.extractEnclosingFQN(Util.baseTypeOfAdapter(adapterFullName)));
}

for (final var adapter : annotationAdapters) {
final var adapterFullName = adapter.getQualifiedName().toString();
packageImports.add(ProcessorUtils.packageOf(adapterFullName) + ".*");
packageImports.add(ProcessorUtils.extractEnclosingFQN(Util.baseTypeOfAdapter(adapterFullName)));
packageImports.add(adapterFullName);
packageImports.add(
ProcessorUtils.extractEnclosingFQN(Util.baseTypeOfAdapter(adapterFullName)));

ConstraintAdapterPrism.getInstanceOn(adapter)
.value()
.toString()
.transform(packageImports::add);
.value()
.toString()
.transform(packageImports::add);
}

return packageImports;
Expand Down
8 changes: 3 additions & 5 deletions validator-generator/src/main/java/io/avaje/validation/generator/ContraintReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,16 @@ public boolean hasValidationAnnotation() {
public void read() {}

private Set<String> importTypes() {
if (Util.validImportType(type)) {
importTypes.add(type);
}
importTypes.add(type);

annotations.keySet().forEach(t -> importTypes.addAll(t.importTypes()));
return importTypes;
}

@Override
public void writeImports(Append writer) {
public void writeImports(Append writer, String adapterPackage) {
for (final String importType : importTypes()) {
if (Util.validImportType(importType)) {
if (Util.validImportType(importType, adapterPackage)) {
writer.append("import %s;", importType).eol();
}
}
Expand Down
2 changes: 1 addition & 1 deletion validator-generator/src/main/java/io/avaje/validation/generator/SimpleAdapterWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private void writeFields() {
}

private void writeImports() {
beanReader.writeImports(writer);
beanReader.writeImports(writer, adapterPackage);
}

private void writePackage() {
Expand Down
5 changes: 3 additions & 2 deletions validator-generator/src/main/java/io/avaje/validation/generator/SimpleComponentWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,13 @@ private void writeMetaDataEntry(List<String> entries) {

private void writeImports() {
importTypes.add(Constants.VALIDATOR);
importTypes.add(Constants.VALID_SPI);
importTypes.add("io.avaje.validation.spi.GeneratedComponent");
importTypes.add("io.avaje.validation.spi.MetaData");
importTypes.add("io.avaje.validation.spi.Generated");
importTypes.addAll(metaData.allImports());

for (final String importType : importTypes) {
if (Util.validImportType(importType)) {
if (Util.validImportType(importType, metaData.packageName())) {
writer.append("import %s;", importType).eol();
}
}
Expand Down
2 changes: 1 addition & 1 deletion validator-generator/src/main/java/io/avaje/validation/generator/SimpleParamBeanWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void write() throws IOException {
}

private void writeImports() {
beanReader.writeImports(writer);
beanReader.writeImports(writer, adapterPackage);
}

private void writePackage() {
Expand Down
10 changes: 6 additions & 4 deletions validator-generator/src/main/java/io/avaje/validation/generator/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@ public static boolean isNullable(Element p) {
return false;
}

static boolean validImportType(String type) {
return type.indexOf('.') > 0 && !type.startsWith("java.lang.")
|| (type.startsWith("java.lang.")
&& type.replace("java.lang.", "").transform(s -> s.contains(".")));
static boolean validImportType(String type, String adapterPackage) {
return type.indexOf('.') > -1
&& !type.startsWith("java.lang.")
&& type.replace(adapterPackage + ".", "").transform(s -> s.contains("."))
|| (type.startsWith("java.lang.")
&& type.replace("java.lang.", "").transform(s -> s.contains(".")));
}

static String shortName(String fullType) {
Expand Down
8 changes: 3 additions & 5 deletions validator-generator/src/main/java/io/avaje/validation/generator/ValidMethodReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,15 @@ public String shortName() {
}

private Set<String> importTypes() {
if (Util.validImportType(type)) {
importTypes.add(type);
}
importTypes.add(type);
paramAnnotations.forEach(a -> a.addImports(importTypes));
returnElementAnnotation.addImports(importTypes);
return importTypes;
}

public void writeImports(Append writer) {
public void writeImports(Append writer, String packageName) {
for (final String importType : importTypes()) {
if (Util.validImportType(importType)) {
if (Util.validImportType(importType, packageName)) {
writer.append("import %s;", importType).eol();
}
}
Expand Down
Loading