Skip to content

Shorten fully qualified type names to simple names with imports #94

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
bnaudts merged 2 commits into from
Nov 4, 2026
Merged

Shorten fully qualified type names to simple names with imports #94

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
da48dee
run A: structure.optimizeImports(["**"], shortenQualifiedNames=False)
Nov 4, 2026
cbed5c2
run B: structure.optimizeImports(["**"], shortenQualifiedNames=True)
Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/AnalysisHints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.codelaser.maddi.aapi.parser;

import io.codelaser.maddi.cst.api.element.SourceSet;
import io.codelaser.maddi.inspection.resource.SourceSetImpl;

import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
import java.util.Set;

import io.codelaser.maddi.cst.api.element.SourceSet;
import io.codelaser.maddi.inspection.resource.SourceSetImpl;

/**
*
* @param libraryName the name (for logging purposes only)
Expand Down
26 changes: 14 additions & 12 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/AnalysisHintsCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,16 @@

package io.codelaser.maddi.aapi.parser;

import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.modification.prepwork.io.LoadAnalysisResults;
import io.codelaser.maddi.modification.prepwork.io.WriteAnalysisResults;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.codelaser.maddi.cst.api.analysis.Message;
import io.codelaser.maddi.cst.api.element.Element;
import io.codelaser.maddi.cst.api.info.Info;
Expand All @@ -31,15 +38,10 @@
import io.codelaser.maddi.cst.impl.analysis.ValueImpl;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;
import io.codelaser.maddi.inspection.api.integration.JavaInspectorFactory;
import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.modification.prepwork.io.LoadAnalysisResults;
import io.codelaser.maddi.modification.prepwork.io.WriteAnalysisResults;
import io.codelaser.maddi.util.Trie;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

/*
From analysis hints to machine-readable analysis results in json format.
Expand All @@ -50,7 +52,7 @@
- AnalysisHintsWriter (here, to update the hints file), uses AnalysisHintsComposer
*/
public class AnalysisHintsCompiler {
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(AnalysisHintsCompiler.class);
private static final Logger LOGGER = LoggerFactory.getLogger(AnalysisHintsCompiler.class);

private final CompilerVisitor compilerVisitor;
private final JavaInspectorFactory javaInspectorFactory;
Expand Down
25 changes: 13 additions & 12 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/AnalysisHintsComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@
package io.codelaser.maddi.aapi.parser;


import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.codelaser.maddi.cst.api.element.Comment;
import io.codelaser.maddi.cst.api.element.CompilationUnit;
import io.codelaser.maddi.cst.api.element.Element;
Expand All @@ -32,18 +45,6 @@
import io.codelaser.maddi.cst.api.type.ParameterizedType;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;
import io.codelaser.maddi.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;


/*
Expand Down
26 changes: 13 additions & 13 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/AnalysisHintsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@

package io.codelaser.maddi.aapi.parser;

import io.codelaser.maddi.analysis.api.AnalysisHintsShadows;
import java.io.IOException;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import io.codelaser.maddi.modification.common.defaults.AnnotationProvider;
import io.codelaser.maddi.modification.prepwork.io.LoadAnalysisResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.codelaser.maddi.analysis.api.AnalysisHintsShadows;
import io.codelaser.maddi.cst.api.element.*;
import io.codelaser.maddi.cst.api.expression.AnnotationExpression;
import io.codelaser.maddi.cst.api.expression.StringConstant;
import io.codelaser.maddi.cst.api.info.*;
import io.codelaser.maddi.cst.api.type.ParameterizedType;
import io.codelaser.maddi.cst.api.type.Wildcard;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;
import io.codelaser.maddi.inspection.api.integration.JavaInspectorFactory;
import io.codelaser.maddi.inspection.api.parser.ParseResult;
import io.codelaser.maddi.inspection.api.resource.CompiledTypesManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import io.codelaser.maddi.modification.common.defaults.AnnotationProvider;
import io.codelaser.maddi.modification.prepwork.io.LoadAnalysisResults;

/*
Read the analysis hints of a library/JDK.
Expand Down Expand Up @@ -367,8 +367,8 @@ private static boolean sameErasedBounds(TypeParameter tp1, TypeParameter tp2) {
return b1.equals(b2);
}

private static boolean sameWildcard(io.codelaser.maddi.cst.api.type.Wildcard w1,
io.codelaser.maddi.cst.api.type.Wildcard w2) {
private static boolean sameWildcard(Wildcard w1,
Wildcard w2) {
if (w1 == null || w2 == null) return w1 == w2;
return w1.isUnbound() == w2.isUnbound() && w1.isExtends() == w2.isExtends() && w1.isSuper() == w2.isSuper();
}
Expand Down
17 changes: 9 additions & 8 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/AnalysisHintsWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@

package io.codelaser.maddi.aapi.parser;

import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.cst.api.element.Element;
import io.codelaser.maddi.cst.api.info.TypeInfo;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;
import io.codelaser.maddi.util.Trie;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.IOException;
import java.util.Arrays;
Expand All @@ -34,6 +26,15 @@
import java.util.function.Function;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.codelaser.maddi.cst.api.element.Element;
import io.codelaser.maddi.cst.api.info.TypeInfo;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;
import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.util.Trie;

public class AnalysisHintsWriter {
private static final Logger LOGGER = LoggerFactory.getLogger(AnalysisHintsWriter.class);
private final JavaInspector javaInspector;
Expand Down
6 changes: 3 additions & 3 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/CompilerVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

package io.codelaser.maddi.aapi.parser;

import io.codelaser.maddi.modification.common.defaults.DebugVisitor;
import java.util.Set;

import io.codelaser.maddi.cst.api.info.TypeInfo;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;

import java.util.Set;
import io.codelaser.maddi.modification.common.defaults.DebugVisitor;

public interface CompilerVisitor {

Expand Down
18 changes: 9 additions & 9 deletions maddi-aapi-parser/src/main/java/io/codelaser/maddi/aapi/parser/DecoratorWithComments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
package io.codelaser.maddi.aapi.parser;


import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.modification.prepwork.io.DecoratorImpl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Stream;

import io.codelaser.maddi.cst.api.analysis.Property;
import io.codelaser.maddi.cst.api.element.Comment;
import io.codelaser.maddi.cst.api.element.Element;
Expand All @@ -30,16 +34,12 @@
import io.codelaser.maddi.cst.api.info.ParameterInfo;
import io.codelaser.maddi.cst.api.output.Qualification;
import io.codelaser.maddi.cst.api.runtime.Runtime;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Stream;
import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.modification.prepwork.io.DecoratorImpl;

class DecoratorWithComments extends DecoratorImpl {

private final io.codelaser.maddi.cst.api.runtime.Runtime runtime;
private final Runtime runtime;
private final Map<Element, Element> translationMap;
private final Function<Element, AnalysisHintsParser.Data> dataProvider;
private final Function<Element, ShallowAnalyzer.InfoData> infoDataProvider;
Expand Down
37 changes: 16 additions & 21 deletions maddi-aapi-parser/src/test/java/io/codelaser/maddi/aapi/parser/CommonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,32 @@

package io.codelaser.maddi.aapi.parser;

import static io.codelaser.maddi.cst.impl.analysis.PropertyImpl.*;
import static io.codelaser.maddi.cst.impl.analysis.ValueImpl.ImmutableImpl.MUTABLE;
import static io.codelaser.maddi.cst.impl.analysis.ValueImpl.IndependentImpl.DEPENDENT;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.IOException;
import java.nio.file.Path;
import java.util.List;

import org.jspecify.annotations.NonNull;
import org.junit.jupiter.api.BeforeAll;
import org.slf4j.LoggerFactory;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;
import io.codelaser.maddi.annotation.Immutable;
import io.codelaser.maddi.cst.api.analysis.Value;
import io.codelaser.maddi.cst.api.element.SourceSet;
import io.codelaser.maddi.cst.api.info.TypeInfo;
import io.codelaser.maddi.cst.api.runtime.Runtime;
import io.codelaser.maddi.cst.impl.analysis.ValueImpl;
import io.codelaser.maddi.graph.G;
import io.codelaser.maddi.inspection.api.integration.JavaInspector;
import io.codelaser.maddi.inspection.api.integration.JavaInspectorFactory;
import io.codelaser.maddi.inspection.api.resource.CompiledTypesManager;
import io.codelaser.maddi.inspection.api.resource.InputConfiguration;
import io.codelaser.maddi.inspection.resource.InputConfigurationImpl;
import io.codelaser.maddi.inspection.resource.SourceSetImpl;
import io.codelaser.maddi.graph.G;
import org.jspecify.annotations.NonNull;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.platform.commons.JUnitException;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.file.Path;
import java.util.List;

import static io.codelaser.maddi.cst.impl.analysis.PropertyImpl.*;
import static io.codelaser.maddi.cst.impl.analysis.ValueImpl.ImmutableImpl.MUTABLE;
import static io.codelaser.maddi.cst.impl.analysis.ValueImpl.IndependentImpl.DEPENDENT;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import io.codelaser.maddi.modification.common.defaults.ShallowAnalyzer;

public class CommonTest {
private static CompiledTypesManager compiledTypesManager;
Expand Down
Loading
Loading