Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Refactoring in grizzly-config: removed dead code #25058

Merged
merged 16 commits into from
Jul 23, 2024
Merged

Refactoring in grizzly-config: removed dead code #25058

merged 16 commits into from
Jul 23, 2024

Conversation

dmatej
Copy link
Contributor

@dmatej dmatej commented Jul 22, 2024

  • I tried to commit step by step
  • First I was comparing the code with JDK11 and 17 as our code was copy pasted some 20 years ago, however then I found that some obsoleted code is not even used ... soon it became clear that quite a lot of this code is not used.
  • Probably when Grizzly was implemented, these classes were adapted to work with it using SSLConfigurator. The unused code remained in the SVN at those times and we inherited it.

@dmatej
JSSE14Support was merged into JSSESupport
e81e858 
- we don't use JSSESupport instances and we don't support Java 1.2 for years.

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
JSSE14SocketFactory merged to JSSESocketFactory
d3568c8 
- Shortened the inheritance to GlassfishServerSocketFactory


Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
JSSE14Factory renamed to JSSEFactory and the interface deleted
be443d6 
- We don't have any other implementation

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Removed unused methods from SSLImplementation and children
a996078 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Removed unused methods from ServerSocketFactory and children
501f1ec 
- Deleted also javadoc bloc probably copy pasted from some obsoleted JDK

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
ServerSocketFactory merged to JSSESocketFactory and deleted unused code
abe6f06 
- Also done small improvements in the code ie the attributes map had always
  just string values.
- The DefaultServerSocketFactory is a part of JDK, we don't use it.


Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
The init() method can return the SSLContext directly
e62d695 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Renamed socket factories to sslcontext factories and init() method to…
bb163ef 
… create()

- Now it makes sense, the original impl moved to the SSLConfigurator mostly,
  and from some point GF required to create just the SSLContext

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej dmatej added this to the 7.0.16 milestone Jul 22, 2024
@dmatej dmatej self-assigned this Jul 22, 2024
@dmatej
JSSEFactory.getSocketFactory renamed to getSSLContextFactory
d079fe0 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Deleted unused GlassfishSSLSupport
2ea4a33 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Deleted unused JSSESupport
cb5932f 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
Deleted JSSEFactory
5bab919 
- Redundant piece in the hierarchy of calls

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
avpinchuk
avpinchuk reviewed Jul 23, 2024
View reviewed changes
Copy link
Contributor

@avpinchuk avpinchuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more minor bugs

nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ConfigAwareElement.java Outdated Show resolved Hide resolved
nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java Outdated Show resolved Hide resolved
@dmatej
Improved array/list processing in grizzly-config
f50460b 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
GenericGrizzlyListener - replaced deprecated CompressionLevel enum
74d80ff 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
The habitat renamed to locator in grizzly-config module
98ac1b5 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej
The serverSF renamed to sslContextFactory
793afb0 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
@dmatej dmatej merged commit b6a2ca9 into eclipse-ee4j:master Jul 23, 2024
2 checks passed
@dmatej dmatej deleted the tls branch July 23, 2024 21:03
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@avpinchuk avpinchuk avpinchuk approved these changes

@arjantijms arjantijms Awaiting requested review from arjantijms

@pzygielo pzygielo Awaiting requested review from pzygielo

@hs536 hs536 Awaiting requested review from hs536

@kaido207 kaido207 Awaiting requested review from kaido207

Assignees

@dmatej dmatej

Labels
code cleaning
Projects
None yet
Milestone
7.0.16
Development

Successfully merging this pull request may close these issues.
2 participants
@dmatej @avpinchuk