Skip to content

Commit 3b97b9e

Browse files
committed
Also updates springdoc dependency
1 parent 5387136 commit 3b97b9e

2 files changed

Lines changed: 1 addition & 27 deletions

File tree

basyx.common/basyx.http/src/main/java/org/eclipse/digitaltwin/basyx/http/BaSyxHTTPConfiguration.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,12 @@
3333
import org.slf4j.LoggerFactory;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3535
import org.springframework.beans.factory.annotation.Value;
36-
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
37-
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
38-
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
3936
import org.springframework.context.annotation.Bean;
4037
import org.springframework.context.annotation.Configuration;
4138
import org.springframework.http.converter.HttpMessageConverter;
4239
import org.springframework.http.converter.ResourceHttpMessageConverter;
4340
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
4441
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
45-
import org.springframework.util.ClassUtils;
4642
import org.springframework.web.cors.CorsConfiguration;
4743
import org.springframework.web.cors.CorsConfigurationSource;
4844
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
@@ -62,8 +58,6 @@
6258
*/
6359
@Configuration
6460
public class BaSyxHTTPConfiguration {
65-
private static final String SPRINGDOC_QUERYDSL_CUSTOMIZER_BEAN_NAME = "queryDslQuerydslPredicateOperationCustomizer";
66-
6761
Logger logger = LoggerFactory.getLogger(BaSyxHTTPConfiguration.class);
6862

6963
/**
@@ -117,26 +111,6 @@ private static void moveResourceHttpMessageConverterToFront(List<HttpMessageConv
117111
}
118112
}
119113

120-
@Bean
121-
public static BeanDefinitionRegistryPostProcessor springdocQuerydslCompatibilityPostProcessor() {
122-
return new BeanDefinitionRegistryPostProcessor() {
123-
@Override
124-
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) {
125-
if (isLegacySpringDataTypeInformationMissing() && registry.containsBeanDefinition(SPRINGDOC_QUERYDSL_CUSTOMIZER_BEAN_NAME)) {
126-
registry.removeBeanDefinition(SPRINGDOC_QUERYDSL_CUSTOMIZER_BEAN_NAME);
127-
}
128-
}
129-
130-
@Override
131-
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
132-
}
133-
};
134-
}
135-
136-
private static boolean isLegacySpringDataTypeInformationMissing() {
137-
return !ClassUtils.isPresent("org.springframework.data.util.TypeInformation", BaSyxHTTPConfiguration.class.getClassLoader());
138-
}
139-
140114
/**
141115
* Collects a list of {@link CorsPathPatternProvider} and uses them to configure
142116
* CORS for the passed pathPatterns

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363
<dependency>
364364
<groupId>org.springdoc</groupId>
365365
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
366-
<version>2.8.14</version>
366+
<version>3.0.3</version>
367367
</dependency>
368368
<dependency>
369369
<groupId>org.eclipse.paho</groupId>

0 commit comments

Comments
 (0)