diff options
| author | Robert Henigan <robert.henigan@livio.io> | 2021-03-10 16:33:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 16:33:37 -0500 |
| commit | 3997daa55d0bc86013a921e507ca79117fde053d (patch) | |
| tree | 4e9f5e3f5aa42149fdb308e9f47abfe452f7e366 | |
| parent | c60d308e11e2879ee674a59dd19e73f0535f821f (diff) | |
| parent | b51682cd7f52d3527756d67ab459ac3f0b9a708b (diff) | |
| download | sdl_android-3997daa55d0bc86013a921e507ca79117fde053d.tar.gz | |
Merge pull request #1627 from smartdevicelink/feature/issue_1626_deprecated_issue
Fix deprecated keyword issue in class javadoc
8 files changed, 14 insertions, 10 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java index c040af0cd..62a006abe 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java @@ -89,7 +89,7 @@ import java.util.List; * <td>The information about the park brake: - true, if active - false if not.</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
@@ -99,7 +99,7 @@ import java.util.List; * <td>The information about the park brake: - true, if active - false if not.</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
@@ -109,7 +109,7 @@ import java.util.List; * <td>The information about the park brake: - true, if active - false if not.</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
@@ -119,7 +119,7 @@ import java.util.List; * <td>References signal "DrStatRr_B_Actl".</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java index e5757c3d2..05a49adc0 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java @@ -52,7 +52,7 @@ import java.util.List; * <th>SmartDeviceLink Ver. Available</th>
* </tr>
* <tr>
- * <td>@Deprecated <s>displayType</s></td>
+ * <td>@property-deprecated <s>displayType</s></td>
* <td><s>DisplayType</s></td>
* <td><s>The type of display</s>
* </td>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java index b7744a3e3..b723f08b9 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java @@ -113,7 +113,7 @@ import java.util.Hashtable; * <td>Subscribable</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java index 1263a47e6..5962a04fd 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java @@ -122,7 +122,7 @@ import java.util.List; * <td>{"string_min_length": 0, "string_max_length": 500}</td>
* <td>
* @since SmartDeviceLink 1.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java index 7ea19c858..a779c7288 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java @@ -121,7 +121,7 @@ import java.util.Hashtable; * <td>Subscribable</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java index e607711d0..3f3dff1bf 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java @@ -116,7 +116,7 @@ import java.util.Hashtable; * <td>Subscribable</td>
* <td>
* @since SmartDeviceLink 2.0.0
- * @deprecated in SmartDeviceLink 7.1.0
+ * @property-deprecated in SmartDeviceLink 7.1.0
* </td>
* </tr>
* <tr>
diff --git a/generator/templates/base_template.java b/generator/templates/base_template.java index 29f171872..e2f44a2cf 100644 --- a/generator/templates/base_template.java +++ b/generator/templates/base_template.java @@ -63,7 +63,7 @@ import {{i}};{{ '\n' if loop.last }} * <td>{%- for d in param.description %}{{d}}{%- endfor %}</td> * <td>{%- if param.mandatory is eq true %}Y{%- else %}N{%- endif %}</td> * <td>{%- for k in param.values %}{{ '{' if loop.first}}"{{k}}": {{param.values[k]}}{{ ', ' if not loop.last else '}'}}{%- endfor %}</td> - {%- if param.since is defined and param.since is not none %}{% set see, deprecated, since, history, spacing = param.see, param.deprecated, param.since, param.history, ' * ' %} + {%- if param.since is defined and param.since is not none %}{% set see, deprecated, since, history, spacing, headerParam = param.see, param.deprecated, param.since, param.history, ' * ', 'true' %} * <td> {%- include "javadoc_version_info.java" %} * </td> diff --git a/generator/templates/javadoc_version_info.java b/generator/templates/javadoc_version_info.java index a6c34467c..0eabb1bd2 100644 --- a/generator/templates/javadoc_version_info.java +++ b/generator/templates/javadoc_version_info.java @@ -4,7 +4,11 @@ {%- endif %} {%- if deprecated is defined and deprecated is not none %} {{spacing}}{{prefix}}@since SmartDeviceLink {{history[0].since}} +{%- if headerParam is defined and headerParam is not none %} +{{spacing}}{{prefix}}@property-deprecated in SmartDeviceLink {{since}} +{%- else %} {{spacing}}{{prefix}}@deprecated in SmartDeviceLink {{since}} +{%- endif %} {%- elif history is defined and history is not none %} {{spacing}}{{prefix}}@since SmartDeviceLink {{history[0].since}} {%- else %} |