Merge branch '838-deprecacy-information-for-data-overlay' into 'master'

Resolve "deprecacy information for data overlay"

Closes #838

See merge request minerva/core!932

CHANGELOG

@@ -4,6 +4,8 @@ minerva (14.0.0~beta.2) unstable; urgency=low
   * Bug fix: validation of project name length is provided (#950)
   * Bug fix: after reducing privileges on himself interface is refreshed (#948)
   * Bug fix: removing overlays as curator in admin panel fixed (#944)
+  * Bug fix: information about deprecated column is more clear about column 
+    names (#838)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 16 Sep 2019 21:00:00 +0200
 

rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java

@@ -106,8 +106,8 @@ public class OverlayRestImpl extends BaseRestImpl {
   private List<String> getDeprecatedColumns(Layout overlay) {
     try {
       List<String> result = new ArrayList<>();
-      for (ColorSchemaColumn column : new ColorSchemaReader().getDeprecatedColumns(overlay)) {
-        result.add(column.name());
+      for (Pair<ColorSchemaColumn, String> entry : new ColorSchemaReader().getDeprecatedColumns(overlay)) {
+        result.add(entry.getRight());
       }
       return result;
     } catch (IOException | InvalidColorSchemaException e) {

service/src/main/java/lcsb/mapviewer/services/utils/ColorSchemaReader.java

@@ -814,9 +814,9 @@ public class ColorSchemaReader {
     return readColorSchema(new ByteArrayInputStream(inputData), params);
   }
 
-  public List<ColorSchemaColumn> getDeprecatedColumns(Layout overlay)
+  public List<Pair<ColorSchemaColumn, String>> getDeprecatedColumns(Layout overlay)
       throws IOException, InvalidColorSchemaException {
-    List<ColorSchemaColumn> result = new ArrayList<>();
+    List<Pair<ColorSchemaColumn, String>> result = new ArrayList<>();
     if (overlay.getInputData() != null) {
       BufferedReader br = new BufferedReader(
           new InputStreamReader(new ByteArrayInputStream(overlay.getInputData().getFileContent())));
@@ -843,13 +843,14 @@ public class ColorSchemaReader {
         Map<ColorSchemaColumn, Integer> schemaColumns = new HashMap<>();
         parseColumns(columns, schemaColumns, type);
         for (ColorSchemaColumn column : schemaColumns.keySet()) {
+          Pair<ColorSchemaColumn, String> entry = new Pair<>(column, columns[schemaColumns.get(column)]);
           try {
             Field f = ColorSchemaColumn.class.getField(column.name());
             if (f.isAnnotationPresent(Deprecated.class)) {
-              result.add(column);
+              result.add(entry);
             } else if (column.getDepractedColumnName() != null
                 && column.getDepractedColumnName().equalsIgnoreCase(columns[schemaColumns.get(column)])) {
-              result.add(column);
+              result.add(entry);
             }
           } catch (NoSuchFieldException | SecurityException e) {
             throw new InvalidStateException(e);