Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Eliminate repeated code with HttpServletRequestWrapper in mvc-annotation-commons.#776

Merged
wu-sheng merged 6 commits intoapache:mainapache/skywalking-java:mainfrom
jiangyunpeng:mainjiangyunpeng/skywalking-java:mainCopy head branch name to clipboard
Sep 28, 2025
Merged

Eliminate repeated code with HttpServletRequestWrapper in mvc-annotation-commons.#776
wu-sheng merged 6 commits intoapache:mainapache/skywalking-java:mainfrom
jiangyunpeng:mainjiangyunpeng/skywalking-java:mainCopy head branch name to clipboard

Conversation

@jiangyunpeng
Copy link
Contributor

@jiangyunpeng jiangyunpeng commented Sep 24, 2025

Eliminate repeated code with HttpServletRequestWrapper in mvc-annotation-commons.

There is a lot of duplicate code in the AbstractMethodInterceptor of mvc-annotation-commons, mainly due to the change in the package name of Servlet after JDK 17. This PR uses an HttpServletRequestWrapper to shield code differences, reduce duplicate code, and facilitate subsequent maintenance.

  • [ x ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #.
  • [ x ] Update the CHANGES log.

@wu-sheng wu-sheng added enhancement New feature or request plugin labels Sep 24, 2025
@wu-sheng wu-sheng added this to the 9.6.0 milestone Sep 24, 2025
@wu-sheng
Copy link
Member

wu-sheng commented Sep 25, 2025

Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java:[36,59] (imports) AvoidStarImport: Using the '.' form of import should be avoided - org.apache.skywalking.apm.plugin.spring.mvc.commons..
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java:[159,113] (whitespace) WhitespaceAround: '{' is not preceded with whitespace.
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java:[166,94] (whitespace) WhitespaceAfter: ',' is not followed by whitespace.
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/HttpServletRequestWrappers.java:[22,1] (whitespace) EmptyLineSeparator: 'import' has more than 1 empty lines before.
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/HttpServletRequestWrappers.java:[71,9] (whitespace) EmptyLineSeparator: '}' has more than 1 empty lines after.
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/HttpServletRequestWrappers.java:[111,9] (whitespace) EmptyLineSeparator: '}' has more than 1 empty lines after.
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/HttpServletRequestWrapper.java:[18,1] (whitespace) EmptyLineSeparator: 'package' should be separated from previous line.
Error: src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/HttpServletRequestWrapper.java:[21,1] (whitespace) EmptyLineSeparator: 'import' has more than 1 empty lines before.
Error: Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:3.2.1:check (validate) on project apm-springmvc-annotation-commons: You have 8 Checkstyle violations. -> [Help 1]

You are not using the upstream code style. Please import them and fix the issue.

@wu-sheng
Copy link
Member

wu-sheng commented Sep 26, 2025

@jiangyunpeng Could you have this fix?

@jiangyunpeng
Copy link
Contributor Author

jiangyunpeng commented Sep 28, 2025 •
edited
Loading

ok, I have fixed it

@wu-sheng wu-sheng merged commit 606c563 into apache:main Sep 28, 2025
197 of 198 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wu-sheng wu-sheng wu-sheng approved these changes

Assignees

No one assigned

Labels

enhancement New feature or request plugin

Projects

None yet

Milestone

9.6.0

Development

Successfully merging this pull request may close these issues.

2 participants

@jiangyunpeng @wu-sheng
Morty Proxy This is a proxified and sanitized view of the page, visit original site.