Treat gradients with equal points as single color state

Author: stefanvictora

src/main/java/at/sv/hue/InputConfigurationParser.java

@@ -163,10 +163,15 @@ public List<ScheduledState> parse(String input) {
                                            .map(point -> parseColorValue(point, capabilities))
                                            .map(color -> Pair.of(color.x(), color.y()))
                                            .toList();
-                        gradient = Gradient.builder()
-                                           .points(points)
-                                           .mode(m.group("mode"))
-                                           .build();
+                        if (points.stream().distinct().count() == 1) {
+                            x = points.getFirst().first();
+                            y = points.getFirst().second();
+                        } else {
+                            gradient = Gradient.builder()
+                                               .points(points)
+                                               .mode(m.group("mode"))
+                                               .build();
+                        }
                         break;
                     case "effect":
                         value = value.trim();

src/main/java/at/sv/hue/api/hue/HueApiImpl.java

@@ -740,13 +740,19 @@ private ScheduledLightState createScheduledLightState(SceneAction sceneAction) {
         }
         if (action.getGradient() != null) {
             Action.Gradient gradient = action.getGradient();
-            List<Pair<Double, Double>> points = gradient.getPoints()
-                                                        .stream()
-                                                        .map(point ->
-                                                                Pair.of(point.getColor().getXy().getX(),
-                                                                        point.getColor().getXy().getY()))
-                                                        .toList();
-            state.gradient(new Gradient(points, gradient.getMode()));
+            if (gradient.getPoints().stream().distinct().count() == 1) {
+                XY xy = gradient.getPoints().getFirst().getColor().getXy();
+                state.x(xy.getX());
+                state.y(xy.getY());
+            } else {
+                List<Pair<Double, Double>> points = gradient.getPoints()
+                                                            .stream()
+                                                            .map(point ->
+                                                                    Pair.of(point.getColor().getXy().getX(),
+                                                                            point.getColor().getXy().getY()))
+                                                            .toList();
+                state.gradient(new Gradient(points, gradient.getMode()));
+            }
         }
         // todo: transition time?
         return state.build();

src/main/java/at/sv/hue/api/hue/Light.java

@@ -83,6 +83,9 @@ private at.sv.hue.Gradient getGradient() {
         if (gradient == null) {
             return null;
         }
+        if (gradient.getPoints().stream().distinct().count() == 1) {
+            return null;
+        }
         return gradient.getGradient();
     }
 

src/test/java/at/sv/hue/HueSchedulerTest.java

@@ -3685,13 +3685,16 @@ void parse_gradient_invalidFormat_exception() {
     }
 
     @Test
-    void parse_gradient_rgb_justOnePoint_exception() {
+    void parse_gradient_rgb_justOnePoint_convertedToXY() {
         addKnownLightIdsWithDefaultCapabilities(1);
+        addStateNow("1", "gradient:[xy(0.3 0.4)]");
+        ScheduledRunnable scheduledRunnable = startAndGetSingleRunnable();
 
-        assertThatThrownBy(() -> addStateNow("1", "gradient:[rgb(94 186 125)]"))
-                .isInstanceOf(InvalidPropertyValue.class)
-                .hasMessageStartingWith("Invalid gradient")
-                .hasMessageContaining("A gradient must contain at least two colors.");
+        advanceTimeAndRunAndAssertPutCalls(scheduledRunnable,
+                expectedPutCall(1).x(0.3).y(0.4)
+        );
+
+        ensureRunnable(initialNow.plusDays(1));
     }
 
     @Test
@@ -3700,7 +3703,7 @@ void parse_gradient_rgb_twoManyPoints_exception() {
                                                   .maxGradientPoints(2)
                                                   .capabilities(EnumSet.of(Capability.GRADIENT)));
 
-        assertThatThrownBy(() -> addStateNow("1", "gradient:[rgb(94 186 125),rgb(94 186 125),rgb(94 186 125)]"))
+        assertThatThrownBy(() -> addStateNow("1", "gradient:[rgb(94 186 125),rgb(94 186 125),rgb(94 186 166)]"))
                 .isInstanceOf(InvalidPropertyValue.class)
                 .hasMessageStartingWith("Invalid gradient")
                 .hasMessageContaining("The maximum number of gradient points for this light is 2.");
@@ -3816,6 +3819,20 @@ void parse_gradient_rgb_twoPoints() {
         ensureRunnable(initialNow.plusDays(1));
     }
 
+    @Test
+    void parse_gradient_xy_twoPoints_same_convertedToXY() {
+        addKnownLightIdsWithDefaultCapabilities(1);
+        addStateNow( "1", "bri:100", "gradient:[xy(0.3 0.4),xy(0.3 0.4)]");
+
+        ScheduledRunnable scheduledRunnable = startAndGetSingleRunnable();
+
+        advanceTimeAndRunAndAssertPutCalls(scheduledRunnable,
+                expectedPutCall(1).bri(100).x(0.3).y(0.4)
+        );
+
+        ensureRunnable(initialNow.plusDays(1));
+    }
+
     @Test
     void parse_gradient_rgb_twoPoints_withMode_correctlyParsed() {
         addKnownLightIdsWithDefaultCapabilities(1);
@@ -4518,6 +4535,20 @@ void parse_sunset_withSmooth_inSpring_handlesDST() {
         );
     }
 
+    @Test
+    void parse_complexStartTimeExpression_canBeParsed() {
+        addKnownLightIdsWithDefaultCapabilities(1);
+        addState(1, now, "bri:100%");
+        addState(1, "clamp(smooth(mix(sunset+20, 21:15, 70%), 10d), max(18:30, mix(sunset-15, 19:00, 40%)), min(22:45, mix(sunset+150, 21:45, 50%)))", "bri:50%");
+        // normal sunset: 16:14:29
+        ZonedDateTime modifiedSunset = now.with(LocalTime.of(19, 49, 22));
+
+        startScheduler(
+                expectedRunnable(now, modifiedSunset),
+                expectedRunnable(modifiedSunset, now.plusDays(1))
+        );
+    }
+
     @Test
     void parse_sunrise_callsStartTimeProvider_usesUpdatedSunriseTimeNextDay() {
         addKnownLightIdsWithDefaultCapabilities(1);