Skip to content

Commit f756d30

Browse files
bnasslahsenbnasslahsen
committed
Support for spring-native 0.10.1. Fixes #1225 
1 parent d36f9b5 commit f756d30

File tree

2 files changed

+64
-26
lines changed

2 files changed

+64
-26
lines changed

‎pom.xml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
<jaxb-impl.version>2.1</jaxb-impl.version>
7676
<javax.jws-api.version>1.1</javax.jws-api.version>
7777
<jjwt.version>0.9.1</jjwt.version>
78-
<spring-native.version>0.9.2</spring-native.version>
78+
<spring-native.version>0.10.1</spring-native.version>
79+
<kotlin.version>1.5.21</kotlin.version>
7980
</properties>
8081

8182
<dependencyManagement>
@@ -165,6 +166,17 @@
165166
</exclusion>
166167
</exclusions>
167168
</dependency>
169+
<dependency>
170+
<groupId>org.jetbrains.kotlin</groupId>
171+
<artifactId>kotlin-stdlib-jdk8</artifactId>
172+
<version>${kotlin.version}</version>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.jetbrains.kotlin</groupId>
176+
<artifactId>kotlin-test</artifactId>
177+
<version>${kotlin.version}</version>
178+
<scope>test</scope>
179+
</dependency>
168180
</dependencies>
169181
<build>
170182
<pluginManagement>
@@ -176,6 +188,32 @@
176188
</plugin>
177189
</plugins>
178190
</pluginManagement>
191+
<plugins>
192+
<plugin>
193+
<groupId>org.jetbrains.kotlin</groupId>
194+
<artifactId>kotlin-maven-plugin</artifactId>
195+
<version>${kotlin.version}</version>
196+
<executions>
197+
<execution>
198+
<id>compile</id>
199+
<phase>compile</phase>
200+
<goals>
201+
<goal>compile</goal>
202+
</goals>
203+
</execution>
204+
<execution>
205+
<id>test-compile</id>
206+
<phase>test-compile</phase>
207+
<goals>
208+
<goal>test-compile</goal>
209+
</goals>
210+
</execution>
211+
</executions>
212+
<configuration>
213+
<jvmTarget>1.8</jvmTarget>
214+
</configuration>
215+
</plugin>
216+
</plugins>
179217
</build>
180218

181219
<profiles>

‎springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocHints.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,38 +65,38 @@
6565
import org.springframework.context.annotation.Configuration;
6666
import org.springframework.context.annotation.PropertySource;
6767
import org.springframework.nativex.hint.AccessBits;
68-
import org.springframework.nativex.hint.ProxyHint;
68+
import org.springframework.nativex.hint.JdkProxyHint;
6969
import org.springframework.nativex.hint.ResourceHint;
7070
import org.springframework.nativex.hint.TypeHint;
7171

7272
import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
7373
import static org.springdoc.core.Constants.SPRING_NATIVE_LISTENER;
7474

75-
@ProxyHint(typeNames = "javax.servlet.http.HttpServletRequest")
76-
@ProxyHint(typeNames = "org.springframework.web.context.request.NativeWebRequest" )
75+
@JdkProxyHint(typeNames = "javax.servlet.http.HttpServletRequest")
76+
@JdkProxyHint(typeNames = "org.springframework.web.context.request.NativeWebRequest" )
7777

78-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.RestController", "org.springframework.core.annotation.SynthesizedAnnotation" })
79-
@ProxyHint(typeNames = { "org.springframework.stereotype.Controller", "org.springframework.core.annotation.SynthesizedAnnotation" })
80-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.SessionAttribute", "org.springframework.core.annotation.SynthesizedAnnotation" })
81-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.RestControllerAdvice", "org.springframework.core.annotation.SynthesizedAnnotation" })
82-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.ResponseStatus", "org.springframework.core.annotation.SynthesizedAnnotation" })
83-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.ResponseBody", "org.springframework.core.annotation.SynthesizedAnnotation" })
84-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.RequestPart", "org.springframework.core.annotation.SynthesizedAnnotation" })
85-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.RequestPart", "org.springframework.core.annotation.SynthesizedAnnotation" })
86-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.RequestMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
87-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.GetMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
88-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.PostMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
89-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.PutMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
90-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.PatchMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
91-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.DeleteMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
92-
@ProxyHint(typeNames = { "org.springframework.web.bind.annotation.ControllerAdvice", "org.springframework.core.annotation.SynthesizedAnnotation" })
93-
@ProxyHint(typeNames = {"org.springframework.web.bind.annotation.RequestParam", "org.springframework.core.annotation.SynthesizedAnnotation"})
94-
@ProxyHint(typeNames = {"org.springframework.web.bind.annotation.RequestHeader", "org.springframework.core.annotation.SynthesizedAnnotation"})
95-
@ProxyHint(typeNames = {"org.springframework.web.bind.annotation.RequestBody", "org.springframework.core.annotation.SynthesizedAnnotation"})
96-
@ProxyHint(typeNames = {"org.springframework.web.bind.annotation.PathVariable", "org.springframework.core.annotation.SynthesizedAnnotation"})
97-
@ProxyHint(typeNames = {"org.springframework.web.bind.annotation.ModelAttribute", "org.springframework.core.annotation.SynthesizedAnnotation"})
98-
@ProxyHint(typeNames = {"org.springframework.stereotype.Controller", "org.springframework.core.annotation.SynthesizedAnnotation"})
99-
@ProxyHint(typeNames = {"org.springframework.web.bind.annotation.ControllerAdvice", "org.springframework.core.annotation.SynthesizedAnnotation"})
78+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.RestController", "org.springframework.core.annotation.SynthesizedAnnotation" })
79+
@JdkProxyHint(typeNames = { "org.springframework.stereotype.Controller", "org.springframework.core.annotation.SynthesizedAnnotation" })
80+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.SessionAttribute", "org.springframework.core.annotation.SynthesizedAnnotation" })
81+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.RestControllerAdvice", "org.springframework.core.annotation.SynthesizedAnnotation" })
82+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.ResponseStatus", "org.springframework.core.annotation.SynthesizedAnnotation" })
83+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.ResponseBody", "org.springframework.core.annotation.SynthesizedAnnotation" })
84+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.RequestPart", "org.springframework.core.annotation.SynthesizedAnnotation" })
85+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.RequestPart", "org.springframework.core.annotation.SynthesizedAnnotation" })
86+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.RequestMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
87+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.GetMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
88+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.PostMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
89+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.PutMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
90+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.PatchMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
91+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.DeleteMapping", "org.springframework.core.annotation.SynthesizedAnnotation" })
92+
@JdkProxyHint(typeNames = { "org.springframework.web.bind.annotation.ControllerAdvice", "org.springframework.core.annotation.SynthesizedAnnotation" })
93+
@JdkProxyHint(typeNames = {"org.springframework.web.bind.annotation.RequestParam", "org.springframework.core.annotation.SynthesizedAnnotation"})
94+
@JdkProxyHint(typeNames = {"org.springframework.web.bind.annotation.RequestHeader", "org.springframework.core.annotation.SynthesizedAnnotation"})
95+
@JdkProxyHint(typeNames = {"org.springframework.web.bind.annotation.RequestBody", "org.springframework.core.annotation.SynthesizedAnnotation"})
96+
@JdkProxyHint(typeNames = {"org.springframework.web.bind.annotation.PathVariable", "org.springframework.core.annotation.SynthesizedAnnotation"})
97+
@JdkProxyHint(typeNames = {"org.springframework.web.bind.annotation.ModelAttribute", "org.springframework.core.annotation.SynthesizedAnnotation"})
98+
@JdkProxyHint(typeNames = {"org.springframework.stereotype.Controller", "org.springframework.core.annotation.SynthesizedAnnotation"})
99+
@JdkProxyHint(typeNames = {"org.springframework.web.bind.annotation.ControllerAdvice", "org.springframework.core.annotation.SynthesizedAnnotation"})
100100

101101
@TypeHint(typeNames = { "org.springdoc.core.CacheOrGroupedOpenApiCondition$OnCacheDisabled", "io.swagger.v3.oas.models.parameters.Parameter$StyleEnum",
102102
"io.swagger.v3.oas.models.security.SecurityScheme$In" , "io.swagger.v3.oas.models.security.SecurityScheme$Type",

0 commit comments

Comments
 (0)