Merge pull request #485 from openweave/feature/fix_missing_override_keyword

robszewczyk · web-flow · commit 91e068b3ce34 · 2020-02-06T10:03:27.000-08:00
Add missing clear API in GenericTraitUpdatableDataSink interface
diff --git a/src/device-manager/java/src/nl/Weave/DataManagement/GenericTraitUpdatableDataSink.java b/src/device-manager/java/src/nl/Weave/DataManagement/GenericTraitUpdatableDataSink.java
@@ -35,6 +35,11 @@
 
 public interface GenericTraitUpdatableDataSink
 {
+    /**
+     * clear trait data
+     */
+    public void clear();
+
     /**
      * Assigns the provided value to the given path as a signed integer value.
      *
diff --git a/src/device-manager/java/src/nl/Weave/DataManagement/GenericTraitUpdatableDataSinkImpl.java b/src/device-manager/java/src/nl/Weave/DataManagement/GenericTraitUpdatableDataSinkImpl.java
@@ -36,6 +36,7 @@
 
 public class GenericTraitUpdatableDataSinkImpl implements GenericTraitUpdatableDataSink
 {
+    @Override
     public void clear()
     {
         if (mTraitInstancePtr != 0)

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@`
`35`	`35`
`36`	`36`	`public interface GenericTraitUpdatableDataSink`
`37`	`37`	`{`
	`38`	`+ /**`
	`39`	`+ * clear trait data`
	`40`	`+ */`
	`41`	`+ public void clear();`
	`42`	`+`
`38`	`43`	`/**`
`39`	`44`	`* Assigns the provided value to the given path as a signed integer value.`
`40`	`45`	`*`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`
`37`	`37`	`public class GenericTraitUpdatableDataSinkImpl implements GenericTraitUpdatableDataSink`
`38`	`38`	`{`
	`39`	`+ @Override`
`39`	`40`	`public void clear()`
`40`	`41`	`{`
`41`	`42`	`if (mTraitInstancePtr != 0)`