[brooklyn-server] branch master updated: currently we say "SSH task" even for WinRM; this fixes that

[heneveld]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 6640444  currently we say "SSH task" even for WinRM; this fixes that
6640444 is described below

commit 664044455b4b67b1407ac50aef7028f80575da28
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Fri Jul 30 14:44:20 2021 +0100

    currently we say "SSH task" even for WinRM; this fixes that
---
 .../org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java   | 4 ++++
 .../util/core/task/ssh/internal/AbstractSshExecTaskFactory.java   | 8 +++++---
 .../util/core/task/ssh/internal/PlainSshExecTaskFactory.java      | 3 +++
 .../apache/brooklyn/location/winrm/PlainWinRmExecTaskFactory.java | 3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
 
b/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
index 706ea3d..c295636 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/effector/ssh/SshEffectorTasks.java
@@ -109,6 +109,10 @@ public class SshEffectorTasks {
         public SshEffectorTaskFactory(MachineLocation machine, String 
...commands) {
             super(machine, commands);
         }
+
+        @Override
+        protected String taskTypeShortName() { return "SSH"; }
+
         @Override
         public ProcessTaskWrapper<RET> newTask(Entity entity, Effector<RET> 
effector, ConfigBag parameters) {
             markDirty();
diff --git 
a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
 
b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
index a2e5b93..170040b 100644
--- 
a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
+++ 
b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/AbstractSshExecTaskFactory.java
@@ -47,7 +47,9 @@ public abstract class AbstractSshExecTaskFactory<T extends 
AbstractProcessTaskFa
         this(commands);
         machine(machine);
     }
-    
+
+    protected abstract String taskTypeShortName();
+
     @Override
     public ProcessTaskWrapper<RET> newTask() {
         dirty = false;
@@ -64,7 +66,7 @@ public abstract class AbstractSshExecTaskFactory<T extends 
AbstractProcessTaskFa
                 }
             }
             @Override
-            protected String taskTypeShortName() { return "SSH"; }
+            protected String taskTypeShortName() { return 
AbstractSshExecTaskFactory.this.taskTypeShortName(); }
 
             @Override
             protected void initStreams(TaskBuilder<Object> tb) {
@@ -124,4 +126,4 @@ public abstract class AbstractSshExecTaskFactory<T extends 
AbstractProcessTaskFa
         }
     }
 
-}
\ No newline at end of file
+}
diff --git 
a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/PlainSshExecTaskFactory.java
 
b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/PlainSshExecTaskFactory.java
index 92def17..3da6d6f 100644
--- 
a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/PlainSshExecTaskFactory.java
+++ 
b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/internal/PlainSshExecTaskFactory.java
@@ -49,6 +49,9 @@ public class PlainSshExecTaskFactory<RET> extends 
AbstractSshExecTaskFactory<Pla
     }
 
     @Override
+    protected String taskTypeShortName() { return "SSH"; }
+
+    @Override
     public <T2> PlainSshExecTaskFactory<T2> returning(ScriptReturnType type) {
         return (PlainSshExecTaskFactory<T2>) super.<T2>returning(type);
     }
diff --git 
a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/PlainWinRmExecTaskFactory.java
 
b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/PlainWinRmExecTaskFactory.java
index 3b0bdce..7d719dd 100644
--- 
a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/PlainWinRmExecTaskFactory.java
+++ 
b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/PlainWinRmExecTaskFactory.java
@@ -47,6 +47,9 @@ public class PlainWinRmExecTaskFactory<RET> extends 
AbstractSshExecTaskFactory<P
     }
 
     @Override
+    protected String taskTypeShortName() { return "WinRM"; }
+
+    @Override
     public <T2> PlainWinRmExecTaskFactory<T2> returning(ScriptReturnType type) 
{
         return (PlainWinRmExecTaskFactory<T2>) super.<T2>returning(type);
     }