Loading pom.xml +1 −1 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ <properties> <!-- REDMIC --> <redmic.rest-lib.version>0.9.0</redmic.rest-lib.version> <redmic.rest-lib.version>0.10.0-feature-atlasMicroservice</redmic.rest-lib.version> <redmic.models.version>0.10.0-feature-cleanAtlasComponents</redmic.models.version> <redmic.broker-lib.version>0.10.0-feature-atlasMicroservice</redmic.broker-lib.version> <redmic.user-settings-lib.version>0.1.0</redmic.user-settings-lib.version> Loading src/main/java/es/redmic/viewlib/common/querymanagement/QueryDTOMessageConverter.java +3 −3 Original line number Diff line number Diff line Loading @@ -36,17 +36,17 @@ import es.redmic.models.es.common.query.dto.GeoDataQueryDTO; import es.redmic.models.es.common.query.dto.MetadataQueryDTO; import es.redmic.models.es.common.query.dto.SimpleQueryDTO; import es.redmic.models.es.common.view.JsonViewsForQueryDTO; import es.redmic.restlib.common.service.UserUtilsServiceItfc; import es.redmic.restlib.config.UserService; public class QueryDTOMessageConverter extends MappingJackson2HttpMessageConverter { UserUtilsServiceItfc userService; UserService userService; public QueryDTOMessageConverter() { super(); } public QueryDTOMessageConverter(ObjectMapper objectMapper, UserUtilsServiceItfc userService) { public QueryDTOMessageConverter(ObjectMapper objectMapper, UserService userService) { super(objectMapper); this.userService = userService; } Loading src/main/java/es/redmic/viewlib/common/querymanagement/QueryManagement.java +2 −2 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; import es.redmic.models.es.common.view.QueryDTODeserializerModifier; import es.redmic.restlib.common.service.UserUtilsServiceItfc; import es.redmic.restlib.config.UserService; @Component public class QueryManagement { Loading @@ -40,7 +40,7 @@ public class QueryManagement { ObjectMapper objectMapper; @Autowired UserUtilsServiceItfc userService; UserService userService; @Bean public SimpleModule queryDTOJsonViewModule() { Loading src/main/java/es/redmic/viewlib/common/service/RBaseService.java +2 −2 Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ import es.redmic.models.es.common.query.dto.SimpleQueryDTO; import es.redmic.models.es.common.view.JsonViewsForQueryDTO; import es.redmic.models.es.common.view.JsonViewsForQueryDTO.ViewClassInterface; import es.redmic.models.es.utils.JacksonFieldUtils; import es.redmic.restlib.common.service.UserUtilsServiceItfc; import es.redmic.restlib.config.UserService; public abstract class RBaseService<TModel extends BaseES<?>, TDTO extends CommonDTO, TQueryDTO extends SimpleQueryDTO> { Loading @@ -61,7 +61,7 @@ public abstract class RBaseService<TModel extends BaseES<?>, TDTO extends Common protected ObjectMapper objectMapper; @Autowired UserUtilsServiceItfc userService; UserService userService; @SuppressWarnings("unchecked") public RBaseService() { Loading Loading
pom.xml +1 −1 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ <properties> <!-- REDMIC --> <redmic.rest-lib.version>0.9.0</redmic.rest-lib.version> <redmic.rest-lib.version>0.10.0-feature-atlasMicroservice</redmic.rest-lib.version> <redmic.models.version>0.10.0-feature-cleanAtlasComponents</redmic.models.version> <redmic.broker-lib.version>0.10.0-feature-atlasMicroservice</redmic.broker-lib.version> <redmic.user-settings-lib.version>0.1.0</redmic.user-settings-lib.version> Loading
src/main/java/es/redmic/viewlib/common/querymanagement/QueryDTOMessageConverter.java +3 −3 Original line number Diff line number Diff line Loading @@ -36,17 +36,17 @@ import es.redmic.models.es.common.query.dto.GeoDataQueryDTO; import es.redmic.models.es.common.query.dto.MetadataQueryDTO; import es.redmic.models.es.common.query.dto.SimpleQueryDTO; import es.redmic.models.es.common.view.JsonViewsForQueryDTO; import es.redmic.restlib.common.service.UserUtilsServiceItfc; import es.redmic.restlib.config.UserService; public class QueryDTOMessageConverter extends MappingJackson2HttpMessageConverter { UserUtilsServiceItfc userService; UserService userService; public QueryDTOMessageConverter() { super(); } public QueryDTOMessageConverter(ObjectMapper objectMapper, UserUtilsServiceItfc userService) { public QueryDTOMessageConverter(ObjectMapper objectMapper, UserService userService) { super(objectMapper); this.userService = userService; } Loading
src/main/java/es/redmic/viewlib/common/querymanagement/QueryManagement.java +2 −2 Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; import es.redmic.models.es.common.view.QueryDTODeserializerModifier; import es.redmic.restlib.common.service.UserUtilsServiceItfc; import es.redmic.restlib.config.UserService; @Component public class QueryManagement { Loading @@ -40,7 +40,7 @@ public class QueryManagement { ObjectMapper objectMapper; @Autowired UserUtilsServiceItfc userService; UserService userService; @Bean public SimpleModule queryDTOJsonViewModule() { Loading
src/main/java/es/redmic/viewlib/common/service/RBaseService.java +2 −2 Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ import es.redmic.models.es.common.query.dto.SimpleQueryDTO; import es.redmic.models.es.common.view.JsonViewsForQueryDTO; import es.redmic.models.es.common.view.JsonViewsForQueryDTO.ViewClassInterface; import es.redmic.models.es.utils.JacksonFieldUtils; import es.redmic.restlib.common.service.UserUtilsServiceItfc; import es.redmic.restlib.config.UserService; public abstract class RBaseService<TModel extends BaseES<?>, TDTO extends CommonDTO, TQueryDTO extends SimpleQueryDTO> { Loading @@ -61,7 +61,7 @@ public abstract class RBaseService<TModel extends BaseES<?>, TDTO extends Common protected ObjectMapper objectMapper; @Autowired UserUtilsServiceItfc userService; UserService userService; @SuppressWarnings("unchecked") public RBaseService() { Loading