Skip to content

Commit 4924965

Browse files
committed
Parameterize goal request and response interfaces on action type
Signed-off-by: Jacob Perron <[email protected]>
1 parent 4e18e73 commit 4924965

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

rcljava_common/src/main/java/org/ros2/rcljava/interfaces/GoalRequestDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import java.util.List;
1919

20-
public interface GoalRequestDefinition extends MessageDefinition {
20+
public interface GoalRequestDefinition<T extends ActionDefinition> extends MessageDefinition {
2121
MessageDefinition getGoal();
2222
List<Byte> getGoalUuid();
2323
}

rcljava_common/src/main/java/org/ros2/rcljava/interfaces/GoalResponseDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package org.ros2.rcljava.interfaces;
1717

18-
public interface GoalResponseDefinition extends MessageDefinition {
18+
public interface GoalResponseDefinition<T extends ActionDefinition> extends MessageDefinition {
1919
void accept(boolean accepted);
2020
void setStamp(int sec, int nanosec);
2121
}

rosidl_generator_java/resource/action.java.em

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ import @(action_import);
8080

8181
public class @(type_name) implements ActionDefinition {
8282

83-
public static class SendGoalRequest extends @(type_name)_SendGoal_Request implements GoalRequestDefinition {
83+
public static class SendGoalRequest extends @(type_name)_SendGoal_Request implements GoalRequestDefinition<@(type_name)> {
8484
public List<Byte> getGoalUuid() {
8585
return super.getGoalId().getUuid();
8686
}
8787
}
8888

89-
public static class SendGoalResponse extends @(type_name)_SendGoal_Response implements GoalResponseDefinition {
89+
public static class SendGoalResponse extends @(type_name)_SendGoal_Response implements GoalResponseDefinition<@(type_name)> {
9090
public void accept(boolean accepted) {
9191
super.setAccepted(accepted);
9292
}

0 commit comments

Comments
 (0)