Skip to content

Commit 77d8699

Browse files
committed
typesafe request and response definitions
Signed-off-by: Jacob Perron <jacob@openrobotics.org>
1 parent 06c9e7e commit 77d8699

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

rcljava/src/main/java/org/ros2/rcljava/action/ActionServerImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public synchronized final long getHandle() {
184184
private final T actionTypeInstance;
185185
private final String actionName;
186186
private long handle;
187-
private final GoalCallback<? extends GoalRequestDefinition> goalCallback;
187+
private final GoalCallback<? extends GoalRequestDefinition<T>> goalCallback;
188188
private final CancelCallback<T> cancelCallback;
189189
private final Consumer<ActionServerGoalHandle<T>> acceptedCallback;
190190

@@ -225,7 +225,7 @@ public ActionServerImpl(
225225
final WeakReference<Node> nodeReference,
226226
final Class<T> actionType,
227227
final String actionName,
228-
final GoalCallback<? extends GoalRequestDefinition> goalCallback,
228+
final GoalCallback<? extends GoalRequestDefinition<T>> goalCallback,
229229
final CancelCallback<T> cancelCallback,
230230
final Consumer<ActionServerGoalHandle<T>> acceptedCallback) throws IllegalArgumentException {
231231
this.nodeReference = nodeReference;
@@ -302,8 +302,8 @@ public boolean isReady(long waitSetHandle) {
302302

303303
private ActionServerGoalHandle<T> executeGoalRequest(
304304
RMWRequestId rmwRequestId,
305-
GoalRequestDefinition requestMessage,
306-
GoalResponseDefinition responseMessage)
305+
GoalRequestDefinition<T> requestMessage,
306+
GoalResponseDefinition<T> responseMessage)
307307
{
308308
builtin_interfaces.msg.Time timeRequestHandled = this.clock.now().toMsg();
309309
responseMessage.setStamp(timeRequestHandled.getSec(), timeRequestHandled.getNanosec());
@@ -445,8 +445,8 @@ public void execute() {
445445
Class<? extends GoalRequestDefinition> requestType = this.actionTypeInstance.getSendGoalRequestType();
446446
Class<? extends GoalResponseDefinition> responseType = this.actionTypeInstance.getSendGoalResponseType();
447447

448-
GoalRequestDefinition requestMessage = null;
449-
GoalResponseDefinition responseMessage = null;
448+
GoalRequestDefinition<T> requestMessage = null;
449+
GoalResponseDefinition<T> responseMessage = null;
450450

451451
try {
452452
requestMessage = requestType.newInstance();

rcljava/src/main/java/org/ros2/rcljava/node/Node.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ <T extends ServiceDefinition> Client<T> createClient(final Class<T> serviceType,
146146

147147
<T extends ActionDefinition> ActionServer<T> createActionServer(final Class<T> actionType,
148148
final String actionName,
149-
final GoalCallback<? extends GoalRequestDefinition> goalCallback,
149+
final GoalCallback<? extends GoalRequestDefinition<T>> goalCallback,
150150
final CancelCallback<T> cancelCallback,
151151
final Consumer<ActionServerGoalHandle<T>> acceptedCallback);
152152

rcljava/src/main/java/org/ros2/rcljava/node/NodeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ private static native <T extends ServiceDefinition> long nativeCreateClientHandl
405405

406406
public <T extends ActionDefinition> ActionServer<T> createActionServer(final Class<T> actionType,
407407
final String actionName,
408-
final GoalCallback<? extends GoalRequestDefinition> goalCallback,
408+
final GoalCallback<? extends GoalRequestDefinition<T>> goalCallback,
409409
final CancelCallback<T> cancelCallback,
410410
final Consumer<ActionServerGoalHandle<T>> acceptedCallback) throws IllegalArgumentException {
411411
ActionServer<T> actionServer = new ActionServerImpl<T>(

0 commit comments

Comments
 (0)