Skip to content

Remove all non null values that are returned #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronzi merged 6 commits into from
Aug 13, 2025
Merged

Remove all non null values that are returned #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8665ba2
Remove all non null values that are returned
geso02 Aug 11, 2025
1ef9ffe
Trigger ECA validation
geso02 Aug 11, 2025
2ac2af3
Update basyx.submodelregistry/basyx.submodelregistry-service/src/main…
geso02 Aug 13, 2025
c32fcc7
Update changes based on the review
geso02 Aug 13, 2025
57d4bd5
Merge branch 'no-null-values-from-backend' of https://github.com/geso…
geso02 Aug 13, 2025
b321dcd
Fix JSON configuration and remove unnecessary custom beans
geso02 Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions ...va/org/eclipse/digitaltwin/basyx/aasregistry/service/configuration/RestConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,18 @@
import org.springframework.core.convert.converter.Converter;
import org.springframework.format.FormatterRegistry;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.SerializationFeature;

@Configuration
@EnableWebMvc
public class RestConfiguration extends BaSyxHTTPConfiguration implements WebMvcConfigurer {

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

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

@Bean
public CorsPathPatternProvider getAasRegistryServiceCorsUrlProvider() {
return new CorsPathPatternProvider("/shell-descriptors/**");
Expand All @@ -72,6 +61,11 @@ public CorsPathPatternProvider getAasRegistryServiceDescriptionCorsUrlProvider()
public SerializationExtension getExtension() {
return new Aas4JHTTPSerializationExtension();
}

@Bean
public SerializationExtension getDisableExtension() {
return builder -> builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
}

@Override
public void addFormatters(FormatterRegistry registry) {
Expand Down
1 change: 0 additions & 1 deletion ...n/java/org/eclipse/digitaltwin/basyx/aasregistry/service/events/RegistryEventLogSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
public class RegistryEventLogSink implements RegistryEventSink {

@Autowired
@Qualifier("mappingJackson2HttpMessageConverter")
private MappingJackson2HttpMessageConverter converter;

@Override
Expand Down
15 changes: 6 additions & 9 deletions ...g/eclipse/digitaltwin/basyx/submodelregistry/service/configuration/RestConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import com.fasterxml.jackson.databind.SerializationFeature;

@Configuration
@EnableWebMvc
public class RestConfiguration extends BaSyxHTTPConfiguration {

@Bean
Expand All @@ -52,14 +51,7 @@ public LocationBuilder submodelRegistryLocationBuilder() {
public RestTemplate submodelRegistryRestTemplate() {
return new RestTemplate();
}

@Bean
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/**");
Expand All @@ -74,4 +66,9 @@ public CorsPathPatternProvider getSubmodelRegistryServiceDescriptionCorsUrlProvi
public SerializationExtension getSubmodelRegistryExtension() {
return new Aas4JHTTPSerializationExtension();
}

@Bean
public SerializationExtension getDisableExtension() {
return builder -> builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
}
}
1 change: 0 additions & 1 deletion ...a/org/eclipse/digitaltwin/basyx/submodelregistry/service/events/RegistryEventLogSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
public class RegistryEventLogSink implements RegistryEventSink {

@Autowired
@Qualifier("submodelRegistryMappingJackson2HttpMessageConverter")
private MappingJackson2HttpMessageConverter converter;

@Override
Expand Down