Skip to content

Comments

Clean Code for bundles/org.eclipse.equinox.http.jetty#1080

Merged
laeubi merged 2 commits intomasterfrom
clean-code/bundles/org.eclipse.equinox.http.jetty
Oct 31, 2025
Merged

Clean Code for bundles/org.eclipse.equinox.http.jetty#1080
laeubi merged 2 commits intomasterfrom
clean-code/bundles/org.eclipse.equinox.http.jetty

Conversation

@eclipse-equinox-bot
Copy link
Contributor

The following cleanups were applied:

  • Add final modifier to private fields
  • Add missing '@Deprecated' annotations
  • Add missing '@Override' annotations
  • Add missing '@Override' annotations to implementations of interface methods
  • Convert control statement bodies to block
  • Make inner classes static where possible
  • Remove trailing white spaces on all lines
  • Remove unnecessary array creation for varargs
  • Remove unnecessary suppress warning tokens
  • Remove unused imports
  • Remove unused private constructors
  • Remove unused private fields
  • Remove unused private methods
  • Remove unused private types
  • Replace deprecated calls with inlined content where possible
  • Use pattern matching for instanceof

The following Manifest cleanups where applied:

  • Calculate 'uses' directive for public packages
  • Remove unused dependencies

@github-actions
Copy link

github-actions bot commented Jul 15, 2025

Test Results

  810 files  ±0    810 suites  ±0   1h 35m 51s ⏱️ + 2m 13s
2 222 tests ±0  2 173 ✅ ±0   49 💤 ±0  0 ❌ ±0 
6 678 runs  ±0  6 529 ✅ ±0  149 💤 ±0  0 ❌ ±0 

Results for commit 7613e81. ± Comparison against base commit add2865.

♻️ This comment has been updated with latest results.

org.eclipse.jetty.session;version="[12.0.1,13.0.0)",
org.eclipse.jetty.ee8.servlet;version="[12.0.1,13.0.0)",
org.eclipse.jetty.ee8.nested;version="[12.0.1,13.0.0)",
org.eclipse.jetty.util;version="[12.0.1,13.0.0)",
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be fixed in PDE (or bnd...) as it leads to

Access restriction: The method 'AbstractLifeCycle.stop()' is not API (restriction on classpath entry '/home/jenkins/agent/workspace/equinox_PR-1080/.m2/repository/org/eclipse/jetty/jetty-util/12.0.23/jetty-util-12.0.23.jar')

I have not yet found out why bndlib thing the package is not referenced, maybe because the method is overriden in a subclass and the compiler emits a reference to the subclass.

@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 4 times, most recently from 5a8853a to 9ff9e59 Compare July 22, 2025 03:15
@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 4 times, most recently from 18ffb6e to ad5e974 Compare July 29, 2025 03:23
@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 5 times, most recently from ce6c7a9 to 70224e3 Compare August 3, 2025 03:25
@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 3 times, most recently from 21ae55a to 4a22e9b Compare August 7, 2025 08:33
@laeubi
Copy link
Member

laeubi commented Aug 7, 2025

I have now created

the reason for the restriction errors is that JDT handles methods inherited from super class different from those directly overridden.

@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch from 4a22e9b to 5eac8ae Compare August 13, 2025 03:11
@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 3 times, most recently from aaeca71 to 92a6b5f Compare August 28, 2025 03:10
@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch from 92a6b5f to bd41ed8 Compare August 30, 2025 03:00
@eclipse-equinox-bot
Copy link
Contributor Author

eclipse-equinox-bot commented Aug 30, 2025

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
features/org.eclipse.equinox.server.jetty/feature.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From 9690760fd94f6171989c3e9daf99e8ac11f9b445 Mon Sep 17 00:00:00 2001
From: Eclipse Equinox Bot <equinox-bot@eclipse.org>
Date: Wed, 3 Sep 2025 03:08:44 +0000
Subject: [PATCH] Version bump(s) for 4.38 stream


diff --git a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
index a35c8a37d..46740e1b0 100644
--- a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.equinox.http.jetty
-Bundle-Version: 3.9.500.qualifier
+Bundle-Version: 3.9.600.qualifier
 Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
diff --git a/features/org.eclipse.equinox.server.jetty/feature.xml b/features/org.eclipse.equinox.server.jetty/feature.xml
index 7deca534b..ef4a5d29d 100644
--- a/features/org.eclipse.equinox.server.jetty/feature.xml
+++ b/features/org.eclipse.equinox.server.jetty/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.server.jetty"
       label="%featureName"
-      version="1.11.800.qualifier"
+      version="1.11.900.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
-- 
2.51.0

Further information are available in Common Build Issues - Missing version increments.

@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 2 times, most recently from c541eaf to 8880192 Compare September 1, 2025 03:12
@eclipse-equinox-bot eclipse-equinox-bot force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch 2 times, most recently from 127b03b to e41f9f1 Compare September 3, 2025 03:03
@laeubi
Copy link
Member

laeubi commented Oct 27, 2025

The JDT change was merged, so lets see how far we get now!

@laeubi laeubi force-pushed the clean-code/bundles/org.eclipse.equinox.http.jetty branch from d098287 to 7613e81 Compare October 27, 2025 04:44
@laeubi
Copy link
Member

laeubi commented Oct 27, 2025

Seems to still using 3.44.0.v20251023-0518 so from Oct 23 ... @HannesWell should the jdt compiler not automatically deployed and used?

@HannesWell
Copy link
Member

should the jdt compiler not automatically deployed and used?

In general yes, but not if the build is unstable (because ECJ changes are regularly the cause of comparator-errors and then it should be investigated). And we had a few unstable builds.

Copy link
Member

@laeubi laeubi left a comment

Choose a reason for hiding this comment

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

It all seems fine now!

@laeubi laeubi merged commit e1dfedc into master Oct 31, 2025
30 of 34 checks passed
@laeubi laeubi deleted the clean-code/bundles/org.eclipse.equinox.http.jetty branch October 31, 2025 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants