From 4e2e742d10785c66099337c0a6369e86c477e233 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 8 Jul 2019 14:43:43 +0200 Subject: [PATCH] map Category to Frontend --- .../src/main/java/sonia/scm/api/v2/resources/UIPluginDto.java | 4 ++-- .../java/sonia/scm/api/v2/resources/UIPluginDtoMapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDto.java index ec77afa0ea..cb579cee01 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDto.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDto.java @@ -3,10 +3,10 @@ package sonia.scm.api.v2.resources; import de.otto.edison.hal.HalRepresentation; import de.otto.edison.hal.Links; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; -@Getter @Setter +@Getter +@Setter public class UIPluginDto extends HalRepresentation { private String name; diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDtoMapper.java index 26f85fde66..78f6e06b31 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/UIPluginDtoMapper.java @@ -29,7 +29,7 @@ public class UIPluginDtoMapper { UIPluginDto dto = new UIPluginDto(); dto.setName(plugin.getPlugin().getInformation().getName()); dto.setBundles(getScriptResources(plugin)); - dto.setType("42"); //TODO: add plugin category + dto.setType(plugin.getPlugin().getInformation().getCategory() != null ? plugin.getPlugin().getInformation().getCategory() : "No Category defined"); dto.setVersion(plugin.getPlugin().getInformation().getVersion()); dto.setAuthor(plugin.getPlugin().getInformation().getAuthor()); dto.setDescription(plugin.getPlugin().getInformation().getDescription());