Skip to content

Commit

Permalink
[visualcrossing] Add missing @ActionOutput annotation (openhab#17665)
Browse files Browse the repository at this point in the history
Related to openhab#17504

Also fix the return of corresponding static methods

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
  • Loading branch information
lolodomo authored and KaaNee committed Nov 8, 2024
1 parent fd075c7 commit d9898aa
Showing 1 changed file with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.openhab.binding.visualcrossing.internal.api.VisualCrossingRateException;
import org.openhab.binding.visualcrossing.internal.api.dto.WeatherResponse;
import org.openhab.core.automation.annotation.ActionInput;
import org.openhab.core.automation.annotation.ActionOutput;
import org.openhab.core.automation.annotation.RuleAction;
import org.openhab.core.thing.binding.ThingActions;
import org.openhab.core.thing.binding.ThingActionsScope;
Expand All @@ -47,8 +48,7 @@ public void setThingHandler(ThingHandler thingHandler) {
}

@RuleAction(label = "@text/action.timeline.label", description = "@text/action.timeline.description")
@Nullable
public WeatherResponse timeline(
public @Nullable @ActionOutput(label = "Result", type = "org.openhab.binding.visualcrossing.internal.api.dto.WeatherResponse") WeatherResponse timeline(
@ActionInput(name = "location", label = "@text/action.label.location", description = "@text/action.description.location") @Nullable String location,
@ActionInput(name = "unitGroup", label = "@text/action.label.unitGroup", description = "@text/action.description.unitGroup") @Nullable UnitGroup unitGroup,
@ActionInput(name = "lang", label = "@text/action.label.lang", description = "@text/action.description.lang") @Nullable String lang,
Expand All @@ -62,21 +62,20 @@ public WeatherResponse timeline(
return localHandler.timeline(location, unitGroup, lang, dateFrom, dateTo);
}

public static void timeline(@Nullable ThingActions actions, @Nullable String location,
public static @Nullable WeatherResponse timeline(@Nullable ThingActions actions, @Nullable String location,
@Nullable UnitGroup unitGroup, @Nullable String lang, @Nullable String dateFrom, @Nullable String dateTo)
throws VisualCrossingAuthException, VisualCrossingApiException, VisualCrossingRateException {
((VisualCrossingHandler) requireNonNull(actions)).timeline(location, unitGroup, lang, dateFrom, dateTo);
return ((VisualCrossingHandler) requireNonNull(actions)).timeline(location, unitGroup, lang, dateFrom, dateTo);
}

@RuleAction(label = "@text/action.timeline.label", description = "@text/action.timeline.description")
@Nullable
public WeatherResponse timeline()
public @Nullable @ActionOutput(label = "Result", type = "org.openhab.binding.visualcrossing.internal.api.dto.WeatherResponse") WeatherResponse timeline()
throws VisualCrossingAuthException, VisualCrossingApiException, VisualCrossingRateException {
return timeline(null, null, null, null, null);
}

public static void timeline(@Nullable ThingActions actions)
public static @Nullable WeatherResponse timeline(@Nullable ThingActions actions)
throws VisualCrossingAuthException, VisualCrossingApiException, VisualCrossingRateException {
((VisualCrossingHandler) requireNonNull(actions)).timeline(null, null, null, null, null);
return ((VisualCrossingHandler) requireNonNull(actions)).timeline(null, null, null, null, null);
}
}

0 comments on commit d9898aa

Please sign in to comment.