ArchivingMode messages made more consistent for TimeseriesAccess

archivingmanager/src/main/java/org/tango/archiving/server/manager/TimeseriesAccess.java

@@ -11,6 +11,7 @@ import fr.soleil.tango.archiving.TangoArchivingSystemConfigurationService;
 import fr.soleil.tango.archiving.build.DatabaseConnectionConfig;
 import fr.soleil.tango.archiving.build.TangoArchivingServicesBuilder;
 import fr.soleil.tango.archiving.config.AttributeConfig;
+import fr.soleil.tango.archiving.config.InsertionModes;
 import fr.soleil.tango.archiving.infra.tango.ArchivingConfig;
 import fr.soleil.tango.archiving.infra.tango.ArchivingConfigs;
 import fr.soleil.tango.archiving.infra.tango.TangoArchiverProperties;
@@ -22,12 +23,7 @@ import org.tango.archiving.server.manager.configuration.ArchivingStartConfig;
 import org.tango.archiving.server.manager.configuration.InsertionModesMapper;
 import org.tango.utils.DevFailedUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.OptionalInt;
-import java.util.Set;
+import java.util.*;
 
 public class TimeseriesAccess implements IArchivingAccess {
 
@@ -132,20 +128,42 @@ public class TimeseriesAccess implements IArchivingAccess {
         return toStringArray(configService.getCurrentInsertionModes(id.getAsInt()));
     }
 
-    private String[] toStringArray(Object toConvert) {
+    private String[] toStringArray(Optional<InsertionModes> toConvert) {
         List<String> array = new ArrayList<>();
-        Arrays.stream(toConvert.getClass().getDeclaredFields())
-                .forEach(f -> {
-                    try {
-                        f.setAccessible(true);
-                        Object value = f.get(toConvert);
-                        if (value != null) {
-                            array.add(f.getName() + ": " + f.get(toConvert));
+        if (toConvert.isPresent()){
+            InsertionModes modes = toConvert.get();
+            if (modes.isPeriodic()) {
+                array.add("MODE_P");
+                array.add(String.valueOf(modes.getPeriodPeriodic()));
+            }
+            if (modes.isAbsolute()) {
+                array.add("MODE_A");
+                array.add(String.valueOf(modes.getPeriodAbsolute()));
+                array.add(modes.getDecreaseDeltaAbsolute().toString());
+                array.add(modes.getIncreaseDeltaAbsolute().toString());
+                array.add(String.valueOf(modes.isSlowDriftAbsolute()));
+            }
+            if (modes.isRelative()){
+                array.add("MODE_R");
+                array.add(String.valueOf(modes.getPeriodRelative()));
+                array.add(modes.getDecreasePercentRelative().toString());
+                array.add(modes.getIncreasePercentRelative().toString());
+                array.add(String.valueOf(modes.isSlowDriftRelative()));
+            }
+            if (modes.isThreshold()) {
+                array.add("MODE_T");
+                array.add(String.valueOf(modes.getPeriodThreshold()));
+                array.add(modes.getMinThresholdValue().toString());
+                array.add(modes.getMaxThresholdValue().toString());
+            }
+            if (modes.isDifference()){
+                array.add("MODE_D");
+                array.add(String.valueOf(modes.getPeriodDifference()));
+            }
+            if (modes.isEvent()) {
+                array.add("MODE_EVT");
             }
-                    } catch (IllegalAccessException e) {
-                        array.add(f.getName() + ": error");
         }
-                });
         return array.toArray(new String[0]);
     }