Skip to content

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

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 #184

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
f56a8f3
run A: structure.optimizeImports(["**"], shortenQualifiedNames=False)
Nov 4, 2026
8ea82b1
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
  •  
  •  
  •  
14 changes: 8 additions & 6 deletions maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaAwt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@
import java.util.EventListener;
import java.util.Locale;
import java.util.Set;

import javax.accessibility.AccessibleContext;
import io.codelaser.maddi.annotation.Modified;
import io.codelaser.maddi.annotation.NotModified;

import io.codelaser.maddi.annotation.Commutable;
import io.codelaser.maddi.annotation.Immutable;
import io.codelaser.maddi.annotation.Independent;
import io.codelaser.maddi.annotation.Modified;
import io.codelaser.maddi.annotation.NotModified;
import io.codelaser.maddi.annotation.method.GetSet;

public class JavaAwt {
Expand Down Expand Up @@ -744,7 +746,7 @@
ImageObserver imageObserver) { return false; }
void dispose() { }
//override from java.lang.Object
protected void finalize() { }

Check warning on line 749 in maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaAwt.java

View workflow job for this annotation

GitHub Actions / build + fast tests (JDK 26) 

[removal] finalize() in Object has been deprecated and marked for removal

//override from java.lang.Object
//@NotModified[H] @NotNull[H]
Expand All @@ -756,19 +758,19 @@

class ItemSelectable$ {
// a modifying method, declared so (generated from the assumed-defaults list)
@Modified void addItemListener(java.awt.event.ItemListener p0) { }
@Modified void removeItemListener(java.awt.event.ItemListener p0) { }
@Modified void addItemListener(ItemListener p0) { }
@Modified void removeItemListener(ItemListener p0) { }

// a query, declared so (generated from the assumed-defaults list)
@NotModified Object[] getSelectedObjects() { return null; }
}

class MenuContainer$ {
// a modifying method, declared so (generated from the assumed-defaults list)
@Modified void remove(java.awt.MenuComponent p0) { }
@Modified void remove(MenuComponent p0) { }

// a query, declared so (generated from the assumed-defaults list)
@NotModified java.awt.Font getFont() { return null; }
@NotModified Font getFont() { return null; }
}

class Transparency$ {
Expand Down
356 changes: 180 additions & 176 deletions maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaIo.java
View file
Open in desktop

Large diffs are not rendered by default.

591 changes: 299 additions & 292 deletions maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLang.java
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
*/

package io.codelaser.maddi.aapi.archive.jdk;
import io.codelaser.maddi.annotation.ImmutableContainer;
import io.codelaser.maddi.annotation.NotModified;

import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method;
import io.codelaser.maddi.annotation.Nullable;

import io.codelaser.maddi.annotation.ImmutableContainer;
import io.codelaser.maddi.annotation.NotModified;
import io.codelaser.maddi.annotation.NotNull;
import io.codelaser.maddi.annotation.Nullable;

public class JavaLangAnnotation {
public static final String PACKAGE_NAME = "java.lang.annotation";
Expand Down Expand Up @@ -52,7 +52,7 @@ class AnnotationTypeMismatchException$ {
@Nullable @NotModified String foundType() { return null; }

// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
AnnotationTypeMismatchException$(@Nullable java.lang.reflect.Method p0, @Nullable java.lang.String p1) { }
AnnotationTypeMismatchException$(@Nullable Method p0, @Nullable String p1) { }
}

//public enum ElementType extends Enum<ElementType>
Expand All @@ -69,7 +69,7 @@ class IncompleteAnnotationException$ {
@NotModified String elementName() { return null; }

// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
IncompleteAnnotationException$(@NotNull java.lang.Class<? extends java.lang.annotation.Annotation> p0, @NotNull java.lang.String p1) { }
IncompleteAnnotationException$(@NotNull Class<? extends Annotation> p0, @NotNull String p1) { }
}

//public enum RetentionPolicy extends Enum<RetentionPolicy>
Expand All @@ -82,8 +82,8 @@ class RetentionPolicy$ {
//public java.lang.annotation.AnnotationFormatError (shadow created for its nullability, generated)
class AnnotationFormatError$ {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
AnnotationFormatError$(@Nullable java.lang.String p0) { }
AnnotationFormatError$(@Nullable java.lang.String p0, @Nullable java.lang.Throwable p1) { }
AnnotationFormatError$(@Nullable java.lang.Throwable p0) { }
AnnotationFormatError$(@Nullable String p0) { }
AnnotationFormatError$(@Nullable String p0, @Nullable Throwable p1) { }
AnnotationFormatError$(@Nullable Throwable p0) { }
}
}
13 changes: 7 additions & 6 deletions maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
*/

package io.codelaser.maddi.aapi.archive.jdk;
import io.codelaser.maddi.annotation.NotModified;
import io.codelaser.maddi.annotation.ImmutableContainer;
import io.codelaser.maddi.annotation.Independent;
import io.codelaser.maddi.annotation.NotNull;

import java.lang.constant.ClassDesc;
import java.lang.constant.ConstantDesc;
import java.lang.invoke.MethodHandles;
import java.util.Optional;

import io.codelaser.maddi.annotation.ImmutableContainer;
import io.codelaser.maddi.annotation.Independent;
import io.codelaser.maddi.annotation.NotModified;
import io.codelaser.maddi.annotation.NotNull;
import io.codelaser.maddi.annotation.Nullable;

public class JavaLangConstant {
Expand All @@ -49,7 +50,7 @@ class Constable$ {
//public java.lang.constant.ClassDesc (shadow created for its nullability, generated)
class ClassDesc$ {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
@Nullable java.lang.constant.ClassDesc componentType() { return null; }
@Nullable ClassDesc componentType() { return null; }

// a query, declared so (generated from the assumed-defaults list)
@NotModified boolean isArray() { return false; }
Expand Down
27 changes: 16 additions & 11 deletions maddi-aapi-archive/src/main/java/io/codelaser/maddi/aapi/archive/jdk/JavaLangRef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@

package io.codelaser.maddi.aapi.archive.jdk;

import io.codelaser.maddi.annotation.NotModified;
import java.lang.ref.Cleaner;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.util.concurrent.ThreadFactory;

import io.codelaser.maddi.annotation.Modified;
import io.codelaser.maddi.annotation.Nullable;
import io.codelaser.maddi.annotation.NotModified;
import io.codelaser.maddi.annotation.NotNull;
import io.codelaser.maddi.annotation.Nullable;

public class JavaLangRef {
public static final String PACKAGE_NAME = "java.lang.ref";
Expand All @@ -30,7 +35,7 @@ class Reference$<T> {
@NotModified @Nullable T get() { return null; }

// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
static void reachabilityFence(@Nullable java.lang.Object p0) { }
static void reachabilityFence(@Nullable Object p0) { }
boolean refersTo(@Nullable T p0) { return false; }

// a modifying method, declared so (generated from the assumed-defaults list)
Expand All @@ -44,39 +49,39 @@ static void reachabilityFence(@Nullable java.lang.Object p0) { }
//public java.lang.ref.Cleaner (shadow created for its nullability, generated)
class Cleaner$ {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
static java.lang.ref.Cleaner create(@NotNull java.util.concurrent.ThreadFactory p0) { return null; }
@Modified java.lang.ref.Cleaner.Cleanable register(@NotNull java.lang.Object p0, @NotNull java.lang.Runnable p1) { return null; }
static Cleaner create(@NotNull ThreadFactory p0) { return null; }
@Modified Cleaner.Cleanable register(@NotNull Object p0, @NotNull Runnable p1) { return null; }
}

//public java.lang.ref.PhantomReference (shadow created for its nullability, generated)
class PhantomReference$<T> {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
PhantomReference$(@Nullable T p0, @Nullable java.lang.ref.ReferenceQueue<? super T> p1) { }
PhantomReference$(@Nullable T p0, @Nullable ReferenceQueue<? super T> p1) { }
@NotModified @Nullable T get() { return null; }
}

//public java.lang.ref.ReferenceQueue (shadow created for its nullability, generated)
class ReferenceQueue$<T> {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
@Modified @Nullable java.lang.ref.Reference<? extends T> poll() { return null; }
@Modified @Nullable java.lang.ref.Reference<? extends T> remove(long p0) { return null; }
@Modified @Nullable Reference<? extends T> poll() { return null; }
@Modified @Nullable Reference<? extends T> remove(long p0) { return null; }

// a modifying method, declared so (generated from the assumed-defaults list)
@Modified java.lang.ref.Reference<? extends T> remove() { return null; }
@Modified Reference<? extends T> remove() { return null; }
}

//public java.lang.ref.SoftReference (shadow created for its nullability, generated)
class SoftReference$<T> {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
SoftReference$(@Nullable T p0) { }
SoftReference$(@Nullable T p0, @Nullable java.lang.ref.ReferenceQueue<? super T> p1) { }
SoftReference$(@Nullable T p0, @Nullable ReferenceQueue<? super T> p1) { }
@NotModified @Nullable T get() { return null; }
}

//public java.lang.ref.WeakReference (shadow created for its nullability, generated)
class WeakReference$<T> {
// nullability from JSpecify's JDK (generated, jspecify-jdk-nullness.py)
WeakReference$(@Nullable T p0) { }
WeakReference$(@Nullable T p0, @Nullable java.lang.ref.ReferenceQueue<? super T> p1) { }
WeakReference$(@Nullable T p0, @Nullable ReferenceQueue<? super T> p1) { }
}
}
Loading
Loading