Skip to content

Code cleanup - @Override, serialization, @Deprecated annotations#294

Open
dmatej wants to merge 1 commit intoeclipse-ee4j:masterfrom
dmatej:overrides
Open

Code cleanup - @Override, serialization, @Deprecated annotations#294
dmatej wants to merge 1 commit intoeclipse-ee4j:masterfrom
dmatej:overrides

Conversation

@dmatej
Copy link
Copy Markdown
Contributor

@dmatej dmatej commented Apr 23, 2026

  • In previous PRs I have noticed that some overrides are bit surprising which sometimes lead to mistakes. Also refactoring is safer when compiler screams when I remove/add something with unexpected consequences.
  • Added @OverRide annotations
  • Added missing serialVersionUID numbers
  • Added missing @deprecated annotations
  • Removed redundant modifiers
  • Removed redundant classcasts
  • Variable declarations of local variables moved to their first usage.

It would be probably better to merge this before #293

- In previous PRs I have noticed that some overrides are bit surprising which
  sometimes lead to mistakes. Also refactoring is safer when compiler screams
  when I remove/add something with unexpected consequences.
- Added @OverRide annotations
- Added missing serialVersionUID numbers
- Added missing @deprecated annotations
- Removed redundant modifiers
- Removed redundant classcasts
- Variable declarations of local variables moved to their first usage.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej dmatej added this to the 5.1.0 milestone Apr 23, 2026
@dmatej dmatej requested a review from a team April 23, 2026 16:09
@dmatej
Copy link
Copy Markdown
Contributor Author

dmatej commented Apr 29, 2026

@pzygielo Could you find time to review this and #293 please?

@OndroMih
Copy link
Copy Markdown

OndroMih commented May 1, 2026

Summary generated by AI:

AI Summary of changes

Summary

This PR focuses on code cleanup improvements:

  • Added @Override annotations to ensure correct method overriding
  • Added missing serialVersionUID numbers for serialization compatibility
  • Added missing @Deprecated annotations
  • Removed redundant modifiers (public, static, final)
  • Removed redundant classcasts
  • Moved local variable declarations to their first usage

The author notes this cleanup makes refactoring safer and helps catch mistakes at compile time.


Change Groups

1. Added @OverRide annotations

Added @Override annotations to methods that override parent/interface methods.
This helps catch errors when method signatures change or don't actually override anything.

Files affected: 811 Java files

Examples:

  • orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java
  • rmic/src/main/java/org/glassfish/rmic/Generator.java

2. Added missing serialVersionUID numbers

Added private static final long serialVersionUID fields to classes that implement
Serializable but were missing the field. This ensures serialization compatibility
across different JVM versions.

Files affected: Multiple files across orbmain and rmic modules

Examples:

  • orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientRequestDispatcherImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionImpl.java
  • rmic/src/main/java/org/glassfish/rmic/iiop/Generator.java

3. Added missing @deprecated annotations

Added @Deprecated annotations to methods and classes that should no longer be used.
Previously some were commented out as // @Deprecated.

Files affected: Multiple files

Examples:

  • orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryStaticImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java

4. Removed redundant modifiers

Removed redundant public, static, and final modifiers from:

  • Interface fields (already public, static, final by default)
  • Interface methods (already public by default)
  • Abstract class methods (already abstract by default)

Files affected: Multiple files

Examples:

  • orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryStaticImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java

5. Removed redundant classcasts

Removed unnecessary explicit casts that were redundant due to type inference or
already being the correct type.

Files affected: Multiple files

Examples:

  • orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java

6. Moved local variable declarations to first usage

Moved local variable declarations closer to their first usage point, improving
code readability and reducing scope.

Files affected: Multiple files

Examples:

  • orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java
  • orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubInvocationHandlerImpl.java

Summary

  • 811 Java files: all code cleanup improvements
  • 0 pom.xml files
  • 0 other files

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants