feat: Renaming PositionWithDuration to HwPositionWithDuration as per the v4 spec release

Author: blackspherefollower

buttplug4j/src/main/java/io/github/blackspherefollower/buttplug4j/client/ButtplugClientDeviceFeature.java

@@ -137,11 +137,11 @@ public boolean HasPositionWithDuration() {
 
     public Future<ButtplugMessage> PositionWithDuration(final int position, final int duration) throws ButtplugDeviceFeatureException {
         CheckStepRange("PositionWithDuration", position);
-        return device.sendOutputCommand(featureIndex, new OutputCmd.PositionWithDuration(position, duration));
+        return device.sendOutputCommand(featureIndex, new OutputCmd.HwPositionWithDuration(position, duration));
     }
 
     public Future<ButtplugMessage> PositionWithDurationFloat(final float position, final int duration) throws ButtplugDeviceFeatureException {
-        return device.sendOutputCommand(featureIndex, new OutputCmd.PositionWithDuration(GetStepFromFloat("PositionWithDuration", position), duration));
+        return device.sendOutputCommand(featureIndex, new OutputCmd.HwPositionWithDuration(GetStepFromFloat("PositionWithDuration", position), duration));
     }
 
     public boolean HasLed() {

buttplug4j/src/main/java/io/github/blackspherefollower/buttplug4j/protocol/messages/OutputCmd.java

@@ -48,7 +48,7 @@ public final void setCommand(final IOutputCommand command) {
             @JsonSubTypes.Type(value = Position.class, name = "Position"),
             @JsonSubTypes.Type(value = Temperature.class, name = "Temperature"),
             @JsonSubTypes.Type(value = Constrict.class, name = "Constrict"),
-            @JsonSubTypes.Type(value = PositionWithDuration.class, name = "PositionWithDuration"),
+            @JsonSubTypes.Type(value = HwPositionWithDuration.class, name = "HwPositionWithDuration"),
             @JsonSubTypes.Type(value = Led.class, name = "Led")
     })
     public interface IOutputCommand {
@@ -154,16 +154,16 @@ public Position() {
         }
     }
 
-    public static class PositionWithDuration extends ValueCommand {
+    public static class HwPositionWithDuration extends ValueCommand {
         @JsonProperty(value = "Duration", required = true)
         private int duration;
 
-        public PositionWithDuration(int value, int duration) {
+        public HwPositionWithDuration(int value, int duration) {
             super(value);
             this.duration = duration;
         }
 
-        public PositionWithDuration() {
+        public HwPositionWithDuration() {
             super();
             this.duration = 0;
         }

buttplug4j/src/test/java/io/github/blackspherefollower/buttplug4j/client/ButtplugClientDeviceFeatureTest.java

@@ -238,9 +238,9 @@ void testPositionWithDurationWithValidStep() throws Exception {
         assertNotNull(result);
         ArgumentCaptor<OutputCmd.IOutputCommand> captor = ArgumentCaptor.forClass(OutputCmd.IOutputCommand.class);
         verify(mockDevice).sendOutputCommand(eq(0), captor.capture());
-        assertInstanceOf(OutputCmd.PositionWithDuration.class, captor.getValue());
-        assertEquals(15, ((OutputCmd.PositionWithDuration) captor.getValue()).getValue());
-        assertEquals(500, ((OutputCmd.PositionWithDuration) captor.getValue()).getDuration());
+        assertInstanceOf(OutputCmd.HwPositionWithDuration.class, captor.getValue());
+        assertEquals(15, ((OutputCmd.HwPositionWithDuration) captor.getValue()).getValue());
+        assertEquals(500, ((OutputCmd.HwPositionWithDuration) captor.getValue()).getDuration());
     }
 
     @Test
@@ -257,9 +257,9 @@ void testPositionWithDurationFloatWithValidValue() throws Exception {
         assertNotNull(result);
         ArgumentCaptor<OutputCmd.IOutputCommand> captor = ArgumentCaptor.forClass(OutputCmd.IOutputCommand.class);
         verify(mockDevice).sendOutputCommand(eq(0), captor.capture());
-        assertInstanceOf(OutputCmd.PositionWithDuration.class, captor.getValue());
-        assertEquals(20, ((OutputCmd.PositionWithDuration) captor.getValue()).getValue());
-        assertEquals(500, ((OutputCmd.PositionWithDuration) captor.getValue()).getDuration());
+        assertInstanceOf(OutputCmd.HwPositionWithDuration.class, captor.getValue());
+        assertEquals(20, ((OutputCmd.HwPositionWithDuration) captor.getValue()).getValue());
+        assertEquals(500, ((OutputCmd.HwPositionWithDuration) captor.getValue()).getDuration());
     }
 
     @Test

buttplug4j/src/test/java/io/github/blackspherefollower/buttplug4j/protocol/messages/OutputCmdTest.java

@@ -258,7 +258,7 @@ public void testLed() throws IOException, ButtplugProtocolException {
 
     @Test
     public void testPositionWithDuration() throws IOException, ButtplugProtocolException {
-        String testStr = "[{\"OutputCmd\":{\"Id\":1,\"DeviceIndex\":0,\"FeatureIndex\":0,\"Command\":{\"PositionWithDuration\":{\"Value\":5,\"Duration\":10}}}}]";
+        String testStr = "[{\"OutputCmd\":{\"Id\":1,\"DeviceIndex\":0,\"FeatureIndex\":0,\"Command\":{\"HwPositionWithDuration\":{\"Value\":5,\"Duration\":10}}}}]";
 
         Validator.Result result = new ValidatorFactory().validate(schema, testStr);
         assertTrue(result.isValid(), result.getErrors().stream().map(Error::getError).collect(Collectors.joining("\n")));
@@ -271,9 +271,9 @@ public void testPositionWithDuration() throws IOException, ButtplugProtocolExcep
         assertEquals(1, msgs.get(0).getId());
         assertEquals(0, ((OutputCmd) msgs.get(0)).getDeviceIndex());
         assertEquals(0, ((OutputCmd) msgs.get(0)).getFeatureIndex());
-        assertInstanceOf(OutputCmd.PositionWithDuration.class, ((OutputCmd) msgs.get(0)).getCommand());
-        assertEquals(5, ((OutputCmd.PositionWithDuration) ((OutputCmd) msgs.get(0)).getCommand()).getValue());
-        assertEquals(10, ((OutputCmd.PositionWithDuration) ((OutputCmd) msgs.get(0)).getCommand()).getDuration());
+        assertInstanceOf(OutputCmd.HwPositionWithDuration.class, ((OutputCmd) msgs.get(0)).getCommand());
+        assertEquals(5, ((OutputCmd.HwPositionWithDuration) ((OutputCmd) msgs.get(0)).getCommand()).getValue());
+        assertEquals(10, ((OutputCmd.HwPositionWithDuration) ((OutputCmd) msgs.get(0)).getCommand()).getDuration());
 
         String jsonOut = parser.formatJson(msgs);
         assertEquals(testStr, jsonOut);