diff --git a/Makefile b/Makefile index 2ce3b63..7411a8c 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,9 @@ docker-graal-build: docker-graal-release: docker tag docker.registry:5000/wikiproject-native:latest docker.registry:5000/wikiproject-native:$(NATIVE_VERSION) +docker-graal-push: + docker push docker.registry:5000/wikiproject-native:$(NATIVE_VERSION) + docker-graal-run: RUN_PORT=8080 docker-graal-run: echo "$(firstword $(MAKECMDGOALS))" diff --git a/src/main/java/tk/antoine_roux/wiki/configuration/ApiVersionRequestMappingHandlerMapping.java b/src/main/java/tk/antoine_roux/wiki/configuration/ApiVersionRequestMappingHandlerMapping.java index 6955534..20bd17c 100644 --- a/src/main/java/tk/antoine_roux/wiki/configuration/ApiVersionRequestMappingHandlerMapping.java +++ b/src/main/java/tk/antoine_roux/wiki/configuration/ApiVersionRequestMappingHandlerMapping.java @@ -52,8 +52,8 @@ public class ApiVersionRequestMappingHandlerMapping extends RequestMappingHandle RequestMappingInfo requestMappingInfo = new RequestMappingInfo( new PatternsRequestCondition( new String[]{annotationApiPrefix.value()}, - this.getUrlPathHelper(), this.getPathMatcher(), - false + false, + this.getPathMatcher() ), new RequestMethodsRequestCondition(), new ParamsRequestCondition(), @@ -76,11 +76,7 @@ public class ApiVersionRequestMappingHandlerMapping extends RequestMappingHandle } return new RequestMappingInfo( - new PatternsRequestCondition( - patterns, this.getUrlPathHelper(), this.getPathMatcher(), - false - // , this.useTrailingSlashMatch(), this.getFileExtensions() - ), + new PatternsRequestCondition(patterns, false, this.getPathMatcher()), new RequestMethodsRequestCondition(), new ParamsRequestCondition(), new HeadersRequestCondition(), diff --git a/src/main/java/tk/antoine_roux/wiki/configuration/WebConfiguration.java b/src/main/java/tk/antoine_roux/wiki/configuration/WebConfiguration.java index b7907dd..9f8dcd2 100644 --- a/src/main/java/tk/antoine_roux/wiki/configuration/WebConfiguration.java +++ b/src/main/java/tk/antoine_roux/wiki/configuration/WebConfiguration.java @@ -12,7 +12,7 @@ import tk.antoine_roux.wiki.Constant; /** * spring web configuration */ -@Configuration +@Configuration(proxyBeanMethods = false) public class WebConfiguration extends WebMvcConfigurationSupport { @Bean diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 822417f..fbca480 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,4 +12,5 @@ logging.level.root=INFO management.server.port=8080 info.name=gitlab-runner-gateway info.more.detail=This is a REST API use to gateway gitlab runner call to gitlab instance + management.endpoints.web.exposure.include=mappings