Skip to content

Commit

Permalink
Fixes bean collision (#253)
Browse files Browse the repository at this point in the history
* Fixes bean collision


Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>
  • Loading branch information
FrankSchnicke committed Apr 3, 2024
1 parent db05055 commit da1f27a
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,24 @@
public class RestConfiguration extends BaSyxHTTPConfiguration {

@Bean
public LocationBuilder locationBuilder() {
public LocationBuilder submodelRegistryLocationBuilder() {
return new DefaultLocationBuilder();
}

@Bean
public RestTemplate restTemplate() {
public RestTemplate submodelRegistryRestTemplate() {
return new RestTemplate();
}

@Bean
public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
public MappingJackson2HttpMessageConverter submodelRegistryMappingJackson2HttpMessageConverter() {
Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder().serializationInclusion(JsonInclude.Include.NON_NULL);
builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
return new MappingJackson2HttpMessageConverter(builder.build());
}

@Bean
public CorsPathPatternProvider getSubmodelRegistryServiceCorsUrlProvider() {
return new CorsPathPatternProvider("/submodel-descriptors/**");
}
}
}

0 comments on commit da1f27a

Please sign in to comment.