Skip to content

Commit 8665ba2

Browse files
committed
Remove all non null values that are returned
#630
1 parent ef8d9aa commit 8665ba2

4 files changed

Lines changed: 96 additions & 3 deletions

File tree

basyx.aasregistry/basyx.aasregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/aasregistry/service/configuration/RestConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@
3636
import org.springframework.format.FormatterRegistry;
3737
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
3838
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
39-
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
4039
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
4140

4241
import com.fasterxml.jackson.annotation.JsonInclude;
4342
import com.fasterxml.jackson.databind.SerializationFeature;
4443

4544
@Configuration
46-
@EnableWebMvc
4745
public class RestConfiguration extends BaSyxHTTPConfiguration implements WebMvcConfigurer {
4846

4947
@Bean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*******************************************************************************
2+
* Copyright (C) 2025 DFKI GmbH (https://www.dfki.de/en/web)
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the
6+
* "Software"), to deal in the Software without restriction, including
7+
* without limitation the rights to use, copy, modify, merge, publish,
8+
* distribute, sublicense, and/or sell copies of the Software, and to
9+
* permit persons to whom the Software is furnished to do so, subject to
10+
* the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be
13+
* included in all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*
23+
* SPDX-License-Identifier: MIT
24+
******************************************************************************/
25+
package org.eclipse.digitaltwin.basyx.aasregistry.service.configuration;
26+
27+
import java.util.List;
28+
29+
import org.springframework.http.converter.HttpMessageConverter;
30+
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
31+
import org.springframework.stereotype.Component;
32+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
33+
34+
@Component
35+
public class WebMvcConfig implements WebMvcConfigurer {
36+
37+
private MappingJackson2HttpMessageConverter converter;
38+
39+
public WebMvcConfig(MappingJackson2HttpMessageConverter converter) {
40+
this.converter = converter;
41+
}
42+
43+
@Override
44+
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
45+
converters.add(converter);
46+
}
47+
48+
}

basyx.submodelregistry/basyx.submodelregistry-service/src/main/java/org/eclipse/digitaltwin/basyx/submodelregistry/service/configuration/RestConfiguration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import com.fasterxml.jackson.databind.SerializationFeature;
4141

4242
@Configuration
43-
@EnableWebMvc
4443
public class RestConfiguration extends BaSyxHTTPConfiguration {
4544

4645
@Bean
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*******************************************************************************
2+
* Copyright (C) 2025 DFKI GmbH (https://www.dfki.de/en/web)
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining
5+
* a copy of this software and associated documentation files (the
6+
* "Software"), to deal in the Software without restriction, including
7+
* without limitation the rights to use, copy, modify, merge, publish,
8+
* distribute, sublicense, and/or sell copies of the Software, and to
9+
* permit persons to whom the Software is furnished to do so, subject to
10+
* the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be
13+
* included in all copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*
23+
* SPDX-License-Identifier: MIT
24+
******************************************************************************/
25+
package org.eclipse.digitaltwin.basyx.submodelregistry.service.configuration;
26+
27+
import java.util.List;
28+
29+
import org.springframework.http.converter.HttpMessageConverter;
30+
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
31+
import org.springframework.stereotype.Component;
32+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
33+
34+
@Component
35+
public class WebMvcConfig implements WebMvcConfigurer {
36+
37+
private MappingJackson2HttpMessageConverter converter;
38+
39+
public WebMvcConfig(MappingJackson2HttpMessageConverter converter) {
40+
this.converter = converter;
41+
}
42+
43+
@Override
44+
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
45+
converters.add(converter);
46+
}
47+
48+
}

0 commit comments

Comments
 (0)