diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-03-19 14:08:07 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-03-19 14:08:07 -0400 |
| commit | 81f9108ac71892d6fb4ab6fd782496d5e166fe79 (patch) | |
| tree | de617a63888f5130723d3c097d8b5cbc67aae9d2 | |
| parent | 0b61927cf646849afa77cbf121c754dd778926f0 (diff) | |
| download | sdl_android-81f9108ac71892d6fb4ab6fd782496d5e166fe79.tar.gz | |
Add MOBILE_API.xml for the new specs
24 files changed, 895 insertions, 162 deletions
diff --git a/android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml b/android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml index 769e87d3c..6582c9361 100644 --- a/android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml +++ b/android/sdl_android/src/androidTest/assets/xml/MOBILE_API.xml @@ -1,7 +1,7 @@ <?xml version="1.0" standalone="no"?> <?xml-stylesheet type="text/xml" href="protocol2html.xsl"?> -<interface name="SmartDeviceLink RAPI" version="5.0.0" minVersion="1.0" date="2018-10-03"> +<interface name="SmartDeviceLink RAPI" version="5.1.0" minVersion="1.0" date="2019-03-19"> <enum name="Result" internal_scope="base" since="1.0"> <element name="SUCCESS"> <description>The request succeeded</description> @@ -542,8 +542,38 @@ <element name="VEHICLEDATA_FUELRANGE" since="5.0" /> <element name="VEHICLEDATA_ENGINEOILLIFE" since="5.0" /> <element name="VEHICLEDATA_ELECTRONICPARKBRAKESTATUS" since="5.0" /> + <element name="VEHICLEDATA_CLOUDAPPVEHICLEID" since="5.1"/> </enum> + <enum name="HybridAppPreference" since="5.1"> + <description>Enumeration for the user's preference of which app type to use when both are available</description> + <element name="MOBILE" /> + <element name="CLOUD" /> + <element name="BOTH" /> + </enum> + + <struct name="CloudAppProperties" since="5.1"> + <param name="nicknames" type="String" minlength="0" maxlength="100" array="true" minsize="0" maxsize="100" mandatory="false"> + <description>An array of app names a cloud app is allowed to register with. If included in a SetCloudAppProperties request, this value will overwrite the existing "nicknames" field in the app policies section of the policy table.</description> + </param> + <param name="appID" type="String" maxlength="100" mandatory="true"/> + <param name="enabled" type="Boolean" mandatory="false"> + <description>If true, cloud app will be included in HMI RPC UpdateAppList</description> + </param> + <param name="authToken" type="String" maxlength="65535" mandatory="false"> + <description>Used to authenticate websocket connection on app activation</description> + </param> + <param name="cloudTransportType" type="String" maxlength="100" mandatory="false"> + <description>Specifies the connection type Core should use</description> + </param> + <param name="hybridAppPreference" type="HybridAppPreference" mandatory="false"> + <description>Specifies the user preference to use the cloud app version or mobile app version when both are available</description> + </param> + <param name="endpoint" type="String" maxlength="65535" mandatory="false"> + <description>Specifies the endpoint which Core will attempt to connect to when this app is selected</description> + </param> + </struct> + <enum name="ButtonName" since="1.0"> <description>Defines the hard (physical) and soft (touchscreen) buttons available from the module</description> <element name="OK" /> @@ -2411,6 +2441,7 @@ <element name="MEDIA" /> <element name="FOTA" /> <element name="OEM_SPECIFIC" since="5.0" /> + <element name="ICON_URL" since="5.1" /> </enum> <enum name="AppHMIType" since="2.0"> @@ -2608,6 +2639,12 @@ <element name="UnsubscribeWayPointsID" value="47" hexvalue="2F" since="4.1" /> <element name="GetSystemCapabilityID" value="48" hexvalue="30" since="4.5" /> <element name="SendHapticDataID" value="49" hexvalue="31" since="4.5" /> + <element name="SetCloudAppPropertiesID" value="50" hexvalue="32" since="5.1" /> + <element name="GetCloudAppPropertiesID" value="51" hexvalue="33" since="5.1" /> + <element name="PublishAppServiceID" value="52" hexvalue="34" since="5.1" /> + <element name="GetAppServiceDataID" value="53" hexvalue="35" since="5.1" /> + <element name="GetFileID" value="54" hexvalue="36" since="5.1" /> + <element name="PerformAppServiceInteractionID" value="55" hexvalue="37" since="5.1" /> <!-- Base Notifications @@ -2632,6 +2669,8 @@ <element name="OnInteriorVehicleDataID" value="32783" hexvalue="800F" since="4.5" /> <element name="OnWayPointChangeID" value="32784" hexvalue="8010" since="4.1" /> <element name="OnRCStatusID" value="32785" hexvalue="8011" since="5.0" /> + <element name="OnAppServiceDataID" value="32786" hexvalue="8012" since="5.1" /> + <element name="OnSystemCapabilityUpdatedID" value="32787" hexvalue="8013" since="5.1" /> <!-- Ford Specific Request / Response RPCs @@ -2789,6 +2828,7 @@ <element name="PHONE_CALL"/> <element name="VIDEO_STREAMING"/> <element name="REMOTE_CONTROL"/> + <element name="APP_SERVICES" since="5.1"/> </enum> <struct name="NavigationCapability" since="4.5"> @@ -3602,24 +3642,6 @@ </struct> <!-- End of RC --> - <struct name="SystemCapability" since="4.5"> - <description>The systemCapabilityType indicates which type of data should be changed and identifies which data object exists in this struct. For example, if the SystemCapability Type is NAVIGATION then a "navigationCapability" should exist</description> - <param name="systemCapabilityType" type="SystemCapabilityType" mandatory="true"> - <description>Used as a descriptor of what data to expect in this struct. The corresponding param to this enum should be included and the only other para included.</description> - </param> - <param name="navigationCapability" type="NavigationCapability" mandatory="false"> - <description>Describes extended capabilities for onboard navigation system </description> - </param> - <param name="phoneCapability" type="PhoneCapability" mandatory="false"> - <description>Describes extended capabilities of the module's phone feature</description> - </param> - <param name="videoStreamingCapability" type="VideoStreamingCapability" mandatory="false"> - <description>Describes extended capabilities of the module's phone feature</description> - </param> - <param name="remoteControlCapability" type="RemoteControlCapabilities" mandatory="false"> - <description>Describes extended capabilities of the module's phone feature</description> - </param> - </struct> <enum name="MetadataType" since="4.5"> <element name="mediaTitle"> @@ -3700,6 +3722,427 @@ </param> </struct> + <!-- App Services --> + + <enum name="AppServiceType" platform="documentation" since="5.1"> + <element name="MEDIA"/> + <element name="WEATHER"/> + <element name="NAVIGATION"/> + </enum> + + <struct name="MediaServiceManifest" since="5.1"> + </struct> + + <enum name="MediaType" since="5.1"> + <element name="MUSIC"/> + <element name="PODCAST"/> + <element name="AUDIOBOOK"/> + <element name="OTHER"/> + </enum> + + <struct name="MediaServiceData" since="5.1"> + <description>This data is related to what a media service should provide</description> + + <param name="mediaType" type="MediaType" mandatory="false"> + <description>The type of the currently playing or paused track.</description> + </param> + + <param name="mediaTitle" type="String" mandatory="false"> + <description> + Music: The name of the current track + Podcast: The name of the current episode + Audiobook: The name of the current chapter + </description> + </param> + + <param name="mediaArtist" type="String" mandatory="false"> + <description> + Music: The name of the current album artist + Podcast: The provider of the podcast (hosts, network, company) + Audiobook: The book author's name + </description> + </param> + + <param name="mediaAlbum" type="String" mandatory="false"> + <description> + Music: The name of the current album + Podcast: The name of the current podcast show + Audiobook: The name of the current book + </description> + </param> + + <param name="playlistName" type="String" mandatory="false"> + <description> + Music: The name of the playlist or radio station, if the user is playing from a playlist, otherwise, Null + Podcast: The name of the playlist, if the user is playing from a playlist, otherwise, Null + Audiobook: Likely not applicable, possibly a collection or "playlist" of books + </description> + </param> + + <param name="isExplicit" type="Boolean" mandatory="false"> + <description> Whether or not the content currently playing (e.g. the track, episode, or book) contains explicit content</description> + </param> + + <param name="trackPlaybackProgress" type="Integer" mandatory="false"> + <description> + Music: The current progress of the track in seconds + Podcast: The current progress of the episode in seconds + Audiobook: The current progress of the current segment (e.g. the chapter) in seconds + </description> + </param> + + <param name="trackPlaybackDuration" type="Integer" mandatory="false"> + <description> + Music: The total duration of the track in seconds + Podcast: The total duration of the episode in seconds + Audiobook: The total duration of the current segment (e.g. the chapter) in seconds + </description> + </param> + + <param name="queuePlaybackProgress" type="Integer" mandatory="false"> + <description> + Music: The current progress of the playback queue in seconds + Podcast: The current progress of the playback queue in seconds + Audiobook: The current progress of the playback queue (e.g. the book) in seconds + </description> + </param> + + <param name="queuePlaybackDuration" type="Integer" mandatory="false"> + <description> + Music: The total duration of the playback queue in seconds + Podcast: The total duration of the playback queue in seconds + Audiobook: The total duration of the playback queue (e.g. the book) in seconds + </description> + </param> + + <param name="queueCurrentTrackNumber" type="Integer" mandatory="false"> + <description> + Music: The current number (1 based) of the track in the playback queue + Podcast: The current number (1 based) of the episode in the playback queue + Audiobook: The current number (1 based) of the episode in the playback queue (e.g. the chapter number in the book) + </description> + </param> + + <param name="queueTotalTrackCount" type="Integer" mandatory="false"> + <description> + Music: The total number of tracks in the playback queue + Podcast: The total number of episodes in the playback queue + Audiobook: The total number of sections in the playback queue (e.g. the number of chapters in the book) + </description> + </param> + </struct> + + <struct name="WeatherServiceManifest" since="5.1"> + <param name="currentForecastSupported" type="Boolean" mandatory="false"/> + <param name="maxMultidayForecastAmount" type="Integer" mandatory="false"/> + <param name="maxHourlyForecastAmount" type="Integer" mandatory="false"/> + <param name="maxMinutelyForecastAmount" type="Integer" mandatory="false"/> + <param name="weatherForLocationSupported" type="Boolean" mandatory="false"/> + </struct> + + <struct name="WeatherAlert" since="5.1"> + <param name="title" type="String" mandatory="false"/> + <param name="summary" type="String" mandatory="false"/> + <param name="expires" type="DateTime" mandatory="false"/> + <param name="regions" type="String" array="true" minsize="1" maxsize="99" mandatory="false"/> + <param name="severity" type="String" mandatory="false"/> + <param name="timeIssued" type="DateTime" mandatory="false"/> + </struct> + + <struct name="WeatherData" since="5.1"> + <param name="currentTemperature" type="Temperature" mandatory="false"/> + <param name="temperatureHigh" type="Temperature" mandatory="false"/> + <param name="temperatureLow" type="Temperature" mandatory="false"/> + <param name="apparentTemperature" type="Temperature" mandatory="false"/> + <param name="apparentTemperatureHigh" type="Temperature" mandatory="false"/> + <param name="apparentTemperatureLow" type="Temperature" mandatory="false"/> + + <param name="weatherSummary" type="String" mandatory="false"/> + <param name="time" type="DateTime" mandatory="false"/> + <param name="humidity" type="Float" minvalue="0" maxvalue="1" mandatory="false"> + <description> 0 to 1, percentage humidity </description> + </param> + <param name="cloudCover" type="Float" minvalue="0" maxvalue="1" mandatory="false"> + <description> 0 to 1, percentage cloud cover </description> + </param> + <param name="moonPhase" type="Float" minvalue="0" maxvalue="1" mandatory="false"> + <description> 0 to 1, percentage of the moon seen, e.g. 0 = no moon, 0.25 = quarter moon </description> + </param> + + <param name="windBearing" type="Integer" mandatory="false"> + <description> In degrees, true north at 0 degrees </description> + </param> + <param name="windGust" type="Float" mandatory="false"> + <description> km/hr </description> + </param> + <param name="windSpeed" type="Float" mandatory="false"> + <description> km/hr </description> + </param> + + <param name="nearestStormBearing" type="Integer" mandatory="false"> + <description> In degrees, true north at 0 degrees </description> + </param> + <param name="nearestStormDistance" type="Integer" mandatory="false"> + <description> In km </description> + </param> + <param name="precipAccumulation" type="Float" mandatory="false"> + <description> cm </description> + </param> + <param name="precipIntensity" type="Float" mandatory="false"> + <description> cm of water per hour </description> + </param> + <param name="precipProbability" type="Float" minvalue="0" maxvalue="1" mandatory="false"> + <description> 0 to 1, percentage chance </description> + </param> + <param name="precipType" type="String" mandatory="false"> + <description> e.g. "rain", "snow", "sleet", "hail" </description> + </param> + <param name="visibility" type="Float" mandatory="false"> + <description> In km </description> + </param> + + <param name="weatherIcon" type="Image" mandatory="false"/> + </struct> + + <struct name="WeatherServiceData" since="5.1"> + <description> This data is related to what a weather service would provide</description> + <param name="location" type="LocationDetails" mandatory="true"/> + <param name="currentForecast" type="WeatherData" mandatory="false"/> + <param name="minuteForecast" type="WeatherData" array="true" minsize="15" maxsize="60" mandatory="false"/> + <param name="hourlyForecast" type="WeatherData" array="true" minsize="1" maxsize="96" mandatory="false"/> + <param name="multidayForecast" type="WeatherData" array="true" minsize="1" maxsize="30" mandatory="false"/> + <param name="alerts" type="WeatherAlert" array="true" minsize="1" maxsize="10" mandatory="false"> + <description> This array should be ordered with the first object being the current day</description> + </param> + </struct> + + <struct name="NavigationServiceManifest" since="5.1"> + <param name="acceptsWayPoints" type="Boolean" mandatory="false"> + <description> Informs the subscriber if this service can actually accept way points. </description> + </param> + </struct> + + <enum name="NavigationAction" since="5.1"> + <element name="TURN"> + <description> Using this action plus a supplied direction can give the type of turn. </description> + </element> + <element name="EXIT"/> + <element name="STAY"/> + <element name="MERGE"/> + <element name="FERRY"/> + <element name="CAR_SHUTTLE_TRAIN"/> + <element name="WAYPOINT"/> + </enum> + + <enum name="NavigationJunction" since="5.1"> + <element name="REGULAR"> + <description> A junction that represents a standard intersection with a single road crossing another. </description> + </element> + <element name="BIFURCATION"> + <description> A junction where the road splits off into two paths; a fork in the road. </description> + </element> + <element name="MULTI_CARRIAGEWAY"> + <description> A junction that has multiple intersections and paths. </description> + </element> + <element name="ROUNDABOUT"> + <description> A junction where traffic moves in a single direction around a central, non-traversable point to reach one of the connecting roads. </description> + </element> + <element name="TRAVERSABLE_ROUNDABOUT"> + <description> Similar to a roundabout, however the center of the roundabout is fully traversable. Also known as a mini-roundabout. </description> + </element> + <element name="JUGHANDLE"> + <description> A junction where lefts diverge to the right, then curve to the left, converting a left turn to a crossing maneuver. </description> + </element> + <element name="ALL_WAY_YIELD"> + <description> Multiple way intersection that allows traffic to flow based on priority; most commonly right of way and first in, first out. </description> + </element> + <element name="TURN_AROUND"> + <description> A junction designated for traffic turn arounds. </description> + </element> + </enum> + + <enum name="Direction" since="5.1"> + <element name="LEFT"/> + <element name="RIGHT"/> + </enum> + + <struct name="NavigationInstruction" since="5.1"> + <param name="locationDetails" type="LocationDetails" mandatory="true"/> + + <param name="action" type="NavigationAction" mandatory="true"/> + + <param name="eta" type="DateTime" mandatory="false"/> + + <param name="bearing" type="Integer" minvalue="0" maxvalue="359" mandatory="false"> + <description> The angle at which this instruction takes place. For example, 0 would mean straight, less than 45 is bearing right, greater than 135 is sharp right, between 45 and 135 is a regular right, and 180 is a U-Turn, etc. </description> + </param> + + <param name="junctionType" type="NavigationJunction" mandatory="false"/> + + <param name="drivingSide" type="Direction" mandatory="false"> + <description> Used to infer which side of the road this instruction takes place. For a U-Turn (action=TURN, bearing=180) this will determine which direction the turn should take place. </description> + </param> + + <param name="details" type="String" mandatory="false"> + <description> This is a string representation of this instruction, used to display instructions to the users. This is not intended to be read aloud to the users, see the param prompt in NavigationServiceData for that. </description> + </param> + + <param name="image" type="Image" mandatory="false"> + <description> An image representation of this instruction. </description> + </param> + </struct> + + <struct name="NavigationServiceData" since="5.1"> + <description> This data is related to what a navigation service would provide.</description> + + <param name="timeStamp" type="DateTime" mandatory="true"> + <description> This is the timestamp of when the data was generated. This is to ensure any time or distance given in the data can accurately be adjusted if necessary. </description> + </param> + + <param name="origin" type="LocationDetails" mandatory="false"/> + <param name="destination" type="LocationDetails" mandatory="false"/> + <param name="destinationETA" type="DateTime" mandatory="false"/> + + <param name="instructions" type="NavigationInstruction" array="true" mandatory="false"> + <description> This array should be ordered with all remaining instructions. The start of this array should always contain the next instruction.</description> + </param> + + <param name="nextInstructionETA" type="DateTime" mandatory="false"/> + <param name="nextInstructionDistance" type="Float" mandatory="false"> + <description>The distance to this instruction from current location. This should only be updated ever .1 unit of distance. For more accuracy the consumer can use the GPS location of itself and the next instruction. </description> + </param> + <param name="nextInstructionDistanceScale" type="Float" mandatory="false"> + <description>Distance till next maneuver (starting from) from previous maneuver.</description> + </param> + + <param name="prompt" type="String" mandatory="false"> + <description>This is a prompt message that should be conveyed to the user through either display or voice (TTS). This param will change often as it should represent the following: approaching instruction, post instruction, alerts that affect the current navigation session, etc.</description> + </param> + </struct> + + <struct name="AppServiceManifest" since="5.1"> + <description> This manifest contains all the information necessary for the service to be published, activated, and consumers able to interact with it </description> + + <param name="serviceName" type="String" mandatory="false"> + <description> Unique name of this service </description> + </param> + + <param name="serviceType" type="String" mandatory="true"> + <description> The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core. </description> + </param> + + <param name="serviceIcon" type="Image" mandatory="false"> + <description> The icon to be associated with this service. Most likely the same as the appIcon.</description> + </param> + + <param name="allowAppConsumers" type="Boolean" mandatory="false" defvalue="false"> + <description> If true, app service consumers beyond the IVI system will be able to access this service. If false, only the IVI system will be able consume the service. If not provided, it is assumed to be false. </description> + </param> + + <param name="rpcSpecVersion" type="SyncMsgVersion" mandatory="false"> + <description> This is the max RPC Spec version the app service understands. This is important during the RPC passthrough functionality. If not included, it is assumed the max version of the module is acceptable. </description> + </param> + + <param name="handledRPCs" type="Integer" array="true" mandatory="false"> + <description> This field contains the Function IDs for the RPCs that this service intends to handle correctly. This means the service will provide meaningful responses. </description> + </param> + + <param name="mediaServiceManifest" type="MediaServiceManifest" mandatory="false"/> + <param name="weatherServiceManifest" type="WeatherServiceManifest" mandatory="false"/> + <param name="navigationServiceManifest" type="NavigationServiceManifest" mandatory="false"/> + </struct> + + <struct name="AppServiceRecord" since="5.1"> + <description> This is the record of an app service publisher that the module has. It should contain the most up to date information including the service's active state</description> + + <param name="serviceID" type="String" mandatory="true"> + <description> A unique ID tied to this specific service record. The ID is supplied by the module that services publish themselves. </description> + </param> + + <param name="serviceManifest" type="AppServiceManifest" mandatory="true"> + <description> Manifest for the service that this record is for.</description> + </param> + + <param name="servicePublished" type="Boolean" mandatory="true"> + <description> If true, the service is published and available. If false, the service has likely just been unpublished, and should be considered unavailable.</description> + </param> + + <param name="serviceActive" type="Boolean" mandatory="true"> + <description> If true, the service is the active primary service of the supplied service type. It will receive all potential RPCs that are passed through to that service type. If false, it is not the primary service of the supplied type. See servicePublished for its availability. </description> + </param> + </struct> + + <struct name="AppServiceData" since="5.1"> + <description> Contains all the current data of the app service. The serviceType will link to which of the service data objects are included in this object (e.g. if the service type is MEDIA, the mediaServiceData param should be included).</description> + + <param name="serviceType" type="String" mandatory="true"> + <description>The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core.</description> + </param> + <param name="serviceID" type="String" mandatory="true"/> + + <param name="mediaServiceData" type="MediaServiceData" mandatory="false"/> + <param name="weatherServiceData" type="WeatherServiceData" mandatory="false"/> + <param name="navigationServiceData" type="NavigationServiceData" mandatory="false"/> + </struct> + + <enum name="ServiceUpdateReason" since="5.1"> + <element name="PUBLISHED"> + <description> The service has just been published with the module and once activated to the primary service of its type, it will be ready for possible consumption.</description> + </element> + <element name="REMOVED"> + <description> The service has just been unpublished with the module and is no longer accessible</description> + </element> + <element name="ACTIVATED"> + <description> The service is activated as the primary service of this type. All requests dealing with this service type will be handled by this service.</description> + </element> + <element name="DEACTIVATED"> + <description> The service has been deactivated as the primary service of its type</description> + </element> + <element name="MANIFEST_UPDATE"> + <description> The service has updated its manifest. This could imply updated capabilities</description> + </element> + </enum> + + <struct name="AppServiceCapability" since="5.1"> + <param name="updateReason" type="ServiceUpdateReason" mandatory="false"> + <description> Only included in OnSystemCapabilityUpdated. Update reason for service record.</description> + </param> + <param name="updatedAppServiceRecord" type="AppServiceRecord" mandatory="true"> + <description>Service record for a specific app service provider</description> + </param> + </struct> + + <struct name="AppServicesCapabilities" since="5.1"> + <description>Capabilities of app services including what service types are supported and the current state of services.</description> + <param name="appServices" type="AppServiceCapability" array="true" mandatory="false"> + <description>An array of currently available services. If this is an update to the capability the affected services will include an update reason in that item</description> + </param> + </struct> + + <!-- End App Services --> + + <struct name="SystemCapability" since="4.5"> + <description>The systemCapabilityType identifies which data object exists in this struct. For example, if the SystemCapability Type is NAVIGATION then a "navigationCapability" should exist</description> + <param name="systemCapabilityType" type="SystemCapabilityType" mandatory="true"> + <description>Used as a descriptor of what data to expect in this struct. The corresponding param to this enum should be included and the only other param included.</description> + </param> + <param name="navigationCapability" type="NavigationCapability" mandatory="false"> + <description>Describes extended capabilities for onboard navigation system </description> + </param> + <param name="phoneCapability" type="PhoneCapability" mandatory="false"> + <description>Describes extended capabilities of the module's phone feature</description> + </param> + <param name="videoStreamingCapability" type="VideoStreamingCapability" mandatory="false"> + <description>Describes extended capabilities of the module's phone feature</description> + </param> + <param name="remoteControlCapability" type="RemoteControlCapabilities" mandatory="false"> + <description>Describes extended capabilities of the module's phone feature</description> + </param> + <param name="appServicesCapabilities" type="AppServicesCapabilities" mandatory="false" since="5.1"> + <description>An array of currently available services. If this is an update to the capability the affected services will include an update reason in that item</description> + </param> + </struct> + <!-- Requests/Responses --> <function name="RegisterAppInterface" functionID="RegisterAppInterfaceID" messagetype="request" since="1.0"> @@ -4939,6 +5382,9 @@ <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="Boolean" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> @@ -5054,6 +5500,9 @@ <param name="electronicParkBrakeStatus" type="VehicleDataResult" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="VehicleDataResult" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="VehicleDataResult" mandatory="false"> @@ -5147,6 +5596,9 @@ <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="Boolean" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> @@ -5260,6 +5712,9 @@ <param name="electronicParkBrakeStatus" type="VehicleDataResult" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="VehicleDataResult" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="VehicleDataResult" mandatory="false"> @@ -5356,6 +5811,9 @@ <param name="electronicParkBrakeStatus" type="Boolean" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="Boolean" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="Boolean" mandatory="false"> @@ -5473,6 +5931,9 @@ <param name="electronicParkBrakeStatus" type="ElectronicParkBrakeStatus" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="String" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Data Items --> <param name="eCallInfo" type="ECallInfo" mandatory="false"> @@ -6014,6 +6475,67 @@ </param> </function> + <function name="GetFile" functionID="GetFileID" messagetype="request" since="5.1"> + <description>This request is sent to the module to retrieve a file</description> + <param name="fileName" type="String" maxlength="255" mandatory="true"> + <description>File name that should be retrieved</description> + </param> + <param name="appServiceId" type="String" mandatory="false"> + <description>ID of the service that should have uploaded the requested file.</description> + </param> + <param name="fileType" type="FileType" mandatory="false"> + <description>Selected file type.</description> + </param> + <param name="offset" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false"> + <description>Optional offset in bytes for resuming partial data chunks</description> + </param> + <param name="length" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false"> + <description> + Optional length in bytes for resuming partial data chunks + If offset is set to 0, then length is the total length of the file to be retrieved + </description> + </param> + </function> + + <function name="GetFile" functionID="GetFileID" messagetype="response" since="5.1"> + <description>This response includes the data that is requested from the specific service</description> + <param name="success" type="Boolean" platform="documentation" mandatory="true"> + <description> true, if successful; false, if failed </description> + </param> + <param name="resultCode" type="Result" platform="documentation" mandatory="true"> + <description>See Result</description> + <element name="SUCCESS"/> + <element name="REJECTED"/> + <element name="DISALLOWED"/> + <element name="INVALID_DATA"/> + <element name="OUT_OF_MEMORY"/> + <element name="TOO_MANY_PENDING_REQUESTS"/> + <element name="APPLICATION_NOT_REGISTERED"/> + <element name="GENERIC_ERROR"/> + <element name="FILE_NOT_FOUND"/> + </param> + <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation"> + <description>Provides additional human readable info regarding the result.</description> + </param> + + <!-- Specific response data --> + <param name="offset" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false"> + <description>Optional offset in bytes for resuming partial data chunks</description> + </param> + + <param name="length" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false"> + <description>Optional length in bytes for resuming partial data chunks if offset is set to 0, then length is the total length of the file to be downloaded</description> + </param> + + <param name="fileType" type="FileType" mandatory="false"> + <description>File type that is being sent in response.</description> + </param> + + <param name="crc" type="Integer" minvalue="0" maxvalue="4294967295" mandatory="false"> + <description>Additional CRC32 checksum to protect data integrity up to 512 Mbits</description> + </param> + </function> + <function name="DeleteFile" functionID="DeleteFileID" messagetype="request" since="3.0"> <description> Used to delete a file resident on the module in the app's local cache. @@ -6395,8 +6917,8 @@ </param> <param name="subscribe" type="Boolean" mandatory="false" since="4.5.1"> <description> - If subscribe is true, the head unit will register onInteriorVehicleData notifications for the requested moduleType. - If subscribe is false, the head unit will unregister onInteriorVehicleData notifications for the requested moduleType. + If subscribe is true, the head unit will register OnInteriorVehicleData notifications for the requested moduleType. + If subscribe is false, the head unit will unregister OnInteriorVehicleData notifications for the requested moduleType. If subscribe is not included, the subscription status of the app for the requested moduleType will remain unchanged. </description> <history> @@ -6554,6 +7076,9 @@ <param name="systemCapabilityType" type="SystemCapabilityType" mandatory="true"> <description>The type of system capability to get more information on</description> </param> + <param name="subscribe" type="Boolean" mandatory="false" since="5.1"> + <description>Flag to subscribe to updates of the supplied service capability type. If true, the requester will be subscribed. If false, the requester will not be subscribed and be removed as a subscriber if it was previously subscribed.</description> + </param> </function> <function name="GetSystemCapability" functionID="GetSystemCapabilityID" messagetype="response" since="4.5"> @@ -6607,6 +7132,170 @@ </param> </function> + <function name="SetCloudAppProperties" functionID="SetCloudAppPropertiesID" messagetype="request" since="5.1"> + <description> + RPC used to enable/disable a cloud application and set its cloud-related policy properties + </description> + <param name="properties" type="CloudAppProperties" mandatory="true"> + <description> The new cloud application properties </description> + </param> + </function> + + <function name="SetCloudAppProperties" functionID="SetCloudAppPropertiesID" messagetype="response" since="5.1"> + <description>The response to SetCloudAppProperties</description> + <param name="success" type="Boolean" platform="documentation" mandatory="true"> + <description> true if successful; false if failed </description> + </param> + <param name="resultCode" type="Result" platform="documentation" mandatory="true"> + <description>See Result</description> + <element name="SUCCESS"/> + <element name="INVALID_DATA"/> + <element name="OUT_OF_MEMORY"/> + <element name="TOO_MANY_PENDING_REQUESTS"/> + <element name="GENERIC_ERROR"/> + <element name="DISALLOWED"/> + <element name="WARNINGS"/> + </param> + </function> + + <function name="GetCloudAppProperties" functionID="GetCloudAppPropertiesID" messagetype="request" since="5.1"> + <description> + RPC used to get the current properties of a cloud application + </description> + <param name="appID" type="String" maxlength="100" mandatory="true"></param> + </function> + + <function name="GetCloudAppProperties" functionID="GetCloudAppPropertiesID" messagetype="response" since="5.1"> + <description>The response to GetCloudAppProperties</description> + <param name="properties" type="CloudAppProperties" mandatory="false"> + <description> The requested cloud application properties </description> + </param> + <param name="success" type="Boolean" platform="documentation" mandatory="true"> + <description> true if successful; false if failed </description> + </param> + <param name="resultCode" type="Result" platform="documentation" mandatory="true"> + <description>See Result</description> + <element name="SUCCESS"/> + <element name="INVALID_DATA"/> + <element name="OUT_OF_MEMORY"/> + <element name="TOO_MANY_PENDING_REQUESTS"/> + <element name="GENERIC_ERROR"/> + <element name="DISALLOWED"/> + <element name="WARNINGS"/> + </param> + </function> + + <function name="PublishAppService" functionID="PublishAppServiceID" messagetype="request" since="5.1"> + <description>Registers a service offered by this app on the module</description> + + <param name="appServiceManifest" type="AppServiceManifest" mandatory="true"> + <description> The manifest of the service that wishes to be published.</description> + </param> + </function> + + <function name="PublishAppService" functionID="PublishAppServiceID" messagetype="response" since="5.1"> + <description>Response to the request to register a service offered by this app on the module</description> + + <param name="success" type="Boolean" platform="documentation" mandatory="true"> + <description> true, if successful; false, if failed </description> + </param> + + <param name="resultCode" type="Result" platform="documentation" mandatory="true"> + <description>See Result</description> + <element name="SUCCESS"/> + <element name="REJECTED"/> + <element name="DISALLOWED"/> + <element name="INVALID_DATA"/> + <element name="OUT_OF_MEMORY"/> + <element name="TOO_MANY_PENDING_REQUESTS"/> + <element name="APPLICATION_NOT_REGISTERED"/> + <element name="GENERIC_ERROR"/> + </param> + + <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation"> + <description>Provides additional human readable info regarding the result.</description> + </param> + + <param name="appServiceRecord" type="AppServiceRecord" mandatory="false"> + <description> If the request was successful, this object will be the current status of the service record for the published service. This will include the Core supplied service ID.</description> + </param> + </function> + + <function name="GetAppServiceData" functionID="GetAppServiceDataID" messagetype="request" since="5.1"> + <description> This request asks the module for current data related to the specific service. It also includes an option to subscribe to that service for future updates</description> + + <param name="serviceType" type="String" mandatory="true"> + <description>The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core.</description> + </param> + + <param name="subscribe" type="Boolean" mandatory="false"> + <description> If true, the consumer is requesting to subscribe to all future updates from the service publisher. If false, the consumer doesn't wish to subscribe and should be unsubscribed if it was previously subscribed.</description> + </param> + </function> + + <function name="GetAppServiceData" functionID="GetAppServiceDataID" messagetype="response" since="5.1"> + <description> This response includes the data that was requested from the specific service</description> + + <param name="success" type="Boolean" platform="documentation" mandatory="true"> + <description> true, if successful; false, if failed </description> + </param> + + <param name="resultCode" type="Result" platform="documentation" mandatory="true"> + <description>See Result</description> + <element name="SUCCESS"/> + <element name="REJECTED"/> + <element name="DISALLOWED"/> + <element name="INVALID_DATA"/> + <element name="OUT_OF_MEMORY"/> + <element name="TOO_MANY_PENDING_REQUESTS"/> + <element name="APPLICATION_NOT_REGISTERED"/> + <element name="GENERIC_ERROR"/> + </param> + + <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation"> + <description>Provides additional human readable info regarding the result.</description> + </param> + + <!-- Specific response data --> + <param name="serviceData" type="AppServiceData" mandatory="false"/> + </function> + + <function name="PerformAppServiceInteraction" functionID="PerformAppServiceInteractionID" messagetype="request" since="5.1"> + <param name="serviceUri" type="String" mandatory="true"> + <description>Fully qualified URI based on a predetermined scheme provided by the app service. SDL makes no guarantee that this URI is correct.</description> + </param> + + <param name="serviceID" type="String" mandatory="true"> + <description>The service ID that the app consumer wishes to send this URI.</description> + </param> + + <param name="originApp" type="String" mandatory="true"> + <description>This string is the appID of the app requesting the app service provider take the specific action.</description> + </param> + + <param name="requestServiceActive" type="Boolean" mandatory="false"> + <description>This flag signals the requesting consumer would like this service to become the active primary service of the destination's type.</description> + </param> + </function> + + <function name="PerformAppServiceInteraction" functionID="PerformAppServiceInteractionID" messagetype="response" since="5.1"> + <param name="success" type="Boolean" platform="documentation" mandatory="true"> + <description> true, if successful; false, if failed </description> + </param> + + <param name="resultCode" type="Result" platform="documentation" mandatory="true"> + <description>See Result. All results will be available for this response.</description> + </param> + + <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation"> + <description>Provides additional human readable info regarding the result.</description> + </param> + + <param name="serviceSpecificResult" type="String" mandatory="false"> + <description>The service can provide specific result strings to the consumer through this param.</description> + </param> + </function> + <!-- Notifications --> <function name="OnHMIStatus" functionID="OnHMIStatusID" messagetype="notification" since="1.0"> @@ -6732,6 +7421,9 @@ <param name="electronicParkBrakeStatus" type="ElectronicParkBrakeStatus" mandatory="false" since="5.0"> <description>The status of the park brake as provided by Electric Park Brake (EPB) system.</description> </param> + <param name="cloudAppVehicleID" type="String" mandatory="false" since="5.1"> + <description>Parameter used by cloud apps to identify a head unit</description> + </param> <!-- Ford Specific Vehicle Data --> <param name="eCallInfo" type="ECallInfo" mandatory="false"> @@ -6897,6 +7589,19 @@ </param> </function> + <function name="OnAppServiceData" functionID="OnAppServiceDataID" messagetype="notification" since="5.1"> + <description>This notification includes the data that is updated from the specific service</description> + + <param name="serviceData" type="AppServiceData" mandatory="true"/> + </function> + + <function name="OnSystemCapabilityUpdated" functionID="OnSystemCapabilityUpdatedID" messagetype="notification" since="5.1"> + <description>A notification to inform the connected device that a specific system capability has changed.</description> + <param name="systemCapability" type="SystemCapability" mandatory="true"> + <description>The system capability that has been updated</description> + </param> + </function> + <!-- ~~~~~~~~~~~~~~~~~~ --> <!-- Ford Specific APIs --> <!-- ~~~~~~~~~~~~~~~~~~ --> @@ -7012,4 +7717,4 @@ </function> --> -</interface>
\ No newline at end of file +</interface> diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java index 17e3d9cd9..484307be9 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java @@ -146,7 +146,7 @@ public class SdlManagerTests extends AndroidTestCase2 { try { createSampleManager("app",null, Test.GENERAL_LOCKSCREENCONFIG); } catch (IllegalArgumentException ex) { - assertSame(ex.getMessage(), "You must specify an app ID by calling setAppId"); + assertSame(ex.getMessage(), "You must specify an app ID by calling setAppID"); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java index 289bc5771..2fa72e73e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java @@ -327,14 +327,14 @@ public class Test { public static final String GENERAL_APP_ID = "123e4567e8"; public static final String GENERAL_FULL_APP_ID = "123e4567-e89b-12d3-a456-426655440000"; public static final HybridAppPreference GENERAL_HYBRID_APP_PREFERENCE = HybridAppPreference.CLOUD; - public static final CloudAppProperties GENERAL_CLOUD_APP_PROPERTIES = new CloudAppProperties(); + public static final CloudAppProperties GENERAL_CLOUDAPPPROPERTIES = new CloudAppProperties(); public static final AppServiceType GENERAL_APP_SERVICE_TYPE = AppServiceType.MEDIA; public static final List<Integer> GENERAL_FUNCTION_ID_LIST = Arrays.asList(FunctionID.GET_VEHICLE_DATA.getId(), FunctionID.SEND_HAPTIC_DATA.getId()); - public static final AppServiceManifest GENERAL_APP_SERVICE_MANIFEST = new AppServiceManifest(); + public static final AppServiceManifest GENERAL_APPSERVICEMANIFEST = new AppServiceManifest(); public static final MediaServiceManifest GENERAL_MEDIA_SERVICE_MANIFEST = new MediaServiceManifest(); public static final WeatherServiceManifest GENERAL_WEATHER_SERVICE_MANIFEST = new WeatherServiceManifest(); public static final NavigationServiceManifest GENERAL_NAVIGATION_SERVICE_MANIFEST = new NavigationServiceManifest(); - public static final AppServiceRecord GENERAL_APP_SERVICE_RECORD = new AppServiceRecord(); + public static final AppServiceRecord GENERAL_APPSERVICERECORD = new AppServiceRecord(); public static final AppServiceCapability GENERAL_APP_SERVICE_CAPABILITY = new AppServiceCapability(); public static final AppServicesCapabilities GENERAL_APP_SERVICE_CAPABILITIES = new AppServicesCapabilities(); public static final ServiceUpdateReason GENERAL_SERVICE_UPDATE_REASON = ServiceUpdateReason.MANIFEST_UPDATE; @@ -342,11 +342,11 @@ public class Test { public static final WeatherData GENERAL_WEATHERDATA = new WeatherData(); public static final WeatherAlert GENERAL_WEATHERALERT = new WeatherAlert(); public static final MediaType GENERAL_MEDIATYPE = MediaType.MUSIC; - public static final MediaServiceData GENERAL_MEDIASERVICE_DATA = new MediaServiceData(); - public static final WeatherServiceData GENERAL_WEATHERSERVICE_DATA = new WeatherServiceData(); - public static final NavigationServiceData GENERAL_NAVIGATIONSERVICE_DATA = new NavigationServiceData(); - public static final AppServiceData GENERAL_APPSERVICE_DATA = new AppServiceData(); - public static final NavigationAction GENERAL_NAVIGATION_ACTION = NavigationAction.STAY; + public static final MediaServiceData GENERAL_MEDIASERVICEDATA = new MediaServiceData(); + public static final WeatherServiceData GENERAL_WEATHERSERVICEDATA = new WeatherServiceData(); + public static final NavigationServiceData GENERAL_NAVIGATIONSERVICEDATA = new NavigationServiceData(); + public static final AppServiceData GENERAL_APPSERVICEDATA = new AppServiceData(); + public static final NavigationAction GENERAL_NAVIGATIONACTION = NavigationAction.STAY; public static final NavigationJunction GENERAL_NAVIGATION_JUNCTION = NavigationJunction.BIFURCATION; public static final Direction GENERAL_DIRECTION = Direction.RIGHT; public static final NavigationInstruction GENERAL_NAVIGATION_INSTRUCTION = new NavigationInstruction(); @@ -897,36 +897,36 @@ public class Test { GENERAL_LOCKSCREENCONFIG.setBackgroundColor(Color.BLUE); GENERAL_LOCKSCREENCONFIG.setEnabled(true); GENERAL_LOCKSCREENCONFIG.setCustomView(R.layout.activity_sdllock_screen); - GENERAL_CLOUD_APP_PROPERTIES.setNicknames(GENERAL_STRING_LIST); - GENERAL_CLOUD_APP_PROPERTIES.setAppID(GENERAL_STRING); - GENERAL_CLOUD_APP_PROPERTIES.setEnabled(GENERAL_BOOLEAN); - GENERAL_CLOUD_APP_PROPERTIES.setAuthToken(GENERAL_STRING); - GENERAL_CLOUD_APP_PROPERTIES.setCloudTransportType(GENERAL_STRING); - GENERAL_CLOUD_APP_PROPERTIES.setHybridAppPreference(GENERAL_HYBRID_APP_PREFERENCE); - GENERAL_CLOUD_APP_PROPERTIES.setEndpoint(GENERAL_STRING); + GENERAL_CLOUDAPPPROPERTIES.setNicknames(GENERAL_STRING_LIST); + GENERAL_CLOUDAPPPROPERTIES.setAppID(GENERAL_STRING); + GENERAL_CLOUDAPPPROPERTIES.setEnabled(GENERAL_BOOLEAN); + GENERAL_CLOUDAPPPROPERTIES.setAuthToken(GENERAL_STRING); + GENERAL_CLOUDAPPPROPERTIES.setCloudTransportType(GENERAL_STRING); + GENERAL_CLOUDAPPPROPERTIES.setHybridAppPreference(GENERAL_HYBRID_APP_PREFERENCE); + GENERAL_CLOUDAPPPROPERTIES.setEndpoint(GENERAL_STRING); GENERAL_WEATHER_SERVICE_MANIFEST.setWeatherForLocationSupported(GENERAL_BOOLEAN); GENERAL_WEATHER_SERVICE_MANIFEST.setCurrentForecastSupported(GENERAL_BOOLEAN); GENERAL_WEATHER_SERVICE_MANIFEST.setMaxMultidayForecastAmount(GENERAL_INTEGER); GENERAL_WEATHER_SERVICE_MANIFEST.setMaxMinutelyForecastAmount(GENERAL_INTEGER); GENERAL_WEATHER_SERVICE_MANIFEST.setMaxHourlyForecastAmount(GENERAL_INTEGER); - GENERAL_APP_SERVICE_MANIFEST.setWeatherServiceManifest(GENERAL_WEATHER_SERVICE_MANIFEST); - GENERAL_APP_SERVICE_MANIFEST.setServiceName(GENERAL_STRING); - GENERAL_APP_SERVICE_MANIFEST.setServiceIcon(GENERAL_IMAGE); - GENERAL_APP_SERVICE_MANIFEST.setRpcSpecVersion(GENERAL_SDLMSGVERSION); - GENERAL_APP_SERVICE_MANIFEST.setMediaServiceManifest(GENERAL_MEDIA_SERVICE_MANIFEST); - GENERAL_APP_SERVICE_MANIFEST.setHandledRpcs(GENERAL_FUNCTION_ID_LIST); - GENERAL_APP_SERVICE_MANIFEST.setAllowAppConsumers(GENERAL_BOOLEAN); - GENERAL_APP_SERVICE_MANIFEST.setServiceType(GENERAL_STRING); + GENERAL_APPSERVICEMANIFEST.setWeatherServiceManifest(GENERAL_WEATHER_SERVICE_MANIFEST); + GENERAL_APPSERVICEMANIFEST.setServiceName(GENERAL_STRING); + GENERAL_APPSERVICEMANIFEST.setServiceIcon(GENERAL_IMAGE); + GENERAL_APPSERVICEMANIFEST.setRpcSpecVersion(GENERAL_SDLMSGVERSION); + GENERAL_APPSERVICEMANIFEST.setMediaServiceManifest(GENERAL_MEDIA_SERVICE_MANIFEST); + GENERAL_APPSERVICEMANIFEST.setHandledRpcs(GENERAL_FUNCTION_ID_LIST); + GENERAL_APPSERVICEMANIFEST.setAllowAppConsumers(GENERAL_BOOLEAN); + GENERAL_APPSERVICEMANIFEST.setServiceType(GENERAL_STRING); GENERAL_NAVIGATION_SERVICE_MANIFEST.setAcceptsWayPoints(GENERAL_BOOLEAN); - GENERAL_APP_SERVICE_RECORD.setServiceId(GENERAL_STRING); - GENERAL_APP_SERVICE_RECORD.setServiceManifest(GENERAL_APP_SERVICE_MANIFEST); - GENERAL_APP_SERVICE_RECORD.setServiceActive(GENERAL_BOOLEAN); - GENERAL_APP_SERVICE_RECORD.setServicePublished(GENERAL_BOOLEAN); + GENERAL_APPSERVICERECORD.setServiceID(GENERAL_STRING); + GENERAL_APPSERVICERECORD.setServiceManifest(GENERAL_APPSERVICEMANIFEST); + GENERAL_APPSERVICERECORD.setServiceActive(GENERAL_BOOLEAN); + GENERAL_APPSERVICERECORD.setServicePublished(GENERAL_BOOLEAN); - GENERAL_APP_SERVICE_CAPABILITY.setUpdatedAppServiceRecord(GENERAL_APP_SERVICE_RECORD); + GENERAL_APP_SERVICE_CAPABILITY.setUpdatedAppServiceRecord(GENERAL_APPSERVICERECORD); GENERAL_APP_SERVICE_CAPABILITY.setUpdateReason(GENERAL_SERVICE_UPDATE_REASON); GENERAL_APP_SERVICE_CAPABILITIES.setAppServices(GENERAL_APPSERVICECAPABILITY_LIST); @@ -969,33 +969,33 @@ public class Test { GENERAL_WEATHERALERT.setSeverity(GENERAL_STRING); GENERAL_WEATHERALERT.setTimeIssued(GENERAL_DATETIME); - GENERAL_WEATHERSERVICE_DATA.setLocation(GENERAL_LOCATIONDETAILS); - GENERAL_WEATHERSERVICE_DATA.setCurrentForecast(GENERAL_WEATHERDATA); - GENERAL_WEATHERSERVICE_DATA.setMinuteForecast(GENERAL_WEATHERDATA_LIST); - GENERAL_WEATHERSERVICE_DATA.setHourlyForecast(GENERAL_WEATHERDATA_LIST); - GENERAL_WEATHERSERVICE_DATA.setMultidayForecast(GENERAL_WEATHERDATA_LIST); - GENERAL_WEATHERSERVICE_DATA.setAlerts(GENERAL_WEATHERALERT_LIST); - - GENERAL_MEDIASERVICE_DATA.setMediaType(GENERAL_MEDIATYPE); - GENERAL_MEDIASERVICE_DATA.setMediaTitle(GENERAL_STRING); - GENERAL_MEDIASERVICE_DATA.setMediaArtist(GENERAL_STRING); - GENERAL_MEDIASERVICE_DATA.setMediaAlbum(GENERAL_STRING); - GENERAL_MEDIASERVICE_DATA.setPlaylistName(GENERAL_STRING); - GENERAL_MEDIASERVICE_DATA.setIsExplicit(GENERAL_BOOLEAN); - GENERAL_MEDIASERVICE_DATA.setTrackPlaybackProgress(GENERAL_INTEGER); - GENERAL_MEDIASERVICE_DATA.setTrackPlaybackDuration(GENERAL_INTEGER); - GENERAL_MEDIASERVICE_DATA.setQueuePlaybackProgress(GENERAL_INTEGER); - GENERAL_MEDIASERVICE_DATA.setQueuePlaybackDuration(GENERAL_INTEGER); - GENERAL_MEDIASERVICE_DATA.setQueueCurrentTrackNumber(GENERAL_INTEGER); - GENERAL_MEDIASERVICE_DATA.setQueueTotalTrackCount(GENERAL_INTEGER); - - GENERAL_APPSERVICE_DATA.setServiceType(GENERAL_STRING); - GENERAL_APPSERVICE_DATA.setServiceId(GENERAL_STRING); - GENERAL_APPSERVICE_DATA.setWeatherServiceData(GENERAL_WEATHERSERVICE_DATA); - GENERAL_APPSERVICE_DATA.setMediaServiceData(GENERAL_MEDIASERVICE_DATA); + GENERAL_WEATHERSERVICEDATA.setLocation(GENERAL_LOCATIONDETAILS); + GENERAL_WEATHERSERVICEDATA.setCurrentForecast(GENERAL_WEATHERDATA); + GENERAL_WEATHERSERVICEDATA.setMinuteForecast(GENERAL_WEATHERDATA_LIST); + GENERAL_WEATHERSERVICEDATA.setHourlyForecast(GENERAL_WEATHERDATA_LIST); + GENERAL_WEATHERSERVICEDATA.setMultidayForecast(GENERAL_WEATHERDATA_LIST); + GENERAL_WEATHERSERVICEDATA.setAlerts(GENERAL_WEATHERALERT_LIST); + + GENERAL_MEDIASERVICEDATA.setMediaType(GENERAL_MEDIATYPE); + GENERAL_MEDIASERVICEDATA.setMediaTitle(GENERAL_STRING); + GENERAL_MEDIASERVICEDATA.setMediaArtist(GENERAL_STRING); + GENERAL_MEDIASERVICEDATA.setMediaAlbum(GENERAL_STRING); + GENERAL_MEDIASERVICEDATA.setPlaylistName(GENERAL_STRING); + GENERAL_MEDIASERVICEDATA.setIsExplicit(GENERAL_BOOLEAN); + GENERAL_MEDIASERVICEDATA.setTrackPlaybackProgress(GENERAL_INTEGER); + GENERAL_MEDIASERVICEDATA.setTrackPlaybackDuration(GENERAL_INTEGER); + GENERAL_MEDIASERVICEDATA.setQueuePlaybackProgress(GENERAL_INTEGER); + GENERAL_MEDIASERVICEDATA.setQueuePlaybackDuration(GENERAL_INTEGER); + GENERAL_MEDIASERVICEDATA.setQueueCurrentTrackNumber(GENERAL_INTEGER); + GENERAL_MEDIASERVICEDATA.setQueueTotalTrackCount(GENERAL_INTEGER); + + GENERAL_APPSERVICEDATA.setServiceType(GENERAL_STRING); + GENERAL_APPSERVICEDATA.setServiceID(GENERAL_STRING); + GENERAL_APPSERVICEDATA.setWeatherServiceData(GENERAL_WEATHERSERVICEDATA); + GENERAL_APPSERVICEDATA.setMediaServiceData(GENERAL_MEDIASERVICEDATA); GENERAL_NAVIGATION_INSTRUCTION.setLocationDetails(GENERAL_LOCATIONDETAILS); - GENERAL_NAVIGATION_INSTRUCTION.setAction(GENERAL_NAVIGATION_ACTION); + GENERAL_NAVIGATION_INSTRUCTION.setAction(GENERAL_NAVIGATIONACTION); GENERAL_NAVIGATION_INSTRUCTION.setEta(GENERAL_DATETIME); GENERAL_NAVIGATION_INSTRUCTION.setBearing(GENERAL_INTEGER); GENERAL_NAVIGATION_INSTRUCTION.setJunctionType(GENERAL_NAVIGATION_JUNCTION); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java index e1619e086..5172e4053 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java @@ -618,7 +618,7 @@ public class Validator{ return false; } - if (!params1.getServiceId().equals(params2.getServiceId())){ + if (!params1.getServiceID().equals(params2.getServiceID())){ return false; } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java index 6bd5fe01e..4459b17f3 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java @@ -28,7 +28,7 @@ public class AppServiceCapabilityTest extends TestCase { public void setUp(){ msg = new AppServiceCapability(); - msg.setUpdatedAppServiceRecord(Test.GENERAL_APP_SERVICE_RECORD); + msg.setUpdatedAppServiceRecord(Test.GENERAL_APPSERVICERECORD); msg.setUpdateReason(Test.GENERAL_SERVICE_UPDATE_REASON); } @@ -41,7 +41,7 @@ public class AppServiceCapabilityTest extends TestCase { ServiceUpdateReason updateReason = msg.getUpdateReason(); // Valid Tests - assertEquals(Test.MATCH, serviceRecord, Test.GENERAL_APP_SERVICE_RECORD); + assertEquals(Test.MATCH, serviceRecord, Test.GENERAL_APPSERVICERECORD); assertEquals(Test.MATCH, updateReason, Test.GENERAL_SERVICE_UPDATE_REASON); // Invalid/Null Tests @@ -53,9 +53,9 @@ public class AppServiceCapabilityTest extends TestCase { } public void testRequiredParamsConstructor(){ - msg = new AppServiceCapability(Test.GENERAL_APP_SERVICE_RECORD); + msg = new AppServiceCapability(Test.GENERAL_APPSERVICERECORD); AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord(); - assertEquals(Test.MATCH, serviceRecord, Test.GENERAL_APP_SERVICE_RECORD); + assertEquals(Test.MATCH, serviceRecord, Test.GENERAL_APPSERVICERECORD); } public void testJson(){ @@ -63,7 +63,7 @@ public class AppServiceCapabilityTest extends TestCase { try{ reference.put(AppServiceCapability.KEY_UPDATE_REASON, Test.GENERAL_SERVICE_UPDATE_REASON); - reference.put(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD, Test.GENERAL_APP_SERVICE_RECORD); + reference.put(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD, Test.GENERAL_APPSERVICERECORD); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); @@ -74,7 +74,7 @@ public class AppServiceCapabilityTest extends TestCase { if (key.equals(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD)){ JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(Test.TRUE, Validator.validateAppServiceRecord(Test.GENERAL_APP_SERVICE_RECORD, new AppServiceRecord(hashTest))); + assertTrue(Test.TRUE, Validator.validateAppServiceRecord(Test.GENERAL_APPSERVICERECORD, new AppServiceRecord(hashTest))); } else{ assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java index 9fec35631..54aff3ef5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java @@ -30,10 +30,10 @@ public class AppServiceDataTests extends TestCase { msg = new AppServiceData(); msg.setServiceType(Test.GENERAL_STRING); - msg.setServiceId(Test.GENERAL_STRING); - msg.setMediaServiceData(Test.GENERAL_MEDIASERVICE_DATA); - msg.setWeatherServiceData(Test.GENERAL_WEATHERSERVICE_DATA); - msg.setNavigationServiceData(Test.GENERAL_NAVIGATIONSERVICE_DATA); + msg.setServiceID(Test.GENERAL_STRING); + msg.setMediaServiceData(Test.GENERAL_MEDIASERVICEDATA); + msg.setWeatherServiceData(Test.GENERAL_WEATHERSERVICEDATA); + msg.setNavigationServiceData(Test.GENERAL_NAVIGATIONSERVICEDATA); } @@ -43,7 +43,7 @@ public class AppServiceDataTests extends TestCase { public void testRpcValues () { // Test Values String appServiceType = msg.getServiceType(); - String serviceId = msg.getServiceId(); + String serviceId = msg.getServiceID(); MediaServiceData mediaServiceData = msg.getMediaServiceData(); WeatherServiceData weatherServiceData = msg.getWeatherServiceData(); NavigationServiceData navigationServiceData = msg.getNavigationServiceData(); @@ -51,16 +51,16 @@ public class AppServiceDataTests extends TestCase { // Valid Tests assertEquals(Test.GENERAL_STRING, appServiceType); assertEquals(Test.GENERAL_STRING, serviceId); - assertEquals(Test.GENERAL_MEDIASERVICE_DATA, mediaServiceData); - assertEquals(Test.GENERAL_WEATHERSERVICE_DATA, weatherServiceData); - assertEquals(Test.GENERAL_NAVIGATIONSERVICE_DATA, navigationServiceData); + assertEquals(Test.GENERAL_MEDIASERVICEDATA, mediaServiceData); + assertEquals(Test.GENERAL_WEATHERSERVICEDATA, weatherServiceData); + assertEquals(Test.GENERAL_NAVIGATIONSERVICEDATA, navigationServiceData); // Invalid/Null Tests AppServiceData msg = new AppServiceData(); assertNotNull(Test.NOT_NULL, msg); assertNull(Test.NULL, msg.getServiceType()); - assertNull(Test.NULL, msg.getServiceId()); + assertNull(Test.NULL, msg.getServiceID()); assertNull(Test.NULL, msg.getMediaServiceData()); assertNull(Test.NULL, msg.getWeatherServiceData()); assertNull(Test.NULL, msg.getNavigationServiceData()); @@ -71,7 +71,7 @@ public class AppServiceDataTests extends TestCase { msg = new AppServiceData(Test.GENERAL_STRING, Test.GENERAL_STRING); String appServiceType = msg.getServiceType(); - String serviceId = msg.getServiceId(); + String serviceId = msg.getServiceID(); assertEquals(Test.GENERAL_STRING, appServiceType); assertEquals(Test.GENERAL_STRING, serviceId); @@ -83,9 +83,9 @@ public class AppServiceDataTests extends TestCase { try{ reference.put(AppServiceData.KEY_SERVICE_TYPE, Test.GENERAL_STRING); reference.put(AppServiceData.KEY_SERVICE_ID, Test.GENERAL_STRING); - reference.put(AppServiceData.KEY_MEDIA_SERVICE_DATA, Test.GENERAL_MEDIASERVICE_DATA); - reference.put(AppServiceData.KEY_WEATHER_SERVICE_DATA, Test.GENERAL_WEATHERSERVICE_DATA); - reference.put(AppServiceData.KEY_NAVIGATION_SERVICE_DATA, Test.GENERAL_NAVIGATIONSERVICE_DATA); + reference.put(AppServiceData.KEY_MEDIA_SERVICE_DATA, Test.GENERAL_MEDIASERVICEDATA); + reference.put(AppServiceData.KEY_WEATHER_SERVICE_DATA, Test.GENERAL_WEATHERSERVICEDATA); + reference.put(AppServiceData.KEY_NAVIGATION_SERVICE_DATA, Test.GENERAL_NAVIGATIONSERVICEDATA); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); @@ -97,15 +97,15 @@ public class AppServiceDataTests extends TestCase { if (key.equals(AppServiceData.KEY_MEDIA_SERVICE_DATA)){ JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(Test.TRUE, Validator.validateMediaServiceData(Test.GENERAL_MEDIASERVICE_DATA, new MediaServiceData(hashTest))); + assertTrue(Test.TRUE, Validator.validateMediaServiceData(Test.GENERAL_MEDIASERVICEDATA, new MediaServiceData(hashTest))); } else if (key.equals(AppServiceData.KEY_WEATHER_SERVICE_DATA)){ JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(Test.TRUE, Validator.validateWeatherServiceData(Test.GENERAL_WEATHERSERVICE_DATA, new WeatherServiceData(hashTest))); + assertTrue(Test.TRUE, Validator.validateWeatherServiceData(Test.GENERAL_WEATHERSERVICEDATA, new WeatherServiceData(hashTest))); } else if (key.equals(AppServiceData.KEY_NAVIGATION_SERVICE_DATA)){ JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(Test.TRUE, Validator.validateNavigationServiceData(Test.GENERAL_NAVIGATIONSERVICE_DATA, new NavigationServiceData(hashTest))); + assertTrue(Test.TRUE, Validator.validateNavigationServiceData(Test.GENERAL_NAVIGATIONSERVICEDATA, new NavigationServiceData(hashTest))); } else { assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java index af58b12fb..0e00a1d70 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java @@ -29,8 +29,8 @@ public class AppServiceRecordTests extends TestCase { msg = new AppServiceRecord(); msg.setServicePublished(Test.GENERAL_BOOLEAN); msg.setServiceActive(Test.GENERAL_BOOLEAN); - msg.setServiceManifest(Test.GENERAL_APP_SERVICE_MANIFEST); - msg.setServiceId(Test.GENERAL_STRING); + msg.setServiceManifest(Test.GENERAL_APPSERVICEMANIFEST); + msg.setServiceID(Test.GENERAL_STRING); } @@ -43,12 +43,12 @@ public class AppServiceRecordTests extends TestCase { boolean isServicePublished = msg.getServicePublished(); boolean isServiceActive = msg.getServiceActive(); AppServiceManifest serviceManifest = msg.getServiceManifest(); - String serviceID = msg.getServiceId(); + String serviceID = msg.getServiceID(); // Valid Tests assertEquals(Test.GENERAL_BOOLEAN, isServicePublished); assertEquals(Test.GENERAL_BOOLEAN, isServiceActive); - assertEquals(Test.GENERAL_APP_SERVICE_MANIFEST, serviceManifest); + assertEquals(Test.GENERAL_APPSERVICEMANIFEST, serviceManifest); assertEquals(Test.GENERAL_STRING, serviceID); // Invalid/Null Tests @@ -58,21 +58,21 @@ public class AppServiceRecordTests extends TestCase { assertNull(Test.NULL, msg.getServicePublished()); assertNull(Test.NULL, msg.getServiceActive()); assertNull(Test.NULL, msg.getServiceManifest()); - assertNull(Test.NULL, msg.getServiceId()); + assertNull(Test.NULL, msg.getServiceID()); } public void testRequiredParamsConstructor(){ - msg = new AppServiceRecord(Test.GENERAL_STRING, Test.GENERAL_APP_SERVICE_MANIFEST, Test.GENERAL_BOOLEAN, Test.GENERAL_BOOLEAN); + msg = new AppServiceRecord(Test.GENERAL_STRING, Test.GENERAL_APPSERVICEMANIFEST, Test.GENERAL_BOOLEAN, Test.GENERAL_BOOLEAN); boolean isServicePublished = msg.getServicePublished(); boolean isServiceActive = msg.getServiceActive(); AppServiceManifest serviceManifest = msg.getServiceManifest(); - String serviceID = msg.getServiceId(); + String serviceID = msg.getServiceID(); // Valid Tests assertEquals(Test.GENERAL_BOOLEAN, isServicePublished); assertEquals(Test.GENERAL_BOOLEAN, isServiceActive); - assertEquals(Test.GENERAL_APP_SERVICE_MANIFEST, serviceManifest); + assertEquals(Test.GENERAL_APPSERVICEMANIFEST, serviceManifest); assertEquals(Test.GENERAL_STRING, serviceID); } @@ -83,7 +83,7 @@ public class AppServiceRecordTests extends TestCase { reference.put(AppServiceRecord.KEY_SERVICE_ACTIVE, Test.GENERAL_BOOLEAN); reference.put(AppServiceRecord.KEY_SERVICE_PUBLISHED, Test.GENERAL_BOOLEAN); reference.put(AppServiceRecord.KEY_SERVICE_ID, Test.GENERAL_STRING); - reference.put(AppServiceRecord.KEY_SERVICE_MANIFEST, Test.GENERAL_APP_SERVICE_MANIFEST); + reference.put(AppServiceRecord.KEY_SERVICE_MANIFEST, Test.GENERAL_APPSERVICEMANIFEST); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); @@ -95,7 +95,7 @@ public class AppServiceRecordTests extends TestCase { if(key.equals(AppServiceRecord.KEY_SERVICE_MANIFEST)){ JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); - assertTrue(Test.TRUE, Validator.validateAppServiceManifest( Test.GENERAL_APP_SERVICE_MANIFEST, new AppServiceManifest(hashTest))); + assertTrue(Test.TRUE, Validator.validateAppServiceManifest( Test.GENERAL_APPSERVICEMANIFEST, new AppServiceManifest(hashTest))); }else { assertEquals(Test.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key)); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java index 38500561b..c27d33ee2 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java @@ -33,7 +33,7 @@ public class NavigationInstructionTests extends TestCase { msg = new NavigationInstruction(); msg.setLocationDetails(Test.GENERAL_LOCATIONDETAILS); - msg.setAction(Test.GENERAL_NAVIGATION_ACTION); + msg.setAction(Test.GENERAL_NAVIGATIONACTION); msg.setEta(Test.GENERAL_DATETIME); msg.setBearing(Test.GENERAL_INTEGER); msg.setJunctionType(Test.GENERAL_NAVIGATION_JUNCTION); @@ -58,7 +58,7 @@ public class NavigationInstructionTests extends TestCase { // Valid Tests assertEquals(Test.GENERAL_LOCATIONDETAILS, locationDetails); - assertEquals(Test.GENERAL_NAVIGATION_ACTION, action); + assertEquals(Test.GENERAL_NAVIGATIONACTION, action); assertEquals(Test.GENERAL_DATETIME, eta); assertEquals(Test.GENERAL_INTEGER, bearing); assertEquals(Test.GENERAL_NAVIGATION_JUNCTION, junctionType); @@ -81,14 +81,14 @@ public class NavigationInstructionTests extends TestCase { } public void testRequiredConstructor(){ - NavigationInstruction msg = new NavigationInstruction(Test.GENERAL_LOCATIONDETAILS, Test.GENERAL_NAVIGATION_ACTION); + NavigationInstruction msg = new NavigationInstruction(Test.GENERAL_LOCATIONDETAILS, Test.GENERAL_NAVIGATIONACTION); assertNotNull(Test.NOT_NULL, msg); LocationDetails locationDetails = msg.getLocationDetails(); NavigationAction action = msg.getAction(); assertEquals(Test.GENERAL_LOCATIONDETAILS, locationDetails); - assertEquals(Test.GENERAL_NAVIGATION_ACTION, action); + assertEquals(Test.GENERAL_NAVIGATIONACTION, action); } public void testJson(){ @@ -96,7 +96,7 @@ public class NavigationInstructionTests extends TestCase { try{ reference.put(NavigationInstruction.KEY_LOCATION_DETAILS, Test.GENERAL_LOCATIONDETAILS); - reference.put(NavigationInstruction.KEY_ACTION, Test.GENERAL_NAVIGATION_ACTION); + reference.put(NavigationInstruction.KEY_ACTION, Test.GENERAL_NAVIGATIONACTION); reference.put(NavigationInstruction.KEY_ETA, Test.GENERAL_DATETIME); reference.put(NavigationInstruction.KEY_BEARING, Test.GENERAL_INTEGER); reference.put(NavigationInstruction.KEY_JUNCTION_TYPE, Test.GENERAL_NAVIGATION_JUNCTION); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java index 108ec930f..8a04d4b6a 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java @@ -20,7 +20,7 @@ public class OnAppServiceDataTests extends BaseRpcTests { protected RPCMessage createMessage(){ OnAppServiceData msg = new OnAppServiceData(); - msg.setServiceData(Test.GENERAL_APPSERVICE_DATA); + msg.setServiceData(Test.GENERAL_APPSERVICEDATA); return msg; } @@ -40,7 +40,7 @@ public class OnAppServiceDataTests extends BaseRpcTests { JSONObject result = new JSONObject(); try{ - result.put(OnAppServiceData.KEY_SERVICE_DATA, Test.GENERAL_APPSERVICE_DATA.serializeJSON()); + result.put(OnAppServiceData.KEY_SERVICE_DATA, Test.GENERAL_APPSERVICEDATA.serializeJSON()); }catch(JSONException e){ fail(Test.JSON_FAIL); } @@ -56,7 +56,7 @@ public class OnAppServiceDataTests extends BaseRpcTests { AppServiceData cmdId = ( (OnAppServiceData) msg ).getServiceData(); // Valid Tests - assertEquals(Test.MATCH, Test.GENERAL_APPSERVICE_DATA, cmdId); + assertEquals(Test.MATCH, Test.GENERAL_APPSERVICEDATA, cmdId); // Invalid/Null Tests OnAppServiceData msg = new OnAppServiceData(); @@ -66,8 +66,8 @@ public class OnAppServiceDataTests extends BaseRpcTests { assertNull(Test.NULL, msg.getServiceData()); // test constructor with param - msg = new OnAppServiceData(Test.GENERAL_APPSERVICE_DATA); + msg = new OnAppServiceData(Test.GENERAL_APPSERVICEDATA); AppServiceData serviceData = msg.getServiceData(); - assertEquals(serviceData, Test.GENERAL_APPSERVICE_DATA); + assertEquals(serviceData, Test.GENERAL_APPSERVICEDATA); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java index 423e53add..d31c33caa 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java @@ -15,7 +15,7 @@ public class GetCloudAppPropertiesTests extends BaseRpcTests { protected RPCMessage createMessage(){ GetCloudAppProperties msg = new GetCloudAppProperties(); - msg.setAppId(Test.GENERAL_STRING); + msg.setAppID(Test.GENERAL_STRING); return msg; } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java index c5be9b14f..5e5c4ffbd 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java @@ -22,7 +22,7 @@ public class PerformAppServiceInteractionTests extends BaseRpcTests { PerformAppServiceInteraction msg = new PerformAppServiceInteraction(); msg.setServiceUri(Test.GENERAL_STRING); - msg.setAppServiceId(Test.GENERAL_STRING); + msg.setServiceID(Test.GENERAL_STRING); msg.setOriginApp(Test.GENERAL_STRING); msg.setRequestServiceActive(Test.GENERAL_BOOLEAN); @@ -61,7 +61,7 @@ public class PerformAppServiceInteractionTests extends BaseRpcTests { public void testRpcValues () { // Test Values String serviceUri = ( (PerformAppServiceInteraction) msg ).getServiceUri(); - String appServiceId = ( (PerformAppServiceInteraction) msg ).getAppServiceId(); + String appServiceId = ( (PerformAppServiceInteraction) msg ).getServiceID(); String originApp = ( (PerformAppServiceInteraction) msg ).getOriginApp(); boolean requestServiceActive = ( (PerformAppServiceInteraction) msg ).getRequestServiceActive(); @@ -77,7 +77,7 @@ public class PerformAppServiceInteractionTests extends BaseRpcTests { testNullBase(msg); assertNull(Test.NULL, msg.getServiceUri()); - assertNull(Test.NULL, msg.getAppServiceId()); + assertNull(Test.NULL, msg.getServiceID()); assertNull(Test.NULL, msg.getOriginApp()); assertNull(Test.NULL, msg.getRequestServiceActive()); } @@ -89,7 +89,7 @@ public class PerformAppServiceInteractionTests extends BaseRpcTests { // test with param in constructor PerformAppServiceInteraction msg = new PerformAppServiceInteraction(Test.GENERAL_STRING,Test.GENERAL_STRING,Test.GENERAL_STRING); String serviceUri = msg.getServiceUri(); - String appServiceId = msg.getAppServiceId(); + String appServiceId = msg.getServiceID(); String originApp = msg.getOriginApp(); assertEquals(Test.MATCH, Test.GENERAL_STRING, serviceUri); assertEquals(Test.MATCH, Test.GENERAL_STRING, appServiceId); @@ -116,7 +116,7 @@ public class PerformAppServiceInteractionTests extends BaseRpcTests { JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS); - assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_ID), cmd.getAppServiceId()); + assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_ID), cmd.getServiceID()); assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_URI), cmd.getServiceUri()); assertEquals(Test.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_ORIGIN_APP), cmd.getOriginApp()); assertEquals(Test.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE), cmd.getRequestServiceActive()); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java index 6d0d67490..ffe7a60b4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java @@ -21,7 +21,7 @@ public class PublishAppServiceTests extends BaseRpcTests { @Override protected RPCMessage createMessage() { PublishAppService msg = new PublishAppService(); - msg.setServiceManifest(Test.GENERAL_APP_SERVICE_MANIFEST); + msg.setAppServiceManifest(Test.GENERAL_APPSERVICEMANIFEST); return msg; } @@ -40,7 +40,7 @@ public class PublishAppServiceTests extends BaseRpcTests { JSONObject result = new JSONObject(); try { - result.put(PublishAppService.KEY_APP_SERVICE_MANIFEST, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_APP_SERVICE_MANIFEST.getStore())); + result.put(PublishAppService.KEY_APP_SERVICE_MANIFEST, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_APPSERVICEMANIFEST.getStore())); } catch (JSONException e) { fail(Test.JSON_FAIL); } @@ -53,17 +53,17 @@ public class PublishAppServiceTests extends BaseRpcTests { */ public void testRpcValues () { // Test Values - AppServiceManifest copy = ( (PublishAppService) msg ).getServiceManifest(); + AppServiceManifest copy = ( (PublishAppService) msg ).getAppServiceManifest(); // Valid Tests - assertTrue(Validator.validateAppServiceManifest(Test.GENERAL_APP_SERVICE_MANIFEST, copy)); + assertTrue(Validator.validateAppServiceManifest(Test.GENERAL_APPSERVICEMANIFEST, copy)); // Invalid/Null Tests PublishAppService msg = new PublishAppService(); assertNotNull(Test.NOT_NULL, msg); testNullBase(msg); - assertNull(Test.MATCH, msg.getServiceManifest()); + assertNull(Test.MATCH, msg.getAppServiceManifest()); } /** @@ -71,10 +71,10 @@ public class PublishAppServiceTests extends BaseRpcTests { */ public void testRequiredParamsConstructor () { - PublishAppService msg = new PublishAppService(Test.GENERAL_APP_SERVICE_MANIFEST); + PublishAppService msg = new PublishAppService(Test.GENERAL_APPSERVICEMANIFEST); assertNotNull(Test.NOT_NULL, msg); // Valid Tests - assertTrue(Validator.validateAppServiceManifest(Test.GENERAL_APP_SERVICE_MANIFEST, msg.getServiceManifest())); + assertTrue(Validator.validateAppServiceManifest(Test.GENERAL_APPSERVICEMANIFEST, msg.getAppServiceManifest())); } /** @@ -99,7 +99,7 @@ public class PublishAppServiceTests extends BaseRpcTests { JSONObject appServiceManifestObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppService.KEY_APP_SERVICE_MANIFEST); AppServiceManifest manifestTest = new AppServiceManifest(JsonRPCMarshaller.deserializeJSONObject(appServiceManifestObject)); - assertTrue(Test.TRUE, Validator.validateAppServiceManifest(manifestTest, cmd.getServiceManifest())); + assertTrue(Test.TRUE, Validator.validateAppServiceManifest(manifestTest, cmd.getAppServiceManifest())); } catch (JSONException e) { e.printStackTrace(); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java index ea817c85e..1a5751701 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java @@ -15,7 +15,7 @@ public class SetCloudAppPropertiesTests extends BaseRpcTests { protected RPCMessage createMessage(){ SetCloudAppProperties msg = new SetCloudAppProperties(); - msg.setProperties(Test.GENERAL_CLOUD_APP_PROPERTIES); + msg.setProperties(Test.GENERAL_CLOUDAPPPROPERTIES); return msg; } @@ -35,7 +35,7 @@ public class SetCloudAppPropertiesTests extends BaseRpcTests { JSONObject result = new JSONObject(); try{ - result.put(SetCloudAppProperties.KEY_PROPERTIES, Test.GENERAL_CLOUD_APP_PROPERTIES.serializeJSON()); + result.put(SetCloudAppProperties.KEY_PROPERTIES, Test.GENERAL_CLOUDAPPPROPERTIES.serializeJSON()); }catch(JSONException e){ fail(Test.JSON_FAIL); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java index 08d0a7207..ef3e53424 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java @@ -47,13 +47,13 @@ public class GetAppServiceDataResponseTests extends BaseRpcTests { public void testRpcValues () { // Invalid/Null Tests GetAppServiceDataResponse msg = new GetAppServiceDataResponse(); - msg.setServiceData(Test.GENERAL_APPSERVICE_DATA); + msg.setServiceData(Test.GENERAL_APPSERVICEDATA); assertNotNull(Test.NOT_NULL, msg); testNullBase(msg); // test getter AppServiceData serviceData = msg.getServiceData(); - assertEquals(Test.GENERAL_APPSERVICE_DATA, serviceData); + assertEquals(Test.GENERAL_APPSERVICEDATA, serviceData); } /** diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java index f51a7945a..97ded7f67 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java @@ -27,7 +27,7 @@ public class PublishAppServiceResponseTests extends BaseRpcTests { PublishAppServiceResponse msg = new PublishAppServiceResponse(); - msg.setServiceRecord(Test.GENERAL_APP_SERVICE_RECORD); + msg.setServiceRecord(Test.GENERAL_APPSERVICERECORD); return msg; } @@ -47,7 +47,7 @@ public class PublishAppServiceResponseTests extends BaseRpcTests { JSONObject result = new JSONObject(); try{ - result.put(PublishAppServiceResponse.KEY_APP_SERVICE_RECORD, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_APP_SERVICE_RECORD.getStore())); + result.put(PublishAppServiceResponse.KEY_APP_SERVICE_RECORD, JsonRPCMarshaller.serializeHashtable(Test.GENERAL_APPSERVICERECORD.getStore())); }catch(JSONException e){ fail(Test.JSON_FAIL); } @@ -63,7 +63,7 @@ public class PublishAppServiceResponseTests extends BaseRpcTests { AppServiceRecord testRecord = ( (PublishAppServiceResponse) msg ).getServiceRecord(); // Valid Tests - assertTrue(Test.TRUE, Validator.validateAppServiceRecord(Test.GENERAL_APP_SERVICE_RECORD, testRecord)); + assertTrue(Test.TRUE, Validator.validateAppServiceRecord(Test.GENERAL_APPSERVICERECORD, testRecord)); // Invalid/Null Tests PublishAppServiceResponse msg = new PublishAppServiceResponse(); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java index 6f0f5be19..ba20a38c5 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -975,7 +975,7 @@ public class SdlManager extends BaseSdlManager{ } if (sdlManager.appId == null) { - throw new IllegalArgumentException("You must specify an app ID by calling setAppId"); + throw new IllegalArgumentException("You must specify an app ID by calling setAppID"); } if (sdlManager.managerListener == null) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index 05fa8353f..b62fe1e1c 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -3007,7 +3007,7 @@ public class SdlRouterService extends Service{ return appId; } - /*public long getAppId() { + /*public long getAppID() { return appId; }*/ /** diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java index c8defc5d9..f76ace181 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceData.java @@ -61,7 +61,7 @@ public class AppServiceData extends RPCStruct { public AppServiceData(@NonNull String serviceType, @NonNull String serviceId) { this(); setServiceType(serviceType); - setServiceId(serviceId); + setServiceID(serviceId); } // Setters and Getters @@ -83,14 +83,14 @@ public class AppServiceData extends RPCStruct { /** * @param serviceId - */ - public void setServiceId(@NonNull String serviceId) { + public void setServiceID(@NonNull String serviceId) { setValue(KEY_SERVICE_ID, serviceId); } /** * @return serviceId - */ - public String getServiceId() { + public String getServiceID() { return getString(KEY_SERVICE_ID); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java index d195066a5..66524e237 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/AppServiceRecord.java @@ -56,10 +56,10 @@ public class AppServiceRecord extends RPCStruct { super(hash); } - public AppServiceRecord(@NonNull String serviceId, @NonNull AppServiceManifest serviceManifest, + public AppServiceRecord(@NonNull String serviceID, @NonNull AppServiceManifest serviceManifest, @NonNull Boolean servicePublished, @NonNull Boolean serviceActive) { this(); - setServiceId(serviceId); + setServiceID(serviceID); setServiceManifest(serviceManifest); setServicePublished(servicePublished); setServiceActive(serviceActive); @@ -68,17 +68,17 @@ public class AppServiceRecord extends RPCStruct { // Setters and Getters /** * ID of this service - * @param serviceId - the service ID + * @param serviceID - the service ID */ - public void setServiceId(@NonNull String serviceId){ - setValue(KEY_SERVICE_ID, serviceId); + public void setServiceID(@NonNull String serviceID){ + setValue(KEY_SERVICE_ID, serviceID); } /** * ID of this service * @return serviceId */ - public String getServiceId(){ + public String getServiceID(){ return getString(KEY_SERVICE_ID); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java index 4c3bca434..c08d4e92f 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppProperties.java @@ -40,7 +40,7 @@ import java.util.Hashtable; public class GetCloudAppProperties extends RPCRequest { - public static final String KEY_APP_ID = "appID"; + public static final String KEY_APP_ID = "appID"; public GetCloudAppProperties() { super(FunctionID.GET_CLOUD_APP_PROPERTIES.toString()); @@ -55,11 +55,11 @@ public class GetCloudAppProperties extends RPCRequest { setParameters(KEY_APP_ID, appID); } - public void setAppId(String appId){ + public void setAppID(String appId){ setParameters(KEY_APP_ID, appId); } - public String getAppId(){ + public String getAppID(){ return getString((KEY_APP_ID)); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java index be89774a8..7f779feff 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetCloudAppPropertiesResponse.java @@ -35,21 +35,34 @@ import android.support.annotation.NonNull; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; +import com.smartdevicelink.proxy.rpc.enums.Result; import java.util.Hashtable; public class GetCloudAppPropertiesResponse extends RPCResponse { - public static final String KEY_PROPERTIES = "properties"; + public static final String KEY_PROPERTIES = "properties"; public GetCloudAppPropertiesResponse() { super(FunctionID.GET_CLOUD_APP_PROPERTIES.toString()); } + public GetCloudAppPropertiesResponse(Hashtable<String, Object> hash) { super(hash); } - public void setCloudAppProperties(@NonNull CloudAppProperties cloudAppProperties){ + /** + * Constructs a new GetCloudAppPropertiesResponse object + * @param success whether the request is successfully processed + * @param resultCode whether the request is successfully processed + */ + public GetCloudAppPropertiesResponse(@NonNull Boolean success, @NonNull Result resultCode) { + this(); + setSuccess(success); + setResultCode(resultCode); + } + + public void setCloudAppProperties(CloudAppProperties cloudAppProperties){ setParameters(KEY_PROPERTIES, cloudAppProperties); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java index 37dd36684..088f0d254 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PerformAppServiceInteraction.java @@ -27,7 +27,7 @@ public class PerformAppServiceInteraction extends RPCRequest { public PerformAppServiceInteraction(@NonNull String serviceUri, @NonNull String appServiceId, @NonNull String originApp) { this(); setServiceUri(serviceUri); - setAppServiceId(appServiceId); + setServiceID(appServiceId); setOriginApp(originApp); } @@ -53,7 +53,7 @@ public class PerformAppServiceInteraction extends RPCRequest { * The service ID that the app consumer wishes to send this URI. * @param appServiceId - */ - public void setAppServiceId(@NonNull String appServiceId){ + public void setServiceID(@NonNull String appServiceId){ setParameters(KEY_SERVICE_ID, appServiceId); } @@ -61,7 +61,7 @@ public class PerformAppServiceInteraction extends RPCRequest { * The service ID that the app consumer wishes to send this URI. * @return appServiceId */ - public String getAppServiceId(){ + public String getServiceID(){ return getString(KEY_SERVICE_ID); } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java index 07af27d8e..383d22430 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PublishAppService.java @@ -68,7 +68,7 @@ public class PublishAppService extends RPCRequest { */ public PublishAppService(@NonNull AppServiceManifest appServiceManifest) { this(); - setServiceManifest(appServiceManifest); + setAppServiceManifest(appServiceManifest); } // Getters / Setters @@ -77,7 +77,7 @@ public class PublishAppService extends RPCRequest { * The manifest of the service that wishes to be published. * @param serviceManifest - the App Service Manifest */ - public void setServiceManifest(@NonNull AppServiceManifest serviceManifest){ + public void setAppServiceManifest(@NonNull AppServiceManifest serviceManifest){ setParameters(KEY_APP_SERVICE_MANIFEST, serviceManifest); } @@ -85,7 +85,7 @@ public class PublishAppService extends RPCRequest { * The manifest of the service that wishes to be published. * @return serviceManifest - the App Service Manifest */ - public AppServiceManifest getServiceManifest(){ + public AppServiceManifest getAppServiceManifest(){ return (AppServiceManifest) getObject(AppServiceManifest.class,KEY_APP_SERVICE_MANIFEST); } } diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java index 61a53d51c..310bfbd43 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetCloudAppPropertiesResponse.java @@ -31,8 +31,11 @@ */ package com.smartdevicelink.proxy.rpc; +import android.support.annotation.NonNull; + import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.proxy.RPCResponse; +import com.smartdevicelink.proxy.rpc.enums.Result; import java.util.Hashtable; @@ -41,9 +44,21 @@ public class SetCloudAppPropertiesResponse extends RPCResponse { public SetCloudAppPropertiesResponse(){ super(FunctionID.SET_CLOUD_APP_PROPERTIES.toString()); } + public SetCloudAppPropertiesResponse(Hashtable<String, Object> hash) { super(hash); } + /** + * Constructs a new SetCloudAppPropertiesResponse object + * @param success whether the request is successfully processed + * @param resultCode whether the request is successfully processed + */ + public SetCloudAppPropertiesResponse(@NonNull Boolean success, @NonNull Result resultCode) { + this(); + setSuccess(success); + setResultCode(resultCode); + } + } |