Allow double and remove boolean in OutputElementStyle (type of property values)

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/webapp/AbstractSerializerTest.java

@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Ericsson and others
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.webapp;
+
+import org.junit.Before;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Abstract test class for testing serializers
+ *
+ * @author Bernd Hufmann
+ */
+public class AbstractSerializerTest {
+
+    /**
+     * A object mapper to be used for serialization / deserialization. A new
+     * instance is created per test case.
+     */
+    protected ObjectMapper fMapper;
+
+    /**
+     * Test setup
+     */
+    @Before
+    public void setup() {
+        fMapper = new ObjectMapper();
+    }
+}

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/src/org/eclipse/tracecompass/incubator/trace/server/jersey/rest/core/tests/webapp/OutputElementStyleSerializerTest.java

@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2025 Ericsson and others
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.webapp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.webapp.OutputElementStyleSerializer;
+import org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests.stubs.OutputElementStyleStub;
+import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
+import org.eclipse.tracecompass.tmf.core.model.StyleProperties;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+/**
+ * Test the {@link OutputElementStyleSerializer}
+ *
+ * @author Bernd Hufmann
+ */
+public class OutputElementStyleSerializerTest extends AbstractSerializerTest {
+
+    private static final String VALID_STYLE_NAME = "valid-styles";
+    private static final String MAPPED_STYLE_NAME = "mapped-styles";
+    private static final String INVALID_STYLE_NAME = "invalid-styles";
+
+    /**
+     * Verify that valid style objects are serialized properly
+     *
+     * @throws JsonProcessingException
+     *             if an error occurs
+     */
+    @SuppressWarnings("null")
+    @Test
+    public void testValidStyles() throws JsonProcessingException {
+        Map<String, Object> validStyles = new HashMap<>();
+        validStyles.put(StyleProperties.BACKGROUND_COLOR, "ffffff");
+        validStyles.put(StyleProperties.LINEAR_GRADIENT, "true");
+        validStyles.put(StyleProperties.OPACITY, 0.4f);
+        validStyles.put(StyleProperties.WIDTH, Integer.valueOf(4));
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(OutputElementStyle.class, new OutputElementStyleSerializer());
+        fMapper.registerModule(module);
+
+        OutputElementStyle testStyle = new OutputElementStyle(VALID_STYLE_NAME, validStyles);
+        String json = fMapper.writeValueAsString(testStyle);
+
+        OutputElementStyleStub deserialized = fMapper.readValue(json, OutputElementStyleStub.class);
+        assertEquals(testStyle.getParentKey(), deserialized.getParentKey());
+
+        verifyStyles(testStyle, deserialized);
+    }
+
+    /**
+     * Verify that certain types of style objects are serialized properly, e.g. Long
+     * are casted to Integer
+     *
+     * @throws JsonProcessingException
+     *             if an error occurs
+     */
+    @SuppressWarnings("null")
+    @Test
+    public void testMappedStyles() throws JsonProcessingException {
+        Map<String, Object> mappedStyles = new HashMap<>();
+        mappedStyles.put(StyleProperties.LINEAR_GRADIENT, "true");
+        mappedStyles.put(StyleProperties.OPACITY, 0.4d);
+        mappedStyles.put("long-style", Long.valueOf(1234));
+        mappedStyles.put("byte-style", Byte.valueOf((byte) 5));
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(OutputElementStyle.class, new OutputElementStyleSerializer());
+        fMapper.registerModule(module);
+
+        OutputElementStyle testStyle = new OutputElementStyle(MAPPED_STYLE_NAME, mappedStyles);
+        String json = fMapper.writeValueAsString(testStyle);
+
+        OutputElementStyleStub deserialized = fMapper.readValue(json, OutputElementStyleStub.class);
+        assertEquals(testStyle.getParentKey(), deserialized.getParentKey());
+
+        verifyStyles(testStyle, deserialized);
+    }
+
+    /**
+     * Verify that types of style objects that are not specified in the TSP are not serialized properly
+     *
+     * @throws JsonProcessingException
+     *             if an error occurs
+     */
+    @SuppressWarnings("null")
+    @Test
+    public void testInvalidStyles() throws JsonProcessingException {
+        Map<String, Object> invalidStyles = new HashMap<>();
+        invalidStyles.put("ignore-invalid", invalidStyles);
+        invalidStyles.put("ingore-long-style1", Long.valueOf(Long.MIN_VALUE));
+        invalidStyles.put("ingore-long-style2", Long.valueOf(Long.MAX_VALUE));
+
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(OutputElementStyle.class, new OutputElementStyleSerializer());
+        fMapper.registerModule(module);
+
+        OutputElementStyle testStyle = new OutputElementStyle(INVALID_STYLE_NAME, invalidStyles);
+        String json = fMapper.writeValueAsString(testStyle);
+
+        OutputElementStyleStub deserialized = fMapper.readValue(json, OutputElementStyleStub.class);
+        assertEquals(testStyle.getParentKey(), deserialized.getParentKey());
+        assertTrue(deserialized.getStyleValues().isEmpty());
+    }
+
+    private static void verifyStyles(OutputElementStyle testStyle, OutputElementStyleStub deserialized) {
+        for (Entry<String, Object> entry : testStyle.getStyleValues().entrySet()) {
+            Map<String, Object> styleValues = deserialized.getStyleValues();
+            assertNotNull(styleValues);
+            String key = entry.getKey();
+            Object entryValue = entry.getValue();
+            assertTrue(key, styleValues.containsKey(key));
+            if (entryValue instanceof Float || entryValue instanceof Double) {
+                assertEquals(key, Double.valueOf(entryValue.toString()), styleValues.get(key));
+            } else if (entryValue instanceof Number longValue) {
+                assertEquals(key, longValue.intValue(), styleValues.get(key));
+            } else {
+                assertEquals(key, entryValue, styleValues.get(key));
+            }
+        }
+    }
+
+}

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/OutputElementStyle.java

@@ -45,7 +45,7 @@ public interface OutputElementStyle {
     /**
      * Type for style values (String, Float, Integer or Boolean)
      */
-    @Schema(description = "Supported types of a style value.", oneOf = { String.class, Float.class, Integer.class, Boolean.class })
+    @Schema(description = "Supported types of a style value.", oneOf = { String.class, Double.class, Integer.class })
     interface StyleValue {
         // empty
     }

trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/webapp/OutputElementStyleSerializer.java

@@ -12,6 +12,7 @@
 package org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.webapp;
 
 import java.io.IOException;
+import java.util.Map.Entry;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle;
@@ -38,11 +39,31 @@ public OutputElementStyleSerializer() {
         super(OutputElementStyle.class);
     }
 
+    /**
+     * Serialize {@link OutputElementStyle} according to TSP, see here for details:
+     * {@link org.eclipse.tracecompass.incubator.internal.trace.server.jersey.rest.core.model.OutputElementStyle}
+     */
+    @SuppressWarnings({ "nls", "null" })
     @Override
     public void serialize(@NonNull OutputElementStyle value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
-        gen.writeStringField("parentKey", value.getParentKey()); //$NON-NLS-1$
-        gen.writeObjectField("values", value.getStyleValues()); //$NON-NLS-1$
+        gen.writeStringField("parentKey", value.getParentKey());
+
+        // Verify the type of style values. Make sure only supported types are returned.
+        gen.writeObjectFieldStart("values");
+        for (Entry<String, Object> entry : value.getStyleValues().entrySet()) {
+            Object entryValue = entry.getValue();
+            if (entryValue instanceof Long longValue) {
+                if (longValue >= Integer.MIN_VALUE && longValue <= Integer.MAX_VALUE) {
+                    gen.writeFieldName(entry.getKey());
+                    gen.writeNumber(longValue.intValue());
+                }
+            } else if ((entryValue instanceof String) || (entryValue instanceof Number)) {
+                gen.writeFieldName(entry.getKey());
+                gen.writeObject(entryValue);
+            }
+        }
+        gen.writeEndObject();
         gen.writeEndObject();
     }