Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[solarforecast] Add missing @ActionOutput annotation #17506

Merged
merged 4 commits into from
Oct 4, 2024
Merged

[solarforecast] Add missing @ActionOutput annotation #17506

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a564e
[solarforecast] Add missing @ActionOutput annotation
lolodomo Oct 4, 2024
e1e1a0a
Review comment: args instead of arguments
lolodomo Oct 4, 2024
75a26b2
Review comment: rename method getDay
lolodomo Oct 4, 2024
a2459f9
README updated
lolodomo Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions ...rc/main/java/org/openhab/binding/solarforecast/internal/actions/SolarForecastActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.solarforecast.internal.utils.Utils;
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.library.types.QuantityType;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.binding.ThingActions;
import org.openhab.core.thing.binding.ThingActionsScope;
import org.openhab.core.thing.binding.ThingHandler;
import org.openhab.core.types.State;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -48,9 +48,9 @@ public class SolarForecastActions implements ThingActions {
private Optional<ThingHandler> thingHandler = Optional.empty();

@RuleAction(label = "@text/actionDayLabel", description = "@text/actionDayDesc")
public QuantityType<Energy> getDay(
public @ActionOutput(name = "getDay", type = "QuantityType<Energy>") QuantityType<Energy> getDay(
@ActionInput(name = "localDate", label = "@text/actionInputDayLabel", description = "@text/actionInputDayDesc") LocalDate localDate,
String... args) {
@ActionInput(name = "arguments") String... args) {
if (thingHandler.isPresent()) {
List<SolarForecast> l = ((SolarForecastProvider) thingHandler.get()).getSolarForecasts();
if (!l.isEmpty()) {
Expand Down Expand Up @@ -78,9 +78,9 @@ public QuantityType<Energy> getDay(
}

@RuleAction(label = "@text/actionPowerLabel", description = "@text/actionPowerDesc")
public QuantityType<Power> getPower(
public @ActionOutput(name = "getPower", type = "QuantityType<Power>") QuantityType<Power> getPower(
@ActionInput(name = "timestamp", label = "@text/actionInputDateTimeLabel", description = "@text/actionInputDateTimeDesc") Instant timestamp,
String... args) {
@ActionInput(name = "arguments") String... args) {
if (thingHandler.isPresent()) {
List<SolarForecast> l = ((SolarForecastProvider) thingHandler.get()).getSolarForecasts();
if (!l.isEmpty()) {
Expand Down Expand Up @@ -108,10 +108,10 @@ public QuantityType<Power> getPower(
}

@RuleAction(label = "@text/actionEnergyLabel", description = "@text/actionEnergyDesc")
public QuantityType<Energy> getEnergy(
public @ActionOutput(name = "getEnergy", type = "QuantityType<Energy>") QuantityType<Energy> getEnergy(
@ActionInput(name = "start", label = "@text/actionInputDateTimeBeginLabel", description = "@text/actionInputDateTimeBeginDesc") Instant start,
@ActionInput(name = "end", label = "@text/actionInputDateTimeEndLabel", description = "@text/actionInputDateTimeEndDesc") Instant end,
String... args) {
@ActionInput(name = "arguments") String... args) {
lolodomo marked this conversation as resolved.
Show resolved Hide resolved
if (thingHandler.isPresent()) {
List<SolarForecast> l = ((SolarForecastProvider) thingHandler.get()).getSolarForecasts();
if (!l.isEmpty()) {
Expand Down Expand Up @@ -139,7 +139,7 @@ public QuantityType<Energy> getEnergy(
}

@RuleAction(label = "@text/actionForecastBeginLabel", description = "@text/actionForecastBeginDesc")
public Instant getForecastBegin() {
public @ActionOutput(name = "getForecastBegin", type = "java.time.Instant") Instant getForecastBegin() {
if (thingHandler.isPresent()) {
List<SolarForecast> forecastObjectList = ((SolarForecastProvider) thingHandler.get()).getSolarForecasts();
return Utils.getCommonStartTime(forecastObjectList);
Expand All @@ -150,7 +150,7 @@ public Instant getForecastBegin() {
}

@RuleAction(label = "@text/actionForecastEndLabel", description = "@text/actionForecastEndDesc")
public Instant getForecastEnd() {
public @ActionOutput(name = "getForecastEnd", type = "java.time.Instant") Instant getForecastEnd() {
if (thingHandler.isPresent()) {
List<SolarForecast> forecastObjectList = ((SolarForecastProvider) thingHandler.get()).getSolarForecasts();
return Utils.getCommonEndTime(forecastObjectList);
Expand All @@ -172,15 +172,15 @@ public void triggerUpdate() {
}
}

public static State getDay(ThingActions actions, LocalDate ld, String... args) {
public static QuantityType<Energy> getDay(ThingActions actions, LocalDate ld, String... args) {
lsiepel marked this conversation as resolved.
Show resolved Hide resolved
return ((SolarForecastActions) actions).getDay(ld, args);
}

public static State getPower(ThingActions actions, Instant dateTime, String... args) {
public static QuantityType<Power> getPower(ThingActions actions, Instant dateTime, String... args) {
return ((SolarForecastActions) actions).getPower(dateTime, args);
}

public static State getEnergy(ThingActions actions, Instant begin, Instant end, String... args) {
public static QuantityType<Energy> getEnergy(ThingActions actions, Instant begin, Instant end, String... args) {
return ((SolarForecastActions) actions).getEnergy(begin, end, args);
}

Expand Down