-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#10832] Backport: Support
getStatusCode() for compatibility with S…
…pring WebFlux 6.1 & Boot 3.x. [#NotAssigned] Removed getRawStatusCode() method for removal in Spring Webflux 6.1 [#10736] Separate dummy java class not to disturb spring-web dependency [#10736] Remove dummy classes after install the plugin [#10736] Use maven-clean-plugin instead of exec [#10736] Split spring-stub into separate modules
- Loading branch information
Showing
26 changed files
with
653 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
.../resttemplate/src/main/java/com/navercorp/pinpoint/plugin/resttemplate/SpringVersion.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package com.navercorp.pinpoint.plugin.resttemplate;/* | ||
| * Copyright 2024 NAVER Corp. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * @author intr3p1d | ||
| */ | ||
| public class SpringVersion { | ||
|
|
||
| public static final int SPRING_VERSION_UNKNOWN = -1; | ||
| public static final int SPRING_VERSION_5 = 5_00_00; | ||
| public static final int SPRING_VERSION_6 = 6_00_00; | ||
|
|
||
| static final String SPRING5_HTTP_STATUS_INTERFACE_NAME = "org.springframework.http.HttpStatus"; | ||
| static final String SPRING6_HTTP_STATUS_INTERFACE_NAME = "org.springframework.http.HttpStatusCode"; | ||
|
|
||
|
|
||
| public static int getVersion(ClassLoader classLoader) { | ||
| // Spring 6.0 + (boot 3.0 + ) | ||
| final Class<?> httpStatusCode = getClass(classLoader, SPRING6_HTTP_STATUS_INTERFACE_NAME); | ||
| if (httpStatusCode != null) { | ||
| return SpringVersion.SPRING_VERSION_6; | ||
| } | ||
|
|
||
| // ~ Spring 5.x (boot 2.0 -) | ||
| final Class<?> httpStatus = getClass(classLoader, SPRING5_HTTP_STATUS_INTERFACE_NAME); | ||
| if (httpStatus != null) { | ||
| return SpringVersion.SPRING_VERSION_5; | ||
| } | ||
| return SpringVersion.SPRING_VERSION_UNKNOWN; | ||
| } | ||
|
|
||
|
|
||
| static Class<?> getClass(ClassLoader classLoader, String className) { | ||
| Objects.requireNonNull(className, "className"); | ||
| try { | ||
| return Class.forName(className, false, classLoader); | ||
| } catch (ClassNotFoundException ignored) { | ||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
.../java/com/navercorp/pinpoint/plugin/resttemplate/interceptor/util/HttpStatusProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Copyright 2024 NAVER Corp. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.navercorp.pinpoint.plugin.resttemplate.interceptor.util; | ||
|
|
||
| /** | ||
| * @author intr3p1d | ||
| */ | ||
| public interface HttpStatusProvider { | ||
| int getStatusCode(Object target); | ||
| } |
38 changes: 38 additions & 0 deletions
38
...om/navercorp/pinpoint/plugin/resttemplate/interceptor/util/HttpStatusProviderFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2024 NAVER Corp. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.navercorp.pinpoint.plugin.resttemplate.interceptor.util; | ||
|
|
||
| import com.navercorp.pinpoint.plugin.resttemplate.SpringVersion; | ||
|
|
||
| /** | ||
| * @author intr3p1d | ||
| */ | ||
| public class HttpStatusProviderFactory { | ||
|
|
||
| public HttpStatusProviderFactory() { | ||
| } | ||
|
|
||
| public static HttpStatusProvider getHttpStatusProvider(int version) { | ||
| switch (version) { | ||
| case SpringVersion.SPRING_VERSION_5: | ||
| return new Spring5HttpStatusProvider(); | ||
| case SpringVersion.SPRING_VERSION_6: | ||
| return new Spring6HttpStatusProvider(); | ||
| default: | ||
| return new UnsupportedHttpStatusProvider(); | ||
| } | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
...om/navercorp/pinpoint/plugin/resttemplate/interceptor/util/Spring5HttpStatusProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2024 NAVER Corp. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.navercorp.pinpoint.plugin.resttemplate.interceptor.util; | ||
|
|
||
| import org.springframework.http.client.ClientHttpResponse; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * @author intr3p1d | ||
| */ | ||
| public class Spring5HttpStatusProvider implements HttpStatusProvider { | ||
| @Override | ||
| public int getStatusCode(Object target) { | ||
| if (target instanceof ClientHttpResponse) { | ||
| final ClientHttpResponse response = (ClientHttpResponse) target; | ||
| try { | ||
| return response.getRawStatusCode(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| return -1; | ||
| } | ||
| } |
38 changes: 38 additions & 0 deletions
38
...om/navercorp/pinpoint/plugin/resttemplate/interceptor/util/Spring6HttpStatusProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2024 NAVER Corp. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.navercorp.pinpoint.plugin.resttemplate.interceptor.util; | ||
|
|
||
| import org.springframework.http.client.ClientHttpResponse; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * @author intr3p1d | ||
| */ | ||
| public class Spring6HttpStatusProvider implements HttpStatusProvider { | ||
| @Override | ||
| public int getStatusCode(Object target) { | ||
| if (target instanceof ClientHttpResponse) { | ||
| final ClientHttpResponse response = (ClientHttpResponse) target; | ||
| try { | ||
| return response.getStatusCode().value(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| return -1; | ||
| } | ||
| } |
Oops, something went wrong.