diff --git a/pom.xml b/pom.xml
index b571f904084fbc5a37ed68bebc40c658cea2679f..3756a6a6c0ab43fdeed5286fbce2b885e37e1da3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<description>Dashboard Controller for URBANITE</description>
<properties>
- <keycloak.version>14.0.0</keycloak.version>
+ <keycloak.version>16.1.1</keycloak.version>
<mapstruct.version>1.4.2.Final</mapstruct.version>
<springfox-swagger2.version>2.9.2</springfox-swagger2.version>
<springdoc-openapi-ui.version>1.5.2</springdoc-openapi-ui.version>
diff --git a/src/main/java/it/eng/urbanite/dashboard/Runner.java b/src/main/java/it/eng/urbanite/dashboard/Runner.java
index 0b1d25e4bd24052921ff4964f6811bb6afb27cd2..6389206b6f19b972611eaf9e7c7e7d48b7b89baa 100644
--- a/src/main/java/it/eng/urbanite/dashboard/Runner.java
+++ b/src/main/java/it/eng/urbanite/dashboard/Runner.java
@@ -9,13 +9,12 @@ import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
+import it.eng.urbanite.dashboard.config.Constants;
import it.eng.urbanite.dashboard.model.enumeration.MenuType;
import it.eng.urbanite.dashboard.service.MenuBlockService;
import it.eng.urbanite.dashboard.service.dto.MenuBlockDTO;
-import lombok.extern.slf4j.Slf4j;
@Component
-@Slf4j
public class Runner implements ApplicationRunner {
private final Logger log = LoggerFactory.getLogger(Runner.class);
@@ -40,57 +39,36 @@ public class Runner implements ApplicationRunner {
}
void initPersonalMenuBlock() {
-// logger.info("\n");
-// logger.info("------------------ Start inserting pilots ------------------");
MenuBlockDTO menuBlockDTO = new MenuBlockDTO();
- menuBlockDTO.setId((long) 2000);
- menuBlockDTO.setCode("PERSONAL_DASHBOARDS");
- menuBlockDTO.setCreatedBy("waste manager");
- // GET THE USERNAME FOR EACH USER AND CHECK FOR EMPTY FOR THE
- // USER!!!!!!!!!!!!!!!!!!!
+ menuBlockDTO.setCode("PRIVATE_DASHBOARDS");
+ menuBlockDTO.setCreatedBy(Constants.SYSTEM);
menuBlockDTO.setCreatedDate(Instant.now());
- menuBlockDTO.setIcon(null);
- menuBlockDTO.setLabel("PERSONAL DASHBOARDS");
- menuBlockDTO.setType(MenuType.PERSONAL);
+ menuBlockDTO.setIcon("lock-outline");
+ menuBlockDTO.setLabel("Private");
+ menuBlockDTO.setType(MenuType.PRIVATE);
menuBlockService.save(menuBlockDTO);
-// logger.info("------------------ End inserting pilots ------------------");
-// logger.info("\n");
}
void initSharedMenuBlock() {
-// logger.info("\n");
-// logger.info("------------------ Start inserting pilots ------------------");
MenuBlockDTO menuBlockDTO = new MenuBlockDTO();
- menuBlockDTO.setId((long) 2000);
menuBlockDTO.setCode("SHARED_DASHBOARDS");
- menuBlockDTO.setCreatedBy("waste manager");
- // GET THE USERNAME FOR EACH USER AND CHECK FOR EMPTY FOR THE
- // USER!!!!!!!!!!!!!!!!!!!
+ menuBlockDTO.setCreatedBy(Constants.SYSTEM);
menuBlockDTO.setCreatedDate(Instant.now());
- menuBlockDTO.setIcon(null);
- menuBlockDTO.setLabel("SHARED DASHBOARDS");
+ menuBlockDTO.setIcon("share-outline");
+ menuBlockDTO.setLabel("Shared");
menuBlockDTO.setType(MenuType.SHARED);
menuBlockService.save(menuBlockDTO);
-// logger.info("------------------ End inserting pilots ------------------");
-// logger.info("\n");
}
void initPublicMenuBlock() {
-// logger.info("\n");
-// logger.info("------------------ Start inserting pilots ------------------");
MenuBlockDTO menuBlockDTO = new MenuBlockDTO();
- menuBlockDTO.setId((long) 2000);
menuBlockDTO.setCode("PUBLIC_DASHBOARDS");
- menuBlockDTO.setCreatedBy("waste manager");
- // GET THE USERNAME FOR EACH USER AND CHECK FOR EMPTY FOR THE
- // USER!!!!!!!!!!!!!!!!!!!
+ menuBlockDTO.setCreatedBy(Constants.SYSTEM);
menuBlockDTO.setCreatedDate(Instant.now());
- menuBlockDTO.setIcon(null);
- menuBlockDTO.setLabel("PUBLIC DASHBOARDS");
+ menuBlockDTO.setIcon("globe-outline");
+ menuBlockDTO.setLabel("Public");
menuBlockDTO.setType(MenuType.PUBLIC);
menuBlockService.save(menuBlockDTO);
-// logger.info("------------------ End inserting pilots ------------------");
-// logger.info("\n");
}
boolean hasRows() {
diff --git a/src/main/java/it/eng/urbanite/dashboard/model/DashboardPage.java b/src/main/java/it/eng/urbanite/dashboard/model/DashboardPage.java
index 6c40b8a3022a07c367c44926647fc19a2a1e9a0d..b9fff6b3573f80193c182c8088a0f4432995a3db 100644
--- a/src/main/java/it/eng/urbanite/dashboard/model/DashboardPage.java
+++ b/src/main/java/it/eng/urbanite/dashboard/model/DashboardPage.java
@@ -17,6 +17,8 @@ import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import it.eng.urbanite.dashboard.model.enumeration.MenuType;
+
/**
* The DashboardPage entity.
*/
@@ -48,6 +50,9 @@ public class DashboardPage extends AbstractAuditingEntity implements Serializabl
@Column(name = "shared")
private Boolean shared;
+
+ @Column(name = "type")
+ private MenuType type;
@OneToMany(mappedBy = "dashboardPage")
@JsonIgnoreProperties(value = { "dashboardPage" }, allowSetters = true)
@@ -57,7 +62,21 @@ public class DashboardPage extends AbstractAuditingEntity implements Serializabl
@JsonIgnoreProperties(value = { "dashboardPage" }, allowSetters = true)
private Set<Target> targets = new HashSet<>();
- public Long getId() {
+
+ public DashboardPage type(MenuType type) {
+ this.type = type;
+ return this;
+ }
+
+ public MenuType getType() {
+ return type;
+ }
+
+ public void setType(MenuType type) {
+ this.type = type;
+ }
+
+ public Long getId() {
return id;
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/model/enumeration/MenuType.java b/src/main/java/it/eng/urbanite/dashboard/model/enumeration/MenuType.java
index 0a1e6fa845137fde5ac400b14a79f4ff71c8341b..199c7715edf0bbee5132474f649c55690bb7a6eb 100644
--- a/src/main/java/it/eng/urbanite/dashboard/model/enumeration/MenuType.java
+++ b/src/main/java/it/eng/urbanite/dashboard/model/enumeration/MenuType.java
@@ -5,6 +5,6 @@ package it.eng.urbanite.dashboard.model.enumeration;
*/
public enum MenuType {
SHARED,
- PERSONAL,
+ PRIVATE,
PUBLIC
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/DashboardComponentQueryService.java b/src/main/java/it/eng/urbanite/dashboard/service/DashboardComponentQueryService.java
index 985e16ceb5d3b2f6f2735030b03dd89d6a00cbbc..b99befce6e2e82f53124ecd5b279aec2382fc4d0 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/DashboardComponentQueryService.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/DashboardComponentQueryService.java
@@ -28,8 +28,6 @@ public class DashboardComponentQueryService extends QueryService<DashboardCompon
private final Logger log = LoggerFactory.getLogger(DashboardComponentQueryService.class);
private final DashboardComponentRepository dashboardComponentRepository;
private final DashboardComponentMapper dashboardComponentMapper;
-
- private boolean securityEnabled = true;
public DashboardComponentQueryService(
DashboardComponentRepository dashboardComponentRepository,
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/DashboardPageQueryService.java b/src/main/java/it/eng/urbanite/dashboard/service/DashboardPageQueryService.java
index 0b05db14bed08902e2011cec074027687bc5b0d5..fbdb3e1fee1c7a01da29d1d97d83ab2af09ed996 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/DashboardPageQueryService.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/DashboardPageQueryService.java
@@ -18,7 +18,6 @@ import it.eng.urbanite.dashboard.config.Constants;
import it.eng.urbanite.dashboard.model.DashboardComponent_;
import it.eng.urbanite.dashboard.model.DashboardPage;
import it.eng.urbanite.dashboard.model.DashboardPage_;
-import it.eng.urbanite.dashboard.model.MenuItem;
import it.eng.urbanite.dashboard.model.Target_;
import it.eng.urbanite.dashboard.repository.DashboardPageRepository;
import it.eng.urbanite.dashboard.repository.MenuItemRepository;
@@ -36,9 +35,6 @@ public class DashboardPageQueryService extends QueryService<DashboardPage> {
private final Logger log = LoggerFactory.getLogger(DashboardPageQueryService.class);
private final DashboardPageRepository dashboardPageRepository;
private final DashboardPageMapper dashboardPageMapper;
-
- private final MenuItemRepository menuRepository;
- private final MenuItemMapper menuMapper;
private boolean securityEnabled = true;
@@ -48,8 +44,6 @@ public class DashboardPageQueryService extends QueryService<DashboardPage> {
MenuItemMapper menuMapper) {
this.dashboardPageRepository = dashboardPageRepository;
this.dashboardPageMapper = dashboardPageMapper;
- this.menuRepository = menuRepository;
- this.menuMapper = menuMapper;
}
/**
@@ -59,26 +53,15 @@ public class DashboardPageQueryService extends QueryService<DashboardPage> {
*/
@Transactional(readOnly = true)
public List<DashboardPageDTO> findByCriteria(DashboardPageCriteria criteria) {
- //log.info("find by criteria : {}", criteria);
- //final Specification<DashboardPage> specification = createSpecification(criteria);
- //return dashboardPageMapper.toDto(dashboardPageRepository.findAll(specification));
-
+
log.info("find by criteria : {}", criteria);
final Specification<DashboardPage> specification = createSpecification(criteria);
List<DashboardPage> l = dashboardPageRepository.findAll(specification);
List<DashboardPageDTO> r = dashboardPageMapper.toDto(l);
- //Set Boolean PageOwner: True when Current user created the page
- //String createdBy = SecurityUtils.getCurrentUserLogin().orElse(Constants.SYSTEM);
- //r.stream().forEach( p -> p.setPageOwner(createdBy.equals(p.getCreatedBy())));
-
- //Set Boolean PageOwner: True when Current user created the page and MenuType (SHARED | PERSONAL)
String createdBy = SecurityUtils.getCurrentUserLogin().orElse(Constants.SYSTEM);
- for(DashboardPageDTO p : r) {
- p.setPageOwner(createdBy.equals(p.getCreatedBy()));
- List<MenuItem> listTypes = menuRepository.findByDashboardPageId(p.getId());
- p.setType(listTypes!=null && listTypes.size()>0 ? listTypes.get(0).getType(): null);
- }
+
+ r.stream().forEach(p -> p.setPageOwner(createdBy.equals(p.getCreatedBy())));
return r;
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/MenuBlockQueryService.java b/src/main/java/it/eng/urbanite/dashboard/service/MenuBlockQueryService.java
index c90966dd684ec579b484874ca64d5f0b31154c03..b9b4ce091ff9fe0316324aa5b48fb7043b2f7c98 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/MenuBlockQueryService.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/MenuBlockQueryService.java
@@ -23,8 +23,6 @@ public class MenuBlockQueryService extends QueryService<MenuBlock> {
private final Logger log = LoggerFactory.getLogger(MenuBlockQueryService.class);
private final MenuBlockRepository menuBlockRepository;
private final MenuBlockMapper menuBlockMapper;
-
- private boolean securityEnabled = true;
public MenuBlockQueryService(MenuBlockRepository menuBlockRepository, MenuBlockMapper menuBlockMapper) {
this.menuBlockRepository = menuBlockRepository;
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/MenuItemQueryService.java b/src/main/java/it/eng/urbanite/dashboard/service/MenuItemQueryService.java
index 24f8988151b5595d39918d27dbebb98523c60e0d..04b438c07db58a00d5c64f5dd6107b29161e63bd 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/MenuItemQueryService.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/MenuItemQueryService.java
@@ -23,8 +23,6 @@ public class MenuItemQueryService extends QueryService<MenuItem> {
private final Logger log = LoggerFactory.getLogger(MenuItemQueryService.class);
private final MenuItemRepository menuItemRepository;
private final MenuItemMapper menuItemMapper;
-
- private boolean securityEnabled = true;
public MenuItemQueryService(MenuItemRepository menuItemRepository, MenuItemMapper menuItemMapper) {
this.menuItemRepository = menuItemRepository;
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/TargetAvailableQueryService.java b/src/main/java/it/eng/urbanite/dashboard/service/TargetAvailableQueryService.java
index 1b162e9bb2253bac72c2d507c39c94ce779a42f1..41cdae3bb6adc84f3ce1b5d30baad14b56eb6d03 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/TargetAvailableQueryService.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/TargetAvailableQueryService.java
@@ -24,8 +24,6 @@ public class TargetAvailableQueryService extends QueryService<TargetAvailable> {
private final Logger log = LoggerFactory.getLogger(TargetAvailableQueryService.class);
private final TargetAvailableRepository repository;
private final TargetAvailableMapper mapper;
-
- private boolean securityEnabled = true;
public TargetAvailableQueryService(TargetAvailableRepository repository, TargetAvailableMapper mapper) {
this.repository = repository;
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/TargetQueryService.java b/src/main/java/it/eng/urbanite/dashboard/service/TargetQueryService.java
index 8b05e4c10c743794cb7155d1d082a62f4fd3531c..8bbd49574416fe0566f0e43bfbfa27459eef6c2c 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/TargetQueryService.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/TargetQueryService.java
@@ -28,8 +28,6 @@ public class TargetQueryService extends QueryService<Target> {
private final Logger log = LoggerFactory.getLogger(TargetQueryService.class);
private final TargetRepository targetRepository;
private final TargetMapper targetMapper;
-
- private boolean securityEnabled = true;
public TargetQueryService(TargetRepository targetRepository, TargetMapper targetMapper) {
this.targetRepository = targetRepository;
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/criteria/DashboardComponentCriteria.java b/src/main/java/it/eng/urbanite/dashboard/service/criteria/DashboardComponentCriteria.java
index 439c3a47231c65bced72ad0e05aa34f3ad7a4134..e4c0860c5d58cb14e410fb42b884ae104f57f269 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/criteria/DashboardComponentCriteria.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/criteria/DashboardComponentCriteria.java
@@ -17,7 +17,12 @@ public class DashboardComponentCriteria implements Serializable, Criteria {
*/
public static class ComponentTypeFilter extends Filter<ComponentType> {
- public ComponentTypeFilter() {}
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public ComponentTypeFilter() {}
public ComponentTypeFilter(ComponentTypeFilter filter) {
super(filter);
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuBlockCriteria.java b/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuBlockCriteria.java
index 3d97c8683cd9954eaacb07c28435447c046e42ba..c3519db08ddf20aa3fe8e3886a57a1c0d0e87967 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuBlockCriteria.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuBlockCriteria.java
@@ -27,7 +27,12 @@ public class MenuBlockCriteria implements Serializable, Criteria {
*/
public static class MenuTypeFilter extends Filter<MenuType> {
- public MenuTypeFilter() {}
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2143934743475911102L;
+
+ public MenuTypeFilter() {}
public MenuTypeFilter(MenuTypeFilter filter) {
super(filter);
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuItemCriteria.java b/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuItemCriteria.java
index 075742c08607e6c84c8083c20061be0477d655fd..c32bb009b7f0084ea101b75636e19e32ca521110 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuItemCriteria.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/criteria/MenuItemCriteria.java
@@ -27,7 +27,13 @@ public class MenuItemCriteria implements Serializable, Criteria {
*/
public static class MenuTypeFilter extends Filter<MenuType> {
- public MenuTypeFilter() {}
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1549527396273610049L;
+
+ public MenuTypeFilter() {}
public MenuTypeFilter(MenuTypeFilter filter) {
super(filter);
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetAvailableCriteria.java b/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetAvailableCriteria.java
index 6d391c92397d486168cf421baacbdef1f14ad0f0..d09091f420529b49ab8b8c2ea1c366be75c98bb8 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetAvailableCriteria.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetAvailableCriteria.java
@@ -17,7 +17,12 @@ public class TargetAvailableCriteria implements Serializable, Criteria {
*/
public static class TargetTypeFilter extends Filter<TargetType> {
- public TargetTypeFilter() {}
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2648384846788760207L;
+
+ public TargetTypeFilter() {}
public TargetTypeFilter(TargetTypeFilter filter) {
super(filter);
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetCriteria.java b/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetCriteria.java
index 018557d090e819740cd9e6bc1fef7dfaf29e5459..949c3457ae6f83caf7631dbd31ba3391f46ae75c 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetCriteria.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/criteria/TargetCriteria.java
@@ -17,7 +17,12 @@ public class TargetCriteria implements Serializable, Criteria {
*/
public static class TargetTypeFilter extends Filter<TargetType> {
- public TargetTypeFilter() {}
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2688330347119959170L;
+
+ public TargetTypeFilter() {}
public TargetTypeFilter(TargetTypeFilter filter) {
super(filter);
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardComponentDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardComponentDTO.java
index 2b6ef90ae35620e6df6be97aa9dad24f19bc8db4..3f0252f53e8470229c01504ffaf0bab9847715b7 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardComponentDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardComponentDTO.java
@@ -2,20 +2,30 @@ package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
import java.time.Instant;
-import java.util.Objects;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.ComponentType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the {@link it.eng.urbanite.dashboard.domain.DashboardComponent} entity.
*/
@ApiModel(description = "The DashboardComponent entity.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class DashboardComponentDTO implements Serializable {
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
@NotNull
private ComponentType componentType;
@@ -33,102 +43,4 @@ public class DashboardComponentDTO implements Serializable {
private DashboardPageDTO dashboardPage;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public ComponentType getComponentType() {
- return componentType;
- }
-
- public void setComponentType(ComponentType componentType) {
- this.componentType = componentType;
- }
-
- public String getComponentName() {
- return componentName;
- }
-
- public void setComponentName(String componentName) {
- this.componentName = componentName;
- }
-
- public String getComponentcontent() {
- return componentcontent;
- }
-
- public void setComponentcontent(String componentcontent) {
- this.componentcontent = componentcontent;
- }
-
- public String getComponentPosition() {
- return componentPosition;
- }
-
- public void setComponentPosition(String componentPosition) {
- this.componentPosition = componentPosition;
- }
-
- public Instant getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Instant createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public DashboardPageDTO getDashboardPage() {
- return dashboardPage;
- }
-
- public void setDashboardPage(DashboardPageDTO dashboardPage) {
- this.dashboardPage = dashboardPage;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof DashboardComponentDTO)) {
- return false;
- }
-
- DashboardComponentDTO dashboardComponentDTO = (DashboardComponentDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, dashboardComponentDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "DashboardComponentDTO{" +
- "id=" + getId() +
- ", componentType='" + getComponentType() + "'" +
- ", componentName='" + getComponentName() + "'" +
- ", componentcontent='" + getComponentcontent() + "'" +
- ", componentPosition='" + getComponentPosition() + "'" +
- ", createdDate='" + getCreatedDate() + "'" +
- ", createdBy='" + getCreatedBy() + "'" +
- ", dashboardPage=" + getDashboardPage() +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageCloningDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageCloningDTO.java
index eefe667ad0e9d7410f366849a22038c793e517bb..15d1f050ea110d10b9402ac14da87edda77d6ec3 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageCloningDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageCloningDTO.java
@@ -1,71 +1,29 @@
package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
-import java.util.Objects;
+
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.CloningOpionType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the DashboardPageCloningDTO
*/
@ApiModel(description = "The Dashboard Page Cloning.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class DashboardPageCloningDTO implements Serializable {
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6175490608580509545L;
+
+ private Long id;
private String dashboardName;
private CloningOpionType option;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getDashboardName() {
- return dashboardName;
- }
-
- public void setDashboardName(String dashboardName) {
- this.dashboardName = dashboardName;
- }
-
- public CloningOpionType getOption() {
- return option;
- }
-
- public void setOption(CloningOpionType option) {
- this.option = option;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof DashboardPageCloningDTO)) {
- return false;
- }
-
- DashboardPageCloningDTO dashboardPagecloningDTO = (DashboardPageCloningDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, dashboardPagecloningDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "DashboardPageCloningDTO{" +
- "id=" + getId() +
- ", dashboardName='" + getDashboardName() + "'" +
- ", option='" + getOption() + "'" +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageDTO.java
index 6f0780a01c4c2dc507671f82de63673ec2d85d6c..80b196026e9018541625224e6daba4a7a38f4286 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/DashboardPageDTO.java
@@ -2,20 +2,29 @@ package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
import java.time.Instant;
-import java.util.Objects;
-
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.MenuType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the {@link it.eng.urbanite.dashboard.domain.DashboardPage} entity.
*/
@ApiModel(description = "The DashboardPage entity.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class DashboardPageDTO implements Serializable {
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
@NotNull
private String name;
@@ -37,121 +46,4 @@ public class DashboardPageDTO implements Serializable {
private Boolean pageOwner;
private MenuType type;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getNote() {
- return note;
- }
-
- public void setNote(String note) {
- this.note = note;
- }
-
- public Boolean getShared() {
- return shared;
- }
-
- public void setShared(Boolean shared) {
- this.shared = shared;
- }
-
- public Instant getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Instant createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public Boolean getPageOwner() {
- return pageOwner;
- }
-
- public void setPageOwner(Boolean pageOwner) {
- this.pageOwner = pageOwner;
- }
-
- public MenuType getType() {
- return type;
- }
-
- public void setType(MenuType type) {
- this.type = type;
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof DashboardPageDTO)) {
- return false;
- }
-
- DashboardPageDTO dashboardPageDTO = (DashboardPageDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, dashboardPageDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "DashboardPageDTO{" +
- "id=" + getId() +
- ", name='" + getName() + "'" +
- ", description='" + getDescription() + "'" +
- ", content='" + getContent() + "'" +
- ", note='" + getNote() + "'" +
- ", shared='" + getShared() + "'" +
- ", pageOwner='" + getPageOwner() + "'" +
- ", createdDate='" + getCreatedDate() + "'" +
- ", createdBy='" + getCreatedBy() + "'" +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuBlockDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuBlockDTO.java
index c06223060c00dbcdcd9079d4cbfadb515ec89af1..2593e24cd6518919572af73c7b8d97cf68b846de 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuBlockDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuBlockDTO.java
@@ -3,20 +3,27 @@ package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
import java.time.Instant;
import java.util.List;
-import java.util.Objects;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.MenuType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the {@link it.eng.urbanite.dashboard.domain.MenuBlock} entity.
*/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
@ApiModel(description = "The MenuBlock entity.")
public class MenuBlockDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
- private Long id;
+ private Long id;
@NotNull
private String code;
@@ -32,117 +39,6 @@ public class MenuBlockDTO implements Serializable {
private Instant createdDate;
private String createdBy;
-
private String icon;
-
private List<MenuItemDTO> linkedItems;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- public MenuType getType() {
- return type;
- }
-
- public void setType(MenuType type) {
- this.type = type;
- }
-
- public Instant getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Instant createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public List<MenuItemDTO> getLinkedItems() {
- return linkedItems;
- }
-
- public void setLinkedItems(List<MenuItemDTO> linkedItems) {
- this.linkedItems = linkedItems;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof MenuBlockDTO)) {
- return false;
- }
-
- MenuBlockDTO menuBlockDTO = (MenuBlockDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, menuBlockDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "MenuBlockDTO{" +
- "id=" + getId() +
- ", code='" + getCode() + "'" +
- ", label='" + getLabel() + "'" +
- ", order=" + getOrder() +
- ", icon=" + getIcon() +
- ", type='" + getType() + "'" +
- ", createdDate='" + getCreatedDate() + "'" +
- ", createdBy='" + getCreatedBy() + "'" +
- "}";
- }
-
-
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuItemDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuItemDTO.java
index a04d8a019f5b2de167912c4123b791b0eff5dda8..49f40eb5d1ac8823272c2c49309fb267cd049c00 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuItemDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/MenuItemDTO.java
@@ -2,20 +2,30 @@ package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
import java.time.Instant;
-import java.util.Objects;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.MenuType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the {@link it.eng.urbanite.dashboard.domain.MenuItem} entity.
*/
@ApiModel(description = "The MenuItem entity.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class MenuItemDTO implements Serializable {
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8320107468899796335L;
+
+ private Long id;
@NotNull
private String code;
@@ -38,120 +48,4 @@ public class MenuItemDTO implements Serializable {
private MenuBlockDTO menuBlock;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String label) {
- this.label = label;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- public MenuType getType() {
- return type;
- }
-
- public void setType(MenuType type) {
- this.type = type;
- }
-
- public Instant getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Instant createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public DashboardPageDTO getDashboardPage() {
- return dashboardPage;
- }
-
- public void setDashboardPage(DashboardPageDTO dashboardPage) {
- this.dashboardPage = dashboardPage;
- }
-
- public MenuBlockDTO getMenuBlock() {
- return menuBlock;
- }
-
- public void setMenuBlock(MenuBlockDTO menuBlock) {
- this.menuBlock = menuBlock;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof MenuItemDTO)) {
- return false;
- }
-
- MenuItemDTO menuItemDTO = (MenuItemDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, menuItemDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "MenuItemDTO{" +
- "id=" + getId() +
- ", code='" + getCode() + "'" +
- ", label='" + getLabel() + "'" +
- ", order=" + getOrder() +
- ", type='" + getType() + "'" +
- ", icon=" + getIcon() +
- ", createdDate='" + getCreatedDate() + "'" +
- ", createdBy='" + getCreatedBy() + "'" +
- ", dashboardPage=" + getDashboardPage() +
- ", menuBlock=" + getMenuBlock() +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetAvailableDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetAvailableDTO.java
index 8aecb7995b45afe0d0796b9e2af229c3740034b3..15821313425f1089b8a46c9124e24ce2394f0383 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetAvailableDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetAvailableDTO.java
@@ -2,20 +2,30 @@ package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
import java.time.Instant;
-import java.util.Objects;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.TargetType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the {@link it.eng.urbanite.dashboard.domain.TargetAvailable} entity.
*/
@ApiModel(description = "The TargetAvailable entity.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class TargetAvailableDTO implements Serializable {
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7529497018725768978L;
+
+ private Long id;
@NotNull
private TargetType type;
@@ -29,85 +39,4 @@ public class TargetAvailableDTO implements Serializable {
private Instant createdDate;
private String createdBy;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public TargetType getType() {
- return type;
- }
-
- public void setType(TargetType type) {
- this.type = type;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public Instant getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Instant createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof TargetAvailableDTO)) {
- return false;
- }
-
- TargetAvailableDTO targetDTO = (TargetAvailableDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, targetDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "TargetDTO{" +
- "id=" + getId() +
- ", type='" + getType() + "'" +
- ", name='" + getCode() + "'" +
- ", note='" + getValue() + "'" +
- ", createdDate='" + getCreatedDate() + "'" +
- ", createdBy='" + getCreatedBy() + "'" +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetDTO.java
index 5bdd5b819dbc078d8d4d0de13f8b397b6dfe4685..93be21ff290c023e07d99e56c36d290c0f30607e 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/TargetDTO.java
@@ -2,20 +2,30 @@ package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
import java.time.Instant;
-import java.util.Objects;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import it.eng.urbanite.dashboard.model.enumeration.TargetType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the {@link it.eng.urbanite.dashboard.domain.Target} entity.
*/
@ApiModel(description = "The Target entity.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class TargetDTO implements Serializable {
- private Long id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2738572448128592328L;
+
+ private Long id;
@NotNull
private TargetType type;
@@ -31,93 +41,4 @@ public class TargetDTO implements Serializable {
private DashboardPageDTO dashboardPage;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public TargetType getType() {
- return type;
- }
-
- public void setType(TargetType type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getNote() {
- return note;
- }
-
- public void setNote(String note) {
- this.note = note;
- }
-
- public Instant getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Instant createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public DashboardPageDTO getDashboardPage() {
- return dashboardPage;
- }
-
- public void setDashboardPage(DashboardPageDTO dashboardPage) {
- this.dashboardPage = dashboardPage;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof TargetDTO)) {
- return false;
- }
-
- TargetDTO targetDTO = (TargetDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, targetDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "TargetDTO{" +
- "id=" + getId() +
- ", type='" + getType() + "'" +
- ", name='" + getName() + "'" +
- ", note='" + getNote() + "'" +
- ", createdDate='" + getCreatedDate() + "'" +
- ", createdBy='" + getCreatedBy() + "'" +
- ", dashboardPage=" + getDashboardPage() +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/dto/UserDTO.java b/src/main/java/it/eng/urbanite/dashboard/service/dto/UserDTO.java
index 923b45425e7ebf769f781fdd04bf8914db5d6fa4..21847d0efb8b881a74f5574e6465a9e00281d372 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/dto/UserDTO.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/dto/UserDTO.java
@@ -1,91 +1,30 @@
package it.eng.urbanite.dashboard.service.dto;
import java.io.Serializable;
-import java.util.Objects;
import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* A DTO for the User entity.
*/
@ApiModel(description = "The User entity.")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class UserDTO implements Serializable {
- protected String id;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2969164029605268208L;
+
+ protected String id;
protected String username;
protected String firstName;
protected String lastName;
protected String email;
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof UserDTO)) {
- return false;
- }
-
- UserDTO targetDTO = (UserDTO) o;
- if (this.id == null) {
- return false;
- }
- return Objects.equals(this.id, targetDTO.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(this.id);
- }
-
- @Override
- public String toString() {
- return "UserDTO{" +
- "id=" + getId() +
- ", username='" + getUsername() + "'" +
- ", firstName='" + getFirstName() + "'" +
- ", lastName='" + getLastName() + "'" +
- ", email='" + getEmail() + "'" +
- "}";
- }
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/service/impl/DashboardPageServiceImpl.java b/src/main/java/it/eng/urbanite/dashboard/service/impl/DashboardPageServiceImpl.java
index 6a601d79962d7dcd68e8608c6264bba21e2105b0..c23180369302243c382ee86dfba2cdb7205dc2a1 100644
--- a/src/main/java/it/eng/urbanite/dashboard/service/impl/DashboardPageServiceImpl.java
+++ b/src/main/java/it/eng/urbanite/dashboard/service/impl/DashboardPageServiceImpl.java
@@ -50,7 +50,6 @@ public class DashboardPageServiceImpl implements DashboardPageService {
private final DashboardComponentMapper dashboardComponentMapper;
private final MenuItemRepository menuItemRepository;
- private final MenuItemMapper menuItemMapper;
public DashboardPageServiceImpl(DashboardPageRepository dashboardPageRepository,
DashboardPageMapper dashboardPageMapper,
@@ -68,8 +67,6 @@ public class DashboardPageServiceImpl implements DashboardPageService {
this.dashboardComponentRepository = dashboardComponentRepository;
this.dashboardComponentMapper= dashboardComponentMapper;
this.menuItemRepository = menuItemRepository;
- this.menuItemMapper = menuItemMapper;
-
}
@Override
diff --git a/src/main/java/it/eng/urbanite/dashboard/web/MenuBlockResource.java b/src/main/java/it/eng/urbanite/dashboard/web/MenuBlockResource.java
index de9c32875c62b9433e9c7cff9081748cd2adb765..9f1193e1df32b56cae800be923dcb469001f2ce7 100644
--- a/src/main/java/it/eng/urbanite/dashboard/web/MenuBlockResource.java
+++ b/src/main/java/it/eng/urbanite/dashboard/web/MenuBlockResource.java
@@ -46,7 +46,6 @@ public class MenuBlockResource {
private final MenuBlockService menuBlockService;
private final MenuBlockRepository menuBlockRepository;
- private final MenuBlockQueryService menuBlockQueryService;
public MenuBlockResource(
MenuBlockService menuBlockService,
@@ -55,7 +54,6 @@ public class MenuBlockResource {
) {
this.menuBlockService = menuBlockService;
this.menuBlockRepository = menuBlockRepository;
- this.menuBlockQueryService = menuBlockQueryService;
}
@PostMapping("/menu-blocks")
@@ -117,7 +115,7 @@ public class MenuBlockResource {
public ResponseEntity<List<MenuBlockDTO>> getAllPersonalMenuBlocks() {
log.debug("REST request to get Personal Linked MenuBlocks");
String createdBy = SecurityUtils.getCurrentUserLogin().orElse(Constants.SYSTEM);
- List<MenuBlockDTO> list = menuBlockService.findLinkedItems(MenuType.PERSONAL, createdBy);
+ List<MenuBlockDTO> list = menuBlockService.findLinkedItems(MenuType.PRIVATE, createdBy);
return ResponseEntity.ok().body(list);
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/web/TargetAvailableResource.java b/src/main/java/it/eng/urbanite/dashboard/web/TargetAvailableResource.java
index 04433bc656f56476c7a2655754cde7c10ac2ab0e..d78c3daa86c4455b6875b32bd004c8e42be97902 100644
--- a/src/main/java/it/eng/urbanite/dashboard/web/TargetAvailableResource.java
+++ b/src/main/java/it/eng/urbanite/dashboard/web/TargetAvailableResource.java
@@ -46,12 +46,10 @@ public class TargetAvailableResource {
private final TargetAvailableService service;
private final TargetAvailableRepository repository;
- private final TargetAvailableQueryService queryService;
public TargetAvailableResource(TargetAvailableService service, TargetAvailableRepository repository, TargetAvailableQueryService queryService) {
this.service = service;
this.repository = repository;
- this.queryService = queryService;
}
@PostMapping("/target-availables")
diff --git a/src/main/java/it/eng/urbanite/dashboard/web/error/BadRequestAlertException.java b/src/main/java/it/eng/urbanite/dashboard/web/error/BadRequestAlertException.java
index 7724e937ab367c14ae98442f68fe77c01c114e65..05176a5679eeafb74f0df84594926019784c5ee8 100644
--- a/src/main/java/it/eng/urbanite/dashboard/web/error/BadRequestAlertException.java
+++ b/src/main/java/it/eng/urbanite/dashboard/web/error/BadRequestAlertException.java
@@ -1,7 +1,16 @@
package it.eng.urbanite.dashboard.web.error;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.BAD_REQUEST)
public class BadRequestAlertException extends RuntimeException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5512950570848974787L;
+
public BadRequestAlertException(String message) {
super(message);
}
diff --git a/src/main/java/it/eng/urbanite/dashboard/web/error/ResouceNotFoundException.java b/src/main/java/it/eng/urbanite/dashboard/web/error/ResouceNotFoundException.java
index 6dfa8ae23f13c760f599ac0adfafc77be17a4748..914b789f16b7d44a78dcabd73789c53b7f9622fd 100644
--- a/src/main/java/it/eng/urbanite/dashboard/web/error/ResouceNotFoundException.java
+++ b/src/main/java/it/eng/urbanite/dashboard/web/error/ResouceNotFoundException.java
@@ -6,6 +6,11 @@ import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(value = HttpStatus.NOT_FOUND)
public class ResouceNotFoundException extends RuntimeException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2648698994242228676L;
+
public ResouceNotFoundException(String message) {
super(message);
}