From 294af3ec9251636a7096bc4567dee72ec9605acb Mon Sep 17 00:00:00 2001 From: awsmobilesdk Date: Thu, 6 Jun 2024 18:06:14 +0000 Subject: [PATCH] feat(aws-android-sdk-location): update models to latest --- .../services/geo/AmazonLocation.java | 78 +- .../services/geo/AmazonLocationClient.java | 132 +- .../geo/model/AccessDeniedException.java | 2 +- .../services/geo/model/ApiKeyFilter.java | 2 +- .../geo/model/ApiKeyRestrictions.java | 822 ++--- .../AssociateTrackerConsumerRequest.java | 168 +- .../model/AssociateTrackerConsumerResult.java | 2 +- ...BatchDeleteDevicePositionHistoryError.java | 10 +- ...tchDeleteDevicePositionHistoryRequest.java | 150 +- ...atchDeleteDevicePositionHistoryResult.java | 2 +- .../geo/model/BatchDeleteGeofenceError.java | 112 +- .../geo/model/BatchDeleteGeofenceRequest.java | 10 +- .../geo/model/BatchDeleteGeofenceResult.java | 2 +- .../model/BatchEvaluateGeofencesError.java | 118 +- .../model/BatchEvaluateGeofencesRequest.java | 10 +- .../model/BatchEvaluateGeofencesResult.java | 2 +- .../model/BatchGetDevicePositionError.java | 10 +- .../model/BatchGetDevicePositionRequest.java | 138 +- .../model/BatchGetDevicePositionResult.java | 168 +- .../services/geo/model/BatchItemError.java | 2 +- .../geo/model/BatchItemErrorCode.java | 2 +- .../geo/model/BatchPutGeofenceError.java | 112 +- .../geo/model/BatchPutGeofenceRequest.java | 10 +- .../model/BatchPutGeofenceRequestEntry.java | 274 +- .../geo/model/BatchPutGeofenceResult.java | 160 +- .../geo/model/BatchPutGeofenceSuccess.java | 144 +- .../model/BatchUpdateDevicePositionError.java | 136 +- .../BatchUpdateDevicePositionRequest.java | 10 +- .../BatchUpdateDevicePositionResult.java | 2 +- .../model/CalculateRouteCarModeOptions.java | 2 +- .../model/CalculateRouteMatrixRequest.java | 1676 +++++----- .../geo/model/CalculateRouteMatrixResult.java | 2 +- .../model/CalculateRouteMatrixSummary.java | 220 +- .../geo/model/CalculateRouteRequest.java | 2818 +++++++++-------- .../geo/model/CalculateRouteResult.java | 2 +- .../geo/model/CalculateRouteSummary.java | 1164 +++---- .../model/CalculateRouteTruckModeOptions.java | 2 +- .../services/geo/model/CellSignals.java | 161 + .../amazonaws/services/geo/model/Circle.java | 2 +- .../services/geo/model/ConflictException.java | 2 +- .../CreateGeofenceCollectionRequest.java | 342 +- .../model/CreateGeofenceCollectionResult.java | 162 +- .../services/geo/model/CreateKeyRequest.java | 420 +-- .../services/geo/model/CreateKeyResult.java | 160 +- .../services/geo/model/CreateMapRequest.java | 308 +- .../services/geo/model/CreateMapResult.java | 168 +- .../geo/model/CreatePlaceIndexRequest.java | 856 ++--- .../geo/model/CreatePlaceIndexResult.java | 170 +- .../model/CreateRouteCalculatorRequest.java | 152 +- .../model/CreateRouteCalculatorResult.java | 194 +- .../geo/model/CreateTrackerRequest.java | 2132 +++++++------ .../geo/model/CreateTrackerResult.java | 166 +- .../geo/model/DataSourceConfiguration.java | 2 +- .../DeleteGeofenceCollectionRequest.java | 10 +- .../model/DeleteGeofenceCollectionResult.java | 2 +- .../services/geo/model/DeleteKeyRequest.java | 214 +- .../services/geo/model/DeleteKeyResult.java | 2 +- .../services/geo/model/DeleteMapRequest.java | 10 +- .../services/geo/model/DeleteMapResult.java | 2 +- .../geo/model/DeletePlaceIndexRequest.java | 10 +- .../geo/model/DeletePlaceIndexResult.java | 2 +- .../model/DeleteRouteCalculatorRequest.java | 10 +- .../model/DeleteRouteCalculatorResult.java | 2 +- .../geo/model/DeleteTrackerRequest.java | 10 +- .../geo/model/DeleteTrackerResult.java | 2 +- .../DescribeGeofenceCollectionRequest.java | 10 +- .../DescribeGeofenceCollectionResult.java | 563 ++-- .../geo/model/DescribeKeyRequest.java | 10 +- .../services/geo/model/DescribeKeyResult.java | 506 +-- .../geo/model/DescribeMapRequest.java | 10 +- .../services/geo/model/DescribeMapResult.java | 600 ++-- .../geo/model/DescribePlaceIndexRequest.java | 10 +- .../geo/model/DescribePlaceIndexResult.java | 952 +++--- .../model/DescribeRouteCalculatorRequest.java | 10 +- .../model/DescribeRouteCalculatorResult.java | 718 ++--- .../geo/model/DescribeTrackerRequest.java | 10 +- .../geo/model/DescribeTrackerResult.java | 1248 +++++--- .../services/geo/model/DevicePosition.java | 400 +-- .../geo/model/DevicePositionUpdate.java | 264 +- .../services/geo/model/DeviceState.java | 588 ++++ .../services/geo/model/DimensionUnit.java | 2 +- .../DisassociateTrackerConsumerRequest.java | 162 +- .../DisassociateTrackerConsumerResult.java | 2 +- .../services/geo/model/DistanceUnit.java | 2 +- .../ForecastGeofenceEventsDeviceState.java | 221 ++ .../model/ForecastGeofenceEventsRequest.java | 887 ++++++ .../model/ForecastGeofenceEventsResult.java | 462 +++ .../services/geo/model/ForecastedEvent.java | 823 +++++ .../model/ForecastedGeofenceEventType.java | 64 + .../services/geo/model/GeofenceGeometry.java | 203 +- .../GetDevicePositionHistoryRequest.java | 540 ++-- .../model/GetDevicePositionHistoryResult.java | 2 +- .../geo/model/GetDevicePositionRequest.java | 98 +- .../geo/model/GetDevicePositionResult.java | 400 +-- .../geo/model/GetGeofenceRequest.java | 24 +- .../services/geo/model/GetGeofenceResult.java | 416 +-- .../geo/model/GetMapGlyphsRequest.java | 158 +- .../geo/model/GetMapGlyphsResult.java | 100 +- .../geo/model/GetMapSpritesRequest.java | 144 +- .../geo/model/GetMapSpritesResult.java | 118 +- .../model/GetMapStyleDescriptorRequest.java | 134 +- .../model/GetMapStyleDescriptorResult.java | 100 +- .../services/geo/model/GetMapTileRequest.java | 198 +- .../services/geo/model/GetMapTileResult.java | 100 +- .../services/geo/model/GetPlaceRequest.java | 146 +- .../services/geo/model/GetPlaceResult.java | 2 +- .../services/geo/model/InferredState.java | 361 +++ .../services/geo/model/IntendedUse.java | 2 +- .../geo/model/InternalServerException.java | 2 +- .../com/amazonaws/services/geo/model/Leg.java | 626 ++-- .../services/geo/model/LegGeometry.java | 2 +- .../geo/model/ListDevicePositionsRequest.java | 131 +- .../ListDevicePositionsResponseEntry.java | 260 +- .../geo/model/ListDevicePositionsResult.java | 41 +- .../model/ListGeofenceCollectionsRequest.java | 2 +- .../ListGeofenceCollectionsResponseEntry.java | 168 +- .../model/ListGeofenceCollectionsResult.java | 2 +- .../geo/model/ListGeofenceResponseEntry.java | 428 +-- .../geo/model/ListGeofencesRequest.java | 162 +- .../geo/model/ListGeofencesResult.java | 10 +- .../services/geo/model/ListKeysRequest.java | 122 +- .../geo/model/ListKeysResponseEntry.java | 248 +- .../services/geo/model/ListKeysResult.java | 2 +- .../services/geo/model/ListMapsRequest.java | 2 +- .../geo/model/ListMapsResponseEntry.java | 256 +- .../services/geo/model/ListMapsResult.java | 2 +- .../geo/model/ListPlaceIndexesRequest.java | 2 +- .../model/ListPlaceIndexesResponseEntry.java | 354 +-- .../geo/model/ListPlaceIndexesResult.java | 2 +- .../model/ListRouteCalculatorsRequest.java | 2 +- .../ListRouteCalculatorsResponseEntry.java | 318 +- .../geo/model/ListRouteCalculatorsResult.java | 2 +- .../geo/model/ListTagsForResourceRequest.java | 18 +- .../geo/model/ListTagsForResourceResult.java | 2 +- .../model/ListTrackerConsumersRequest.java | 152 +- .../geo/model/ListTrackerConsumersResult.java | 2 +- .../geo/model/ListTrackersRequest.java | 2 +- .../geo/model/ListTrackersResponseEntry.java | 152 +- .../geo/model/ListTrackersResult.java | 2 +- .../services/geo/model/LteCellDetails.java | 805 +++++ .../services/geo/model/LteLocalId.java | 211 ++ .../geo/model/LteNetworkMeasurements.java | 438 +++ .../services/geo/model/MapConfiguration.java | 453 ++- .../geo/model/MapConfigurationUpdate.java | 183 +- .../services/geo/model/OptimizationMode.java | 62 + .../amazonaws/services/geo/model/Place.java | 1632 +++++----- .../services/geo/model/PlaceGeometry.java | 2 +- .../services/geo/model/PositionFiltering.java | 2 +- .../geo/model/PositionalAccuracy.java | 10 +- .../services/geo/model/PricingPlan.java | 2 +- .../geo/model/PutGeofenceRequest.java | 286 +- .../services/geo/model/PutGeofenceResult.java | 142 +- .../geo/model/ResourceNotFoundException.java | 2 +- .../services/geo/model/RouteMatrixEntry.java | 2 +- .../geo/model/RouteMatrixEntryError.java | 2 +- .../geo/model/RouteMatrixErrorCode.java | 2 +- .../geo/model/SearchForPositionResult.java | 126 +- .../geo/model/SearchForSuggestionsResult.java | 354 +-- .../geo/model/SearchForTextResult.java | 262 +- .../SearchPlaceIndexForPositionRequest.java | 540 ++-- .../SearchPlaceIndexForPositionResult.java | 140 +- .../SearchPlaceIndexForPositionSummary.java | 344 +- ...SearchPlaceIndexForSuggestionsRequest.java | 798 ++--- .../SearchPlaceIndexForSuggestionsResult.java | 160 +- ...SearchPlaceIndexForSuggestionsSummary.java | 730 ++--- .../model/SearchPlaceIndexForTextRequest.java | 846 ++--- .../model/SearchPlaceIndexForTextResult.java | 174 +- .../model/SearchPlaceIndexForTextSummary.java | 998 +++--- .../model/ServiceQuotaExceededException.java | 2 +- .../services/geo/model/SpeedUnit.java | 62 + .../amazonaws/services/geo/model/Status.java | 2 +- .../amazonaws/services/geo/model/Step.java | 400 +-- .../geo/model/TagResourceRequest.java | 18 +- .../services/geo/model/TagResourceResult.java | 2 +- .../geo/model/ThrottlingException.java | 2 +- .../services/geo/model/TimeZone.java | 2 +- .../geo/model/TrackingFilterGeometry.java | 161 + .../services/geo/model/TravelMode.java | 2 +- .../services/geo/model/TruckDimensions.java | 360 +-- .../services/geo/model/TruckWeight.java | 2 +- .../geo/model/UntagResourceRequest.java | 18 +- .../geo/model/UntagResourceResult.java | 2 +- .../UpdateGeofenceCollectionRequest.java | 158 +- .../model/UpdateGeofenceCollectionResult.java | 162 +- .../services/geo/model/UpdateKeyRequest.java | 290 +- .../services/geo/model/UpdateKeyResult.java | 26 +- .../services/geo/model/UpdateMapRequest.java | 264 +- .../services/geo/model/UpdateMapResult.java | 158 +- .../geo/model/UpdatePlaceIndexRequest.java | 256 +- .../geo/model/UpdatePlaceIndexResult.java | 158 +- .../model/UpdateRouteCalculatorRequest.java | 154 +- .../model/UpdateRouteCalculatorResult.java | 162 +- .../geo/model/UpdateTrackerRequest.java | 702 ++-- .../geo/model/UpdateTrackerResult.java | 160 +- .../geo/model/ValidationException.java | 66 +- .../geo/model/ValidationExceptionField.java | 82 +- .../services/geo/model/VehicleWeightUnit.java | 2 +- .../model/VerifyDevicePositionRequest.java | 367 +++ .../geo/model/VerifyDevicePositionResult.java | 470 +++ .../services/geo/model/WiFiAccessPoint.java | 209 ++ .../AccessDeniedExceptionUnmarshaller.java | 2 +- .../transform/ApiKeyFilterJsonMarshaller.java | 2 +- .../ApiKeyFilterJsonUnmarshaller.java | 2 +- .../ApiKeyRestrictionsJsonMarshaller.java | 24 +- .../ApiKeyRestrictionsJsonUnmarshaller.java | 10 +- ...ciateTrackerConsumerRequestMarshaller.java | 6 +- ...TrackerConsumerResultJsonUnmarshaller.java | 2 +- ...icePositionHistoryErrorJsonMarshaller.java | 2 +- ...ePositionHistoryErrorJsonUnmarshaller.java | 2 +- ...evicePositionHistoryRequestMarshaller.java | 4 +- ...PositionHistoryResultJsonUnmarshaller.java | 2 +- ...atchDeleteGeofenceErrorJsonMarshaller.java | 12 +- ...chDeleteGeofenceErrorJsonUnmarshaller.java | 10 +- .../BatchDeleteGeofenceRequestMarshaller.java | 4 +- ...hDeleteGeofenceResultJsonUnmarshaller.java | 2 +- ...hEvaluateGeofencesErrorJsonMarshaller.java | 12 +- ...valuateGeofencesErrorJsonUnmarshaller.java | 8 +- ...tchEvaluateGeofencesRequestMarshaller.java | 4 +- ...aluateGeofencesResultJsonUnmarshaller.java | 2 +- ...hGetDevicePositionErrorJsonMarshaller.java | 2 +- ...etDevicePositionErrorJsonUnmarshaller.java | 2 +- ...tchGetDevicePositionRequestMarshaller.java | 4 +- ...tDevicePositionResultJsonUnmarshaller.java | 14 +- .../BatchItemErrorJsonMarshaller.java | 2 +- .../BatchItemErrorJsonUnmarshaller.java | 2 +- .../BatchPutGeofenceErrorJsonMarshaller.java | 12 +- ...BatchPutGeofenceErrorJsonUnmarshaller.java | 10 +- ...PutGeofenceRequestEntryJsonMarshaller.java | 12 +- ...tGeofenceRequestEntryJsonUnmarshaller.java | 10 +- .../BatchPutGeofenceRequestMarshaller.java | 4 +- ...atchPutGeofenceResultJsonUnmarshaller.java | 14 +- ...BatchPutGeofenceSuccessJsonMarshaller.java | 12 +- ...tchPutGeofenceSuccessJsonUnmarshaller.java | 10 +- ...dateDevicePositionErrorJsonMarshaller.java | 12 +- ...teDevicePositionErrorJsonUnmarshaller.java | 10 +- ...UpdateDevicePositionRequestMarshaller.java | 4 +- ...eDevicePositionResultJsonUnmarshaller.java | 2 +- ...lateRouteCarModeOptionsJsonMarshaller.java | 2 +- ...teRouteCarModeOptionsJsonUnmarshaller.java | 2 +- ...CalculateRouteMatrixRequestMarshaller.java | 46 +- ...lateRouteMatrixResultJsonUnmarshaller.java | 2 +- ...ulateRouteMatrixSummaryJsonMarshaller.java | 18 +- ...ateRouteMatrixSummaryJsonUnmarshaller.java | 10 +- .../CalculateRouteRequestMarshaller.java | 90 +- .../CalculateRouteResultJsonUnmarshaller.java | 2 +- .../CalculateRouteSummaryJsonMarshaller.java | 32 +- ...CalculateRouteSummaryJsonUnmarshaller.java | 20 +- ...teRouteTruckModeOptionsJsonMarshaller.java | 2 +- ...RouteTruckModeOptionsJsonUnmarshaller.java | 2 +- .../transform/CellSignalsJsonMarshaller.java | 51 + .../CellSignalsJsonUnmarshaller.java | 58 + .../model/transform/CircleJsonMarshaller.java | 2 +- .../transform/CircleJsonUnmarshaller.java | 2 +- .../ConflictExceptionUnmarshaller.java | 2 +- ...teGeofenceCollectionRequestMarshaller.java | 26 +- ...fenceCollectionResultJsonUnmarshaller.java | 10 +- .../transform/CreateKeyRequestMarshaller.java | 26 +- .../CreateKeyResultJsonUnmarshaller.java | 12 +- .../transform/CreateMapRequestMarshaller.java | 26 +- .../CreateMapResultJsonUnmarshaller.java | 12 +- .../CreatePlaceIndexRequestMarshaller.java | 36 +- ...reatePlaceIndexResultJsonUnmarshaller.java | 12 +- ...reateRouteCalculatorRequestMarshaller.java | 16 +- ...RouteCalculatorResultJsonUnmarshaller.java | 10 +- .../CreateTrackerRequestMarshaller.java | 56 +- .../CreateTrackerResultJsonUnmarshaller.java | 12 +- ...DataSourceConfigurationJsonMarshaller.java | 2 +- ...taSourceConfigurationJsonUnmarshaller.java | 2 +- ...teGeofenceCollectionRequestMarshaller.java | 6 +- ...fenceCollectionResultJsonUnmarshaller.java | 2 +- .../transform/DeleteKeyRequestMarshaller.java | 10 +- .../DeleteKeyResultJsonUnmarshaller.java | 2 +- .../transform/DeleteMapRequestMarshaller.java | 6 +- .../DeleteMapResultJsonUnmarshaller.java | 2 +- .../DeletePlaceIndexRequestMarshaller.java | 6 +- ...eletePlaceIndexResultJsonUnmarshaller.java | 2 +- ...eleteRouteCalculatorRequestMarshaller.java | 6 +- ...RouteCalculatorResultJsonUnmarshaller.java | 2 +- .../DeleteTrackerRequestMarshaller.java | 6 +- .../DeleteTrackerResultJsonUnmarshaller.java | 2 +- ...beGeofenceCollectionRequestMarshaller.java | 6 +- ...fenceCollectionResultJsonUnmarshaller.java | 28 +- .../DescribeKeyRequestMarshaller.java | 6 +- .../DescribeKeyResultJsonUnmarshaller.java | 34 +- .../DescribeMapRequestMarshaller.java | 6 +- .../DescribeMapResultJsonUnmarshaller.java | 30 +- .../DescribePlaceIndexRequestMarshaller.java | 6 +- ...cribePlaceIndexResultJsonUnmarshaller.java | 36 +- ...cribeRouteCalculatorRequestMarshaller.java | 6 +- ...RouteCalculatorResultJsonUnmarshaller.java | 30 +- .../DescribeTrackerRequestMarshaller.java | 6 +- ...DescribeTrackerResultJsonUnmarshaller.java | 40 +- .../DevicePositionJsonMarshaller.java | 32 +- .../DevicePositionJsonUnmarshaller.java | 26 +- .../DevicePositionUpdateJsonMarshaller.java | 22 +- .../DevicePositionUpdateJsonUnmarshaller.java | 18 +- .../transform/DeviceStateJsonMarshaller.java | 87 + .../DeviceStateJsonUnmarshaller.java | 79 + ...ciateTrackerConsumerRequestMarshaller.java | 14 +- ...TrackerConsumerResultJsonUnmarshaller.java | 2 +- ...ofenceEventsDeviceStateJsonMarshaller.java | 56 + ...enceEventsDeviceStateJsonUnmarshaller.java | 63 + ...recastGeofenceEventsRequestMarshaller.java | 118 + ...tGeofenceEventsResultJsonUnmarshaller.java | 68 + .../ForecastedEventJsonMarshaller.java | 85 + .../ForecastedEventJsonUnmarshaller.java | 78 + .../GeofenceGeometryJsonMarshaller.java | 17 +- .../GeofenceGeometryJsonUnmarshaller.java | 13 +- ...evicePositionHistoryRequestMarshaller.java | 34 +- ...PositionHistoryResultJsonUnmarshaller.java | 2 +- .../GetDevicePositionRequestMarshaller.java | 12 +- ...tDevicePositionResultJsonUnmarshaller.java | 28 +- .../GetGeofenceRequestMarshaller.java | 4 +- .../GetGeofenceResultJsonUnmarshaller.java | 22 +- .../GetMapGlyphsRequestMarshaller.java | 12 +- .../GetMapGlyphsResultJsonUnmarshaller.java | 6 +- .../GetMapSpritesRequestMarshaller.java | 12 +- .../GetMapSpritesResultJsonUnmarshaller.java | 6 +- ...etMapStyleDescriptorRequestMarshaller.java | 12 +- ...StyleDescriptorResultJsonUnmarshaller.java | 6 +- .../GetMapTileRequestMarshaller.java | 14 +- .../GetMapTileResultJsonUnmarshaller.java | 6 +- .../transform/GetPlaceRequestMarshaller.java | 16 +- .../GetPlaceResultJsonUnmarshaller.java | 2 +- .../InferredStateJsonMarshaller.java | 65 + .../InferredStateJsonUnmarshaller.java | 67 + .../InternalServerExceptionUnmarshaller.java | 2 +- .../transform/LegGeometryJsonMarshaller.java | 2 +- .../LegGeometryJsonUnmarshaller.java | 2 +- .../model/transform/LegJsonMarshaller.java | 42 +- .../model/transform/LegJsonUnmarshaller.java | 24 +- .../ListDevicePositionsRequestMarshaller.java | 11 +- ...ePositionsResponseEntryJsonMarshaller.java | 22 +- ...ositionsResponseEntryJsonUnmarshaller.java | 20 +- ...DevicePositionsResultJsonUnmarshaller.java | 2 +- ...tGeofenceCollectionsRequestMarshaller.java | 6 +- ...ollectionsResponseEntryJsonMarshaller.java | 12 +- ...lectionsResponseEntryJsonUnmarshaller.java | 10 +- ...enceCollectionsResultJsonUnmarshaller.java | 2 +- ...stGeofenceResponseEntryJsonMarshaller.java | 40 +- ...GeofenceResponseEntryJsonUnmarshaller.java | 22 +- .../ListGeofencesRequestMarshaller.java | 14 +- .../ListGeofencesResultJsonUnmarshaller.java | 2 +- .../transform/ListKeysRequestMarshaller.java | 16 +- .../ListKeysResponseEntryJsonMarshaller.java | 28 +- ...ListKeysResponseEntryJsonUnmarshaller.java | 18 +- .../ListKeysResultJsonUnmarshaller.java | 2 +- .../transform/ListMapsRequestMarshaller.java | 6 +- .../ListMapsResponseEntryJsonMarshaller.java | 28 +- ...ListMapsResponseEntryJsonUnmarshaller.java | 18 +- .../ListMapsResultJsonUnmarshaller.java | 2 +- .../ListPlaceIndexesRequestMarshaller.java | 6 +- ...aceIndexesResponseEntryJsonMarshaller.java | 28 +- ...eIndexesResponseEntryJsonUnmarshaller.java | 18 +- ...istPlaceIndexesResultJsonUnmarshaller.java | 2 +- ...ListRouteCalculatorsRequestMarshaller.java | 6 +- ...alculatorsResponseEntryJsonMarshaller.java | 20 +- ...culatorsResponseEntryJsonUnmarshaller.java | 16 +- ...outeCalculatorsResultJsonUnmarshaller.java | 2 +- .../ListTagsForResourceRequestMarshaller.java | 6 +- ...TagsForResourceResultJsonUnmarshaller.java | 2 +- ...ListTrackerConsumersRequestMarshaller.java | 6 +- ...rackerConsumersResultJsonUnmarshaller.java | 2 +- .../ListTrackersRequestMarshaller.java | 6 +- ...stTrackersResponseEntryJsonMarshaller.java | 18 +- ...TrackersResponseEntryJsonUnmarshaller.java | 12 +- .../ListTrackersResultJsonUnmarshaller.java | 2 +- .../LteCellDetailsJsonMarshaller.java | 97 + .../LteCellDetailsJsonUnmarshaller.java | 86 + .../transform/LteLocalIdJsonMarshaller.java | 49 + .../transform/LteLocalIdJsonUnmarshaller.java | 59 + .../LteNetworkMeasurementsJsonMarshaller.java | 65 + ...teNetworkMeasurementsJsonUnmarshaller.java | 69 + .../MapConfigurationJsonMarshaller.java | 21 +- .../MapConfigurationJsonUnmarshaller.java | 15 +- .../MapConfigurationUpdateJsonMarshaller.java | 13 +- ...apConfigurationUpdateJsonUnmarshaller.java | 7 +- .../PlaceGeometryJsonMarshaller.java | 2 +- .../PlaceGeometryJsonUnmarshaller.java | 2 +- .../model/transform/PlaceJsonMarshaller.java | 123 +- .../transform/PlaceJsonUnmarshaller.java | 65 +- .../PositionalAccuracyJsonMarshaller.java | 2 +- .../PositionalAccuracyJsonUnmarshaller.java | 2 +- .../PutGeofenceRequestMarshaller.java | 14 +- .../PutGeofenceResultJsonUnmarshaller.java | 10 +- ...ResourceNotFoundExceptionUnmarshaller.java | 2 +- .../RouteMatrixEntryErrorJsonMarshaller.java | 2 +- ...RouteMatrixEntryErrorJsonUnmarshaller.java | 2 +- .../RouteMatrixEntryJsonMarshaller.java | 2 +- .../RouteMatrixEntryJsonUnmarshaller.java | 2 +- ...SearchForPositionResultJsonMarshaller.java | 12 +- ...archForPositionResultJsonUnmarshaller.java | 10 +- ...rchForSuggestionsResultJsonMarshaller.java | 22 +- ...hForSuggestionsResultJsonUnmarshaller.java | 16 +- .../SearchForTextResultJsonMarshaller.java | 20 +- .../SearchForTextResultJsonUnmarshaller.java | 14 +- ...laceIndexForPositionRequestMarshaller.java | 24 +- ...ndexForPositionResultJsonUnmarshaller.java | 14 +- ...IndexForPositionSummaryJsonMarshaller.java | 32 +- ...dexForPositionSummaryJsonUnmarshaller.java | 22 +- ...eIndexForSuggestionsRequestMarshaller.java | 46 +- ...xForSuggestionsResultJsonUnmarshaller.java | 14 +- ...exForSuggestionsSummaryJsonMarshaller.java | 54 +- ...ForSuggestionsSummaryJsonUnmarshaller.java | 36 +- ...rchPlaceIndexForTextRequestMarshaller.java | 46 +- ...aceIndexForTextResultJsonUnmarshaller.java | 12 +- ...laceIndexForTextSummaryJsonMarshaller.java | 54 +- ...ceIndexForTextSummaryJsonUnmarshaller.java | 30 +- ...iceQuotaExceededExceptionUnmarshaller.java | 2 +- .../model/transform/StepJsonMarshaller.java | 42 +- .../model/transform/StepJsonUnmarshaller.java | 24 +- .../TagResourceRequestMarshaller.java | 6 +- .../TagResourceResultJsonUnmarshaller.java | 2 +- .../ThrottlingExceptionUnmarshaller.java | 2 +- .../transform/TimeZoneJsonMarshaller.java | 2 +- .../transform/TimeZoneJsonUnmarshaller.java | 2 +- .../TrackingFilterGeometryJsonMarshaller.java | 64 + ...rackingFilterGeometryJsonUnmarshaller.java | 64 + .../TruckDimensionsJsonMarshaller.java | 20 +- .../TruckDimensionsJsonUnmarshaller.java | 14 +- .../transform/TruckWeightJsonMarshaller.java | 2 +- .../TruckWeightJsonUnmarshaller.java | 2 +- .../UntagResourceRequestMarshaller.java | 6 +- .../UntagResourceResultJsonUnmarshaller.java | 2 +- ...teGeofenceCollectionRequestMarshaller.java | 16 +- ...fenceCollectionResultJsonUnmarshaller.java | 10 +- .../transform/UpdateKeyRequestMarshaller.java | 16 +- .../UpdateKeyResultJsonUnmarshaller.java | 2 +- .../transform/UpdateMapRequestMarshaller.java | 26 +- .../UpdateMapResultJsonUnmarshaller.java | 10 +- .../UpdatePlaceIndexRequestMarshaller.java | 26 +- ...pdatePlaceIndexResultJsonUnmarshaller.java | 10 +- ...pdateRouteCalculatorRequestMarshaller.java | 16 +- ...RouteCalculatorResultJsonUnmarshaller.java | 10 +- .../UpdateTrackerRequestMarshaller.java | 38 +- .../UpdateTrackerResultJsonUnmarshaller.java | 10 +- ...alidationExceptionFieldJsonMarshaller.java | 12 +- ...idationExceptionFieldJsonUnmarshaller.java | 10 +- .../ValidationExceptionUnmarshaller.java | 5 +- ...VerifyDevicePositionRequestMarshaller.java | 96 + ...yDevicePositionResultJsonUnmarshaller.java | 70 + .../WiFiAccessPointJsonMarshaller.java | 50 + .../WiFiAccessPointJsonUnmarshaller.java | 60 + 443 files changed, 29512 insertions(+), 19356 deletions(-) create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CellSignals.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeviceState.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsDeviceState.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsRequest.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsResult.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedEvent.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedGeofenceEventType.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InferredState.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteCellDetails.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteLocalId.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteNetworkMeasurements.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/OptimizationMode.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SpeedUnit.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TrackingFilterGeometry.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionRequest.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionResult.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/WiFiAccessPoint.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsRequestMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsResultJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionRequestMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionResultJsonUnmarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonUnmarshaller.java diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java index 1a01678ccf..6bb69f019c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -1079,6 +1079,48 @@ DisassociateTrackerConsumerResult disassociateTrackerConsumer( DisassociateTrackerConsumerRequest disassociateTrackerConsumerRequest) throws AmazonClientException, AmazonServiceException; + /** + *

+ * Evaluates device positions against geofence geometries from a given + * geofence collection. The event forecasts three states for which a device + * can be in relative to a geofence: + *

+ *

+ * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

+ *

+ * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

+ *

+ * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

+ * + * @param forecastGeofenceEventsRequest + * @return forecastGeofenceEventsResult The response from the + * ForecastGeofenceEvents service method, as returned by AWS + * Location service. + * @throws InternalServerException + * @throws ResourceNotFoundException + * @throws AccessDeniedException + * @throws ValidationException + * @throws ThrottlingException + * @throws AmazonClientException If any internal errors are encountered + * inside the client while attempting to make the request or + * handle the response. For example if a network connection is + * not available. + * @throws AmazonServiceException If an error response is returned by AWS + * Location service indicating either a problem with the data in + * the request, or a server side issue. + */ + ForecastGeofenceEventsResult forecastGeofenceEvents( + ForecastGeofenceEventsRequest forecastGeofenceEventsRequest) + throws AmazonClientException, AmazonServiceException; + /** *

* Retrieves a device's most recent position according to its sample time. @@ -1144,6 +1186,12 @@ GetDevicePositionHistoryResult getDevicePositionHistory( *

* Retrieves the geofence details from a geofence collection. *

+ * + *

+ * The returned geometry will always match the geometry format used when the + * geofence was created. + *

+ * * * @param getGeofenceRequest * @return getGeofenceResult The response from the GetGeofence service @@ -1921,6 +1969,34 @@ UpdateRouteCalculatorResult updateRouteCalculator( UpdateTrackerResult updateTracker(UpdateTrackerRequest updateTrackerRequest) throws AmazonClientException, AmazonServiceException; + /** + *

+ * Verifies the integrity of the device's position by determining if it was + * reported behind a proxy, and by comparing it to an inferred position + * estimated based on the device's state. + *

+ * + * @param verifyDevicePositionRequest + * @return verifyDevicePositionResult The response from the + * VerifyDevicePosition service method, as returned by AWS Location + * service. + * @throws InternalServerException + * @throws ResourceNotFoundException + * @throws AccessDeniedException + * @throws ValidationException + * @throws ThrottlingException + * @throws AmazonClientException If any internal errors are encountered + * inside the client while attempting to make the request or + * handle the response. For example if a network connection is + * not available. + * @throws AmazonServiceException If an error response is returned by AWS + * Location service indicating either a problem with the data in + * the request, or a server side issue. + */ + VerifyDevicePositionResult verifyDevicePosition( + VerifyDevicePositionRequest verifyDevicePositionRequest) throws AmazonClientException, + AmazonServiceException; + /** * Shuts down this client object, releasing any resources that might be held * open. This is an optional method, and callers are not expected to call diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java index 56fa7ad19f..fdd4a7ebd9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -2088,6 +2088,75 @@ public DisassociateTrackerConsumerResult disassociateTrackerConsumer( } } + /** + *

+ * Evaluates device positions against geofence geometries from a given + * geofence collection. The event forecasts three states for which a device + * can be in relative to a geofence: + *

+ *

+ * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

+ *

+ * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

+ *

+ * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

+ * + * @param forecastGeofenceEventsRequest + * @return forecastGeofenceEventsResult The response from the + * ForecastGeofenceEvents service method, as returned by AWS + * Location service. + * @throws InternalServerException + * @throws ResourceNotFoundException + * @throws AccessDeniedException + * @throws ValidationException + * @throws ThrottlingException + * @throws AmazonClientException If any internal errors are encountered + * inside the client while attempting to make the request or + * handle the response. For example if a network connection is + * not available. + * @throws AmazonServiceException If an error response is returned by AWS + * Location service indicating either a problem with the data in + * the request, or a server side issue. + */ + public ForecastGeofenceEventsResult forecastGeofenceEvents( + ForecastGeofenceEventsRequest forecastGeofenceEventsRequest) + throws AmazonServiceException, AmazonClientException { + ExecutionContext executionContext = createExecutionContext(forecastGeofenceEventsRequest); + AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics(); + awsRequestMetrics.startEvent(Field.ClientExecuteTime); + Request request = null; + Response response = null; + try { + awsRequestMetrics.startEvent(Field.RequestMarshallTime); + try { + request = new ForecastGeofenceEventsRequestMarshaller() + .marshall(forecastGeofenceEventsRequest); + // Binds the request metrics to the current request. + request.setAWSRequestMetrics(awsRequestMetrics); + } finally { + awsRequestMetrics.endEvent(Field.RequestMarshallTime); + } + Unmarshaller unmarshaller = new ForecastGeofenceEventsResultJsonUnmarshaller(); + JsonResponseHandler responseHandler = new JsonResponseHandler( + unmarshaller); + + response = invoke(request, responseHandler, executionContext); + + return response.getAwsResponse(); + } finally { + awsRequestMetrics.endEvent(Field.ClientExecuteTime); + endClientExecution(awsRequestMetrics, request, response, LOGGING_AWS_REQUEST_METRIC); + } + } + /** *

* Retrieves a device's most recent position according to its sample time. @@ -2208,6 +2277,12 @@ public GetDevicePositionHistoryResult getDevicePositionHistory( *

* Retrieves the geofence details from a geofence collection. *

+ * + *

+ * The returned geometry will always match the geometry format used when the + * geofence was created. + *

+ * * * @param getGeofenceRequest * @return getGeofenceResult The response from the GetGeofence service @@ -3724,6 +3799,61 @@ public UpdateTrackerResult updateTracker(UpdateTrackerRequest updateTrackerReque } } + /** + *

+ * Verifies the integrity of the device's position by determining if it was + * reported behind a proxy, and by comparing it to an inferred position + * estimated based on the device's state. + *

+ * + * @param verifyDevicePositionRequest + * @return verifyDevicePositionResult The response from the + * VerifyDevicePosition service method, as returned by AWS Location + * service. + * @throws InternalServerException + * @throws ResourceNotFoundException + * @throws AccessDeniedException + * @throws ValidationException + * @throws ThrottlingException + * @throws AmazonClientException If any internal errors are encountered + * inside the client while attempting to make the request or + * handle the response. For example if a network connection is + * not available. + * @throws AmazonServiceException If an error response is returned by AWS + * Location service indicating either a problem with the data in + * the request, or a server side issue. + */ + public VerifyDevicePositionResult verifyDevicePosition( + VerifyDevicePositionRequest verifyDevicePositionRequest) + throws AmazonServiceException, AmazonClientException { + ExecutionContext executionContext = createExecutionContext(verifyDevicePositionRequest); + AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics(); + awsRequestMetrics.startEvent(Field.ClientExecuteTime); + Request request = null; + Response response = null; + try { + awsRequestMetrics.startEvent(Field.RequestMarshallTime); + try { + request = new VerifyDevicePositionRequestMarshaller() + .marshall(verifyDevicePositionRequest); + // Binds the request metrics to the current request. + request.setAWSRequestMetrics(awsRequestMetrics); + } finally { + awsRequestMetrics.endEvent(Field.RequestMarshallTime); + } + Unmarshaller unmarshaller = new VerifyDevicePositionResultJsonUnmarshaller(); + JsonResponseHandler responseHandler = new JsonResponseHandler( + unmarshaller); + + response = invoke(request, responseHandler, executionContext); + + return response.getAwsResponse(); + } finally { + awsRequestMetrics.endEvent(Field.ClientExecuteTime); + endClientExecution(awsRequestMetrics, request, response, LOGGING_AWS_REQUEST_METRIC); + } + } + /** * Returns additional metadata for a previously executed successful, * request, typically used for debugging issues where a service isn't acting diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AccessDeniedException.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AccessDeniedException.java index 7a6a783370..75754dae22 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AccessDeniedException.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AccessDeniedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyFilter.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyFilter.java index b65709b43b..aa84dae697 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyFilter.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyRestrictions.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyRestrictions.java index 93cd5722a6..93bf76e8c2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyRestrictions.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ApiKeyRestrictions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -109,90 +109,90 @@ public class ApiKeyRestrictions implements Serializable { /** *

- * An optional list of allowed HTTP referers for which requests must - * originate from. Requests using this API key from other domains will not - * be allowed. - *

- *

- * Requirements: + * A list of allowed resource ARNs that a API key bearer can perform actions + * on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in - * this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route ARN. You may + * include wildcards in the resource-id to match multiple resources of the + * same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, - * 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key that is being + * created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including multiple - * hexadecimal digits). + * Other than wildcards, you must include the full ARN, including the + * arn, partition, service, + * region, account-id and resource-id + * delimited by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap*. *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

*/ - private java.util.List allowReferers; + private java.util.List allowResources; /** *

- * A list of allowed resource ARNs that a API key bearer can perform actions - * on. + * An optional list of allowed HTTP referers for which requests must + * originate from. Requests using this API key from other domains will not + * be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route ARN. You may - * include wildcards in the resource-id to match multiple resources of the - * same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in + * this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key that is being - * created. + * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, + * 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including the - * arn, partition, service, - * region, account-id and resource-id - * , delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including multiple + * hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap*. + * No spaces allowed. For example, https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

*/ - private java.util.List allowResources; + private java.util.List allowReferers; /** *

@@ -893,748 +893,748 @@ public ApiKeyRestrictions withAllowActions(java.util.Collection allowAct /** *

- * An optional list of allowed HTTP referers for which requests must - * originate from. Requests using this API key from other domains will not - * be allowed. - *

- *

- * Requirements: + * A list of allowed resource ARNs that a API key bearer can perform actions + * on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in - * this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route ARN. You may + * include wildcards in the resource-id to match multiple resources of the + * same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, - * 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key that is being + * created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including multiple - * hexadecimal digits). + * Other than wildcards, you must include the full ARN, including the + * arn, partition, service, + * region, account-id and resource-id + * delimited by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap*. *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

* * @return

- * An optional list of allowed HTTP referers for which requests must - * originate from. Requests using this API key from other domains - * will not be allowed. - *

- *

- * Requirements: + * A list of allowed resource ARNs that a API key bearer can perform + * actions on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any - * symbols in this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route ARN. + * You may include wildcards in the resource-id to match multiple + * resources of the same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits - * (A-F, a-f, 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key that + * is being created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk - * (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including - * multiple hexadecimal digits). + * Other than wildcards, you must include the full ARN, including + * the arn, partition, + * service, region, + * account-id and resource-id delimited by + * colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap* + * . *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

*/ - public java.util.List getAllowReferers() { - return allowReferers; + public java.util.List getAllowResources() { + return allowResources; } /** *

- * An optional list of allowed HTTP referers for which requests must - * originate from. Requests using this API key from other domains will not - * be allowed. - *

- *

- * Requirements: + * A list of allowed resource ARNs that a API key bearer can perform actions + * on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in - * this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route ARN. You may + * include wildcards in the resource-id to match multiple resources of the + * same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, - * 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key that is being + * created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including multiple - * hexadecimal digits). + * Other than wildcards, you must include the full ARN, including the + * arn, partition, service, + * region, account-id and resource-id + * delimited by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap*. *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

* - * @param allowReferers

- * An optional list of allowed HTTP referers for which requests - * must originate from. Requests using this API key from other - * domains will not be allowed. - *

- *

- * Requirements: + * @param allowResources

+ * A list of allowed resource ARNs that a API key bearer can + * perform actions on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any - * symbols in this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route + * ARN. You may include wildcards in the resource-id to match + * multiple resources of the same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits - * (A-F, a-f, 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key + * that is being created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk - * (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including - * multiple hexadecimal digits). + * Other than wildcards, you must include the full ARN, including + * the arn, partition, + * service, region, + * account-id and resource-id delimited + * by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, - * https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap* + * . *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

*/ - public void setAllowReferers(java.util.Collection allowReferers) { - if (allowReferers == null) { - this.allowReferers = null; + public void setAllowResources(java.util.Collection allowResources) { + if (allowResources == null) { + this.allowResources = null; return; } - this.allowReferers = new java.util.ArrayList(allowReferers); + this.allowResources = new java.util.ArrayList(allowResources); } /** *

- * An optional list of allowed HTTP referers for which requests must - * originate from. Requests using this API key from other domains will not - * be allowed. - *

- *

- * Requirements: + * A list of allowed resource ARNs that a API key bearer can perform actions + * on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in - * this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route ARN. You may + * include wildcards in the resource-id to match multiple resources of the + * same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, - * 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key that is being + * created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including multiple - * hexadecimal digits). + * Other than wildcards, you must include the full ARN, including the + * arn, partition, service, + * region, account-id and resource-id + * delimited by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap*. *

    *
    • *
*

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

+ *

* Returns a reference to this object so that method calls can be chained * together. * - * @param allowReferers

- * An optional list of allowed HTTP referers for which requests - * must originate from. Requests using this API key from other - * domains will not be allowed. - *

- *

- * Requirements: + * @param allowResources

+ * A list of allowed resource ARNs that a API key bearer can + * perform actions on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any - * symbols in this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route + * ARN. You may include wildcards in the resource-id to match + * multiple resources of the same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits - * (A-F, a-f, 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key + * that is being created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk - * (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including - * multiple hexadecimal digits). + * Other than wildcards, you must include the full ARN, including + * the arn, partition, + * service, region, + * account-id and resource-id delimited + * by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, - * https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap* + * . *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

* @return A reference to this updated object so that method calls can be * chained together. */ - public ApiKeyRestrictions withAllowReferers(String... allowReferers) { - if (getAllowReferers() == null) { - this.allowReferers = new java.util.ArrayList(allowReferers.length); + public ApiKeyRestrictions withAllowResources(String... allowResources) { + if (getAllowResources() == null) { + this.allowResources = new java.util.ArrayList(allowResources.length); } - for (String value : allowReferers) { - this.allowReferers.add(value); + for (String value : allowResources) { + this.allowResources.add(value); } return this; } /** *

- * An optional list of allowed HTTP referers for which requests must - * originate from. Requests using this API key from other domains will not - * be allowed. - *

- *

- * Requirements: + * A list of allowed resource ARNs that a API key bearer can perform actions + * on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in - * this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route ARN. You may + * include wildcards in the resource-id to match multiple resources of the + * same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, - * 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key that is being + * created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including multiple - * hexadecimal digits). + * Other than wildcards, you must include the full ARN, including the + * arn, partition, service, + * region, account-id and resource-id + * delimited by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap*. *

    *
    • *
*

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

+ *

* Returns a reference to this object so that method calls can be chained * together. * - * @param allowReferers

- * An optional list of allowed HTTP referers for which requests - * must originate from. Requests using this API key from other - * domains will not be allowed. - *

- *

- * Requirements: + * @param allowResources

+ * A list of allowed resource ARNs that a API key bearer can + * perform actions on. *

*
    *
  • *

    - * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any - * symbols in this list $\-._+!*`(),;/?:@=& + * The ARN must be the correct ARN for a map, place, or route + * ARN. You may include wildcards in the resource-id to match + * multiple resources of the same type. *

    *
    • *
  • *

    - * May contain a percent (%) if followed by 2 hexadecimal digits - * (A-F, a-f, 0-9); this is used for URL encoding purposes. + * The resources must be in the same partition, + * region, and account-id as the key + * that is being created. *

    *
    • *
  • *

    - * May contain wildcard characters question mark (?) and asterisk - * (*). - *

    - *

    - * Question mark (?) will replace any single character (including - * hexadecimal digits). - *

    - *

    - * Asterisk (*) will replace any multiple characters (including - * multiple hexadecimal digits). + * Other than wildcards, you must include the full ARN, including + * the arn, partition, + * service, region, + * account-id and resource-id delimited + * by colons (:). *

    *
    • *
  • *

    - * No spaces allowed. For example, - * https://example.com. + * No spaces allowed, even with wildcards. For example, + * arn:aws:geo:region:account-id:map/ExampleMap* + * . *

    *
    • *
+ *

+ * For more information about ARN format, see Amazon Resource Names (ARNs). + *

* @return A reference to this updated object so that method calls can be * chained together. */ - public ApiKeyRestrictions withAllowReferers(java.util.Collection allowReferers) { - setAllowReferers(allowReferers); + public ApiKeyRestrictions withAllowResources(java.util.Collection allowResources) { + setAllowResources(allowResources); return this; } /** *

- * A list of allowed resource ARNs that a API key bearer can perform actions - * on. + * An optional list of allowed HTTP referers for which requests must + * originate from. Requests using this API key from other domains will not + * be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route ARN. You may - * include wildcards in the resource-id to match multiple resources of the - * same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in + * this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key that is being - * created. + * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, + * 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including the - * arn, partition, service, - * region, account-id and resource-id - * , delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including multiple + * hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap*. + * No spaces allowed. For example, https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

* * @return

- * A list of allowed resource ARNs that a API key bearer can perform - * actions on. + * An optional list of allowed HTTP referers for which requests must + * originate from. Requests using this API key from other domains + * will not be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route ARN. - * You may include wildcards in the resource-id to match multiple - * resources of the same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any + * symbols in this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key that - * is being created. + * May contain a percent (%) if followed by 2 hexadecimal digits + * (A-F, a-f, 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including - * the arn, partition, - * service, region, - * account-id and resource-id, delimited - * by colons (:). + * May contain wildcard characters question mark (?) and asterisk + * (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including + * multiple hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap* - * . + * No spaces allowed. For example, https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

*/ - public java.util.List getAllowResources() { - return allowResources; + public java.util.List getAllowReferers() { + return allowReferers; } /** *

- * A list of allowed resource ARNs that a API key bearer can perform actions - * on. + * An optional list of allowed HTTP referers for which requests must + * originate from. Requests using this API key from other domains will not + * be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route ARN. You may - * include wildcards in the resource-id to match multiple resources of the - * same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in + * this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key that is being - * created. + * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, + * 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including the - * arn, partition, service, - * region, account-id and resource-id - * , delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including multiple + * hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap*. + * No spaces allowed. For example, https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

* - * @param allowResources

- * A list of allowed resource ARNs that a API key bearer can - * perform actions on. + * @param allowReferers

+ * An optional list of allowed HTTP referers for which requests + * must originate from. Requests using this API key from other + * domains will not be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route - * ARN. You may include wildcards in the resource-id to match - * multiple resources of the same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any + * symbols in this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key - * that is being created. + * May contain a percent (%) if followed by 2 hexadecimal digits + * (A-F, a-f, 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including - * the arn, partition, - * service, region, - * account-id and resource-id, - * delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk + * (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including + * multiple hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap* - * . + * No spaces allowed. For example, + * https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

*/ - public void setAllowResources(java.util.Collection allowResources) { - if (allowResources == null) { - this.allowResources = null; + public void setAllowReferers(java.util.Collection allowReferers) { + if (allowReferers == null) { + this.allowReferers = null; return; } - this.allowResources = new java.util.ArrayList(allowResources); + this.allowReferers = new java.util.ArrayList(allowReferers); } /** *

- * A list of allowed resource ARNs that a API key bearer can perform actions - * on. + * An optional list of allowed HTTP referers for which requests must + * originate from. Requests using this API key from other domains will not + * be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route ARN. You may - * include wildcards in the resource-id to match multiple resources of the - * same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in + * this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key that is being - * created. + * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, + * 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including the - * arn, partition, service, - * region, account-id and resource-id - * , delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including multiple + * hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap*. + * No spaces allowed. For example, https://example.com. *

    *
    • *
*

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

- *

* Returns a reference to this object so that method calls can be chained * together. * - * @param allowResources

- * A list of allowed resource ARNs that a API key bearer can - * perform actions on. + * @param allowReferers

+ * An optional list of allowed HTTP referers for which requests + * must originate from. Requests using this API key from other + * domains will not be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route - * ARN. You may include wildcards in the resource-id to match - * multiple resources of the same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any + * symbols in this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key - * that is being created. + * May contain a percent (%) if followed by 2 hexadecimal digits + * (A-F, a-f, 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including - * the arn, partition, - * service, region, - * account-id and resource-id, - * delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk + * (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including + * multiple hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap* - * . + * No spaces allowed. For example, + * https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

* @return A reference to this updated object so that method calls can be * chained together. */ - public ApiKeyRestrictions withAllowResources(String... allowResources) { - if (getAllowResources() == null) { - this.allowResources = new java.util.ArrayList(allowResources.length); + public ApiKeyRestrictions withAllowReferers(String... allowReferers) { + if (getAllowReferers() == null) { + this.allowReferers = new java.util.ArrayList(allowReferers.length); } - for (String value : allowResources) { - this.allowResources.add(value); + for (String value : allowReferers) { + this.allowReferers.add(value); } return this; } /** *

- * A list of allowed resource ARNs that a API key bearer can perform actions - * on. + * An optional list of allowed HTTP referers for which requests must + * originate from. Requests using this API key from other domains will not + * be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route ARN. You may - * include wildcards in the resource-id to match multiple resources of the - * same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in + * this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key that is being - * created. + * May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, + * 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including the - * arn, partition, service, - * region, account-id and resource-id - * , delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including multiple + * hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap*. + * No spaces allowed. For example, https://example.com. *

    *
    • *
*

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

- *

* Returns a reference to this object so that method calls can be chained * together. * - * @param allowResources

- * A list of allowed resource ARNs that a API key bearer can - * perform actions on. + * @param allowReferers

+ * An optional list of allowed HTTP referers for which requests + * must originate from. Requests using this API key from other + * domains will not be allowed. + *

+ *

+ * Requirements: *

*
    *
  • *

    - * The ARN must be the correct ARN for a map, place, or route - * ARN. You may include wildcards in the resource-id to match - * multiple resources of the same type. + * Contain only alphanumeric characters (A–Z, a–z, 0–9) or any + * symbols in this list $\-._+!*`(),;/?:@=& *

    *
    • *
  • *

    - * The resources must be in the same partition, - * region, and account-id as the key - * that is being created. + * May contain a percent (%) if followed by 2 hexadecimal digits + * (A-F, a-f, 0-9); this is used for URL encoding purposes. *

    *
    • *
  • *

    - * Other than wildcards, you must include the full ARN, including - * the arn, partition, - * service, region, - * account-id and resource-id, - * delimited by colons (:). + * May contain wildcard characters question mark (?) and asterisk + * (*). + *

    + *

    + * Question mark (?) will replace any single character (including + * hexadecimal digits). + *

    + *

    + * Asterisk (*) will replace any multiple characters (including + * multiple hexadecimal digits). *

    *
    • *
  • *

    - * No spaces allowed, even with wildcards. For example, - * arn:aws:geo:region:account-id:map/ExampleMap* - * . + * No spaces allowed. For example, + * https://example.com. *

    *
    • *
- *

- * For more information about ARN format, see Amazon Resource Names (ARNs). - *

* @return A reference to this updated object so that method calls can be * chained together. */ - public ApiKeyRestrictions withAllowResources(java.util.Collection allowResources) { - setAllowResources(allowResources); + public ApiKeyRestrictions withAllowReferers(java.util.Collection allowReferers) { + setAllowReferers(allowReferers); return this; } @@ -1651,10 +1651,10 @@ public String toString() { sb.append("{"); if (getAllowActions() != null) sb.append("AllowActions: " + getAllowActions() + ","); - if (getAllowReferers() != null) - sb.append("AllowReferers: " + getAllowReferers() + ","); if (getAllowResources() != null) - sb.append("AllowResources: " + getAllowResources()); + sb.append("AllowResources: " + getAllowResources() + ","); + if (getAllowReferers() != null) + sb.append("AllowReferers: " + getAllowReferers()); sb.append("}"); return sb.toString(); } @@ -1666,10 +1666,10 @@ public int hashCode() { hashCode = prime * hashCode + ((getAllowActions() == null) ? 0 : getAllowActions().hashCode()); - hashCode = prime * hashCode - + ((getAllowReferers() == null) ? 0 : getAllowReferers().hashCode()); hashCode = prime * hashCode + ((getAllowResources() == null) ? 0 : getAllowResources().hashCode()); + hashCode = prime * hashCode + + ((getAllowReferers() == null) ? 0 : getAllowReferers().hashCode()); return hashCode; } @@ -1689,16 +1689,16 @@ public boolean equals(Object obj) { if (other.getAllowActions() != null && other.getAllowActions().equals(this.getAllowActions()) == false) return false; - if (other.getAllowReferers() == null ^ this.getAllowReferers() == null) - return false; - if (other.getAllowReferers() != null - && other.getAllowReferers().equals(this.getAllowReferers()) == false) - return false; if (other.getAllowResources() == null ^ this.getAllowResources() == null) return false; if (other.getAllowResources() != null && other.getAllowResources().equals(this.getAllowResources()) == false) return false; + if (other.getAllowReferers() == null ^ this.getAllowReferers() == null) + return false; + if (other.getAllowReferers() != null + && other.getAllowReferers().equals(this.getAllowReferers()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerRequest.java index 1cd65b0a8c..6941aeab83 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -38,6 +38,18 @@ */ public class AssociateTrackerConsumerRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

+ * The name of the tracker resource to be associated with a geofence + * collection. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\w]+
+ */ + private String trackerName; + /** *

* The Amazon Resource Name (ARN) for the geofence collection to be @@ -56,8 +68,8 @@ public class AssociateTrackerConsumerRequest extends AmazonWebServiceRequest imp * Constraints:
* Length: 0 - 1600
* Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
+ * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
*/ private String consumerArn; @@ -69,9 +81,60 @@ public class AssociateTrackerConsumerRequest extends AmazonWebServiceRequest imp *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
+ * + * @return

+ * The name of the tracker resource to be associated with a geofence + * collection. + *

*/ - private String trackerName; + public String getTrackerName() { + return trackerName; + } + + /** + *

+ * The name of the tracker resource to be associated with a geofence + * collection. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\w]+
+ * + * @param trackerName

+ * The name of the tracker resource to be associated with a + * geofence collection. + *

+ */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

+ * The name of the tracker resource to be associated with a geofence + * collection. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\w]+
+ * + * @param trackerName

+ * The name of the tracker resource to be associated with a + * geofence collection. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public AssociateTrackerConsumerRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

@@ -91,8 +154,8 @@ public class AssociateTrackerConsumerRequest extends AmazonWebServiceRequest imp * Constraints:
* Length: 0 - 1600
* Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
+ * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
* * @return

* The Amazon Resource Name (ARN) for the geofence collection to be @@ -130,8 +193,8 @@ public String getConsumerArn() { * Constraints:
* Length: 0 - 1600
* Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
+ * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
* * @param consumerArn

* The Amazon Resource Name (ARN) for the geofence collection to @@ -172,8 +235,8 @@ public void setConsumerArn(String consumerArn) { * Constraints:
* Length: 0 - 1600
* Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
+ * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
* * @param consumerArn

* The Amazon Resource Name (ARN) for the geofence collection to @@ -196,69 +259,6 @@ public AssociateTrackerConsumerRequest withConsumerArn(String consumerArn) { return this; } - /** - *

- * The name of the tracker resource to be associated with a geofence - * collection. - *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\w]+$
- * - * @return

- * The name of the tracker resource to be associated with a geofence - * collection. - *

- */ - public String getTrackerName() { - return trackerName; - } - - /** - *

- * The name of the tracker resource to be associated with a geofence - * collection. - *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\w]+$
- * - * @param trackerName

- * The name of the tracker resource to be associated with a - * geofence collection. - *

- */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; - } - - /** - *

- * The name of the tracker resource to be associated with a geofence - * collection. - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\w]+$
- * - * @param trackerName

- * The name of the tracker resource to be associated with a - * geofence collection. - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public AssociateTrackerConsumerRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -270,10 +270,10 @@ public AssociateTrackerConsumerRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getConsumerArn() != null) - sb.append("ConsumerArn: " + getConsumerArn() + ","); if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + sb.append("TrackerName: " + getTrackerName() + ","); + if (getConsumerArn() != null) + sb.append("ConsumerArn: " + getConsumerArn()); sb.append("}"); return sb.toString(); } @@ -283,10 +283,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode - + ((getConsumerArn() == null) ? 0 : getConsumerArn().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + + ((getConsumerArn() == null) ? 0 : getConsumerArn().hashCode()); return hashCode; } @@ -301,16 +301,16 @@ public boolean equals(Object obj) { return false; AssociateTrackerConsumerRequest other = (AssociateTrackerConsumerRequest) obj; - if (other.getConsumerArn() == null ^ this.getConsumerArn() == null) - return false; - if (other.getConsumerArn() != null - && other.getConsumerArn().equals(this.getConsumerArn()) == false) - return false; if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; if (other.getTrackerName() != null && other.getTrackerName().equals(this.getTrackerName()) == false) return false; + if (other.getConsumerArn() == null ^ this.getConsumerArn() == null) + return false; + if (other.getConsumerArn() != null + && other.getConsumerArn().equals(this.getConsumerArn()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerResult.java index 68bd8a6603..4482d7c9c5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/AssociateTrackerConsumerResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryError.java index 3d310d4e0a..f2abb657a9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ public class BatchDeleteDevicePositionHistoryError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String deviceId; @@ -48,7 +48,7 @@ public class BatchDeleteDevicePositionHistoryError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

* The ID of the device for this position. @@ -65,7 +65,7 @@ public String getDeviceId() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The ID of the device for this position. @@ -85,7 +85,7 @@ public void setDeviceId(String deviceId) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The ID of the device for this position. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryRequest.java index b40932d1a0..dd6ba0d497 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,6 +26,18 @@ */ public class BatchDeleteDevicePositionHistoryRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

+ * The name of the tracker resource to delete the device position history + * from. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\w]+
+ */ + private String trackerName; + /** *

* Devices whose position history you want to delete. @@ -49,9 +61,60 @@ public class BatchDeleteDevicePositionHistoryRequest extends AmazonWebServiceReq *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
+ * + * @return

+ * The name of the tracker resource to delete the device position + * history from. + *

*/ - private String trackerName; + public String getTrackerName() { + return trackerName; + } + + /** + *

+ * The name of the tracker resource to delete the device position history + * from. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\w]+
+ * + * @param trackerName

+ * The name of the tracker resource to delete the device position + * history from. + *

+ */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

+ * The name of the tracker resource to delete the device position history + * from. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\w]+
+ * + * @param trackerName

+ * The name of the tracker resource to delete the device position + * history from. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public BatchDeleteDevicePositionHistoryRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

@@ -192,69 +255,6 @@ public BatchDeleteDevicePositionHistoryRequest withDeviceIds( return this; } - /** - *

- * The name of the tracker resource to delete the device position history - * from. - *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\w]+$
- * - * @return

- * The name of the tracker resource to delete the device position - * history from. - *

- */ - public String getTrackerName() { - return trackerName; - } - - /** - *

- * The name of the tracker resource to delete the device position history - * from. - *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\w]+$
- * - * @param trackerName

- * The name of the tracker resource to delete the device position - * history from. - *

- */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; - } - - /** - *

- * The name of the tracker resource to delete the device position history - * from. - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\w]+$
- * - * @param trackerName

- * The name of the tracker resource to delete the device position - * history from. - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public BatchDeleteDevicePositionHistoryRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -266,10 +266,10 @@ public BatchDeleteDevicePositionHistoryRequest withTrackerName(String trackerNam public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDeviceIds() != null) - sb.append("DeviceIds: " + getDeviceIds() + ","); if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + sb.append("TrackerName: " + getTrackerName() + ","); + if (getDeviceIds() != null) + sb.append("DeviceIds: " + getDeviceIds()); sb.append("}"); return sb.toString(); } @@ -279,9 +279,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDeviceIds() == null) ? 0 : getDeviceIds().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getDeviceIds() == null) ? 0 : getDeviceIds().hashCode()); return hashCode; } @@ -296,16 +296,16 @@ public boolean equals(Object obj) { return false; BatchDeleteDevicePositionHistoryRequest other = (BatchDeleteDevicePositionHistoryRequest) obj; - if (other.getDeviceIds() == null ^ this.getDeviceIds() == null) - return false; - if (other.getDeviceIds() != null - && other.getDeviceIds().equals(this.getDeviceIds()) == false) - return false; if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; if (other.getTrackerName() != null && other.getTrackerName().equals(this.getTrackerName()) == false) return false; + if (other.getDeviceIds() == null ^ this.getDeviceIds() == null) + return false; + if (other.getDeviceIds() != null + && other.getDeviceIds().equals(this.getDeviceIds()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryResult.java index 39cf1f01c1..a68556b7e5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteDevicePositionHistoryResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceError.java index 3a8f0fe6d1..b83039f496 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,13 +24,6 @@ *

*/ public class BatchDeleteGeofenceError implements Serializable { - /** - *

- * Contains details associated to the batch error. - *

- */ - private BatchItemError error; - /** *

* The geofence associated with the error message. @@ -38,7 +31,7 @@ public class BatchDeleteGeofenceError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String geofenceId; @@ -46,101 +39,108 @@ public class BatchDeleteGeofenceError implements Serializable { *

* Contains details associated to the batch error. *

+ */ + private BatchItemError error; + + /** + *

+ * The geofence associated with the error message. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

- * Contains details associated to the batch error. + * The geofence associated with the error message. *

*/ - public BatchItemError getError() { - return error; + public String getGeofenceId() { + return geofenceId; } /** *

- * Contains details associated to the batch error. + * The geofence associated with the error message. *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
* - * @param error

- * Contains details associated to the batch error. + * @param geofenceId

+ * The geofence associated with the error message. *

*/ - public void setError(BatchItemError error) { - this.error = error; + public void setGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; } /** *

- * Contains details associated to the batch error. + * The geofence associated with the error message. *

*

* Returns a reference to this object so that method calls can be chained * together. + *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
* - * @param error

- * Contains details associated to the batch error. + * @param geofenceId

+ * The geofence associated with the error message. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchDeleteGeofenceError withError(BatchItemError error) { - this.error = error; + public BatchDeleteGeofenceError withGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; return this; } /** *

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
* * @return

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

*/ - public String getGeofenceId() { - return geofenceId; + public BatchItemError getError() { + return error; } /** *

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
* - * @param geofenceId

- * The geofence associated with the error message. + * @param error

+ * Contains details associated to the batch error. *

*/ - public void setGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; + public void setError(BatchItemError error) { + this.error = error; } /** *

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

*

* Returns a reference to this object so that method calls can be chained * together. - *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
* - * @param geofenceId

- * The geofence associated with the error message. + * @param error

+ * Contains details associated to the batch error. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchDeleteGeofenceError withGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; + public BatchDeleteGeofenceError withError(BatchItemError error) { + this.error = error; return this; } @@ -155,10 +155,10 @@ public BatchDeleteGeofenceError withGeofenceId(String geofenceId) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getError() != null) - sb.append("Error: " + getError() + ","); if (getGeofenceId() != null) - sb.append("GeofenceId: " + getGeofenceId()); + sb.append("GeofenceId: " + getGeofenceId() + ","); + if (getError() != null) + sb.append("Error: " + getError()); sb.append("}"); return sb.toString(); } @@ -168,8 +168,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); + hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); return hashCode; } @@ -184,15 +184,15 @@ public boolean equals(Object obj) { return false; BatchDeleteGeofenceError other = (BatchDeleteGeofenceError) obj; - if (other.getError() == null ^ this.getError() == null) - return false; - if (other.getError() != null && other.getError().equals(this.getError()) == false) - return false; if (other.getGeofenceId() == null ^ this.getGeofenceId() == null) return false; if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; + if (other.getError() == null ^ this.getError() == null) + return false; + if (other.getError() != null && other.getError().equals(this.getError()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceRequest.java index 97a1cef989..30eb01d76d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class BatchDeleteGeofenceRequest extends AmazonWebServiceRequest implemen *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
*/ private String collectionName; @@ -55,7 +55,7 @@ public class BatchDeleteGeofenceRequest extends AmazonWebServiceRequest implemen *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @return

* The geofence collection storing the geofences to be deleted. @@ -72,7 +72,7 @@ public String getCollectionName() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param collectionName

* The geofence collection storing the geofences to be deleted. @@ -92,7 +92,7 @@ public void setCollectionName(String collectionName) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param collectionName

* The geofence collection storing the geofences to be deleted. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceResult.java index e22ced6614..c866b03e22 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchDeleteGeofenceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesError.java index 3443d4e165..4eda25d1a4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -31,25 +31,25 @@ public class BatchEvaluateGeofencesError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String deviceId; /** *

- * Contains details associated to the batch error. + * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

*/ - private BatchItemError error; + private java.util.Date sampleTime; /** *

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * Contains details associated to the batch error. *

*/ - private java.util.Date sampleTime; + private BatchItemError error; /** *

@@ -58,7 +58,7 @@ public class BatchEvaluateGeofencesError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

* The device associated with the position evaluation error. @@ -75,7 +75,7 @@ public String getDeviceId() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The device associated with the position evaluation error. @@ -95,7 +95,7 @@ public void setDeviceId(String deviceId) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The device associated with the position evaluation error. @@ -110,103 +110,103 @@ public BatchEvaluateGeofencesError withDeviceId(String deviceId) { /** *

- * Contains details associated to the batch error. + * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

* * @return

- * Contains details associated to the batch error. + * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

*/ - public BatchItemError getError() { - return error; + public java.util.Date getSampleTime() { + return sampleTime; } /** *

- * Contains details associated to the batch error. + * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

* - * @param error

- * Contains details associated to the batch error. + * @param sampleTime

+ * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

*/ - public void setError(BatchItemError error) { - this.error = error; + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; } /** *

- * Contains details associated to the batch error. + * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param error

- * Contains details associated to the batch error. + * @param sampleTime

+ * Specifies a timestamp for when the error occurred in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchEvaluateGeofencesError withError(BatchItemError error) { - this.error = error; + public BatchEvaluateGeofencesError withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; return this; } /** *

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * Contains details associated to the batch error. *

* * @return

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * Contains details associated to the batch error. *

*/ - public java.util.Date getSampleTime() { - return sampleTime; + public BatchItemError getError() { + return error; } /** *

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * Contains details associated to the batch error. *

* - * @param sampleTime

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * @param error

+ * Contains details associated to the batch error. *

*/ - public void setSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; + public void setError(BatchItemError error) { + this.error = error; } /** *

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * Contains details associated to the batch error. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param sampleTime

- * Specifies a timestamp for when the error occurred in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * @param error

+ * Contains details associated to the batch error. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchEvaluateGeofencesError withSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; + public BatchEvaluateGeofencesError withError(BatchItemError error) { + this.error = error; return this; } @@ -223,10 +223,10 @@ public String toString() { sb.append("{"); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); - if (getError() != null) - sb.append("Error: " + getError() + ","); if (getSampleTime() != null) - sb.append("SampleTime: " + getSampleTime()); + sb.append("SampleTime: " + getSampleTime() + ","); + if (getError() != null) + sb.append("Error: " + getError()); sb.append("}"); return sb.toString(); } @@ -237,8 +237,8 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); - hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); + hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); return hashCode; } @@ -257,15 +257,15 @@ public boolean equals(Object obj) { return false; if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; - if (other.getError() == null ^ this.getError() == null) - return false; - if (other.getError() != null && other.getError().equals(this.getError()) == false) - return false; if (other.getSampleTime() == null ^ this.getSampleTime() == null) return false; if (other.getSampleTime() != null && other.getSampleTime().equals(this.getSampleTime()) == false) return false; + if (other.getError() == null ^ this.getError() == null) + return false; + if (other.getError() != null && other.getError().equals(this.getError()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesRequest.java index 51dd78aaed..49b42125e3 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public class BatchEvaluateGeofencesRequest extends AmazonWebServiceRequest imple *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
*/ private String collectionName; @@ -91,7 +91,7 @@ public class BatchEvaluateGeofencesRequest extends AmazonWebServiceRequest imple *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @return

* The geofence collection used in evaluating the position of @@ -110,7 +110,7 @@ public String getCollectionName() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param collectionName

* The geofence collection used in evaluating the position of @@ -132,7 +132,7 @@ public void setCollectionName(String collectionName) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param collectionName

* The geofence collection used in evaluating the position of diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesResult.java index fa937cd926..8f4bf2fb5c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchEvaluateGeofencesResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionError.java index 6be57c7e7a..7ddbdfc8a2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ public class BatchGetDevicePositionError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String deviceId; @@ -48,7 +48,7 @@ public class BatchGetDevicePositionError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

* The ID of the device that didn't return a position. @@ -65,7 +65,7 @@ public String getDeviceId() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The ID of the device that didn't return a position. @@ -85,7 +85,7 @@ public void setDeviceId(String deviceId) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The ID of the device that didn't return a position. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionRequest.java index 40554e0508..7a390d7846 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,6 +25,17 @@ *

*/ public class BatchGetDevicePositionRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

+ * The tracker resource retrieving the device position. + *

+ *

+ * Constraints:
+ * Length: 1 -
+ * Pattern: [-._\w]+
+ */ + private String trackerName; + /** *

* Devices whose position you want to retrieve. @@ -47,9 +58,55 @@ public class BatchGetDevicePositionRequest extends AmazonWebServiceRequest imple *

* Constraints:
* Length: 1 -
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
+ * + * @return

+ * The tracker resource retrieving the device position. + *

*/ - private String trackerName; + public String getTrackerName() { + return trackerName; + } + + /** + *

+ * The tracker resource retrieving the device position. + *

+ *

+ * Constraints:
+ * Length: 1 -
+ * Pattern: [-._\w]+
+ * + * @param trackerName

+ * The tracker resource retrieving the device position. + *

+ */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

+ * The tracker resource retrieving the device position. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Length: 1 -
+ * Pattern: [-._\w]+
+ * + * @param trackerName

+ * The tracker resource retrieving the device position. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public BatchGetDevicePositionRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

@@ -189,63 +246,6 @@ public BatchGetDevicePositionRequest withDeviceIds(java.util.Collection return this; } - /** - *

- * The tracker resource retrieving the device position. - *

- *

- * Constraints:
- * Length: 1 -
- * Pattern: ^[-._\w]+$
- * - * @return

- * The tracker resource retrieving the device position. - *

- */ - public String getTrackerName() { - return trackerName; - } - - /** - *

- * The tracker resource retrieving the device position. - *

- *

- * Constraints:
- * Length: 1 -
- * Pattern: ^[-._\w]+$
- * - * @param trackerName

- * The tracker resource retrieving the device position. - *

- */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; - } - - /** - *

- * The tracker resource retrieving the device position. - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Length: 1 -
- * Pattern: ^[-._\w]+$
- * - * @param trackerName

- * The tracker resource retrieving the device position. - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public BatchGetDevicePositionRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -257,10 +257,10 @@ public BatchGetDevicePositionRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDeviceIds() != null) - sb.append("DeviceIds: " + getDeviceIds() + ","); if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + sb.append("TrackerName: " + getTrackerName() + ","); + if (getDeviceIds() != null) + sb.append("DeviceIds: " + getDeviceIds()); sb.append("}"); return sb.toString(); } @@ -270,9 +270,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDeviceIds() == null) ? 0 : getDeviceIds().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getDeviceIds() == null) ? 0 : getDeviceIds().hashCode()); return hashCode; } @@ -287,16 +287,16 @@ public boolean equals(Object obj) { return false; BatchGetDevicePositionRequest other = (BatchGetDevicePositionRequest) obj; - if (other.getDeviceIds() == null ^ this.getDeviceIds() == null) - return false; - if (other.getDeviceIds() != null - && other.getDeviceIds().equals(this.getDeviceIds()) == false) - return false; if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; if (other.getTrackerName() != null && other.getTrackerName().equals(this.getTrackerName()) == false) return false; + if (other.getDeviceIds() == null ^ this.getDeviceIds() == null) + return false; + if (other.getDeviceIds() != null + && other.getDeviceIds().equals(this.getDeviceIds()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionResult.java index e854d26717..42af0edc3e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchGetDevicePositionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,14 +18,6 @@ import java.io.Serializable; public class BatchGetDevicePositionResult implements Serializable { - /** - *

- * Contains device position details such as the device ID, position, and - * timestamps for when the position was received and sampled. - *

- */ - private java.util.List devicePositions; - /** *

* Contains error details for each device that failed to send its position @@ -39,167 +31,175 @@ public class BatchGetDevicePositionResult implements Serializable { * Contains device position details such as the device ID, position, and * timestamps for when the position was received and sampled. *

+ */ + private java.util.List devicePositions; + + /** + *

+ * Contains error details for each device that failed to send its position + * to the tracker resource. + *

* * @return

- * Contains device position details such as the device ID, position, - * and timestamps for when the position was received and sampled. + * Contains error details for each device that failed to send its + * position to the tracker resource. *

*/ - public java.util.List getDevicePositions() { - return devicePositions; + public java.util.List getErrors() { + return errors; } /** *

- * Contains device position details such as the device ID, position, and - * timestamps for when the position was received and sampled. + * Contains error details for each device that failed to send its position + * to the tracker resource. *

* - * @param devicePositions

- * Contains device position details such as the device ID, - * position, and timestamps for when the position was received - * and sampled. + * @param errors

+ * Contains error details for each device that failed to send its + * position to the tracker resource. *

*/ - public void setDevicePositions(java.util.Collection devicePositions) { - if (devicePositions == null) { - this.devicePositions = null; + public void setErrors(java.util.Collection errors) { + if (errors == null) { + this.errors = null; return; } - this.devicePositions = new java.util.ArrayList(devicePositions); + this.errors = new java.util.ArrayList(errors); } /** *

- * Contains device position details such as the device ID, position, and - * timestamps for when the position was received and sampled. + * Contains error details for each device that failed to send its position + * to the tracker resource. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param devicePositions

- * Contains device position details such as the device ID, - * position, and timestamps for when the position was received - * and sampled. + * @param errors

+ * Contains error details for each device that failed to send its + * position to the tracker resource. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchGetDevicePositionResult withDevicePositions(DevicePosition... devicePositions) { - if (getDevicePositions() == null) { - this.devicePositions = new java.util.ArrayList(devicePositions.length); + public BatchGetDevicePositionResult withErrors(BatchGetDevicePositionError... errors) { + if (getErrors() == null) { + this.errors = new java.util.ArrayList(errors.length); } - for (DevicePosition value : devicePositions) { - this.devicePositions.add(value); + for (BatchGetDevicePositionError value : errors) { + this.errors.add(value); } return this; } /** *

- * Contains device position details such as the device ID, position, and - * timestamps for when the position was received and sampled. + * Contains error details for each device that failed to send its position + * to the tracker resource. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param devicePositions

- * Contains device position details such as the device ID, - * position, and timestamps for when the position was received - * and sampled. + * @param errors

+ * Contains error details for each device that failed to send its + * position to the tracker resource. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchGetDevicePositionResult withDevicePositions( - java.util.Collection devicePositions) { - setDevicePositions(devicePositions); + public BatchGetDevicePositionResult withErrors( + java.util.Collection errors) { + setErrors(errors); return this; } /** *

- * Contains error details for each device that failed to send its position - * to the tracker resource. + * Contains device position details such as the device ID, position, and + * timestamps for when the position was received and sampled. *

* * @return

- * Contains error details for each device that failed to send its - * position to the tracker resource. + * Contains device position details such as the device ID, position, + * and timestamps for when the position was received and sampled. *

*/ - public java.util.List getErrors() { - return errors; + public java.util.List getDevicePositions() { + return devicePositions; } /** *

- * Contains error details for each device that failed to send its position - * to the tracker resource. + * Contains device position details such as the device ID, position, and + * timestamps for when the position was received and sampled. *

* - * @param errors

- * Contains error details for each device that failed to send its - * position to the tracker resource. + * @param devicePositions

+ * Contains device position details such as the device ID, + * position, and timestamps for when the position was received + * and sampled. *

*/ - public void setErrors(java.util.Collection errors) { - if (errors == null) { - this.errors = null; + public void setDevicePositions(java.util.Collection devicePositions) { + if (devicePositions == null) { + this.devicePositions = null; return; } - this.errors = new java.util.ArrayList(errors); + this.devicePositions = new java.util.ArrayList(devicePositions); } /** *

- * Contains error details for each device that failed to send its position - * to the tracker resource. + * Contains device position details such as the device ID, position, and + * timestamps for when the position was received and sampled. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param errors

- * Contains error details for each device that failed to send its - * position to the tracker resource. + * @param devicePositions

+ * Contains device position details such as the device ID, + * position, and timestamps for when the position was received + * and sampled. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchGetDevicePositionResult withErrors(BatchGetDevicePositionError... errors) { - if (getErrors() == null) { - this.errors = new java.util.ArrayList(errors.length); + public BatchGetDevicePositionResult withDevicePositions(DevicePosition... devicePositions) { + if (getDevicePositions() == null) { + this.devicePositions = new java.util.ArrayList(devicePositions.length); } - for (BatchGetDevicePositionError value : errors) { - this.errors.add(value); + for (DevicePosition value : devicePositions) { + this.devicePositions.add(value); } return this; } /** *

- * Contains error details for each device that failed to send its position - * to the tracker resource. + * Contains device position details such as the device ID, position, and + * timestamps for when the position was received and sampled. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param errors

- * Contains error details for each device that failed to send its - * position to the tracker resource. + * @param devicePositions

+ * Contains device position details such as the device ID, + * position, and timestamps for when the position was received + * and sampled. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchGetDevicePositionResult withErrors( - java.util.Collection errors) { - setErrors(errors); + public BatchGetDevicePositionResult withDevicePositions( + java.util.Collection devicePositions) { + setDevicePositions(devicePositions); return this; } @@ -214,10 +214,10 @@ public BatchGetDevicePositionResult withErrors( public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDevicePositions() != null) - sb.append("DevicePositions: " + getDevicePositions() + ","); if (getErrors() != null) - sb.append("Errors: " + getErrors()); + sb.append("Errors: " + getErrors() + ","); + if (getDevicePositions() != null) + sb.append("DevicePositions: " + getDevicePositions()); sb.append("}"); return sb.toString(); } @@ -227,9 +227,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getErrors() == null) ? 0 : getErrors().hashCode()); hashCode = prime * hashCode + ((getDevicePositions() == null) ? 0 : getDevicePositions().hashCode()); - hashCode = prime * hashCode + ((getErrors() == null) ? 0 : getErrors().hashCode()); return hashCode; } @@ -244,15 +244,15 @@ public boolean equals(Object obj) { return false; BatchGetDevicePositionResult other = (BatchGetDevicePositionResult) obj; + if (other.getErrors() == null ^ this.getErrors() == null) + return false; + if (other.getErrors() != null && other.getErrors().equals(this.getErrors()) == false) + return false; if (other.getDevicePositions() == null ^ this.getDevicePositions() == null) return false; if (other.getDevicePositions() != null && other.getDevicePositions().equals(this.getDevicePositions()) == false) return false; - if (other.getErrors() == null ^ this.getErrors() == null) - return false; - if (other.getErrors() != null && other.getErrors().equals(this.getErrors()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemError.java index 80571f8d50..3edac07629 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemErrorCode.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemErrorCode.java index f80714d264..dcf44f67eb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemErrorCode.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchItemErrorCode.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceError.java index bb73021ddd..5e1ef31499 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,13 +24,6 @@ *

*/ public class BatchPutGeofenceError implements Serializable { - /** - *

- * Contains details associated to the batch error. - *

- */ - private BatchItemError error; - /** *

* The geofence associated with the error message. @@ -38,7 +31,7 @@ public class BatchPutGeofenceError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String geofenceId; @@ -46,101 +39,108 @@ public class BatchPutGeofenceError implements Serializable { *

* Contains details associated to the batch error. *

+ */ + private BatchItemError error; + + /** + *

+ * The geofence associated with the error message. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

- * Contains details associated to the batch error. + * The geofence associated with the error message. *

*/ - public BatchItemError getError() { - return error; + public String getGeofenceId() { + return geofenceId; } /** *

- * Contains details associated to the batch error. + * The geofence associated with the error message. *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
* - * @param error

- * Contains details associated to the batch error. + * @param geofenceId

+ * The geofence associated with the error message. *

*/ - public void setError(BatchItemError error) { - this.error = error; + public void setGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; } /** *

- * Contains details associated to the batch error. + * The geofence associated with the error message. *

*

* Returns a reference to this object so that method calls can be chained * together. + *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
* - * @param error

- * Contains details associated to the batch error. + * @param geofenceId

+ * The geofence associated with the error message. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchPutGeofenceError withError(BatchItemError error) { - this.error = error; + public BatchPutGeofenceError withGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; return this; } /** *

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
* * @return

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

*/ - public String getGeofenceId() { - return geofenceId; + public BatchItemError getError() { + return error; } /** *

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
* - * @param geofenceId

- * The geofence associated with the error message. + * @param error

+ * Contains details associated to the batch error. *

*/ - public void setGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; + public void setError(BatchItemError error) { + this.error = error; } /** *

- * The geofence associated with the error message. + * Contains details associated to the batch error. *

*

* Returns a reference to this object so that method calls can be chained * together. - *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
* - * @param geofenceId

- * The geofence associated with the error message. + * @param error

+ * Contains details associated to the batch error. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchPutGeofenceError withGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; + public BatchPutGeofenceError withError(BatchItemError error) { + this.error = error; return this; } @@ -155,10 +155,10 @@ public BatchPutGeofenceError withGeofenceId(String geofenceId) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getError() != null) - sb.append("Error: " + getError() + ","); if (getGeofenceId() != null) - sb.append("GeofenceId: " + getGeofenceId()); + sb.append("GeofenceId: " + getGeofenceId() + ","); + if (getError() != null) + sb.append("Error: " + getError()); sb.append("}"); return sb.toString(); } @@ -168,8 +168,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); + hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); return hashCode; } @@ -184,15 +184,15 @@ public boolean equals(Object obj) { return false; BatchPutGeofenceError other = (BatchPutGeofenceError) obj; - if (other.getError() == null ^ this.getError() == null) - return false; - if (other.getError() != null && other.getError().equals(this.getError()) == false) - return false; if (other.getGeofenceId() == null ^ this.getGeofenceId() == null) return false; if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; + if (other.getError() == null ^ this.getError() == null) + return false; + if (other.getError() != null && other.getError().equals(this.getError()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequest.java index 2881265d19..73ae7458eb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ public class BatchPutGeofenceRequest extends AmazonWebServiceRequest implements *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
*/ private String collectionName; @@ -52,7 +52,7 @@ public class BatchPutGeofenceRequest extends AmazonWebServiceRequest implements *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @return

* The geofence collection storing the geofences. @@ -69,7 +69,7 @@ public String getCollectionName() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param collectionName

* The geofence collection storing the geofences. @@ -89,7 +89,7 @@ public void setCollectionName(String collectionName) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param collectionName

* The geofence collection storing the geofences. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java index d5e7bfe8a7..2cdbdda3bd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -31,36 +31,40 @@ public class BatchPutGeofenceRequestEntry implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String geofenceId; /** *

- * Associates one of more properties with the geofence. A property is a - * key-value pair stored with the geofence and added to any geofence event - * triggered with that geofence. + * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. *

+ * *

- * Format: "key" : "value" + * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence geobuf format supports a maximum of 100,000 vertices. *

+ * */ - private java.util.Map geofenceProperties; + private GeofenceGeometry geometry; /** *

- * Contains the details of the position of the geofence. Can be either a - * polygon or a circle. Including both will return a validation error. + * Associates one of more properties with the geofence. A property is a + * key-value pair stored with the geofence and added to any geofence event + * triggered with that geofence. *

- * *

- * Each geofence polygon can have a maximum of 1,000 vertices. + * Format: "key" : "value" *

- * */ - private GeofenceGeometry geometry; + private java.util.Map geofenceProperties; /** *

@@ -70,7 +74,7 @@ public class BatchPutGeofenceRequestEntry implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

* The identifier for the geofence to be stored in a given geofence @@ -89,7 +93,7 @@ public String getGeofenceId() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param geofenceId

* The identifier for the geofence to be stored in a given @@ -111,7 +115,7 @@ public void setGeofenceId(String geofenceId) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param geofenceId

* The identifier for the geofence to be stored in a given @@ -125,6 +129,128 @@ public BatchPutGeofenceRequestEntry withGeofenceId(String geofenceId) { return this; } + /** + *

+ * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. + *

+ * + *

+ * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence geobuf format supports a maximum of 100,000 vertices. + *

+ * + * + * @return

+ * Contains the details to specify the position of the geofence. Can + * be a polygon, a circle or a polygon encoded in Geobuf format. + * Including multiple selections will return a validation error. + *

+ * + *

+ * The geofence polygon format supports a maximum of 1,000 + * vertices. The Geofence geobuf format supports a maximum of 100,000 + * vertices. + *

+ * + */ + public GeofenceGeometry getGeometry() { + return geometry; + } + + /** + *

+ * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. + *

+ * + *

+ * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence geobuf format supports a maximum of 100,000 vertices. + *

+ * + * + * @param geometry

+ * Contains the details to specify the position of the geofence. + * Can be a polygon, a circle or a polygon encoded in Geobuf + * format. Including multiple selections will return a validation + * error. + *

+ * + *

+ * The geofence polygon format supports a maximum of 1,000 + * vertices. The Geofence geobuf format supports a maximum of 100,000 + * vertices. + *

+ * + */ + public void setGeometry(GeofenceGeometry geometry) { + this.geometry = geometry; + } + + /** + *

+ * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. + *

+ * + *

+ * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence geobuf format supports a maximum of 100,000 vertices. + *

+ * + *

+ * Returns a reference to this object so that method calls can be chained + * together. + * + * @param geometry

+ * Contains the details to specify the position of the geofence. + * Can be a polygon, a circle or a polygon encoded in Geobuf + * format. Including multiple selections will return a validation + * error. + *

+ * + *

+ * The geofence polygon format supports a maximum of 1,000 + * vertices. The Geofence geobuf format supports a maximum of 100,000 + * vertices. + *

+ * + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public BatchPutGeofenceRequestEntry withGeometry(GeofenceGeometry geometry) { + this.geometry = geometry; + return this; + } + /** *

* Associates one of more properties with the geofence. A property is a @@ -243,102 +369,6 @@ public BatchPutGeofenceRequestEntry clearGeofencePropertiesEntries() { return this; } - /** - *

- * Contains the details of the position of the geofence. Can be either a - * polygon or a circle. Including both will return a validation error. - *

- * - *

- * Each geofence polygon can have a maximum of 1,000 vertices. - *

- * - * - * @return

- * Contains the details of the position of the geofence. Can be - * either a polygon or a circle. Including both will return a - * validation error. - *

- * - *

- * Each geofence polygon can have a maximum of 1,000 vertices. - *

- * - */ - public GeofenceGeometry getGeometry() { - return geometry; - } - - /** - *

- * Contains the details of the position of the geofence. Can be either a - * polygon or a circle. Including both will return a validation error. - *

- * - *

- * Each geofence polygon can have a maximum of 1,000 vertices. - *

- * - * - * @param geometry

- * Contains the details of the position of the geofence. Can be - * either a polygon or a circle. Including both will return a - * validation error. - *

- * - *

- * Each geofence polygon can have a maximum of 1,000 vertices. - *

- * - */ - public void setGeometry(GeofenceGeometry geometry) { - this.geometry = geometry; - } - - /** - *

- * Contains the details of the position of the geofence. Can be either a - * polygon or a circle. Including both will return a validation error. - *

- * - *

- * Each geofence polygon can have a maximum of 1,000 vertices. - *

- * - *

- * Returns a reference to this object so that method calls can be chained - * together. - * - * @param geometry

- * Contains the details of the position of the geofence. Can be - * either a polygon or a circle. Including both will return a - * validation error. - *

- * - *

- * Each geofence polygon can have a maximum of 1,000 vertices. - *

- * - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public BatchPutGeofenceRequestEntry withGeometry(GeofenceGeometry geometry) { - this.geometry = geometry; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -352,10 +382,10 @@ public String toString() { sb.append("{"); if (getGeofenceId() != null) sb.append("GeofenceId: " + getGeofenceId() + ","); - if (getGeofenceProperties() != null) - sb.append("GeofenceProperties: " + getGeofenceProperties() + ","); if (getGeometry() != null) - sb.append("Geometry: " + getGeometry()); + sb.append("Geometry: " + getGeometry() + ","); + if (getGeofenceProperties() != null) + sb.append("GeofenceProperties: " + getGeofenceProperties()); sb.append("}"); return sb.toString(); } @@ -366,9 +396,9 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); + hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); hashCode = prime * hashCode + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); - hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); return hashCode; } @@ -388,15 +418,15 @@ public boolean equals(Object obj) { if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; + if (other.getGeometry() == null ^ this.getGeometry() == null) + return false; + if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) + return false; if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) return false; if (other.getGeofenceProperties() != null && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) return false; - if (other.getGeometry() == null ^ this.getGeometry() == null) - return false; - if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceResult.java index 1a6b6f8be7..a20af65a2f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,14 +18,6 @@ import java.io.Serializable; public class BatchPutGeofenceResult implements Serializable { - /** - *

- * Contains additional error details for each geofence that failed to be - * stored in a geofence collection. - *

- */ - private java.util.List errors; - /** *

* Contains each geofence that was successfully stored in a geofence @@ -39,163 +31,171 @@ public class BatchPutGeofenceResult implements Serializable { * Contains additional error details for each geofence that failed to be * stored in a geofence collection. *

+ */ + private java.util.List errors; + + /** + *

+ * Contains each geofence that was successfully stored in a geofence + * collection. + *

* * @return

- * Contains additional error details for each geofence that failed - * to be stored in a geofence collection. + * Contains each geofence that was successfully stored in a geofence + * collection. *

*/ - public java.util.List getErrors() { - return errors; + public java.util.List getSuccesses() { + return successes; } /** *

- * Contains additional error details for each geofence that failed to be - * stored in a geofence collection. + * Contains each geofence that was successfully stored in a geofence + * collection. *

* - * @param errors

- * Contains additional error details for each geofence that - * failed to be stored in a geofence collection. + * @param successes

+ * Contains each geofence that was successfully stored in a + * geofence collection. *

*/ - public void setErrors(java.util.Collection errors) { - if (errors == null) { - this.errors = null; + public void setSuccesses(java.util.Collection successes) { + if (successes == null) { + this.successes = null; return; } - this.errors = new java.util.ArrayList(errors); + this.successes = new java.util.ArrayList(successes); } /** *

- * Contains additional error details for each geofence that failed to be - * stored in a geofence collection. + * Contains each geofence that was successfully stored in a geofence + * collection. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param errors

- * Contains additional error details for each geofence that - * failed to be stored in a geofence collection. + * @param successes

+ * Contains each geofence that was successfully stored in a + * geofence collection. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchPutGeofenceResult withErrors(BatchPutGeofenceError... errors) { - if (getErrors() == null) { - this.errors = new java.util.ArrayList(errors.length); + public BatchPutGeofenceResult withSuccesses(BatchPutGeofenceSuccess... successes) { + if (getSuccesses() == null) { + this.successes = new java.util.ArrayList(successes.length); } - for (BatchPutGeofenceError value : errors) { - this.errors.add(value); + for (BatchPutGeofenceSuccess value : successes) { + this.successes.add(value); } return this; } /** *

- * Contains additional error details for each geofence that failed to be - * stored in a geofence collection. + * Contains each geofence that was successfully stored in a geofence + * collection. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param errors

- * Contains additional error details for each geofence that - * failed to be stored in a geofence collection. + * @param successes

+ * Contains each geofence that was successfully stored in a + * geofence collection. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchPutGeofenceResult withErrors(java.util.Collection errors) { - setErrors(errors); + public BatchPutGeofenceResult withSuccesses( + java.util.Collection successes) { + setSuccesses(successes); return this; } /** *

- * Contains each geofence that was successfully stored in a geofence - * collection. + * Contains additional error details for each geofence that failed to be + * stored in a geofence collection. *

* * @return

- * Contains each geofence that was successfully stored in a geofence - * collection. + * Contains additional error details for each geofence that failed + * to be stored in a geofence collection. *

*/ - public java.util.List getSuccesses() { - return successes; + public java.util.List getErrors() { + return errors; } /** *

- * Contains each geofence that was successfully stored in a geofence - * collection. + * Contains additional error details for each geofence that failed to be + * stored in a geofence collection. *

* - * @param successes

- * Contains each geofence that was successfully stored in a - * geofence collection. + * @param errors

+ * Contains additional error details for each geofence that + * failed to be stored in a geofence collection. *

*/ - public void setSuccesses(java.util.Collection successes) { - if (successes == null) { - this.successes = null; + public void setErrors(java.util.Collection errors) { + if (errors == null) { + this.errors = null; return; } - this.successes = new java.util.ArrayList(successes); + this.errors = new java.util.ArrayList(errors); } /** *

- * Contains each geofence that was successfully stored in a geofence - * collection. + * Contains additional error details for each geofence that failed to be + * stored in a geofence collection. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param successes

- * Contains each geofence that was successfully stored in a - * geofence collection. + * @param errors

+ * Contains additional error details for each geofence that + * failed to be stored in a geofence collection. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchPutGeofenceResult withSuccesses(BatchPutGeofenceSuccess... successes) { - if (getSuccesses() == null) { - this.successes = new java.util.ArrayList(successes.length); + public BatchPutGeofenceResult withErrors(BatchPutGeofenceError... errors) { + if (getErrors() == null) { + this.errors = new java.util.ArrayList(errors.length); } - for (BatchPutGeofenceSuccess value : successes) { - this.successes.add(value); + for (BatchPutGeofenceError value : errors) { + this.errors.add(value); } return this; } /** *

- * Contains each geofence that was successfully stored in a geofence - * collection. + * Contains additional error details for each geofence that failed to be + * stored in a geofence collection. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param successes

- * Contains each geofence that was successfully stored in a - * geofence collection. + * @param errors

+ * Contains additional error details for each geofence that + * failed to be stored in a geofence collection. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchPutGeofenceResult withSuccesses( - java.util.Collection successes) { - setSuccesses(successes); + public BatchPutGeofenceResult withErrors(java.util.Collection errors) { + setErrors(errors); return this; } @@ -210,10 +210,10 @@ public BatchPutGeofenceResult withSuccesses( public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getErrors() != null) - sb.append("Errors: " + getErrors() + ","); if (getSuccesses() != null) - sb.append("Successes: " + getSuccesses()); + sb.append("Successes: " + getSuccesses() + ","); + if (getErrors() != null) + sb.append("Errors: " + getErrors()); sb.append("}"); return sb.toString(); } @@ -223,8 +223,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getErrors() == null) ? 0 : getErrors().hashCode()); hashCode = prime * hashCode + ((getSuccesses() == null) ? 0 : getSuccesses().hashCode()); + hashCode = prime * hashCode + ((getErrors() == null) ? 0 : getErrors().hashCode()); return hashCode; } @@ -239,15 +239,15 @@ public boolean equals(Object obj) { return false; BatchPutGeofenceResult other = (BatchPutGeofenceResult) obj; - if (other.getErrors() == null ^ this.getErrors() == null) - return false; - if (other.getErrors() != null && other.getErrors().equals(this.getErrors()) == false) - return false; if (other.getSuccesses() == null ^ this.getSuccesses() == null) return false; if (other.getSuccesses() != null && other.getSuccesses().equals(this.getSuccesses()) == false) return false; + if (other.getErrors() == null ^ this.getErrors() == null) + return false; + if (other.getErrors() != null && other.getErrors().equals(this.getErrors()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceSuccess.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceSuccess.java index e926177fbd..5a85048044 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceSuccess.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceSuccess.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,6 +24,17 @@ *

*/ public class BatchPutGeofenceSuccess implements Serializable { + /** + *

+ * The geofence successfully stored in a geofence collection. + *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
+ */ + private String geofenceId; + /** *

* The timestamp for when the geofence was stored in a geofence collection @@ -33,6 +44,15 @@ public class BatchPutGeofenceSuccess implements Serializable { */ private java.util.Date createTime; + /** + *

+ * The timestamp for when the geofence was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

+ */ + private java.util.Date updateTime; + /** *

* The geofence successfully stored in a geofence collection. @@ -40,18 +60,55 @@ public class BatchPutGeofenceSuccess implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
+ * + * @return

+ * The geofence successfully stored in a geofence collection. + *

*/ - private String geofenceId; + public String getGeofenceId() { + return geofenceId; + } /** *

- * The timestamp for when the geofence was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The geofence successfully stored in a geofence collection. *

+ *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
+ * + * @param geofenceId

+ * The geofence successfully stored in a geofence collection. + *

*/ - private java.util.Date updateTime; + public void setGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; + } + + /** + *

+ * The geofence successfully stored in a geofence collection. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Length: 1 - 100
+ * Pattern: [-._\p{L}\p{N}]+
+ * + * @param geofenceId

+ * The geofence successfully stored in a geofence collection. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public BatchPutGeofenceSuccess withGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; + return this; + } /** *

@@ -113,63 +170,6 @@ public BatchPutGeofenceSuccess withCreateTime(java.util.Date createTime) { return this; } - /** - *

- * The geofence successfully stored in a geofence collection. - *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
- * - * @return

- * The geofence successfully stored in a geofence collection. - *

- */ - public String getGeofenceId() { - return geofenceId; - } - - /** - *

- * The geofence successfully stored in a geofence collection. - *

- *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
- * - * @param geofenceId

- * The geofence successfully stored in a geofence collection. - *

- */ - public void setGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; - } - - /** - *

- * The geofence successfully stored in a geofence collection. - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
- * - * @param geofenceId

- * The geofence successfully stored in a geofence collection. - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public BatchPutGeofenceSuccess withGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; - return this; - } - /** *

* The timestamp for when the geofence was last updated in * Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
*/ private String deviceId; /** *

- * Contains details related to the error code such as the error code and - * error message. + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

*/ - private BatchItemError error; + private java.util.Date sampleTime; /** *

- * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Contains details related to the error code such as the error code and + * error message. *

*/ - private java.util.Date sampleTime; + private BatchItemError error; /** *

@@ -58,7 +58,7 @@ public class BatchUpdateDevicePositionError implements Serializable { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @return

* The device associated with the failed location update. @@ -75,7 +75,7 @@ public String getDeviceId() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The device associated with the failed location update. @@ -95,7 +95,7 @@ public void setDeviceId(String deviceId) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\p{L}\p{N}]+$
+ * Pattern: [-._\p{L}\p{N}]+
* * @param deviceId

* The device associated with the failed location update. @@ -110,111 +110,111 @@ public BatchUpdateDevicePositionError withDeviceId(String deviceId) { /** *

- * Contains details related to the error code such as the error code and - * error message. + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

* * @return

- * Contains details related to the error code such as the error code - * and error message. + * The timestamp at which the device position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

*/ - public BatchItemError getError() { - return error; + public java.util.Date getSampleTime() { + return sampleTime; } /** *

- * Contains details related to the error code such as the error code and - * error message. + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

* - * @param error

- * Contains details related to the error code such as the error - * code and error message. + * @param sampleTime

+ * The timestamp at which the device position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

*/ - public void setError(BatchItemError error) { - this.error = error; + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; } /** *

- * Contains details related to the error code such as the error code and - * error message. + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param error

- * Contains details related to the error code such as the error - * code and error message. + * @param sampleTime

+ * The timestamp at which the device position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchUpdateDevicePositionError withError(BatchItemError error) { - this.error = error; + public BatchUpdateDevicePositionError withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; return this; } /** *

- * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Contains details related to the error code such as the error code and + * error message. *

* * @return

- * The timestamp at which the device position was determined. Uses - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Contains details related to the error code such as the error code + * and error message. *

*/ - public java.util.Date getSampleTime() { - return sampleTime; + public BatchItemError getError() { + return error; } /** *

- * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Contains details related to the error code such as the error code and + * error message. *

* - * @param sampleTime

- * The timestamp at which the device position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param error

+ * Contains details related to the error code such as the error + * code and error message. *

*/ - public void setSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; + public void setError(BatchItemError error) { + this.error = error; } /** *

- * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Contains details related to the error code such as the error code and + * error message. *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param sampleTime

- * The timestamp at which the device position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param error

+ * Contains details related to the error code such as the error + * code and error message. *

* @return A reference to this updated object so that method calls can be * chained together. */ - public BatchUpdateDevicePositionError withSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; + public BatchUpdateDevicePositionError withError(BatchItemError error) { + this.error = error; return this; } @@ -231,10 +231,10 @@ public String toString() { sb.append("{"); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); - if (getError() != null) - sb.append("Error: " + getError() + ","); if (getSampleTime() != null) - sb.append("SampleTime: " + getSampleTime()); + sb.append("SampleTime: " + getSampleTime() + ","); + if (getError() != null) + sb.append("Error: " + getError()); sb.append("}"); return sb.toString(); } @@ -245,8 +245,8 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); - hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); + hashCode = prime * hashCode + ((getError() == null) ? 0 : getError().hashCode()); return hashCode; } @@ -265,15 +265,15 @@ public boolean equals(Object obj) { return false; if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; - if (other.getError() == null ^ this.getError() == null) - return false; - if (other.getError() != null && other.getError().equals(this.getError()) == false) - return false; if (other.getSampleTime() == null ^ this.getSampleTime() == null) return false; if (other.getSampleTime() != null && other.getSampleTime().equals(this.getSampleTime()) == false) return false; + if (other.getError() == null ^ this.getError() == null) + return false; + if (other.getError() != null && other.getError().equals(this.getError()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionRequest.java index 0827e2258a..5ecd300321 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ public class BatchUpdateDevicePositionRequest extends AmazonWebServiceRequest im *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
*/ private String trackerName; @@ -80,7 +80,7 @@ public class BatchUpdateDevicePositionRequest extends AmazonWebServiceRequest im *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @return

* The name of the tracker resource to update. @@ -97,7 +97,7 @@ public String getTrackerName() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param trackerName

* The name of the tracker resource to update. @@ -117,7 +117,7 @@ public void setTrackerName(String trackerName) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param trackerName

* The name of the tracker resource to update. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionResult.java index 14e0c864b8..d77c6e156d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchUpdateDevicePositionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteCarModeOptions.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteCarModeOptions.java index f90655a423..69968b15c6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteCarModeOptions.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteCarModeOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixRequest.java index 60112d3a27..b5e49e1c23 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -89,39 +89,10 @@ public class CalculateRouteMatrixRequest extends AmazonWebServiceRequest impleme *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
*/ private String calculatorName; - /** - *

- * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. - *

- *

- * Requirements: TravelMode must be specified as - * Car. - *

- */ - private CalculateRouteCarModeOptions carModeOptions; - - /** - *

- * Sets the time of departure as the current time. Uses the current time to - * calculate the route matrix. You can't set both DepartureTime - * and DepartNow. If neither is set, the best time of day to - * travel with the best traffic conditions is used to calculate the route - * matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- */ - private Boolean departNow; - /** *

* The list of departure (origin) positions for the route matrix. An array @@ -154,31 +125,6 @@ public class CalculateRouteMatrixRequest extends AmazonWebServiceRequest impleme */ private java.util.List> departurePositions; - /** - *

- * Specifies the desired time of departure. Uses the given time to calculate - * the route matrix. You can't set both DepartureTime and - * DepartNow. If neither is set, the best time of day to travel - * with the best traffic conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - *
    - *
  • - *

    - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, - * 2020–07-2T12:15:20.000Z+01:00 - *

    - *
    • - *
- */ - private java.util.Date departureTime; - /** *

* The list of destination positions for the route matrix. An array of @@ -211,31 +157,6 @@ public class CalculateRouteMatrixRequest extends AmazonWebServiceRequest impleme */ private java.util.List> destinationPositions; - /** - *

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- *

- * Constraints:
- * Allowed Values: Kilometers, Miles - */ - private String distanceUnit; - - /** - *

- * The optional API key to authorize the request. - *

- *

- * Constraints:
- * Length: 0 - 1000
- */ - private String key; - /** *

* Specifies the mode of transport when calculating a route. Used in @@ -282,6 +203,73 @@ public class CalculateRouteMatrixRequest extends AmazonWebServiceRequest impleme */ private String travelMode; + /** + *

+ * Specifies the desired time of departure. Uses the given time to calculate + * the route matrix. You can't set both DepartureTime and + * DepartNow. If neither is set, the best time of day to travel + * with the best traffic conditions is used to calculate the route matrix. + *

+ * + *

+ * Setting a departure time in the past returns a + * 400 ValidationException error. + *

+ * + *
    + *
  • + *

    + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

    + *
    • + *
+ */ + private java.util.Date departureTime; + + /** + *

+ * Sets the time of departure as the current time. Uses the current time to + * calculate the route matrix. You can't set both DepartureTime + * and DepartNow. If neither is set, the best time of day to + * travel with the best traffic conditions is used to calculate the route + * matrix. + *

+ *

+ * Default Value: false + *

+ *

+ * Valid Values: false | true + *

+ */ + private Boolean departNow; + + /** + *

+ * Set the unit system to specify the distance. + *

+ *

+ * Default Value: Kilometers + *

+ *

+ * Constraints:
+ * Allowed Values: Kilometers, Miles + */ + private String distanceUnit; + + /** + *

+ * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. + *

+ *

+ * Requirements: TravelMode must be specified as + * Car. + *

+ */ + private CalculateRouteCarModeOptions carModeOptions; + /** *

* Specifies route preferences when traveling by Truck, such as @@ -295,6 +283,18 @@ public class CalculateRouteMatrixRequest extends AmazonWebServiceRequest impleme */ private CalculateRouteTruckModeOptions truckModeOptions; + /** + *

+ * The optional API key to authorize the request. + *

+ *

+ * Constraints:
+ * Length: 0 - 1000
+ */ + private String key; + /** *

* The name of the route calculator resource that you want to use to @@ -303,7 +303,7 @@ public class CalculateRouteMatrixRequest extends AmazonWebServiceRequest impleme *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @return

* The name of the route calculator resource that you want to use to @@ -322,7 +322,7 @@ public String getCalculatorName() { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param calculatorName

* The name of the route calculator resource that you want to use @@ -344,7 +344,7 @@ public void setCalculatorName(String calculatorName) { *

* Constraints:
* Length: 1 - 100
- * Pattern: ^[-._\w]+$
+ * Pattern: [-._\w]+
* * @param calculatorName

* The name of the route calculator resource that you want to use @@ -360,302 +360,88 @@ public CalculateRouteMatrixRequest withCalculatorName(String calculatorName) { /** *

- * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. + * The list of departure (origin) positions for the route matrix. An array + * of points, each of which is itself a 2-value array defined in WGS 84 + * format: [longitude, latitude]. For example, + * [-123.115, 49.285]. *

+ * *

- * Requirements: TravelMode must be specified as - * Car. + * Depending on the data provider selected in the route calculator resource + * there may be additional restrictions on the inputs you can choose. See Position restrictions in the Amazon Location Service Developer + * Guide. + *

+ * + *

+ * For route calculators that use Esri as the data provider, if you specify + * a departure that's not located on a road, Amazon Location moves the position to the nearest road. The snapped value is + * available in the result in SnappedDeparturePositions. + *

+ * + *

+ * Valid Values: [-180 to 180,-90 to 90] *

* * @return

- * Specifies route preferences when traveling by Car, - * such as avoiding routes that use ferries or tolls. + * The list of departure (origin) positions for the route matrix. An + * array of points, each of which is itself a 2-value array defined + * in WGS + * 84 format: [longitude, latitude]. For example, + * [-123.115, 49.285]. *

+ * *

- * Requirements: TravelMode must be specified as - * Car. + * Depending on the data provider selected in the route calculator + * resource there may be additional restrictions on the inputs you + * can choose. See Position restrictions in the Amazon Location Service + * Developer Guide. + *

+ * + *

+ * For route calculators that use Esri as the data provider, if you + * specify a departure that's not located on a road, Amazon Location + * moves the position to the nearest road. The snapped value + * is available in the result in + * SnappedDeparturePositions. + *

+ * + *

+ * Valid Values: [-180 to 180,-90 to 90] *

*/ - public CalculateRouteCarModeOptions getCarModeOptions() { - return carModeOptions; + public java.util.List> getDeparturePositions() { + return departurePositions; } /** *

- * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. + * The list of departure (origin) positions for the route matrix. An array + * of points, each of which is itself a 2-value array defined in WGS 84 + * format: [longitude, latitude]. For example, + * [-123.115, 49.285]. *

+ * *

- * Requirements: TravelMode must be specified as - * Car. + * Depending on the data provider selected in the route calculator resource + * there may be additional restrictions on the inputs you can choose. See Position restrictions in the Amazon Location Service Developer + * Guide. *

- * - * @param carModeOptions

- * Specifies route preferences when traveling by Car - * , such as avoiding routes that use ferries or tolls. - *

- *

- * Requirements: TravelMode must be specified as - * Car. - *

- */ - public void setCarModeOptions(CalculateRouteCarModeOptions carModeOptions) { - this.carModeOptions = carModeOptions; - } - - /** - *

- * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. - *

- *

- * Requirements: TravelMode must be specified as - * Car. - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - * - * @param carModeOptions

- * Specifies route preferences when traveling by Car - * , such as avoiding routes that use ferries or tolls. - *

- *

- * Requirements: TravelMode must be specified as - * Car. - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteMatrixRequest withCarModeOptions( - CalculateRouteCarModeOptions carModeOptions) { - this.carModeOptions = carModeOptions; - return this; - } - - /** - *

- * Sets the time of departure as the current time. Uses the current time to - * calculate the route matrix. You can't set both DepartureTime - * and DepartNow. If neither is set, the best time of day to - * travel with the best traffic conditions is used to calculate the route - * matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- * - * @return

- * Sets the time of departure as the current time. Uses the current - * time to calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If neither - * is set, the best time of day to travel with the best traffic - * conditions is used to calculate the route matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- */ - public Boolean isDepartNow() { - return departNow; - } - - /** - *

- * Sets the time of departure as the current time. Uses the current time to - * calculate the route matrix. You can't set both DepartureTime - * and DepartNow. If neither is set, the best time of day to - * travel with the best traffic conditions is used to calculate the route - * matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- * - * @return

- * Sets the time of departure as the current time. Uses the current - * time to calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If neither - * is set, the best time of day to travel with the best traffic - * conditions is used to calculate the route matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- */ - public Boolean getDepartNow() { - return departNow; - } - - /** - *

- * Sets the time of departure as the current time. Uses the current time to - * calculate the route matrix. You can't set both DepartureTime - * and DepartNow. If neither is set, the best time of day to - * travel with the best traffic conditions is used to calculate the route - * matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- * - * @param departNow

- * Sets the time of departure as the current time. Uses the - * current time to calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If - * neither is set, the best time of day to travel with the best - * traffic conditions is used to calculate the route matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- */ - public void setDepartNow(Boolean departNow) { - this.departNow = departNow; - } - - /** - *

- * Sets the time of departure as the current time. Uses the current time to - * calculate the route matrix. You can't set both DepartureTime - * and DepartNow. If neither is set, the best time of day to - * travel with the best traffic conditions is used to calculate the route - * matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - * - * @param departNow

- * Sets the time of departure as the current time. Uses the - * current time to calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If - * neither is set, the best time of day to travel with the best - * traffic conditions is used to calculate the route matrix. - *

- *

- * Default Value: false - *

- *

- * Valid Values: false | true - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteMatrixRequest withDepartNow(Boolean departNow) { - this.departNow = departNow; - return this; - } - - /** - *

- * The list of departure (origin) positions for the route matrix. An array - * of points, each of which is itself a 2-value array defined in WGS 84 - * format: [longitude, latitude]. For example, - * [-123.115, 49.285]. - *

- * - *

- * Depending on the data provider selected in the route calculator resource - * there may be additional restrictions on the inputs you can choose. See Position restrictions in the Amazon Location Service Developer - * Guide. - *

- * - *

- * For route calculators that use Esri as the data provider, if you specify - * a departure that's not located on a road, Amazon Location moves the position to the nearest road. The snapped value is - * available in the result in SnappedDeparturePositions. - *

- * - *

- * Valid Values: [-180 to 180,-90 to 90] - *

- * - * @return

- * The list of departure (origin) positions for the route matrix. An - * array of points, each of which is itself a 2-value array defined - * in WGS - * 84 format: [longitude, latitude]. For example, - * [-123.115, 49.285]. - *

- * - *

- * Depending on the data provider selected in the route calculator - * resource there may be additional restrictions on the inputs you - * can choose. See Position restrictions in the Amazon Location Service - * Developer Guide. - *

- * - *

- * For route calculators that use Esri as the data provider, if you - * specify a departure that's not located on a road, Amazon Location - * moves the position to the nearest road. The snapped value - * is available in the result in - * SnappedDeparturePositions. - *

- * - *

- * Valid Values: [-180 to 180,-90 to 90] - *

- */ - public java.util.List> getDeparturePositions() { - return departurePositions; - } - - /** - *

- * The list of departure (origin) positions for the route matrix. An array - * of points, each of which is itself a 2-value array defined in WGS 84 - * format: [longitude, latitude]. For example, - * [-123.115, 49.285]. - *

- * - *

- * Depending on the data provider selected in the route calculator resource - * there may be additional restrictions on the inputs you can choose. See Position restrictions in the Amazon Location Service Developer - * Guide. - *

- * + * *

* For route calculators that use Esri as the data provider, if you specify * a departure that's not located on a road, Amazon Location - * Specifies the desired time of departure. Uses the given time to calculate - * the route matrix. You can't set both DepartureTime and - * DepartNow. If neither is set, the best time of day to travel - * with the best traffic conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - * - * - * @return

- * Specifies the desired time of departure. Uses the given time to - * calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If neither - * is set, the best time of day to travel with the best traffic - * conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - *
    - *
  • - *

    - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For - * example, 2020–07-2T12:15:20.000Z+01:00 - *

    - *
    • - *
- */ - public java.util.Date getDepartureTime() { - return departureTime; - } - - /** - *

- * Specifies the desired time of departure. Uses the given time to calculate - * the route matrix. You can't set both DepartureTime and - * DepartNow. If neither is set, the best time of day to travel - * with the best traffic conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - *
    - *
  • - *

    - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, - * 2020–07-2T12:15:20.000Z+01:00 - *

    - *
    • - *
- * - * @param departureTime

- * Specifies the desired time of departure. Uses the given time - * to calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If - * neither is set, the best time of day to travel with the best - * traffic conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - *
    - *
  • - *

    - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For - * example, 2020–07-2T12:15:20.000Z+01:00 - *

    - *
    • - *
- */ - public void setDepartureTime(java.util.Date departureTime) { - this.departureTime = departureTime; - } - - /** - *

- * Specifies the desired time of departure. Uses the given time to calculate - * the route matrix. You can't set both DepartureTime and - * DepartNow. If neither is set, the best time of day to travel - * with the best traffic conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - *
    - *
  • - *

    - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, - * 2020–07-2T12:15:20.000Z+01:00 - *

    - *
    • - *
- *

- * Returns a reference to this object so that method calls can be chained - * together. - * - * @param departureTime

- * Specifies the desired time of departure. Uses the given time - * to calculate the route matrix. You can't set both - * DepartureTime and DepartNow. If - * neither is set, the best time of day to travel with the best - * traffic conditions is used to calculate the route matrix. - *

- * - *

- * Setting a departure time in the past returns a - * 400 ValidationException error. - *

- * - *
    - *
  • - *

    - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For - * example, 2020–07-2T12:15:20.000Z+01:00 - *

    - *
    • - *
- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteMatrixRequest withDepartureTime(java.util.Date departureTime) { - this.departureTime = departureTime; - return this; - } - /** *

* The list of destination positions for the route matrix. An array of @@ -1314,300 +941,107 @@ public CalculateRouteMatrixRequest withDestinationPositions( /** *

- * Set the unit system to specify the distance. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. *

*

- * Default Value: Kilometers + * The TravelMode you specify also determines how you specify + * route preferences: + *

+ *
    + *
  • + *

    + * If traveling by Car use the CarModeOptions + * parameter. + *

    + *
    • + *
  • + *

    + * If traveling by Truck use the TruckModeOptions + * parameter. + *

    + *
    • + *
+ * + *

+ * Bicycle or Motorcycle are only valid when using + * Grab as a data provider, and only within Southeast Asia. + *

+ *

+ * Truck is not available for Grab. + *

+ *

+ * For more information about using Grab as a data provider, see GrabMaps in the Amazon Location Service Developer Guide. + *

+ * + *

+ * Default Value: Car *

*

* Constraints:
- * Allowed Values: Kilometers, Miles + * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle * * @return

- * Set the unit system to specify the distance. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. *

*

- * Default Value: Kilometers + * The TravelMode you specify also determines how you + * specify route preferences: *

- * @see DistanceUnit + *
    + *
  • + *

    + * If traveling by Car use the + * CarModeOptions parameter. + *

    + *
    • + *
  • + *

    + * If traveling by Truck use the + * TruckModeOptions parameter. + *

    + *
    • + *
+ * + *

+ * Bicycle or Motorcycle are only valid + * when using Grab as a data provider, and only within + * Southeast Asia. + *

+ *

+ * Truck is not available for Grab. + *

+ *

+ * For more information about using Grab as a data provider, see GrabMaps in the Amazon Location Service Developer + * Guide. + *

+ * + *

+ * Default Value: Car + *

+ * @see TravelMode */ - public String getDistanceUnit() { - return distanceUnit; + public String getTravelMode() { + return travelMode; } /** *

- * Set the unit system to specify the distance. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. *

*

- * Default Value: Kilometers + * The TravelMode you specify also determines how you specify + * route preferences: *

- *

- * Constraints:
- * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- * @see DistanceUnit - */ - public void setDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - } - - /** - *

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- * @return A reference to this updated object so that method calls can be - * chained together. - * @see DistanceUnit - */ - public CalculateRouteMatrixRequest withDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - return this; - } - - /** - *

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- *

- * Constraints:
- * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- * @see DistanceUnit - */ - public void setDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); - } - - /** - *

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

- * Set the unit system to specify the distance. - *

- *

- * Default Value: Kilometers - *

- * @return A reference to this updated object so that method calls can be - * chained together. - * @see DistanceUnit - */ - public CalculateRouteMatrixRequest withDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); - return this; - } - - /** - *

- * The optional API key to authorize the request. - *

- *

- * Constraints:
- * Length: 0 - 1000
- * - * @return

- * The optional API key to authorize the request. - *

- */ - public String getKey() { - return key; - } - - /** - *

- * The optional API key to authorize the request. - *

- *

- * Constraints:
- * Length: 0 - 1000
- * - * @param key

- * The optional API key to authorize the request. - *

- */ - public void setKey(String key) { - this.key = key; - } - - /** - *

- * The optional API key to authorize the request. - *

- *

- * Returns a reference to this object so that method calls can be chained - * together. - *

- * Constraints:
- * Length: 0 - 1000
- * - * @param key

- * The optional API key to authorize the request. - *

- * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteMatrixRequest withKey(String key) { - this.key = key; - return this; - } - - /** - *

- * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. - *

- *

- * The TravelMode you specify also determines how you specify - * route preferences: - *

- *
    - *
  • - *

    - * If traveling by Car use the CarModeOptions - * parameter. - *

    - *
    • - *
  • - *

    - * If traveling by Truck use the TruckModeOptions - * parameter. - *

    - *
    • - *
- * - *

- * Bicycle or Motorcycle are only valid when using - * Grab as a data provider, and only within Southeast Asia. - *

- *

- * Truck is not available for Grab. - *

- *

- * For more information about using Grab as a data provider, see GrabMaps in the Amazon Location Service Developer Guide. - *

- * - *

- * Default Value: Car - *

- *

- * Constraints:
- * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle - * - * @return

- * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. - *

- *

- * The TravelMode you specify also determines how you - * specify route preferences: - *

- *
    - *
  • - *

    - * If traveling by Car use the - * CarModeOptions parameter. - *

    - *
    • - *
  • - *

    - * If traveling by Truck use the - * TruckModeOptions parameter. - *

    - *
    • - *
- * - *

- * Bicycle or Motorcycle are only valid - * when using Grab as a data provider, and only within - * Southeast Asia. - *

- *

- * Truck is not available for Grab. - *

- *

- * For more information about using Grab as a data provider, see GrabMaps in the Amazon Location Service Developer - * Guide. - *

- * - *

- * Default Value: Car - *

- * @see TravelMode - */ - public String getTravelMode() { - return travelMode; - } - - /** - *

- * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. - *

- *

- * The TravelMode you specify also determines how you specify - * route preferences: - *

- *
    - *
  • + *
      + *
    • *

      * If traveling by Car use the CarModeOptions * parameter. @@ -1979,8 +1413,508 @@ public CalculateRouteMatrixRequest withTravelMode(TravelMode travelMode) { /** *

      - * Specifies route preferences when traveling by Truck, such as - * avoiding routes that use ferries or tolls, and truck specifications to + * Specifies the desired time of departure. Uses the given time to calculate + * the route matrix. You can't set both DepartureTime and + * DepartNow. If neither is set, the best time of day to travel + * with the best traffic conditions is used to calculate the route matrix. + *

      + * + *

      + * Setting a departure time in the past returns a + * 400 ValidationException error. + *

      + *       + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + * + * @return

      + * Specifies the desired time of departure. Uses the given time to + * calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If neither + * is set, the best time of day to travel with the best traffic + * conditions is used to calculate the route matrix. + *

      + * + *

      + * Setting a departure time in the past returns a + * 400 ValidationException error. + *

      + *       + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For + * example, 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + */ + public java.util.Date getDepartureTime() { + return departureTime; + } + + /** + *

      + * Specifies the desired time of departure. Uses the given time to calculate + * the route matrix. You can't set both DepartureTime and + * DepartNow. If neither is set, the best time of day to travel + * with the best traffic conditions is used to calculate the route matrix. + *

      + * + *

      + * Setting a departure time in the past returns a + * 400 ValidationException error. + *

      + *       + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + * + * @param departureTime

      + * Specifies the desired time of departure. Uses the given time + * to calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If + * neither is set, the best time of day to travel with the best + * traffic conditions is used to calculate the route matrix. + *

      + * + *

      + * Setting a departure time in the past returns a + * 400 ValidationException error. + *

      + *       + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For + * example, 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + */ + public void setDepartureTime(java.util.Date departureTime) { + this.departureTime = departureTime; + } + + /** + *

      + * Specifies the desired time of departure. Uses the given time to calculate + * the route matrix. You can't set both DepartureTime and + * DepartNow. If neither is set, the best time of day to travel + * with the best traffic conditions is used to calculate the route matrix. + *

      + * + *

      + * Setting a departure time in the past returns a + * 400 ValidationException error. + *

      + *       + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param departureTime

      + * Specifies the desired time of departure. Uses the given time + * to calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If + * neither is set, the best time of day to travel with the best + * traffic conditions is used to calculate the route matrix. + *

      + * + *

      + * Setting a departure time in the past returns a + * 400 ValidationException error. + *

      + *       + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For + * example, 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CalculateRouteMatrixRequest withDepartureTime(java.util.Date departureTime) { + this.departureTime = departureTime; + return this; + } + + /** + *

      + * Sets the time of departure as the current time. Uses the current time to + * calculate the route matrix. You can't set both DepartureTime + * and DepartNow. If neither is set, the best time of day to + * travel with the best traffic conditions is used to calculate the route + * matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + * + * @return

      + * Sets the time of departure as the current time. Uses the current + * time to calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If neither + * is set, the best time of day to travel with the best traffic + * conditions is used to calculate the route matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + */ + public Boolean isDepartNow() { + return departNow; + } + + /** + *

      + * Sets the time of departure as the current time. Uses the current time to + * calculate the route matrix. You can't set both DepartureTime + * and DepartNow. If neither is set, the best time of day to + * travel with the best traffic conditions is used to calculate the route + * matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + * + * @return

      + * Sets the time of departure as the current time. Uses the current + * time to calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If neither + * is set, the best time of day to travel with the best traffic + * conditions is used to calculate the route matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + */ + public Boolean getDepartNow() { + return departNow; + } + + /** + *

      + * Sets the time of departure as the current time. Uses the current time to + * calculate the route matrix. You can't set both DepartureTime + * and DepartNow. If neither is set, the best time of day to + * travel with the best traffic conditions is used to calculate the route + * matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + * + * @param departNow

      + * Sets the time of departure as the current time. Uses the + * current time to calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If + * neither is set, the best time of day to travel with the best + * traffic conditions is used to calculate the route matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + */ + public void setDepartNow(Boolean departNow) { + this.departNow = departNow; + } + + /** + *

      + * Sets the time of departure as the current time. Uses the current time to + * calculate the route matrix. You can't set both DepartureTime + * and DepartNow. If neither is set, the best time of day to + * travel with the best traffic conditions is used to calculate the route + * matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param departNow

      + * Sets the time of departure as the current time. Uses the + * current time to calculate the route matrix. You can't set both + * DepartureTime and DepartNow. If + * neither is set, the best time of day to travel with the best + * traffic conditions is used to calculate the route matrix. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CalculateRouteMatrixRequest withDepartNow(Boolean departNow) { + this.departNow = departNow; + return this; + } + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @return

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public CalculateRouteMatrixRequest withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public CalculateRouteMatrixRequest withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + return this; + } + + /** + *

      + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + * + * @return

      + * Specifies route preferences when traveling by Car, + * such as avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + */ + public CalculateRouteCarModeOptions getCarModeOptions() { + return carModeOptions; + } + + /** + *

      + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + * + * @param carModeOptions

      + * Specifies route preferences when traveling by Car + * , such as avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + */ + public void setCarModeOptions(CalculateRouteCarModeOptions carModeOptions) { + this.carModeOptions = carModeOptions; + } + + /** + *

      + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param carModeOptions

      + * Specifies route preferences when traveling by Car + * , such as avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CalculateRouteMatrixRequest withCarModeOptions( + CalculateRouteCarModeOptions carModeOptions) { + this.carModeOptions = carModeOptions; + return this; + } + + /** + *

      + * Specifies route preferences when traveling by Truck, such as + * avoiding routes that use ferries or tolls, and truck specifications to * consider when choosing an optimal road. *

      *

      @@ -2061,6 +1995,72 @@ public CalculateRouteMatrixRequest withTruckModeOptions( return this; } + /** + *

      + * The optional API key to authorize the request. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @return

      + * The optional API key to authorize the request. + *

      + */ + public String getKey() { + return key; + } + + /** + *

      + * The optional API key to authorize the request. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param key

      + * The optional API key to authorize the request. + *

      + */ + public void setKey(String key) { + this.key = key; + } + + /** + *

      + * The optional API key to authorize the request. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param key

      + * The optional API key to authorize the request. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CalculateRouteMatrixRequest withKey(String key) { + this.key = key; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -2074,24 +2074,24 @@ public String toString() { sb.append("{"); if (getCalculatorName() != null) sb.append("CalculatorName: " + getCalculatorName() + ","); - if (getCarModeOptions() != null) - sb.append("CarModeOptions: " + getCarModeOptions() + ","); - if (getDepartNow() != null) - sb.append("DepartNow: " + getDepartNow() + ","); if (getDeparturePositions() != null) sb.append("DeparturePositions: " + getDeparturePositions() + ","); - if (getDepartureTime() != null) - sb.append("DepartureTime: " + getDepartureTime() + ","); if (getDestinationPositions() != null) sb.append("DestinationPositions: " + getDestinationPositions() + ","); - if (getDistanceUnit() != null) - sb.append("DistanceUnit: " + getDistanceUnit() + ","); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); if (getTravelMode() != null) sb.append("TravelMode: " + getTravelMode() + ","); + if (getDepartureTime() != null) + sb.append("DepartureTime: " + getDepartureTime() + ","); + if (getDepartNow() != null) + sb.append("DepartNow: " + getDepartNow() + ","); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit() + ","); + if (getCarModeOptions() != null) + sb.append("CarModeOptions: " + getCarModeOptions() + ","); if (getTruckModeOptions() != null) - sb.append("TruckModeOptions: " + getTruckModeOptions()); + sb.append("TruckModeOptions: " + getTruckModeOptions() + ","); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -2103,21 +2103,21 @@ public int hashCode() { hashCode = prime * hashCode + ((getCalculatorName() == null) ? 0 : getCalculatorName().hashCode()); - hashCode = prime * hashCode - + ((getCarModeOptions() == null) ? 0 : getCarModeOptions().hashCode()); - hashCode = prime * hashCode + ((getDepartNow() == null) ? 0 : getDepartNow().hashCode()); hashCode = prime * hashCode + ((getDeparturePositions() == null) ? 0 : getDeparturePositions().hashCode()); - hashCode = prime * hashCode - + ((getDepartureTime() == null) ? 0 : getDepartureTime().hashCode()); hashCode = prime * hashCode + ((getDestinationPositions() == null) ? 0 : getDestinationPositions().hashCode()); + hashCode = prime * hashCode + ((getTravelMode() == null) ? 0 : getTravelMode().hashCode()); + hashCode = prime * hashCode + + ((getDepartureTime() == null) ? 0 : getDepartureTime().hashCode()); + hashCode = prime * hashCode + ((getDepartNow() == null) ? 0 : getDepartNow().hashCode()); hashCode = prime * hashCode + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getTravelMode() == null) ? 0 : getTravelMode().hashCode()); + hashCode = prime * hashCode + + ((getCarModeOptions() == null) ? 0 : getCarModeOptions().hashCode()); hashCode = prime * hashCode + ((getTruckModeOptions() == null) ? 0 : getTruckModeOptions().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -2137,50 +2137,50 @@ public boolean equals(Object obj) { if (other.getCalculatorName() != null && other.getCalculatorName().equals(this.getCalculatorName()) == false) return false; - if (other.getCarModeOptions() == null ^ this.getCarModeOptions() == null) + if (other.getDeparturePositions() == null ^ this.getDeparturePositions() == null) return false; - if (other.getCarModeOptions() != null - && other.getCarModeOptions().equals(this.getCarModeOptions()) == false) + if (other.getDeparturePositions() != null + && other.getDeparturePositions().equals(this.getDeparturePositions()) == false) return false; - if (other.getDepartNow() == null ^ this.getDepartNow() == null) + if (other.getDestinationPositions() == null ^ this.getDestinationPositions() == null) return false; - if (other.getDepartNow() != null - && other.getDepartNow().equals(this.getDepartNow()) == false) + if (other.getDestinationPositions() != null + && other.getDestinationPositions().equals(this.getDestinationPositions()) == false) return false; - if (other.getDeparturePositions() == null ^ this.getDeparturePositions() == null) + if (other.getTravelMode() == null ^ this.getTravelMode() == null) return false; - if (other.getDeparturePositions() != null - && other.getDeparturePositions().equals(this.getDeparturePositions()) == false) + if (other.getTravelMode() != null + && other.getTravelMode().equals(this.getTravelMode()) == false) return false; if (other.getDepartureTime() == null ^ this.getDepartureTime() == null) return false; if (other.getDepartureTime() != null && other.getDepartureTime().equals(this.getDepartureTime()) == false) return false; - if (other.getDestinationPositions() == null ^ this.getDestinationPositions() == null) + if (other.getDepartNow() == null ^ this.getDepartNow() == null) return false; - if (other.getDestinationPositions() != null - && other.getDestinationPositions().equals(this.getDestinationPositions()) == false) + if (other.getDepartNow() != null + && other.getDepartNow().equals(this.getDepartNow()) == false) return false; if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) return false; if (other.getDistanceUnit() != null && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) return false; - if (other.getKey() == null ^ this.getKey() == null) - return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) - return false; - if (other.getTravelMode() == null ^ this.getTravelMode() == null) + if (other.getCarModeOptions() == null ^ this.getCarModeOptions() == null) return false; - if (other.getTravelMode() != null - && other.getTravelMode().equals(this.getTravelMode()) == false) + if (other.getCarModeOptions() != null + && other.getCarModeOptions().equals(this.getCarModeOptions()) == false) return false; if (other.getTruckModeOptions() == null ^ this.getTruckModeOptions() == null) return false; if (other.getTruckModeOptions() != null && other.getTruckModeOptions().equals(this.getTruckModeOptions()) == false) return false; + if (other.getKey() == null ^ this.getKey() == null) + return false; + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixResult.java index 7de435e141..f5638eed3a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixSummary.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixSummary.java index 0ae63cc778..6b9937d554 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixSummary.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteMatrixSummary.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -55,13 +55,15 @@ public class CalculateRouteMatrixSummary implements Serializable { /** *

      - * The unit of measurement for route distances. + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      *

      * Constraints:
      - * Allowed Values: Kilometers, Miles + * Range: 1 - 160000
      */ - private String distanceUnit; + private Integer routeCount; /** *

      @@ -76,15 +78,13 @@ public class CalculateRouteMatrixSummary implements Serializable { /** *

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * The unit of measurement for route distances. *

      *

      * Constraints:
      - * Range: 1 - 160000
      + * Allowed Values: Kilometers, Miles */ - private Integer routeCount; + private String distanceUnit; /** *

      @@ -273,98 +273,67 @@ public CalculateRouteMatrixSummary withDataSource(String dataSource) { /** *

      - * The unit of measurement for route distances. + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      *

      * Constraints:
      - * Allowed Values: Kilometers, Miles + * Range: 1 - 160000
      * * @return

      - * The unit of measurement for route distances. + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      - * @see DistanceUnit */ - public String getDistanceUnit() { - return distanceUnit; - } - - /** - *

      - * The unit of measurement for route distances. - *

      - *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

      - * The unit of measurement for route distances. - *

      - * @see DistanceUnit - */ - public void setDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - } - - /** - *

      - * The unit of measurement for route distances. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

      - * The unit of measurement for route distances. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - * @see DistanceUnit - */ - public CalculateRouteMatrixSummary withDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - return this; + public Integer getRouteCount() { + return routeCount; } /** *

      - * The unit of measurement for route distances. + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      *

      * Constraints:
      - * Allowed Values: Kilometers, Miles + * Range: 1 - 160000
      * - * @param distanceUnit

      - * The unit of measurement for route distances. + * @param routeCount

      + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      - * @see DistanceUnit */ - public void setDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); + public void setRouteCount(Integer routeCount) { + this.routeCount = routeCount; } /** *

      - * The unit of measurement for route distances. + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      *

      * Returns a reference to this object so that method calls can be chained * together. *

      * Constraints:
      - * Allowed Values: Kilometers, Miles + * Range: 1 - 160000
      * - * @param distanceUnit

      - * The unit of measurement for route distances. + * @param routeCount

      + * The count of cells in the route matrix. Equal to the number of + * DeparturePositions multiplied by the number of + * DestinationPositions. *

      * @return A reference to this updated object so that method calls can be * chained together. - * @see DistanceUnit */ - public CalculateRouteMatrixSummary withDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); + public CalculateRouteMatrixSummary withRouteCount(Integer routeCount) { + this.routeCount = routeCount; return this; } @@ -430,67 +399,98 @@ public CalculateRouteMatrixSummary withErrorCount(Integer errorCount) { /** *

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * The unit of measurement for route distances. *

      *

      * Constraints:
      - * Range: 1 - 160000
      + * Allowed Values: Kilometers, Miles * * @return

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * The unit of measurement for route distances. *

      + * @see DistanceUnit */ - public Integer getRouteCount() { - return routeCount; + public String getDistanceUnit() { + return distanceUnit; } /** *

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * The unit of measurement for route distances. *

      *

      * Constraints:
      - * Range: 1 - 160000
      + * Allowed Values: Kilometers, Miles * - * @param routeCount

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * @param distanceUnit

      + * The unit of measurement for route distances. *

      + * @see DistanceUnit */ - public void setRouteCount(Integer routeCount) { - this.routeCount = routeCount; + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; } /** *

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * The unit of measurement for route distances. *

      *

      * Returns a reference to this object so that method calls can be chained * together. *

      * Constraints:
      - * Range: 1 - 160000
      + * Allowed Values: Kilometers, Miles * - * @param routeCount

      - * The count of cells in the route matrix. Equal to the number of - * DeparturePositions multiplied by the number of - * DestinationPositions. + * @param distanceUnit

      + * The unit of measurement for route distances. *

      * @return A reference to this updated object so that method calls can be * chained together. + * @see DistanceUnit */ - public CalculateRouteMatrixSummary withRouteCount(Integer routeCount) { - this.routeCount = routeCount; + public CalculateRouteMatrixSummary withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

      + * The unit of measurement for route distances. + *

      + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * The unit of measurement for route distances. + *

      + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

      + * The unit of measurement for route distances. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * The unit of measurement for route distances. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public CalculateRouteMatrixSummary withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); return this; } @@ -507,12 +507,12 @@ public String toString() { sb.append("{"); if (getDataSource() != null) sb.append("DataSource: " + getDataSource() + ","); - if (getDistanceUnit() != null) - sb.append("DistanceUnit: " + getDistanceUnit() + ","); + if (getRouteCount() != null) + sb.append("RouteCount: " + getRouteCount() + ","); if (getErrorCount() != null) sb.append("ErrorCount: " + getErrorCount() + ","); - if (getRouteCount() != null) - sb.append("RouteCount: " + getRouteCount()); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit()); sb.append("}"); return sb.toString(); } @@ -523,10 +523,10 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); + hashCode = prime * hashCode + ((getRouteCount() == null) ? 0 : getRouteCount().hashCode()); + hashCode = prime * hashCode + ((getErrorCount() == null) ? 0 : getErrorCount().hashCode()); hashCode = prime * hashCode + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); - hashCode = prime * hashCode + ((getErrorCount() == null) ? 0 : getErrorCount().hashCode()); - hashCode = prime * hashCode + ((getRouteCount() == null) ? 0 : getRouteCount().hashCode()); return hashCode; } @@ -546,20 +546,20 @@ public boolean equals(Object obj) { if (other.getDataSource() != null && other.getDataSource().equals(this.getDataSource()) == false) return false; - if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) + if (other.getRouteCount() == null ^ this.getRouteCount() == null) return false; - if (other.getDistanceUnit() != null - && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) + if (other.getRouteCount() != null + && other.getRouteCount().equals(this.getRouteCount()) == false) return false; if (other.getErrorCount() == null ^ this.getErrorCount() == null) return false; if (other.getErrorCount() != null && other.getErrorCount().equals(this.getErrorCount()) == false) return false; - if (other.getRouteCount() == null ^ this.getRouteCount() == null) + if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) return false; - if (other.getRouteCount() != null - && other.getRouteCount().equals(this.getRouteCount()) == false) + if (other.getDistanceUnit() != null + && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java index 49b149c64e..f541e8e72d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -78,37 +78,10 @@ public class CalculateRouteRequest extends AmazonWebServiceRequest implements Se *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      */ private String calculatorName; - /** - *

      - * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. - *

      - *

      - * Requirements: TravelMode must be specified as - * Car. - *

      - */ - private CalculateRouteCarModeOptions carModeOptions; - - /** - *

      - * Sets the time of departure as the current time. Uses the current time to - * calculate a route. Otherwise, the best time of day to travel with the - * best traffic conditions is used to calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - */ - private Boolean departNow; - /** *

      * The start position for the route. Defined in departurePosition; - /** - *

      - * Specifies the desired time of departure. Uses the given time to calculate - * the route. Otherwise, the best time of day to travel with the best - * traffic conditions is used to calculate the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. - *

      - *       - *       - */ - private java.util.Date departureTime; - /** *

      * The finish position for the route. Defined in - * Set the unit system to specify the distance. + * Specifies an ordered list of up to 23 intermediate positions to include + * along a route between the departure position and destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order that the + * waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] *

        + *
        • + *
      + * *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - */ - private String distanceUnit; - - /** - *

      - * Set to include the geometry details in the result for each path between a - * pair of positions. + * If you specify a waypoint position that's not located on a road, Amazon + * Location moves the position to the nearest road. *

      *

      - * Default Value: false + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. *

      *

      - * Valid Values: false | true + * If Esri is the provider for your route calculator, specifying a route + * that is longer than 400 km returns a + * 400 RoutesValidationException error. *

      - */ - private Boolean includeLegGeometry; - - /** + * *

      - * The optional API key to authorize the request. + * Valid Values: [-180 to 180,-90 to 90] *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      */ - private String key; + private java.util.List> waypointPositions; /** *

      @@ -280,6 +228,78 @@ public class CalculateRouteRequest extends AmazonWebServiceRequest implements Se */ private String travelMode; + /** + *

      + * Specifies the desired time of departure. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. + *

      + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + */ + private java.util.Date departureTime; + + /** + *

      + * Sets the time of departure as the current time. Uses the current time to + * calculate a route. Otherwise, the best time of day to travel with the + * best traffic conditions is used to calculate the route. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + */ + private Boolean departNow; + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + */ + private String distanceUnit; + + /** + *

      + * Set to include the geometry details in the result for each path between a + * pair of positions. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + */ + private Boolean includeLegGeometry; + + /** + *

      + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + */ + private CalculateRouteCarModeOptions carModeOptions; + /** *

      * Specifies route preferences when traveling by Truck, such as @@ -295,41 +315,39 @@ public class CalculateRouteRequest extends AmazonWebServiceRequest implements Se /** *

      - * Specifies an ordered list of up to 23 intermediate positions to include - * along a route between the departure position and destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order that the - * waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] + * Specifies the desired time of arrival. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. *

        - *
        • - *
      * *

      - * If you specify a waypoint position that's not located on a road, Amazon - * Location moves the position to the nearest road. + * ArrivalTime is not supported Esri. *

      + *       + */ + private java.util.Date arrivalTime; + + /** *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. + * Specifies the distance to optimize for when calculating a route. *

      *

      - * If Esri is the provider for your route calculator, specifying a route - * that is longer than 400 km returns a - * 400 RoutesValidationException error. - *

      - * + * Constraints:
      + * Allowed Values: FastestRoute, ShortestRoute + */ + private String optimizeFor; + + /** *

      - * Valid Values: [-180 to 180,-90 to 90] + * The optional API key to authorize the request. *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      */ - private java.util.List> waypointPositions; + private String key; /** *

      @@ -339,7 +357,7 @@ public class CalculateRouteRequest extends AmazonWebServiceRequest implements Se *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @return

      * The name of the route calculator resource that you want to use to @@ -358,7 +376,7 @@ public String getCalculatorName() { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param calculatorName

      * The name of the route calculator resource that you want to use @@ -380,7 +398,7 @@ public void setCalculatorName(String calculatorName) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param calculatorName

      * The name of the route calculator resource that you want to use @@ -396,231 +414,30 @@ public CalculateRouteRequest withCalculatorName(String calculatorName) { /** *

      - * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. + * The start position for the route. Defined in World Geodetic System (WGS 84) format: + * [longitude, latitude]. *

      + *
        + *
      • *

        - * Requirements: TravelMode must be specified as - * Car. + * For example, [-123.115, 49.285] *

        - * - * @return

        - * Specifies route preferences when traveling by Car, - * such as avoiding routes that use ferries or tolls. - *

        - *

        - * Requirements: TravelMode must be specified as - * Car. - *

        - */ - public CalculateRouteCarModeOptions getCarModeOptions() { - return carModeOptions; - } - - /** + *
        • + *
      + * *

      - * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. + * If you specify a departure that's not located on a road, Amazon Location + * moves the position to the nearest road. If Esri is the provider for + * your route calculator, specifying a route that is longer than 400 km + * returns a 400 RoutesValidationException error. *

      + *       *

      - * Requirements: TravelMode must be specified as - * Car. - *

      - * - * @param carModeOptions

      - * Specifies route preferences when traveling by Car - * , such as avoiding routes that use ferries or tolls. - *

      - *

      - * Requirements: TravelMode must be specified as - * Car. - *

      - */ - public void setCarModeOptions(CalculateRouteCarModeOptions carModeOptions) { - this.carModeOptions = carModeOptions; - } - - /** - *

      - * Specifies route preferences when traveling by Car, such as - * avoiding routes that use ferries or tolls. - *

      - *

      - * Requirements: TravelMode must be specified as - * Car. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param carModeOptions

      - * Specifies route preferences when traveling by Car - * , such as avoiding routes that use ferries or tolls. - *

      - *

      - * Requirements: TravelMode must be specified as - * Car. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteRequest withCarModeOptions(CalculateRouteCarModeOptions carModeOptions) { - this.carModeOptions = carModeOptions; - return this; - } - - /** - *

      - * Sets the time of departure as the current time. Uses the current time to - * calculate a route. Otherwise, the best time of day to travel with the - * best traffic conditions is used to calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - * - * @return

      - * Sets the time of departure as the current time. Uses the current - * time to calculate a route. Otherwise, the best time of day to - * travel with the best traffic conditions is used to calculate the - * route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - */ - public Boolean isDepartNow() { - return departNow; - } - - /** - *

      - * Sets the time of departure as the current time. Uses the current time to - * calculate a route. Otherwise, the best time of day to travel with the - * best traffic conditions is used to calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - * - * @return

      - * Sets the time of departure as the current time. Uses the current - * time to calculate a route. Otherwise, the best time of day to - * travel with the best traffic conditions is used to calculate the - * route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - */ - public Boolean getDepartNow() { - return departNow; - } - - /** - *

      - * Sets the time of departure as the current time. Uses the current time to - * calculate a route. Otherwise, the best time of day to travel with the - * best traffic conditions is used to calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - * - * @param departNow

      - * Sets the time of departure as the current time. Uses the - * current time to calculate a route. Otherwise, the best time of - * day to travel with the best traffic conditions is used to - * calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - */ - public void setDepartNow(Boolean departNow) { - this.departNow = departNow; - } - - /** - *

      - * Sets the time of departure as the current time. Uses the current time to - * calculate a route. Otherwise, the best time of day to travel with the - * best traffic conditions is used to calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param departNow

      - * Sets the time of departure as the current time. Uses the - * current time to calculate a route. Otherwise, the best time of - * day to travel with the best traffic conditions is used to - * calculate the route. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteRequest withDepartNow(Boolean departNow) { - this.departNow = departNow; - return this; - } - - /** - *

      - * The start position for the route. Defined in World Geodetic System (WGS 84) format: - * [longitude, latitude]. - *

      - *
        - *
      • - *

        - * For example, [-123.115, 49.285] - *

        - *
        • - *
      - * - *

      - * If you specify a departure that's not located on a road, Amazon Location - * moves the position to the nearest road. If Esri is the provider for - * your route calculator, specifying a route that is longer than 400 km - * returns a 400 RoutesValidationException error. - *

      - *       - *

      - * Valid Values: [-180 to 180,-90 to 90] + * Valid Values: [-180 to 180,-90 to 90] *

      * * @return

      @@ -860,209 +677,57 @@ public CalculateRouteRequest withDeparturePosition( /** *

      - * Specifies the desired time of departure. Uses the given time to calculate - * the route. Otherwise, the best time of day to travel with the best - * traffic conditions is used to calculate the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. + * The finish position for the route. Defined in World Geodetic System (WGS 84) format: + * [longitude, latitude]. *

      - *       *
        *
      • *

        - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, - * 2020–07-2T12:15:20.000Z+01:00 + * For example, [-122.339, 47.615] *

        *
        • *
      + * + *

      + * If you specify a destination that's not located on a road, Amazon + * Location moves the position to the nearest road. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] + *

      * * @return

      - * Specifies the desired time of departure. Uses the given time to - * calculate the route. Otherwise, the best time of day to travel - * with the best traffic conditions is used to calculate the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. + * The finish position for the route. Defined in World Geodetic System (WGS 84) format: + * [longitude, latitude]. *

      - *       *
        *
      • *

        - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For - * example, 2020–07-2T12:15:20.000Z+01:00 + * For example, [-122.339, 47.615] *

        *
        • *
      + * + *

      + * If you specify a destination that's not located on a road, Amazon + * Location moves the position to the nearest road. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] + *

      */ - public java.util.Date getDepartureTime() { - return departureTime; - } - - /** - *

      - * Specifies the desired time of departure. Uses the given time to calculate - * the route. Otherwise, the best time of day to travel with the best - * traffic conditions is used to calculate the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. - *

      - *       - *
        - *
      • - *

        - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, - * 2020–07-2T12:15:20.000Z+01:00 - *

        - *
        • - *
      - * - * @param departureTime

      - * Specifies the desired time of departure. Uses the given time - * to calculate the route. Otherwise, the best time of day to - * travel with the best traffic conditions is used to calculate - * the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. - *

      - *       - *
        - *
      • - *

        - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For - * example, 2020–07-2T12:15:20.000Z+01:00 - *

        - *
        • - *
      - */ - public void setDepartureTime(java.util.Date departureTime) { - this.departureTime = departureTime; - } - - /** - *

      - * Specifies the desired time of departure. Uses the given time to calculate - * the route. Otherwise, the best time of day to travel with the best - * traffic conditions is used to calculate the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. - *

      - *       - *
        - *
      • - *

        - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, - * 2020–07-2T12:15:20.000Z+01:00 - *

        - *
        • - *
      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param departureTime

      - * Specifies the desired time of departure. Uses the given time - * to calculate the route. Otherwise, the best time of day to - * travel with the best traffic conditions is used to calculate - * the route. - *

      - * - *

      - * Setting a departure time in the past returns a - * 400 ValidationException error. - *

      - *       - *
        - *
      • - *

        - * In ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For - * example, 2020–07-2T12:15:20.000Z+01:00 - *

        - *
        • - *
      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteRequest withDepartureTime(java.util.Date departureTime) { - this.departureTime = departureTime; - return this; - } - - /** - *

      - * The finish position for the route. Defined in World Geodetic System (WGS 84) format: - * [longitude, latitude]. - *

      - *
        - *
      • - *

        - * For example, [-122.339, 47.615] - *

        - *
        • - *
      - * - *

      - * If you specify a destination that's not located on a road, Amazon - * Location moves the position to the nearest road. - *

      - *       - *

      - * Valid Values: [-180 to 180,-90 to 90] - *

      - * - * @return

      - * The finish position for the route. Defined in World Geodetic System (WGS 84) format: - * [longitude, latitude]. - *

      - *
        - *
      • - *

        - * For example, [-122.339, 47.615] - *

        - *
        • - *
      - * - *

      - * If you specify a destination that's not located on a road, Amazon - * Location moves the position to the nearest road. - *

      - *       - *

      - * Valid Values: [-180 to 180,-90 to 90] - *

      - */ - public java.util.List getDestinationPosition() { - return destinationPosition; + public java.util.List getDestinationPosition() { + return destinationPosition; } /** @@ -1255,309 +920,734 @@ public CalculateRouteRequest withDestinationPosition( /** *

      - * Set the unit system to specify the distance. + * Specifies an ordered list of up to 23 intermediate positions to include + * along a route between the departure position and destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order that the + * waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] *

        + *
        • + *
      + * *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles + * If you specify a waypoint position that's not located on a road, Amazon + * Location moves the position to the nearest road. + *

      + *

      + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. + *

      + *

      + * If Esri is the provider for your route calculator, specifying a route + * that is longer than 400 km returns a + * 400 RoutesValidationException error. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] + *

      * * @return

      - * Set the unit system to specify the distance. + * Specifies an ordered list of up to 23 intermediate positions to + * include along a route between the departure position and + * destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order that + * the waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] + *

        + *
        • + *
      + * + *

      + * If you specify a waypoint position that's not located on a road, + * Amazon Location moves the position to the nearest road. + *

      + *

      + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. + *

      + *

      + * If Esri is the provider for your route calculator, specifying a + * route that is longer than 400 km returns a + * 400 RoutesValidationException error. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] *

      - * @see DistanceUnit */ - public String getDistanceUnit() { - return distanceUnit; + public java.util.List> getWaypointPositions() { + return waypointPositions; } /** *

      - * Set the unit system to specify the distance. + * Specifies an ordered list of up to 23 intermediate positions to include + * along a route between the departure position and destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order that the + * waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] *

        + *
        • + *
      + * *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

      - * Set the unit system to specify the distance. - *

      - *

      - * Default Value: Kilometers - *

      - * @see DistanceUnit - */ - public void setDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - } - - /** - *

      - * Set the unit system to specify the distance. + * If you specify a waypoint position that's not located on a road, Amazon + * Location moves the position to the nearest road. *

      *

      - * Default Value: Kilometers + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. *

      *

      - * Returns a reference to this object so that method calls can be chained - * together. + * If Esri is the provider for your route calculator, specifying a route + * that is longer than 400 km returns a + * 400 RoutesValidationException error. + *

      + *       *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles + * Valid Values: [-180 to 180,-90 to 90] + *

      * - * @param distanceUnit

      - * Set the unit system to specify the distance. + * @param waypointPositions

      + * Specifies an ordered list of up to 23 intermediate positions + * to include along a route between the departure position and + * destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order + * that the waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] + *

        + *
        • + *
      + * + *

      + * If you specify a waypoint position that's not located on a + * road, Amazon Location moves the position to the nearest road. + *

      + *

      + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. + *

      + *

      + * If Esri is the provider for your route calculator, specifying + * a route that is longer than 400 km returns a + * 400 RoutesValidationException error. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] *

      - * @return A reference to this updated object so that method calls can be - * chained together. - * @see DistanceUnit */ - public CalculateRouteRequest withDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - return this; + public void setWaypointPositions(java.util.Collection> waypointPositions) { + if (waypointPositions == null) { + this.waypointPositions = null; + return; + } + + this.waypointPositions = new java.util.ArrayList>(waypointPositions); } /** *

      - * Set the unit system to specify the distance. + * Specifies an ordered list of up to 23 intermediate positions to include + * along a route between the departure position and destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order that the + * waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] *

        + *
        • + *
      + * *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

      - * Set the unit system to specify the distance. - *

      - *

      - * Default Value: Kilometers - *

      - * @see DistanceUnit - */ - public void setDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); - } - - /** + * If you specify a waypoint position that's not located on a road, Amazon + * Location moves the position to the nearest road. + *

      *

      - * Set the unit system to specify the distance. + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. *

      *

      - * Default Value: Kilometers + * If Esri is the provider for your route calculator, specifying a route + * that is longer than 400 km returns a + * 400 RoutesValidationException error. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] *

      *

      * Returns a reference to this object so that method calls can be chained * together. - *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles * - * @param distanceUnit

      - * Set the unit system to specify the distance. + * @param waypointPositions

      + * Specifies an ordered list of up to 23 intermediate positions + * to include along a route between the departure position and + * destination position. *

      + *
        + *
      • *

        - * Default Value: Kilometers + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order + * that the waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] + *

        + *
        • + *
      + * + *

      + * If you specify a waypoint position that's not located on a + * road, Amazon Location moves the position to the nearest road. + *

      + *

      + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. + *

      + *

      + * If Esri is the provider for your route calculator, specifying + * a route that is longer than 400 km returns a + * 400 RoutesValidationException error. + *

      + *       + *

      + * Valid Values: [-180 to 180,-90 to 90] *

      * @return A reference to this updated object so that method calls can be * chained together. - * @see DistanceUnit */ - public CalculateRouteRequest withDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); + public CalculateRouteRequest withWaypointPositions(java.util.List... waypointPositions) { + if (getWaypointPositions() == null) { + this.waypointPositions = new java.util.ArrayList>( + waypointPositions.length); + } + for (java.util.List value : waypointPositions) { + this.waypointPositions.add(value); + } return this; } /** *

      - * Set to include the geometry details in the result for each path between a - * pair of positions. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true + * Specifies an ordered list of up to 23 intermediate positions to include + * along a route between the departure position and destination position. *

      - * - * @return

      - * Set to include the geometry details in the result for each path - * between a pair of positions. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - */ - public Boolean isIncludeLegGeometry() { - return includeLegGeometry; - } - - /** + *
        + *
      • *

        - * Set to include the geometry details in the result for each path between a - * pair of positions. + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order that the + * waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] *

        + *
        • + *
      + * *

      - * Default Value: false + * If you specify a waypoint position that's not located on a road, Amazon + * Location moves the position to the nearest road. *

      *

      - * Valid Values: false | true + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. *

      - * - * @return

      - * Set to include the geometry details in the result for each path - * between a pair of positions. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - */ - public Boolean getIncludeLegGeometry() { - return includeLegGeometry; - } - - /** *

      - * Set to include the geometry details in the result for each path between a - * pair of positions. + * If Esri is the provider for your route calculator, specifying a route + * that is longer than 400 km returns a + * 400 RoutesValidationException error. *

      + *       *

      - * Default Value: false + * Valid Values: [-180 to 180,-90 to 90] *

      *

      - * Valid Values: false | true - *

      + * Returns a reference to this object so that method calls can be chained + * together. * - * @param includeLegGeometry

      - * Set to include the geometry details in the result for each - * path between a pair of positions. + * @param waypointPositions

      + * Specifies an ordered list of up to 23 intermediate positions + * to include along a route between the departure position and + * destination position. *

      + *
        + *
      • *

        - * Default Value: false + * For example, from the DeparturePosition + * [-123.115, 49.285], the route follows the order + * that the waypoint positions are given + * [[-122.757, 49.0021],[-122.349, 47.620]] *

        + *
        • + *
      + * *

      - * Valid Values: false | true + * If you specify a waypoint position that's not located on a + * road, Amazon Location moves the position to the nearest road. *

      - */ - public void setIncludeLegGeometry(Boolean includeLegGeometry) { - this.includeLegGeometry = includeLegGeometry; - } - - /** - *

      - * Set to include the geometry details in the result for each path between a - * pair of positions. - *

      - *

      - * Default Value: false - *

      - *

      - * Valid Values: false | true - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param includeLegGeometry

      - * Set to include the geometry details in the result for each - * path between a pair of positions. + *

      + * Specifying more than 23 waypoints returns a + * 400 ValidationException error. *

      *

      - * Default Value: false + * If Esri is the provider for your route calculator, specifying + * a route that is longer than 400 km returns a + * 400 RoutesValidationException error. *

      + *       *

      - * Valid Values: false | true + * Valid Values: [-180 to 180,-90 to 90] *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CalculateRouteRequest withIncludeLegGeometry(Boolean includeLegGeometry) { - this.includeLegGeometry = includeLegGeometry; + public CalculateRouteRequest withWaypointPositions( + java.util.Collection> waypointPositions) { + setWaypointPositions(waypointPositions); return this; } /** *

      - * The optional API key to authorize the request. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, Walking, + * Bicycle or Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only valid when + * using Grab as a data provider, and only within Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including areas of + * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how you specify + * route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the CarModeOptions + * parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the TruckModeOptions + * parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car *

      *

      * Constraints:
      - * Length: 0 - 1000
      + * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle * * @return

      - * The optional API key to authorize the request. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. You can + * choose Car, Truck, Walking, Bicycle or Motorcycle as options for + * the TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only valid + * when using Grab as a data provider, and only within Southeast + * Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including areas + * of coverage, see GrabMaps in the Amazon Location Service Developer + * Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how you + * specify route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the + * CarModeOptions parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the + * TruckModeOptions parameter. *

        + *
        • + *
      + *

      + * Default Value: Car + *

      + * @see TravelMode */ - public String getKey() { - return key; + public String getTravelMode() { + return travelMode; } /** *

      - * The optional API key to authorize the request. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, Walking, + * Bicycle or Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only valid when + * using Grab as a data provider, and only within Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including areas of + * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how you specify + * route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the CarModeOptions + * parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the TruckModeOptions + * parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car *

      *

      * Constraints:
      - * Length: 0 - 1000
      + * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle * - * @param key

      - * The optional API key to authorize the request. + * @param travelMode

      + * Specifies the mode of transport when calculating a route. Used + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, + * Walking, Bicycle or + * Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only + * valid when using Grab as a data provider, and only within + * Southeast Asia. *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including + * areas of coverage, see GrabMaps in the Amazon Location Service Developer + * Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how + * you specify route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the + * CarModeOptions parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the + * TruckModeOptions parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car + *

      + * @see TravelMode */ - public void setKey(String key) { - this.key = key; + public void setTravelMode(String travelMode) { + this.travelMode = travelMode; } /** *

      - * The optional API key to authorize the request. + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, Walking, + * Bicycle or Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only valid when + * using Grab as a data provider, and only within Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including areas of + * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how you specify + * route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the CarModeOptions + * parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the TruckModeOptions + * parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car *

      *

      * Returns a reference to this object so that method calls can be chained * together. *

      * Constraints:
      - * Length: 0 - 1000
      + * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle * - * @param key

      - * The optional API key to authorize the request. + * @param travelMode

      + * Specifies the mode of transport when calculating a route. Used + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, + * Walking, Bicycle or + * Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only + * valid when using Grab as a data provider, and only within + * Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including + * areas of coverage, see GrabMaps in the Amazon Location Service Developer + * Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how + * you specify route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the + * CarModeOptions parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the + * TruckModeOptions parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + * @see TravelMode + */ + public CalculateRouteRequest withTravelMode(String travelMode) { + this.travelMode = travelMode; + return this; + } + + /** + *

      + * Specifies the mode of transport when calculating a route. Used in + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, Walking, + * Bicycle or Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only valid when + * using Grab as a data provider, and only within Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including areas of + * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how you specify + * route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the CarModeOptions + * parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the TruckModeOptions + * parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car + *

      + *

      + * Constraints:
      + * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle + * + * @param travelMode

      + * Specifies the mode of transport when calculating a route. Used + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, + * Walking, Bicycle or + * Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only + * valid when using Grab as a data provider, and only within + * Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including + * areas of coverage, see GrabMaps in the Amazon Location Service Developer + * Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how + * you specify route preferences: *

      - * @return A reference to this updated object so that method calls can be - * chained together. + *
        + *
      • + *

        + * If traveling by Car use the + * CarModeOptions parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the + * TruckModeOptions parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car + *

      + * @see TravelMode */ - public CalculateRouteRequest withKey(String key) { - this.key = key; - return this; + public void setTravelMode(TravelMode travelMode) { + this.travelMode = travelMode.toString(); } /** @@ -1605,468 +1695,622 @@ public CalculateRouteRequest withKey(String key) { * Default Value: Car *

      *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      * Constraints:
      * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle * + * @param travelMode

      + * Specifies the mode of transport when calculating a route. Used + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, + * Walking, Bicycle or + * Motorcycle as options for the + * TravelMode. + *

      + * + *

      + * Bicycle and Motorcycle are only + * valid when using Grab as a data provider, and only within + * Southeast Asia. + *

      + *

      + * Truck is not available for Grab. + *

      + *

      + * For more details on the using Grab for routing, including + * areas of coverage, see GrabMaps in the Amazon Location Service Developer + * Guide. + *

      + *       + *

      + * The TravelMode you specify also determines how + * you specify route preferences: + *

      + *
        + *
      • + *

        + * If traveling by Car use the + * CarModeOptions parameter. + *

        + *
        • + *
      • + *

        + * If traveling by Truck use the + * TruckModeOptions parameter. + *

        + *
        • + *
      + *

      + * Default Value: Car + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + * @see TravelMode + */ + public CalculateRouteRequest withTravelMode(TravelMode travelMode) { + this.travelMode = travelMode.toString(); + return this; + } + + /** + *

      + * Specifies the desired time of departure. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. + *

      + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + * * @return

      - * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. You can - * choose Car, Truck, Walking, Bicycle or Motorcycle as options for - * the TravelMode. + * Specifies the desired time of departure. Uses the given time to + * calculate the route. Otherwise, the best time of day to travel + * with the best traffic conditions is used to calculate the route. *

      - * + *
        + *
      • *

        - * Bicycle and Motorcycle are only valid - * when using Grab as a data provider, and only within Southeast - * Asia. + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For + * example, 2020–07-2T12:15:20.000Z+01:00 *

        - *

        - * Truck is not available for Grab. + *

        • + *
      + */ + public java.util.Date getDepartureTime() { + return departureTime; + } + + /** + *

      + * Specifies the desired time of departure. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. + *

      + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + * + * @param departureTime

      + * Specifies the desired time of departure. Uses the given time + * to calculate the route. Otherwise, the best time of day to + * travel with the best traffic conditions is used to calculate + * the route. + *

      + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For + * example, 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + */ + public void setDepartureTime(java.util.Date departureTime) { + this.departureTime = departureTime; + } + + /** + *

      + * Specifies the desired time of departure. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. + *

      + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For example, + * 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param departureTime

      + * Specifies the desired time of departure. Uses the given time + * to calculate the route. Otherwise, the best time of day to + * travel with the best traffic conditions is used to calculate + * the route. + *

      + *
        + *
      • + *

        + * In ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. For + * example, 2020–07-2T12:15:20.000Z+01:00 + *

        + *
        • + *
      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CalculateRouteRequest withDepartureTime(java.util.Date departureTime) { + this.departureTime = departureTime; + return this; + } + + /** + *

      + * Sets the time of departure as the current time. Uses the current time to + * calculate a route. Otherwise, the best time of day to travel with the + * best traffic conditions is used to calculate the route. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + * + * @return

      + * Sets the time of departure as the current time. Uses the current + * time to calculate a route. Otherwise, the best time of day to + * travel with the best traffic conditions is used to calculate the + * route. *

      *

      - * For more details on the using Grab for routing, including areas - * of coverage, see GrabMaps in the Amazon Location Service Developer - * Guide. + * Default Value: false *

      - *       *

      - * The TravelMode you specify also determines how you - * specify route preferences: + * Valid Values: false | true *

      - *
        - *
      • - *

        - * If traveling by Car use the - * CarModeOptions parameter. + */ + public Boolean isDepartNow() { + return departNow; + } + + /** + *

        + * Sets the time of departure as the current time. Uses the current time to + * calculate a route. Otherwise, the best time of day to travel with the + * best traffic conditions is used to calculate the route. + *

        + *

        + * Default Value: false + *

        + *

        + * Valid Values: false | true + *

        + * + * @return

        + * Sets the time of departure as the current time. Uses the current + * time to calculate a route. Otherwise, the best time of day to + * travel with the best traffic conditions is used to calculate the + * route. *

        - *
        • - *
      • *

        - * If traveling by Truck use the - * TruckModeOptions parameter. + * Default Value: false *

        - *
        • - *
      *

      - * Default Value: Car + * Valid Values: false | true *

      - * @see TravelMode */ - public String getTravelMode() { - return travelMode; + public Boolean getDepartNow() { + return departNow; } /** *

      - * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. You can choose - * Car, Truck, Walking, - * Bicycle or Motorcycle as options for the - * TravelMode. - *

      - * - *

      - * Bicycle and Motorcycle are only valid when - * using Grab as a data provider, and only within Southeast Asia. - *

      - *

      - * Truck is not available for Grab. + * Sets the time of departure as the current time. Uses the current time to + * calculate a route. Otherwise, the best time of day to travel with the + * best traffic conditions is used to calculate the route. *

      *

      - * For more details on the using Grab for routing, including areas of - * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + * Default Value: false *

      - *       *

      - * The TravelMode you specify also determines how you specify - * route preferences: + * Valid Values: false | true *

      - *
        - *
      • + * + * @param departNow

        + * Sets the time of departure as the current time. Uses the + * current time to calculate a route. Otherwise, the best time of + * day to travel with the best traffic conditions is used to + * calculate the route. + *

        + *

        + * Default Value: false + *

        + *

        + * Valid Values: false | true + *

        + */ + public void setDepartNow(Boolean departNow) { + this.departNow = departNow; + } + + /** *

        - * If traveling by Car use the CarModeOptions - * parameter. + * Sets the time of departure as the current time. Uses the current time to + * calculate a route. Otherwise, the best time of day to travel with the + * best traffic conditions is used to calculate the route. *

        - *
        • - *
      • *

        - * If traveling by Truck use the TruckModeOptions - * parameter. + * Default Value: false *

        - *
        • - *
      *

      - * Default Value: Car + * Valid Values: false | true *

      *

      - * Constraints:
      - * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle + * Returns a reference to this object so that method calls can be chained + * together. * - * @param travelMode

      - * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. You - * can choose Car, Truck, - * Walking, Bicycle or - * Motorcycle as options for the - * TravelMode. - *

      - * - *

      - * Bicycle and Motorcycle are only - * valid when using Grab as a data provider, and only within - * Southeast Asia. - *

      - *

      - * Truck is not available for Grab. - *

      - *

      - * For more details on the using Grab for routing, including - * areas of coverage, see GrabMaps in the Amazon Location Service Developer - * Guide. - *

      - *       - *

      - * The TravelMode you specify also determines how - * you specify route preferences: - *

      - *
        - *
      • - *

        - * If traveling by Car use the - * CarModeOptions parameter. + * @param departNow

        + * Sets the time of departure as the current time. Uses the + * current time to calculate a route. Otherwise, the best time of + * day to travel with the best traffic conditions is used to + * calculate the route. *

        - *
        • - *
      • *

        - * If traveling by Truck use the - * TruckModeOptions parameter. + * Default Value: false *

        - *
        • - *
      *

      - * Default Value: Car + * Valid Values: false | true *

      - * @see TravelMode + * @return A reference to this updated object so that method calls can be + * chained together. */ - public void setTravelMode(String travelMode) { - this.travelMode = travelMode; + public CalculateRouteRequest withDepartNow(Boolean departNow) { + this.departNow = departNow; + return this; } /** *

      - * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. You can choose - * Car, Truck, Walking, - * Bicycle or Motorcycle as options for the - * TravelMode. + * Set the unit system to specify the distance. *

      - * *

      - * Bicycle and Motorcycle are only valid when - * using Grab as a data provider, and only within Southeast Asia. + * Default Value: Kilometers *

      *

      - * Truck is not available for Grab. - *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @return

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** *

      - * For more details on the using Grab for routing, including areas of - * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + * Set the unit system to specify the distance. *

      - *       *

      - * The TravelMode you specify also determines how you specify - * route preferences: + * Default Value: Kilometers *

      - *
        - *
      • *

        - * If traveling by Car use the CarModeOptions - * parameter. - *

        - *
        • - *
      • + * Constraints:
        + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

        + * Set the unit system to specify the distance. + *

        + *

        + * Default Value: Kilometers + *

        + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** *

        - * If traveling by Truck use the TruckModeOptions - * parameter. + * Set the unit system to specify the distance. *

        - *
        • - *
      *

      - * Default Value: Car + * Default Value: Kilometers *

      *

      * Returns a reference to this object so that method calls can be chained * together. *

      * Constraints:
      - * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle + * Allowed Values: Kilometers, Miles * - * @param travelMode

      - * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. You - * can choose Car, Truck, - * Walking, Bicycle or - * Motorcycle as options for the - * TravelMode. - *

      - * - *

      - * Bicycle and Motorcycle are only - * valid when using Grab as a data provider, and only within - * Southeast Asia. - *

      - *

      - * Truck is not available for Grab. + * @param distanceUnit

      + * Set the unit system to specify the distance. *

      *

      - * For more details on the using Grab for routing, including - * areas of coverage, see GrabMaps in the Amazon Location Service Developer - * Guide. + * Default Value: Kilometers *

      - *       - *

      - * The TravelMode you specify also determines how - * you specify route preferences: + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public CalculateRouteRequest withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

      + * Set the unit system to specify the distance. + *

      + *

      + * Default Value: Kilometers + *

      + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * Set the unit system to specify the distance. *

      - *
        - *
      • *

        - * If traveling by Car use the - * CarModeOptions parameter. + * Default Value: Kilometers *

        - *
        • - *
      • - *

        - * If traveling by Truck use the - * TruckModeOptions parameter. + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

        + * Set the unit system to specify the distance. + *

        + *

        + * Default Value: Kilometers + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

        + * Set the unit system to specify the distance. *

        - *
        • - *
      *

      - * Default Value: Car + * Default Value: Kilometers *

      * @return A reference to this updated object so that method calls can be * chained together. - * @see TravelMode + * @see DistanceUnit */ - public CalculateRouteRequest withTravelMode(String travelMode) { - this.travelMode = travelMode; + public CalculateRouteRequest withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); return this; } /** *

      - * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. You can choose - * Car, Truck, Walking, - * Bicycle or Motorcycle as options for the - * TravelMode. + * Set to include the geometry details in the result for each path between a + * pair of positions. *

      - * *

      - * Bicycle and Motorcycle are only valid when - * using Grab as a data provider, and only within Southeast Asia. + * Default Value: false *

      *

      - * Truck is not available for Grab. + * Valid Values: false | true *

      + * + * @return

      + * Set to include the geometry details in the result for each path + * between a pair of positions. + *

      + *

      + * Default Value: false + *

      + *

      + * Valid Values: false | true + *

      + */ + public Boolean isIncludeLegGeometry() { + return includeLegGeometry; + } + + /** *

      - * For more details on the using Grab for routing, including areas of - * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + * Set to include the geometry details in the result for each path between a + * pair of positions. *

      - *       *

      - * The TravelMode you specify also determines how you specify - * route preferences: + * Default Value: false *

      - *
        - *
      • *

        - * If traveling by Car use the CarModeOptions - * parameter. + * Valid Values: false | true *

        - *
        • - *
      • + * + * @return

        + * Set to include the geometry details in the result for each path + * between a pair of positions. + *

        + *

        + * Default Value: false + *

        + *

        + * Valid Values: false | true + *

        + */ + public Boolean getIncludeLegGeometry() { + return includeLegGeometry; + } + + /** *

        - * If traveling by Truck use the TruckModeOptions - * parameter. + * Set to include the geometry details in the result for each path between a + * pair of positions. *

        - *
        • - *
      *

      - * Default Value: Car + * Default Value: false *

      *

      - * Constraints:
      - * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle + * Valid Values: false | true + *

      * - * @param travelMode

      - * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. You - * can choose Car, Truck, - * Walking, Bicycle or - * Motorcycle as options for the - * TravelMode. - *

      - * - *

      - * Bicycle and Motorcycle are only - * valid when using Grab as a data provider, and only within - * Southeast Asia. - *

      - *

      - * Truck is not available for Grab. + * @param includeLegGeometry

      + * Set to include the geometry details in the result for each + * path between a pair of positions. *

      *

      - * For more details on the using Grab for routing, including - * areas of coverage, see GrabMaps in the Amazon Location Service Developer - * Guide. + * Default Value: false *

      - *       *

      - * The TravelMode you specify also determines how - * you specify route preferences: + * Valid Values: false | true *

      - *
        - *
      • - *

        - * If traveling by Car use the - * CarModeOptions parameter. + */ + public void setIncludeLegGeometry(Boolean includeLegGeometry) { + this.includeLegGeometry = includeLegGeometry; + } + + /** + *

        + * Set to include the geometry details in the result for each path between a + * pair of positions. + *

        + *

        + * Default Value: false + *

        + *

        + * Valid Values: false | true + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param includeLegGeometry

        + * Set to include the geometry details in the result for each + * path between a pair of positions. *

        - *
        • - *
      • *

        - * If traveling by Truck use the - * TruckModeOptions parameter. + * Default Value: false *

        - *
        • - *
      *

      - * Default Value: Car + * Valid Values: false | true *

      - * @see TravelMode + * @return A reference to this updated object so that method calls can be + * chained together. */ - public void setTravelMode(TravelMode travelMode) { - this.travelMode = travelMode.toString(); + public CalculateRouteRequest withIncludeLegGeometry(Boolean includeLegGeometry) { + this.includeLegGeometry = includeLegGeometry; + return this; } /** *

      - * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. You can choose - * Car, Truck, Walking, - * Bicycle or Motorcycle as options for the - * TravelMode. - *

      - * - *

      - * Bicycle and Motorcycle are only valid when - * using Grab as a data provider, and only within Southeast Asia. - *

      - *

      - * Truck is not available for Grab. + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. *

      *

      - * For more details on the using Grab for routing, including areas of - * coverage, see GrabMaps in the Amazon Location Service Developer Guide. + * Requirements: TravelMode must be specified as + * Car. *

      - *       + * + * @return

      + * Specifies route preferences when traveling by Car, + * such as avoiding routes that use ferries or tolls. + *

      + *

      + * Requirements: TravelMode must be specified as + * Car. + *

      + */ + public CalculateRouteCarModeOptions getCarModeOptions() { + return carModeOptions; + } + + /** *

      - * The TravelMode you specify also determines how you specify - * route preferences: + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. *

      - *
        - *
      • *

        - * If traveling by Car use the CarModeOptions - * parameter. + * Requirements: TravelMode must be specified as + * Car. *

        - *
        • - *
      • + * + * @param carModeOptions

        + * Specifies route preferences when traveling by Car + * , such as avoiding routes that use ferries or tolls. + *

        + *

        + * Requirements: TravelMode must be specified as + * Car. + *

        + */ + public void setCarModeOptions(CalculateRouteCarModeOptions carModeOptions) { + this.carModeOptions = carModeOptions; + } + + /** *

        - * If traveling by Truck use the TruckModeOptions - * parameter. + * Specifies route preferences when traveling by Car, such as + * avoiding routes that use ferries or tolls. *

        - *
        • - *
      *

      - * Default Value: Car + * Requirements: TravelMode must be specified as + * Car. *

      *

      * Returns a reference to this object so that method calls can be chained * together. - *

      - * Constraints:
      - * Allowed Values: Car, Truck, Walking, Bicycle, Motorcycle * - * @param travelMode

      - * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. You - * can choose Car, Truck, - * Walking, Bicycle or - * Motorcycle as options for the - * TravelMode. - *

      - * - *

      - * Bicycle and Motorcycle are only - * valid when using Grab as a data provider, and only within - * Southeast Asia. - *

      - *

      - * Truck is not available for Grab. - *

      - *

      - * For more details on the using Grab for routing, including - * areas of coverage, see GrabMaps in the Amazon Location Service Developer - * Guide. - *

      - *       - *

      - * The TravelMode you specify also determines how - * you specify route preferences: - *

      - *
        - *
      • - *

        - * If traveling by Car use the - * CarModeOptions parameter. - *

        - *
        • - *
      • - *

        - * If traveling by Truck use the - * TruckModeOptions parameter. + * @param carModeOptions

        + * Specifies route preferences when traveling by Car + * , such as avoiding routes that use ferries or tolls. *

        - *
        • - *
      *

      - * Default Value: Car + * Requirements: TravelMode must be specified as + * Car. *

      * @return A reference to this updated object so that method calls can be * chained together. - * @see TravelMode */ - public CalculateRouteRequest withTravelMode(TravelMode travelMode) { - this.travelMode = travelMode.toString(); + public CalculateRouteRequest withCarModeOptions(CalculateRouteCarModeOptions carModeOptions) { + this.carModeOptions = carModeOptions; return this; } @@ -2156,329 +2400,257 @@ public CalculateRouteRequest withTruckModeOptions( /** *

      - * Specifies an ordered list of up to 23 intermediate positions to include - * along a route between the departure position and destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order that the - * waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] + * Specifies the desired time of arrival. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. *

        - *
        • - *
      * *

      - * If you specify a waypoint position that's not located on a road, Amazon - * Location moves the position to the nearest road. - *

      - *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. - *

      - *

      - * If Esri is the provider for your route calculator, specifying a route - * that is longer than 400 km returns a - * 400 RoutesValidationException error. + * ArrivalTime is not supported Esri. *

      *       - *

      - * Valid Values: [-180 to 180,-90 to 90] - *

      * * @return

      - * Specifies an ordered list of up to 23 intermediate positions to - * include along a route between the departure position and - * destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order that - * the waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] + * Specifies the desired time of arrival. Uses the given time to + * calculate the route. Otherwise, the best time of day to travel + * with the best traffic conditions is used to calculate the route. *

        - *
        • - *
      * *

      - * If you specify a waypoint position that's not located on a road, - * Amazon Location moves the position to the nearest road. - *

      - *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. - *

      - *

      - * If Esri is the provider for your route calculator, specifying a - * route that is longer than 400 km returns a - * 400 RoutesValidationException error. + * ArrivalTime is not supported Esri. *

      *       - *

      - * Valid Values: [-180 to 180,-90 to 90] - *

      */ - public java.util.List> getWaypointPositions() { - return waypointPositions; + public java.util.Date getArrivalTime() { + return arrivalTime; } /** *

      - * Specifies an ordered list of up to 23 intermediate positions to include - * along a route between the departure position and destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order that the - * waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] + * Specifies the desired time of arrival. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. *

        - *
        • - *
      * *

      - * If you specify a waypoint position that's not located on a road, Amazon - * Location moves the position to the nearest road. + * ArrivalTime is not supported Esri. *

      + *       + * + * @param arrivalTime

      + * Specifies the desired time of arrival. Uses the given time to + * calculate the route. Otherwise, the best time of day to travel + * with the best traffic conditions is used to calculate the + * route. + *

      + * + *

      + * ArrivalTime is not supported Esri. + *

      + *       + */ + public void setArrivalTime(java.util.Date arrivalTime) { + this.arrivalTime = arrivalTime; + } + + /** *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. + * Specifies the desired time of arrival. Uses the given time to calculate + * the route. Otherwise, the best time of day to travel with the best + * traffic conditions is used to calculate the route. *

      + * *

      - * If Esri is the provider for your route calculator, specifying a route - * that is longer than 400 km returns a - * 400 RoutesValidationException error. + * ArrivalTime is not supported Esri. *

      *       *

      - * Valid Values: [-180 to 180,-90 to 90] - *

      + * Returns a reference to this object so that method calls can be chained + * together. * - * @param waypointPositions

      - * Specifies an ordered list of up to 23 intermediate positions - * to include along a route between the departure position and - * destination position. + * @param arrivalTime

      + * Specifies the desired time of arrival. Uses the given time to + * calculate the route. Otherwise, the best time of day to travel + * with the best traffic conditions is used to calculate the + * route. *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order - * that the waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] - *

        - *
        • - *
      * *

      - * If you specify a waypoint position that's not located on a - * road, Amazon Location moves the position to the nearest road. - *

      - *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. - *

      - *

      - * If Esri is the provider for your route calculator, specifying - * a route that is longer than 400 km returns a - * 400 RoutesValidationException error. + * ArrivalTime is not supported Esri. *

      *       - *

      - * Valid Values: [-180 to 180,-90 to 90] - *

      + * @return A reference to this updated object so that method calls can be + * chained together. */ - public void setWaypointPositions(java.util.Collection> waypointPositions) { - if (waypointPositions == null) { - this.waypointPositions = null; - return; - } - - this.waypointPositions = new java.util.ArrayList>(waypointPositions); + public CalculateRouteRequest withArrivalTime(java.util.Date arrivalTime) { + this.arrivalTime = arrivalTime; + return this; } /** *

      - * Specifies an ordered list of up to 23 intermediate positions to include - * along a route between the departure position and destination position. + * Specifies the distance to optimize for when calculating a route. *

      - *
        - *
      • *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order that the - * waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] + * Constraints:
        + * Allowed Values: FastestRoute, ShortestRoute + * + * @return

        + * Specifies the distance to optimize for when calculating a route. + *

        + * @see OptimizationMode + */ + public String getOptimizeFor() { + return optimizeFor; + } + + /** + *

        + * Specifies the distance to optimize for when calculating a route. *

        - *
        • - *
      - * *

      - * If you specify a waypoint position that's not located on a road, Amazon - * Location moves the position to the nearest road. + * Constraints:
      + * Allowed Values: FastestRoute, ShortestRoute + * + * @param optimizeFor

      + * Specifies the distance to optimize for when calculating a + * route. + *

      + * @see OptimizationMode + */ + public void setOptimizeFor(String optimizeFor) { + this.optimizeFor = optimizeFor; + } + + /** + *

      + * Specifies the distance to optimize for when calculating a route. *

      *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Allowed Values: FastestRoute, ShortestRoute + * + * @param optimizeFor

      + * Specifies the distance to optimize for when calculating a + * route. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + * @see OptimizationMode + */ + public CalculateRouteRequest withOptimizeFor(String optimizeFor) { + this.optimizeFor = optimizeFor; + return this; + } + + /** + *

      + * Specifies the distance to optimize for when calculating a route. *

      *

      - * If Esri is the provider for your route calculator, specifying a route - * that is longer than 400 km returns a - * 400 RoutesValidationException error. - *

      - *       + * Constraints:
      + * Allowed Values: FastestRoute, ShortestRoute + * + * @param optimizeFor

      + * Specifies the distance to optimize for when calculating a + * route. + *

      + * @see OptimizationMode + */ + public void setOptimizeFor(OptimizationMode optimizeFor) { + this.optimizeFor = optimizeFor.toString(); + } + + /** *

      - * Valid Values: [-180 to 180,-90 to 90] + * Specifies the distance to optimize for when calculating a route. *

      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Allowed Values: FastestRoute, ShortestRoute * - * @param waypointPositions

      - * Specifies an ordered list of up to 23 intermediate positions - * to include along a route between the departure position and - * destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order - * that the waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] - *

        - *
        • - *
      - * - *

      - * If you specify a waypoint position that's not located on a - * road, Amazon Location moves the position to the nearest road. - *

      - *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. - *

      - *

      - * If Esri is the provider for your route calculator, specifying - * a route that is longer than 400 km returns a - * 400 RoutesValidationException error. - *

      - *       - *

      - * Valid Values: [-180 to 180,-90 to 90] + * @param optimizeFor

      + * Specifies the distance to optimize for when calculating a + * route. *

      * @return A reference to this updated object so that method calls can be * chained together. + * @see OptimizationMode */ - public CalculateRouteRequest withWaypointPositions(java.util.List... waypointPositions) { - if (getWaypointPositions() == null) { - this.waypointPositions = new java.util.ArrayList>( - waypointPositions.length); - } - for (java.util.List value : waypointPositions) { - this.waypointPositions.add(value); - } + public CalculateRouteRequest withOptimizeFor(OptimizationMode optimizeFor) { + this.optimizeFor = optimizeFor.toString(); return this; } /** *

      - * Specifies an ordered list of up to 23 intermediate positions to include - * along a route between the departure position and destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order that the - * waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] + * The optional API key to authorize the request. *

        - *
        • - *
      - * *

      - * If you specify a waypoint position that's not located on a road, Amazon - * Location moves the position to the nearest road. - *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @return

      + * The optional API key to authorize the request. + *

      + */ + public String getKey() { + return key; + } + + /** *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. + * The optional API key to authorize the request. *

      *

      - * If Esri is the provider for your route calculator, specifying a route - * that is longer than 400 km returns a - * 400 RoutesValidationException error. - *

      - *       + * Constraints:
      + * Length: 0 - 1000
      + * + * @param key

      + * The optional API key to authorize the request. + *

      + */ + public void setKey(String key) { + this.key = key; + } + + /** *

      - * Valid Values: [-180 to 180,-90 to 90] + * The optional API key to authorize the request. *

      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      * - * @param waypointPositions

      - * Specifies an ordered list of up to 23 intermediate positions - * to include along a route between the departure position and - * destination position. - *

      - *
        - *
      • - *

        - * For example, from the DeparturePosition - * [-123.115, 49.285], the route follows the order - * that the waypoint positions are given - * [[-122.757, 49.0021],[-122.349, 47.620]] - *

        - *
        • - *
      - * - *

      - * If you specify a waypoint position that's not located on a - * road, Amazon Location moves the position to the nearest road. - *

      - *

      - * Specifying more than 23 waypoints returns a - * 400 ValidationException error. - *

      - *

      - * If Esri is the provider for your route calculator, specifying - * a route that is longer than 400 km returns a - * 400 RoutesValidationException error. - *

      - *       - *

      - * Valid Values: [-180 to 180,-90 to 90] + * @param key

      + * The optional API key to authorize the request. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CalculateRouteRequest withWaypointPositions( - java.util.Collection> waypointPositions) { - setWaypointPositions(waypointPositions); + public CalculateRouteRequest withKey(String key) { + this.key = key; return this; } @@ -2495,28 +2667,32 @@ public String toString() { sb.append("{"); if (getCalculatorName() != null) sb.append("CalculatorName: " + getCalculatorName() + ","); - if (getCarModeOptions() != null) - sb.append("CarModeOptions: " + getCarModeOptions() + ","); - if (getDepartNow() != null) - sb.append("DepartNow: " + getDepartNow() + ","); if (getDeparturePosition() != null) sb.append("DeparturePosition: " + getDeparturePosition() + ","); - if (getDepartureTime() != null) - sb.append("DepartureTime: " + getDepartureTime() + ","); if (getDestinationPosition() != null) sb.append("DestinationPosition: " + getDestinationPosition() + ","); + if (getWaypointPositions() != null) + sb.append("WaypointPositions: " + getWaypointPositions() + ","); + if (getTravelMode() != null) + sb.append("TravelMode: " + getTravelMode() + ","); + if (getDepartureTime() != null) + sb.append("DepartureTime: " + getDepartureTime() + ","); + if (getDepartNow() != null) + sb.append("DepartNow: " + getDepartNow() + ","); if (getDistanceUnit() != null) sb.append("DistanceUnit: " + getDistanceUnit() + ","); if (getIncludeLegGeometry() != null) sb.append("IncludeLegGeometry: " + getIncludeLegGeometry() + ","); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); - if (getTravelMode() != null) - sb.append("TravelMode: " + getTravelMode() + ","); + if (getCarModeOptions() != null) + sb.append("CarModeOptions: " + getCarModeOptions() + ","); if (getTruckModeOptions() != null) sb.append("TruckModeOptions: " + getTruckModeOptions() + ","); - if (getWaypointPositions() != null) - sb.append("WaypointPositions: " + getWaypointPositions()); + if (getArrivalTime() != null) + sb.append("ArrivalTime: " + getArrivalTime() + ","); + if (getOptimizeFor() != null) + sb.append("OptimizeFor: " + getOptimizeFor() + ","); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -2528,25 +2704,29 @@ public int hashCode() { hashCode = prime * hashCode + ((getCalculatorName() == null) ? 0 : getCalculatorName().hashCode()); - hashCode = prime * hashCode - + ((getCarModeOptions() == null) ? 0 : getCarModeOptions().hashCode()); - hashCode = prime * hashCode + ((getDepartNow() == null) ? 0 : getDepartNow().hashCode()); hashCode = prime * hashCode + ((getDeparturePosition() == null) ? 0 : getDeparturePosition().hashCode()); - hashCode = prime * hashCode - + ((getDepartureTime() == null) ? 0 : getDepartureTime().hashCode()); hashCode = prime * hashCode + ((getDestinationPosition() == null) ? 0 : getDestinationPosition().hashCode()); + hashCode = prime * hashCode + + ((getWaypointPositions() == null) ? 0 : getWaypointPositions().hashCode()); + hashCode = prime * hashCode + ((getTravelMode() == null) ? 0 : getTravelMode().hashCode()); + hashCode = prime * hashCode + + ((getDepartureTime() == null) ? 0 : getDepartureTime().hashCode()); + hashCode = prime * hashCode + ((getDepartNow() == null) ? 0 : getDepartNow().hashCode()); hashCode = prime * hashCode + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); hashCode = prime * hashCode + ((getIncludeLegGeometry() == null) ? 0 : getIncludeLegGeometry().hashCode()); - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getTravelMode() == null) ? 0 : getTravelMode().hashCode()); + hashCode = prime * hashCode + + ((getCarModeOptions() == null) ? 0 : getCarModeOptions().hashCode()); hashCode = prime * hashCode + ((getTruckModeOptions() == null) ? 0 : getTruckModeOptions().hashCode()); hashCode = prime * hashCode - + ((getWaypointPositions() == null) ? 0 : getWaypointPositions().hashCode()); + + ((getArrivalTime() == null) ? 0 : getArrivalTime().hashCode()); + hashCode = prime * hashCode + + ((getOptimizeFor() == null) ? 0 : getOptimizeFor().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -2566,30 +2746,35 @@ public boolean equals(Object obj) { if (other.getCalculatorName() != null && other.getCalculatorName().equals(this.getCalculatorName()) == false) return false; - if (other.getCarModeOptions() == null ^ this.getCarModeOptions() == null) + if (other.getDeparturePosition() == null ^ this.getDeparturePosition() == null) return false; - if (other.getCarModeOptions() != null - && other.getCarModeOptions().equals(this.getCarModeOptions()) == false) + if (other.getDeparturePosition() != null + && other.getDeparturePosition().equals(this.getDeparturePosition()) == false) return false; - if (other.getDepartNow() == null ^ this.getDepartNow() == null) + if (other.getDestinationPosition() == null ^ this.getDestinationPosition() == null) return false; - if (other.getDepartNow() != null - && other.getDepartNow().equals(this.getDepartNow()) == false) + if (other.getDestinationPosition() != null + && other.getDestinationPosition().equals(this.getDestinationPosition()) == false) return false; - if (other.getDeparturePosition() == null ^ this.getDeparturePosition() == null) + if (other.getWaypointPositions() == null ^ this.getWaypointPositions() == null) return false; - if (other.getDeparturePosition() != null - && other.getDeparturePosition().equals(this.getDeparturePosition()) == false) + if (other.getWaypointPositions() != null + && other.getWaypointPositions().equals(this.getWaypointPositions()) == false) + return false; + if (other.getTravelMode() == null ^ this.getTravelMode() == null) + return false; + if (other.getTravelMode() != null + && other.getTravelMode().equals(this.getTravelMode()) == false) return false; if (other.getDepartureTime() == null ^ this.getDepartureTime() == null) return false; if (other.getDepartureTime() != null && other.getDepartureTime().equals(this.getDepartureTime()) == false) return false; - if (other.getDestinationPosition() == null ^ this.getDestinationPosition() == null) + if (other.getDepartNow() == null ^ this.getDepartNow() == null) return false; - if (other.getDestinationPosition() != null - && other.getDestinationPosition().equals(this.getDestinationPosition()) == false) + if (other.getDepartNow() != null + && other.getDepartNow().equals(this.getDepartNow()) == false) return false; if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) return false; @@ -2601,24 +2786,29 @@ public boolean equals(Object obj) { if (other.getIncludeLegGeometry() != null && other.getIncludeLegGeometry().equals(this.getIncludeLegGeometry()) == false) return false; - if (other.getKey() == null ^ this.getKey() == null) - return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) - return false; - if (other.getTravelMode() == null ^ this.getTravelMode() == null) + if (other.getCarModeOptions() == null ^ this.getCarModeOptions() == null) return false; - if (other.getTravelMode() != null - && other.getTravelMode().equals(this.getTravelMode()) == false) + if (other.getCarModeOptions() != null + && other.getCarModeOptions().equals(this.getCarModeOptions()) == false) return false; if (other.getTruckModeOptions() == null ^ this.getTruckModeOptions() == null) return false; if (other.getTruckModeOptions() != null && other.getTruckModeOptions().equals(this.getTruckModeOptions()) == false) return false; - if (other.getWaypointPositions() == null ^ this.getWaypointPositions() == null) + if (other.getArrivalTime() == null ^ this.getArrivalTime() == null) return false; - if (other.getWaypointPositions() != null - && other.getWaypointPositions().equals(this.getWaypointPositions()) == false) + if (other.getArrivalTime() != null + && other.getArrivalTime().equals(this.getArrivalTime()) == false) + return false; + if (other.getOptimizeFor() == null ^ this.getOptimizeFor() == null) + return false; + if (other.getOptimizeFor() != null + && other.getOptimizeFor().equals(this.getOptimizeFor()) == false) + return false; + if (other.getKey() == null ^ this.getKey() == null) + return false; + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteResult.java index 7f19689be5..196c838c0c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteSummary.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteSummary.java index 03ffce1414..e85836b3ea 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteSummary.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteSummary.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -23,6 +23,51 @@ *

      */ public class CalculateRouteSummary implements Serializable { + /** + *

      + * Specifies a geographical box surrounding a route. Used to zoom into a + * route when displaying it in a map. For example, + * [min x, min y, max x, max y]. + *

      + *

      + * The first 2 bbox parameters describe the lower southwest + * corner: + *

      + *
        + *
      • + *

        + * The first bbox position is the X coordinate or longitude of + * the lower southwest corner. + *

        + *
        • + *
      • + *

        + * The second bbox position is the Y coordinate or latitude of + * the lower southwest corner. + *

        + *
        • + *
      + *

      + * The next 2 bbox parameters describe the upper northeast + * corner: + *

      + *
        + *
      • + *

        + * The third bbox position is the X coordinate, or longitude of + * the upper northeast corner. + *

        + *
        • + *
      • + *

        + * The fourth bbox position is the Y coordinate, or latitude of + * the upper northeast corner. + *

        + *
        • + *
      + */ + private java.util.List routeBBox; + /** *

      * The data provider of traffic and road network data used to calculate the @@ -73,24 +118,24 @@ public class CalculateRouteSummary implements Serializable { /** *

      - * The unit of measurement for route distances. + * The total travel time for the route measured in seconds. The sum of the + * travel time between every stop on the route. *

      *

      * Constraints:
      - * Allowed Values: Kilometers, Miles + * Range: 0.0 -
      */ - private String distanceUnit; + private Double durationSeconds; /** *

      - * The total travel time for the route measured in seconds. The sum of the - * travel time between every stop on the route. + * The unit of measurement for route distances. *

      *

      * Constraints:
      - * Range: 0.0 -
      + * Allowed Values: Kilometers, Miles */ - private Double durationSeconds; + private String distanceUnit; /** *

      @@ -134,829 +179,784 @@ public class CalculateRouteSummary implements Serializable { *

      *
      • *
    - */ - private java.util.List routeBBox; - - /** - *

    - * The data provider of traffic and road network data used to calculate the - * route. Indicates one of the available providers: - *

    - *
      - *
    • - *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here - *

      - *
      • - *
    - *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    * * @return

    - * The data provider of traffic and road network data used to - * calculate the route. Indicates one of the available providers: + * Specifies a geographical box surrounding a route. Used to zoom + * into a route when displaying it in a map. For example, + * [min x, min y, max x, max y]. + *

    + *

    + * The first 2 bbox parameters describe the lower + * southwest corner: *

    *
      *
    • *

      - * Esri + * The first bbox position is the X coordinate or + * longitude of the lower southwest corner. *

      *
      • *
    • *

      - * Grab + * The second bbox position is the Y coordinate or + * latitude of the lower southwest corner. *

      *
      • + *
    + *

    + * The next 2 bbox parameters describe the upper + * northeast corner: + *

    + *
      *
    • *

      - * Here + * The third bbox position is the X coordinate, or + * longitude of the upper northeast corner. *

      *
      • - *
    + *
  • *

    - * For more information about data providers, see Amazon Location Service data providers. + * The fourth bbox position is the Y coordinate, or + * latitude of the upper northeast corner. *

    + *
    • + *
*/ - public String getDataSource() { - return dataSource; + public java.util.List getRouteBBox() { + return routeBBox; } /** *

- * The data provider of traffic and road network data used to calculate the - * route. Indicates one of the available providers: + * Specifies a geographical box surrounding a route. Used to zoom into a + * route when displaying it in a map. For example, + * [min x, min y, max x, max y]. + *

+ *

+ * The first 2 bbox parameters describe the lower southwest + * corner: *

*
    *
  • *

    - * Esri + * The first bbox position is the X coordinate or longitude of + * the lower southwest corner. *

    *
    • *
  • *

    - * Grab + * The second bbox position is the Y coordinate or latitude of + * the lower southwest corner. *

    *
    • + *
+ *

+ * The next 2 bbox parameters describe the upper northeast + * corner: + *

+ *
    *
  • *

    - * Here + * The third bbox position is the X coordinate, or longitude of + * the upper northeast corner. *

    *
    • - *
+ *
  • *

    - * For more information about data providers, see Amazon Location Service data providers. + * The fourth bbox position is the Y coordinate, or latitude of + * the upper northeast corner. *

    + *
    • + * * - * @param dataSource

    - * The data provider of traffic and road network data used to - * calculate the route. Indicates one of the available providers: + * @param routeBBox

    + * Specifies a geographical box surrounding a route. Used to zoom + * into a route when displaying it in a map. For example, + * [min x, min y, max x, max y]. + *

    + *

    + * The first 2 bbox parameters describe the lower + * southwest corner: *

    *
      *
    • *

      - * Esri + * The first bbox position is the X coordinate or + * longitude of the lower southwest corner. *

      *
      • *
    • *

      - * Grab + * The second bbox position is the Y coordinate or + * latitude of the lower southwest corner. *

      *
      • + *
    + *

    + * The next 2 bbox parameters describe the upper + * northeast corner: + *

    + *
      *
    • *

      - * Here + * The third bbox position is the X coordinate, or + * longitude of the upper northeast corner. *

      *
      • - *
    + *
  • *

    - * For more information about data providers, see Amazon Location Service data providers. + * The fourth bbox position is the Y coordinate, or + * latitude of the upper northeast corner. *

    + *
    • + * */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; + public void setRouteBBox(java.util.Collection routeBBox) { + if (routeBBox == null) { + this.routeBBox = null; + return; + } + + this.routeBBox = new java.util.ArrayList(routeBBox); } /** *

    - * The data provider of traffic and road network data used to calculate the - * route. Indicates one of the available providers: + * Specifies a geographical box surrounding a route. Used to zoom into a + * route when displaying it in a map. For example, + * [min x, min y, max x, max y]. + *

    + *

    + * The first 2 bbox parameters describe the lower southwest + * corner: *

    *
      *
    • *

      - * Esri + * The first bbox position is the X coordinate or longitude of + * the lower southwest corner. *

      *
      • *
    • *

      - * Grab + * The second bbox position is the Y coordinate or latitude of + * the lower southwest corner. *

      *
      • + *
    + *

    + * The next 2 bbox parameters describe the upper northeast + * corner: + *

    + *
      *
    • *

      - * Here + * The third bbox position is the X coordinate, or longitude of + * the upper northeast corner. *

      *
      • - *
    + *
  • *

    - * For more information about data providers, see Amazon Location Service data providers. + * The fourth bbox position is the Y coordinate, or latitude of + * the upper northeast corner. *

    + *
    • + * *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param dataSource

    - * The data provider of traffic and road network data used to - * calculate the route. Indicates one of the available providers: + * @param routeBBox

    + * Specifies a geographical box surrounding a route. Used to zoom + * into a route when displaying it in a map. For example, + * [min x, min y, max x, max y]. *

    - *
      - *
    • *

      - * Esri + * The first 2 bbox parameters describe the lower + * southwest corner: *

      - *
      • + *
        *
      • *

        - * Grab + * The first bbox position is the X coordinate or + * longitude of the lower southwest corner. *

        *
        • *
      • *

        - * Here + * The second bbox position is the Y coordinate or + * latitude of the lower southwest corner. *

        *
        • *
      *

      - * For more information about data providers, see Amazon Location Service data providers. + * The next 2 bbox parameters describe the upper + * northeast corner: *

      + *
        + *
      • + *

        + * The third bbox position is the X coordinate, or + * longitude of the upper northeast corner. + *

        + *
        • + *
      • + *

        + * The fourth bbox position is the Y coordinate, or + * latitude of the upper northeast corner. + *

        + *
        • + *
      * @return A reference to this updated object so that method calls can be * chained together. */ - public CalculateRouteSummary withDataSource(String dataSource) { - this.dataSource = dataSource; + public CalculateRouteSummary withRouteBBox(Double... routeBBox) { + if (getRouteBBox() == null) { + this.routeBBox = new java.util.ArrayList(routeBBox.length); + } + for (Double value : routeBBox) { + this.routeBBox.add(value); + } return this; } /** *

      - * The total distance covered by the route. The sum of the distance - * travelled between every stop on the route. + * Specifies a geographical box surrounding a route. Used to zoom into a + * route when displaying it in a map. For example, + * [min x, min y, max x, max y]. *

      - * *

      - * If Esri is the data source for the route calculator, the route distance - * can’t be greater than 400 km. If the route exceeds 400 km, the response - * is a 400 RoutesValidationException error. + * The first 2 bbox parameters describe the lower southwest + * corner: *

      - *       - *

      - * Constraints:
      - * Range: 0.0 -
      - * - * @return

      - * The total distance covered by the route. The sum of the distance - * travelled between every stop on the route. - *

      - * - *

      - * If Esri is the data source for the route calculator, the route - * distance can’t be greater than 400 km. If the route exceeds 400 - * km, the response is a 400 RoutesValidationException - * error. - *

      - *       - */ - public Double getDistance() { - return distance; - } - - /** + *
        + *
      • *

        - * The total distance covered by the route. The sum of the distance - * travelled between every stop on the route. + * The first bbox position is the X coordinate or longitude of + * the lower southwest corner. *

        - * + *
        • + *
      • *

        - * If Esri is the data source for the route calculator, the route distance - * can’t be greater than 400 km. If the route exceeds 400 km, the response - * is a 400 RoutesValidationException error. + * The second bbox position is the Y coordinate or latitude of + * the lower southwest corner. *

        - * + *
        • + *
      *

      - * Constraints:
      - * Range: 0.0 -
      - * - * @param distance

      - * The total distance covered by the route. The sum of the - * distance travelled between every stop on the route. - *

      - * - *

      - * If Esri is the data source for the route calculator, the route - * distance can’t be greater than 400 km. If the route exceeds - * 400 km, the response is a - * 400 RoutesValidationException error. - *

      - *       - */ - public void setDistance(Double distance) { - this.distance = distance; - } - - /** + * The next 2 bbox parameters describe the upper northeast + * corner: + *

      + *
        + *
      • *

        - * The total distance covered by the route. The sum of the distance - * travelled between every stop on the route. + * The third bbox position is the X coordinate, or longitude of + * the upper northeast corner. *

        - * + *
        • + *
      • *

        - * If Esri is the data source for the route calculator, the route distance - * can’t be greater than 400 km. If the route exceeds 400 km, the response - * is a 400 RoutesValidationException error. + * The fourth bbox position is the Y coordinate, or latitude of + * the upper northeast corner. *

        - * + *
        • + *
      *

      * Returns a reference to this object so that method calls can be chained * together. - *

      - * Constraints:
      - * Range: 0.0 -
      * - * @param distance

      - * The total distance covered by the route. The sum of the - * distance travelled between every stop on the route. + * @param routeBBox

      + * Specifies a geographical box surrounding a route. Used to zoom + * into a route when displaying it in a map. For example, + * [min x, min y, max x, max y]. *

      - * *

      - * If Esri is the data source for the route calculator, the route - * distance can’t be greater than 400 km. If the route exceeds - * 400 km, the response is a - * 400 RoutesValidationException error. - *

      - *       - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CalculateRouteSummary withDistance(Double distance) { - this.distance = distance; - return this; - } - - /** - *

      - * The unit of measurement for route distances. - *

      - *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @return

      - * The unit of measurement for route distances. - *

      - * @see DistanceUnit - */ - public String getDistanceUnit() { - return distanceUnit; - } - - /** - *

      - * The unit of measurement for route distances. - *

      - *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

      - * The unit of measurement for route distances. + * The first 2 bbox parameters describe the lower + * southwest corner: *

      - * @see DistanceUnit - */ - public void setDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - } - - /** - *

      - * The unit of measurement for route distances. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

      - * The unit of measurement for route distances. + *

        + *
      • + *

        + * The first bbox position is the X coordinate or + * longitude of the lower southwest corner. *

        - * @return A reference to this updated object so that method calls can be - * chained together. - * @see DistanceUnit - */ - public CalculateRouteSummary withDistanceUnit(String distanceUnit) { - this.distanceUnit = distanceUnit; - return this; - } - - /** - *

        - * The unit of measurement for route distances. - *

        - *

        - * Constraints:
        - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

        - * The unit of measurement for route distances. + *

        • + *
      • + *

        + * The second bbox position is the Y coordinate or + * latitude of the lower southwest corner. *

        - * @see DistanceUnit - */ - public void setDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); - } - - /** - *

        - * The unit of measurement for route distances. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Allowed Values: Kilometers, Miles - * - * @param distanceUnit

        - * The unit of measurement for route distances. + *

        • + *
      + *

      + * The next 2 bbox parameters describe the upper + * northeast corner: *

      - * @return A reference to this updated object so that method calls can be - * chained together. - * @see DistanceUnit - */ - public CalculateRouteSummary withDistanceUnit(DistanceUnit distanceUnit) { - this.distanceUnit = distanceUnit.toString(); - return this; - } - - /** - *

      - * The total travel time for the route measured in seconds. The sum of the - * travel time between every stop on the route. - *

      - *

      - * Constraints:
      - * Range: 0.0 -
      - * - * @return

      - * The total travel time for the route measured in seconds. The sum - * of the travel time between every stop on the route. - *

      - */ - public Double getDurationSeconds() { - return durationSeconds; - } - - /** - *

      - * The total travel time for the route measured in seconds. The sum of the - * travel time between every stop on the route. - *

      - *

      - * Constraints:
      - * Range: 0.0 -
      - * - * @param durationSeconds

      - * The total travel time for the route measured in seconds. The - * sum of the travel time between every stop on the route. + *

        + *
      • + *

        + * The third bbox position is the X coordinate, or + * longitude of the upper northeast corner. *

        - */ - public void setDurationSeconds(Double durationSeconds) { - this.durationSeconds = durationSeconds; - } - - /** - *

        - * The total travel time for the route measured in seconds. The sum of the - * travel time between every stop on the route. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Range: 0.0 -
        - * - * @param durationSeconds

        - * The total travel time for the route measured in seconds. The - * sum of the travel time between every stop on the route. + *

        • + *
      • + *

        + * The fourth bbox position is the Y coordinate, or + * latitude of the upper northeast corner. *

        + *
        • + *
      * @return A reference to this updated object so that method calls can be * chained together. */ - public CalculateRouteSummary withDurationSeconds(Double durationSeconds) { - this.durationSeconds = durationSeconds; + public CalculateRouteSummary withRouteBBox(java.util.Collection routeBBox) { + setRouteBBox(routeBBox); return this; } /** *

      - * Specifies a geographical box surrounding a route. Used to zoom into a - * route when displaying it in a map. For example, - * [min x, min y, max x, max y]. - *

      - *

      - * The first 2 bbox parameters describe the lower southwest - * corner: + * The data provider of traffic and road network data used to calculate the + * route. Indicates one of the available providers: *

      *
        *
      • *

        - * The first bbox position is the X coordinate or longitude of - * the lower southwest corner. + * Esri *

        *
        • *
      • *

        - * The second bbox position is the Y coordinate or latitude of - * the lower southwest corner. + * Grab *

        *
        • - *
      - *

      - * The next 2 bbox parameters describe the upper northeast - * corner: - *

      - *
        *
      • *

        - * The third bbox position is the X coordinate, or longitude of - * the upper northeast corner. + * Here *

        *
        • - *
      • + *
      *

      - * The fourth bbox position is the Y coordinate, or latitude of - * the upper northeast corner. + * For more information about data providers, see Amazon Location Service data providers. *

      - * - *
    * * @return

    - * Specifies a geographical box surrounding a route. Used to zoom - * into a route when displaying it in a map. For example, - * [min x, min y, max x, max y]. - *

    - *

    - * The first 2 bbox parameters describe the lower - * southwest corner: + * The data provider of traffic and road network data used to + * calculate the route. Indicates one of the available providers: *

    *
      *
    • *

      - * The first bbox position is the X coordinate or - * longitude of the lower southwest corner. + * Esri *

      *
      • *
    • *

      - * The second bbox position is the Y coordinate or - * latitude of the lower southwest corner. + * Grab *

      *
      • - *
    - *

    - * The next 2 bbox parameters describe the upper - * northeast corner: - *

    - *
      *
    • *

      - * The third bbox position is the X coordinate, or - * longitude of the upper northeast corner. + * Here *

      *
      • - *
    • + *
    *

    - * The fourth bbox position is the Y coordinate, or - * latitude of the upper northeast corner. + * For more information about data providers, see Amazon Location Service data providers. *

    - * - * - */ - public java.util.List getRouteBBox() { - return routeBBox; + */ + public String getDataSource() { + return dataSource; } /** *

    - * Specifies a geographical box surrounding a route. Used to zoom into a - * route when displaying it in a map. For example, - * [min x, min y, max x, max y]. - *

    - *

    - * The first 2 bbox parameters describe the lower southwest - * corner: + * The data provider of traffic and road network data used to calculate the + * route. Indicates one of the available providers: *

    *
      *
    • *

      - * The first bbox position is the X coordinate or longitude of - * the lower southwest corner. + * Esri *

      *
      • *
    • *

      - * The second bbox position is the Y coordinate or latitude of - * the lower southwest corner. + * Grab *

      *
      • - *
    - *

    - * The next 2 bbox parameters describe the upper northeast - * corner: - *

    - *
      *
    • *

      - * The third bbox position is the X coordinate, or longitude of - * the upper northeast corner. + * Here *

      *
      • - *
    • + *
    *

    - * The fourth bbox position is the Y coordinate, or latitude of - * the upper northeast corner. + * For more information about data providers, see Amazon Location Service data providers. *

    - * - * * - * @param routeBBox

    - * Specifies a geographical box surrounding a route. Used to zoom - * into a route when displaying it in a map. For example, - * [min x, min y, max x, max y]. + * @param dataSource

    + * The data provider of traffic and road network data used to + * calculate the route. Indicates one of the available providers: *

    + *
      + *
    • *

      - * The first 2 bbox parameters describe the lower - * southwest corner: + * Esri *

      - *
        + * *
      • *

        - * The first bbox position is the X coordinate or - * longitude of the lower southwest corner. + * Grab *

        *
        • *
      • *

        - * The second bbox position is the Y coordinate or - * latitude of the lower southwest corner. + * Here *

        *
        • *
      *

      - * The next 2 bbox parameters describe the upper - * northeast corner: + * For more information about data providers, see Amazon Location Service data providers. + *

      + */ + public void setDataSource(String dataSource) { + this.dataSource = dataSource; + } + + /** + *

      + * The data provider of traffic and road network data used to calculate the + * route. Indicates one of the available providers: + *

      + *
        + *
      • + *

        + * Esri + *

        + *
        • + *
      • + *

        + * Grab + *

        + *
        • + *
      • + *

        + * Here + *

        + *
        • + *
      + *

      + * For more information about data providers, see Amazon Location Service data providers. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param dataSource

      + * The data provider of traffic and road network data used to + * calculate the route. Indicates one of the available providers: *

      *
        *
      • *

        - * The third bbox position is the X coordinate, or - * longitude of the upper northeast corner. + * Esri *

        *
        • *
      • *

        - * The fourth bbox position is the Y coordinate, or - * latitude of the upper northeast corner. + * Grab + *

        + *
        • + *
      • + *

        + * Here *

        *
        • *
      + *

      + * For more information about data providers, see Amazon Location Service data providers. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. */ - public void setRouteBBox(java.util.Collection routeBBox) { - if (routeBBox == null) { - this.routeBBox = null; - return; - } + public CalculateRouteSummary withDataSource(String dataSource) { + this.dataSource = dataSource; + return this; + } - this.routeBBox = new java.util.ArrayList(routeBBox); + /** + *

      + * The total distance covered by the route. The sum of the distance + * travelled between every stop on the route. + *

      + * + *

      + * If Esri is the data source for the route calculator, the route distance + * can’t be greater than 400 km. If the route exceeds 400 km, the response + * is a 400 RoutesValidationException error. + *

      + *       + *

      + * Constraints:
      + * Range: 0.0 -
      + * + * @return

      + * The total distance covered by the route. The sum of the distance + * travelled between every stop on the route. + *

      + * + *

      + * If Esri is the data source for the route calculator, the route + * distance can’t be greater than 400 km. If the route exceeds 400 + * km, the response is a 400 RoutesValidationException + * error. + *

      + *       + */ + public Double getDistance() { + return distance; } /** *

      - * Specifies a geographical box surrounding a route. Used to zoom into a - * route when displaying it in a map. For example, - * [min x, min y, max x, max y]. + * The total distance covered by the route. The sum of the distance + * travelled between every stop on the route. *

      + * *

      - * The first 2 bbox parameters describe the lower southwest - * corner: + * If Esri is the data source for the route calculator, the route distance + * can’t be greater than 400 km. If the route exceeds 400 km, the response + * is a 400 RoutesValidationException error. *

      - *
        - *
      • + * *

        - * The first bbox position is the X coordinate or longitude of - * the lower southwest corner. + * Constraints:
        + * Range: 0.0 -
        + * + * @param distance

        + * The total distance covered by the route. The sum of the + * distance travelled between every stop on the route. + *

        + * + *

        + * If Esri is the data source for the route calculator, the route + * distance can’t be greater than 400 km. If the route exceeds + * 400 km, the response is a + * 400 RoutesValidationException error. + *

        + *         + */ + public void setDistance(Double distance) { + this.distance = distance; + } + + /** + *

        + * The total distance covered by the route. The sum of the distance + * travelled between every stop on the route. *

        - *
        • - *
      • + * *

        - * The second bbox position is the Y coordinate or latitude of - * the lower southwest corner. + * If Esri is the data source for the route calculator, the route distance + * can’t be greater than 400 km. If the route exceeds 400 km, the response + * is a 400 RoutesValidationException error. *

        - *
        • - *
      + *       + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Range: 0.0 -
      + * + * @param distance

      + * The total distance covered by the route. The sum of the + * distance travelled between every stop on the route. + *

      + * + *

      + * If Esri is the data source for the route calculator, the route + * distance can’t be greater than 400 km. If the route exceeds + * 400 km, the response is a + * 400 RoutesValidationException error. + *

      + *       + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CalculateRouteSummary withDistance(Double distance) { + this.distance = distance; + return this; + } + + /** + *

      + * The total travel time for the route measured in seconds. The sum of the + * travel time between every stop on the route. + *

      + *

      + * Constraints:
      + * Range: 0.0 -
      + * + * @return

      + * The total travel time for the route measured in seconds. The sum + * of the travel time between every stop on the route. + *

      + */ + public Double getDurationSeconds() { + return durationSeconds; + } + + /** *

      - * The next 2 bbox parameters describe the upper northeast - * corner: + * The total travel time for the route measured in seconds. The sum of the + * travel time between every stop on the route. *

      - *
        - *
      • *

        - * The third bbox position is the X coordinate, or longitude of - * the upper northeast corner. - *

        - *
        • - *
      • + * Constraints:
        + * Range: 0.0 -
        + * + * @param durationSeconds

        + * The total travel time for the route measured in seconds. The + * sum of the travel time between every stop on the route. + *

        + */ + public void setDurationSeconds(Double durationSeconds) { + this.durationSeconds = durationSeconds; + } + + /** *

        - * The fourth bbox position is the Y coordinate, or latitude of - * the upper northeast corner. + * The total travel time for the route measured in seconds. The sum of the + * travel time between every stop on the route. *

        - *
        • - *
      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Range: 0.0 -
      * - * @param routeBBox

      - * Specifies a geographical box surrounding a route. Used to zoom - * into a route when displaying it in a map. For example, - * [min x, min y, max x, max y]. - *

      - *

      - * The first 2 bbox parameters describe the lower - * southwest corner: - *

      - *
        - *
      • - *

        - * The first bbox position is the X coordinate or - * longitude of the lower southwest corner. - *

        - *
        • - *
      • - *

        - * The second bbox position is the Y coordinate or - * latitude of the lower southwest corner. - *

        - *
        • - *
      - *

      - * The next 2 bbox parameters describe the upper - * northeast corner: - *

      - *
        - *
      • - *

        - * The third bbox position is the X coordinate, or - * longitude of the upper northeast corner. - *

        - *
        • - *
      • - *

        - * The fourth bbox position is the Y coordinate, or - * latitude of the upper northeast corner. + * @param durationSeconds

        + * The total travel time for the route measured in seconds. The + * sum of the travel time between every stop on the route. *

        - *
        • - *
      * @return A reference to this updated object so that method calls can be * chained together. */ - public CalculateRouteSummary withRouteBBox(Double... routeBBox) { - if (getRouteBBox() == null) { - this.routeBBox = new java.util.ArrayList(routeBBox.length); - } - for (Double value : routeBBox) { - this.routeBBox.add(value); - } + public CalculateRouteSummary withDurationSeconds(Double durationSeconds) { + this.durationSeconds = durationSeconds; return this; } /** *

      - * Specifies a geographical box surrounding a route. Used to zoom into a - * route when displaying it in a map. For example, - * [min x, min y, max x, max y]. + * The unit of measurement for route distances. *

      *

      - * The first 2 bbox parameters describe the lower southwest - * corner: - *

      - *
        - *
      • + * Constraints:
        + * Allowed Values: Kilometers, Miles + * + * @return

        + * The unit of measurement for route distances. + *

        + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** *

        - * The first bbox position is the X coordinate or longitude of - * the lower southwest corner. + * The unit of measurement for route distances. *

        - *
        • - *
      • *

        - * The second bbox position is the Y coordinate or latitude of - * the lower southwest corner. - *

        - *
        • - *
      + * Constraints:
      + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

      + * The unit of measurement for route distances. + *

      + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** *

      - * The next 2 bbox parameters describe the upper northeast - * corner: + * The unit of measurement for route distances. *

      - *
        - *
      • *

        - * The third bbox position is the X coordinate, or longitude of - * the upper northeast corner. + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

        + * The unit of measurement for route distances. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public CalculateRouteSummary withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

        + * The unit of measurement for route distances. *

        - *
        • - *
      • *

        - * The fourth bbox position is the Y coordinate, or latitude of - * the upper northeast corner. + * Constraints:
        + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

        + * The unit of measurement for route distances. + *

        + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

        + * The unit of measurement for route distances. *

        - *
        • - *
      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Allowed Values: Kilometers, Miles * - * @param routeBBox

      - * Specifies a geographical box surrounding a route. Used to zoom - * into a route when displaying it in a map. For example, - * [min x, min y, max x, max y]. - *

      - *

      - * The first 2 bbox parameters describe the lower - * southwest corner: - *

      - *
        - *
      • - *

        - * The first bbox position is the X coordinate or - * longitude of the lower southwest corner. - *

        - *
        • - *
      • - *

        - * The second bbox position is the Y coordinate or - * latitude of the lower southwest corner. - *

        - *
        • - *
      - *

      - * The next 2 bbox parameters describe the upper - * northeast corner: - *

      - *
        - *
      • - *

        - * The third bbox position is the X coordinate, or - * longitude of the upper northeast corner. - *

        - *
        • - *
      • - *

        - * The fourth bbox position is the Y coordinate, or - * latitude of the upper northeast corner. + * @param distanceUnit

        + * The unit of measurement for route distances. *

        - *
        • - *
      * @return A reference to this updated object so that method calls can be * chained together. + * @see DistanceUnit */ - public CalculateRouteSummary withRouteBBox(java.util.Collection routeBBox) { - setRouteBBox(routeBBox); + public CalculateRouteSummary withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); return this; } @@ -971,16 +971,16 @@ public CalculateRouteSummary withRouteBBox(java.util.Collection routeBBo public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getRouteBBox() != null) + sb.append("RouteBBox: " + getRouteBBox() + ","); if (getDataSource() != null) sb.append("DataSource: " + getDataSource() + ","); if (getDistance() != null) sb.append("Distance: " + getDistance() + ","); - if (getDistanceUnit() != null) - sb.append("DistanceUnit: " + getDistanceUnit() + ","); if (getDurationSeconds() != null) sb.append("DurationSeconds: " + getDurationSeconds() + ","); - if (getRouteBBox() != null) - sb.append("RouteBBox: " + getRouteBBox()); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit()); sb.append("}"); return sb.toString(); } @@ -990,13 +990,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getRouteBBox() == null) ? 0 : getRouteBBox().hashCode()); hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); - hashCode = prime * hashCode - + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); hashCode = prime * hashCode + ((getDurationSeconds() == null) ? 0 : getDurationSeconds().hashCode()); - hashCode = prime * hashCode + ((getRouteBBox() == null) ? 0 : getRouteBBox().hashCode()); + hashCode = prime * hashCode + + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); return hashCode; } @@ -1011,6 +1011,11 @@ public boolean equals(Object obj) { return false; CalculateRouteSummary other = (CalculateRouteSummary) obj; + if (other.getRouteBBox() == null ^ this.getRouteBBox() == null) + return false; + if (other.getRouteBBox() != null + && other.getRouteBBox().equals(this.getRouteBBox()) == false) + return false; if (other.getDataSource() == null ^ this.getDataSource() == null) return false; if (other.getDataSource() != null @@ -1020,20 +1025,15 @@ public boolean equals(Object obj) { return false; if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) return false; - if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) - return false; - if (other.getDistanceUnit() != null - && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) - return false; if (other.getDurationSeconds() == null ^ this.getDurationSeconds() == null) return false; if (other.getDurationSeconds() != null && other.getDurationSeconds().equals(this.getDurationSeconds()) == false) return false; - if (other.getRouteBBox() == null ^ this.getRouteBBox() == null) + if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) return false; - if (other.getRouteBBox() != null - && other.getRouteBBox().equals(this.getRouteBBox()) == false) + if (other.getDistanceUnit() != null + && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteTruckModeOptions.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteTruckModeOptions.java index f60afb646d..f72b36f669 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteTruckModeOptions.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteTruckModeOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CellSignals.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CellSignals.java new file mode 100644 index 0000000000..e0bd767ca2 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CellSignals.java @@ -0,0 +1,161 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

      + * The cellular network communication infrastructure that the device uses. + *

      + */ +public class CellSignals implements Serializable { + /** + *

      + * Information about the Long-Term Evolution (LTE) network the device is + * connected to. + *

      + */ + private java.util.List lteCellDetails; + + /** + *

      + * Information about the Long-Term Evolution (LTE) network the device is + * connected to. + *

      + * + * @return

      + * Information about the Long-Term Evolution (LTE) network the + * device is connected to. + *

      + */ + public java.util.List getLteCellDetails() { + return lteCellDetails; + } + + /** + *

      + * Information about the Long-Term Evolution (LTE) network the device is + * connected to. + *

      + * + * @param lteCellDetails

      + * Information about the Long-Term Evolution (LTE) network the + * device is connected to. + *

      + */ + public void setLteCellDetails(java.util.Collection lteCellDetails) { + if (lteCellDetails == null) { + this.lteCellDetails = null; + return; + } + + this.lteCellDetails = new java.util.ArrayList(lteCellDetails); + } + + /** + *

      + * Information about the Long-Term Evolution (LTE) network the device is + * connected to. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param lteCellDetails

      + * Information about the Long-Term Evolution (LTE) network the + * device is connected to. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CellSignals withLteCellDetails(LteCellDetails... lteCellDetails) { + if (getLteCellDetails() == null) { + this.lteCellDetails = new java.util.ArrayList(lteCellDetails.length); + } + for (LteCellDetails value : lteCellDetails) { + this.lteCellDetails.add(value); + } + return this; + } + + /** + *

      + * Information about the Long-Term Evolution (LTE) network the device is + * connected to. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param lteCellDetails

      + * Information about the Long-Term Evolution (LTE) network the + * device is connected to. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CellSignals withLteCellDetails(java.util.Collection lteCellDetails) { + setLteCellDetails(lteCellDetails); + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getLteCellDetails() != null) + sb.append("LteCellDetails: " + getLteCellDetails()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + + ((getLteCellDetails() == null) ? 0 : getLteCellDetails().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof CellSignals == false) + return false; + CellSignals other = (CellSignals) obj; + + if (other.getLteCellDetails() == null ^ this.getLteCellDetails() == null) + return false; + if (other.getLteCellDetails() != null + && other.getLteCellDetails().equals(this.getLteCellDetails()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java index a95e3fc014..09b16407a2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ConflictException.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ConflictException.java index 46e84b2703..b9085c60f2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ConflictException.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ConflictException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionRequest.java index e2f4d87b37..b4a170645e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -54,33 +54,10 @@ public class CreateGeofenceCollectionRequest extends AmazonWebServiceRequest imp *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      */ private String collectionName; - /** - *

      - * An optional description for the geofence collection. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - */ - private String description; - - /** - *

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key - * ARN, alias name, or alias ARN. - *

      - *

      - * Constraints:
      - * Length: 1 - 2048
      - */ - private String kmsKeyId; - /** *

      * No longer used. If included, the only allowed value is @@ -100,6 +77,16 @@ public class CreateGeofenceCollectionRequest extends AmazonWebServiceRequest imp */ private String pricingPlanDataSource; + /** + *

      + * An optional description for the geofence collection. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + */ + private String description; + /** *

      * Applies one or more tags to the geofence collection. A tag is a key-value @@ -148,6 +135,19 @@ public class CreateGeofenceCollectionRequest extends AmazonWebServiceRequest imp */ private java.util.Map tags; + /** + *

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key + * ARN, alias name, or alias ARN. + *

      + *

      + * Constraints:
      + * Length: 1 - 2048
      + */ + private String kmsKeyId; + /** *

      * A custom name for the geofence collection. @@ -176,7 +176,7 @@ public class CreateGeofenceCollectionRequest extends AmazonWebServiceRequest imp *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @return

      * A custom name for the geofence collection. @@ -236,7 +236,7 @@ public String getCollectionName() { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param collectionName

      * A custom name for the geofence collection. @@ -299,7 +299,7 @@ public void setCollectionName(String collectionName) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param collectionName

      * A custom name for the geofence collection. @@ -334,132 +334,6 @@ public CreateGeofenceCollectionRequest withCollectionName(String collectionName) return this; } - /** - *

      - * An optional description for the geofence collection. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @return

      - * An optional description for the geofence collection. - *

      - */ - public String getDescription() { - return description; - } - - /** - *

      - * An optional description for the geofence collection. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * An optional description for the geofence collection. - *

      - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

      - * An optional description for the geofence collection. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * An optional description for the geofence collection. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateGeofenceCollectionRequest withDescription(String description) { - this.description = description; - return this; - } - - /** - *

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key - * ARN, alias name, or alias ARN. - *

      - *

      - * Constraints:
      - * Length: 1 - 2048
      - * - * @return

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key - * ID, key ARN, alias name, or alias ARN. - *

      - */ - public String getKmsKeyId() { - return kmsKeyId; - } - - /** - *

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key - * ARN, alias name, or alias ARN. - *

      - *

      - * Constraints:
      - * Length: 1 - 2048
      - * - * @param kmsKeyId

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key - * ID, key ARN, alias name, or alias ARN. - *

      - */ - public void setKmsKeyId(String kmsKeyId) { - this.kmsKeyId = kmsKeyId; - } - - /** - *

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key - * ARN, alias name, or alias ARN. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 1 - 2048
      - * - * @param kmsKeyId

      - * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key - * ID, key ARN, alias name, or alias ARN. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateGeofenceCollectionRequest withKmsKeyId(String kmsKeyId) { - this.kmsKeyId = kmsKeyId; - return this; - } - /** *

      * No longer used. If included, the only allowed value is @@ -617,6 +491,60 @@ public CreateGeofenceCollectionRequest withPricingPlanDataSource(String pricingP return this; } + /** + *

      + * An optional description for the geofence collection. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @return

      + * An optional description for the geofence collection. + *

      + */ + public String getDescription() { + return description; + } + + /** + *

      + * An optional description for the geofence collection. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * An optional description for the geofence collection. + *

      + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

      + * An optional description for the geofence collection. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * An optional description for the geofence collection. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateGeofenceCollectionRequest withDescription(String description) { + this.description = description; + return this; + } + /** *

      * Applies one or more tags to the geofence collection. A tag is a key-value @@ -984,6 +912,78 @@ public CreateGeofenceCollectionRequest clearTagsEntries() { return this; } + /** + *

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key + * ARN, alias name, or alias ARN. + *

      + *

      + * Constraints:
      + * Length: 1 - 2048
      + * + * @return

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key + * ID, key ARN, alias name, or alias ARN. + *

      + */ + public String getKmsKeyId() { + return kmsKeyId; + } + + /** + *

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key + * ARN, alias name, or alias ARN. + *

      + *

      + * Constraints:
      + * Length: 1 - 2048
      + * + * @param kmsKeyId

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key + * ID, key ARN, alias name, or alias ARN. + *

      + */ + public void setKmsKeyId(String kmsKeyId) { + this.kmsKeyId = kmsKeyId; + } + + /** + *

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key ID, key + * ARN, alias name, or alias ARN. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 1 - 2048
      + * + * @param kmsKeyId

      + * A key identifier for an Amazon Web Services KMS customer managed key. Enter a key + * ID, key ARN, alias name, or alias ARN. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateGeofenceCollectionRequest withKmsKeyId(String kmsKeyId) { + this.kmsKeyId = kmsKeyId; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -997,16 +997,16 @@ public String toString() { sb.append("{"); if (getCollectionName() != null) sb.append("CollectionName: " + getCollectionName() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); - if (getKmsKeyId() != null) - sb.append("KmsKeyId: " + getKmsKeyId() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); if (getPricingPlanDataSource() != null) sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); if (getTags() != null) - sb.append("Tags: " + getTags()); + sb.append("Tags: " + getTags() + ","); + if (getKmsKeyId() != null) + sb.append("KmsKeyId: " + getKmsKeyId()); sb.append("}"); return sb.toString(); } @@ -1018,15 +1018,15 @@ public int hashCode() { hashCode = prime * hashCode + ((getCollectionName() == null) ? 0 : getCollectionName().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); + hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); return hashCode; } @@ -1046,15 +1046,6 @@ public boolean equals(Object obj) { if (other.getCollectionName() != null && other.getCollectionName().equals(this.getCollectionName()) == false) return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; - if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) - return false; - if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null @@ -1065,10 +1056,19 @@ public boolean equals(Object obj) { if (other.getPricingPlanDataSource() != null && other.getPricingPlanDataSource().equals(this.getPricingPlanDataSource()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; + if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) + return false; + if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionResult.java index 9728bce5c4..14c8256b91 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateGeofenceCollectionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class CreateGeofenceCollectionResult implements Serializable { + /** + *

      + * The name for the geofence collection. + *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      + */ + private String collectionName; + /** *

      * The Amazon Resource Name (ARN) for the geofence collection resource. Used @@ -35,11 +46,20 @@ public class CreateGeofenceCollectionResult implements Serializable { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      */ private String collectionArn; + /** + *

      + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

      + */ + private java.util.Date createTime; + /** *

      * The name for the geofence collection. @@ -47,18 +67,55 @@ public class CreateGeofenceCollectionResult implements Serializable { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      + * + * @return

      + * The name for the geofence collection. + *

      */ - private String collectionName; + public String getCollectionName() { + return collectionName; + } /** *

      - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The name for the geofence collection. + *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      + * + * @param collectionName

      + * The name for the geofence collection. + *

      + */ + public void setCollectionName(String collectionName) { + this.collectionName = collectionName; + } + + /** + *

      + * The name for the geofence collection. *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      + * + * @param collectionName

      + * The name for the geofence collection. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date createTime; + public CreateGeofenceCollectionResult withCollectionName(String collectionName) { + this.collectionName = collectionName; + return this; + } /** *

      @@ -77,8 +134,8 @@ public class CreateGeofenceCollectionResult implements Serializable { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      * * @return

      * The Amazon Resource Name (ARN) for the geofence collection @@ -115,8 +172,8 @@ public String getCollectionArn() { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      * * @param collectionArn

      * The Amazon Resource Name (ARN) for the geofence collection @@ -156,8 +213,8 @@ public void setCollectionArn(String collectionArn) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      * * @param collectionArn

      * The Amazon Resource Name (ARN) for the geofence collection @@ -180,63 +237,6 @@ public CreateGeofenceCollectionResult withCollectionArn(String collectionArn) { return this; } - /** - *

      - * The name for the geofence collection. - *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      - * - * @return

      - * The name for the geofence collection. - *

      - */ - public String getCollectionName() { - return collectionName; - } - - /** - *

      - * The name for the geofence collection. - *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      - * - * @param collectionName

      - * The name for the geofence collection. - *

      - */ - public void setCollectionName(String collectionName) { - this.collectionName = collectionName; - } - - /** - *

      - * The name for the geofence collection. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      - * - * @param collectionName

      - * The name for the geofence collection. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateGeofenceCollectionResult withCollectionName(String collectionName) { - this.collectionName = collectionName; - return this; - } - /** *

      * The timestamp for when the geofence collection was created in */ public class CreateKeyRequest extends AmazonWebServiceRequest implements Serializable { - /** - *

      - * An optional description for the API key resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - */ - private String description; - - /** - *

      - * The optional timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of - * NoExpiry or ExpireTime must be set. - *

      - */ - private java.util.Date expireTime; - /** *

      * A custom name for the API key resource. @@ -81,24 +61,44 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      */ private String keyName; /** *

      - * Optionally set to true to set no expiration time for the API - * key. One of NoExpiry or ExpireTime must be set. + * The API key restrictions for the API key resource. *

      */ - private Boolean noExpiry; + private ApiKeyRestrictions restrictions; /** *

      - * The API key restrictions for the API key resource. + * An optional description for the API key resource. *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      */ - private ApiKeyRestrictions restrictions; + private String description; + + /** + *

      + * The optional timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of + * NoExpiry or ExpireTime must be set. + *

      + */ + private java.util.Date expireTime; + + /** + *

      + * Optionally set to true to set no expiration time for the API + * key. One of NoExpiry or ExpireTime must be set. + *

      + */ + private Boolean noExpiry; /** *

      @@ -148,126 +148,6 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali */ private java.util.Map tags; - /** - *

      - * An optional description for the API key resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @return

      - * An optional description for the API key resource. - *

      - */ - public String getDescription() { - return description; - } - - /** - *

      - * An optional description for the API key resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * An optional description for the API key resource. - *

      - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

      - * An optional description for the API key resource. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * An optional description for the API key resource. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateKeyRequest withDescription(String description) { - this.description = description; - return this; - } - - /** - *

      - * The optional timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of - * NoExpiry or ExpireTime must be set. - *

      - * - * @return

      - * The optional timestamp for when the API key resource will expire - * in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One - * of NoExpiry or ExpireTime must be set. - *

      - */ - public java.util.Date getExpireTime() { - return expireTime; - } - - /** - *

      - * The optional timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of - * NoExpiry or ExpireTime must be set. - *

      - * - * @param expireTime

      - * The optional timestamp for when the API key resource will - * expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of - * NoExpiry or ExpireTime must be set. - *

      - */ - public void setExpireTime(java.util.Date expireTime) { - this.expireTime = expireTime; - } - - /** - *

      - * The optional timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of - * NoExpiry or ExpireTime must be set. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param expireTime

      - * The optional timestamp for when the API key resource will - * expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of - * NoExpiry or ExpireTime must be set. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateKeyRequest withExpireTime(java.util.Date expireTime) { - this.expireTime = expireTime; - return this; - } - /** *

      * A custom name for the API key resource. @@ -296,7 +176,7 @@ public CreateKeyRequest withExpireTime(java.util.Date expireTime) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @return

      * A custom name for the API key resource. @@ -355,7 +235,7 @@ public String getKeyName() { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param keyName

      * A custom name for the API key resource. @@ -417,7 +297,7 @@ public void setKeyName(String keyName) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param keyName

      * A custom name for the API key resource. @@ -453,116 +333,236 @@ public CreateKeyRequest withKeyName(String keyName) { /** *

      - * Optionally set to true to set no expiration time for the API - * key. One of NoExpiry or ExpireTime must be set. + * The API key restrictions for the API key resource. *

      * * @return

      - * Optionally set to true to set no expiration time for - * the API key. One of NoExpiry or - * ExpireTime must be set. + * The API key restrictions for the API key resource. *

      */ - public Boolean isNoExpiry() { - return noExpiry; + public ApiKeyRestrictions getRestrictions() { + return restrictions; } /** *

      - * Optionally set to true to set no expiration time for the API - * key. One of NoExpiry or ExpireTime must be set. + * The API key restrictions for the API key resource. + *

      + * + * @param restrictions

      + * The API key restrictions for the API key resource. + *

      + */ + public void setRestrictions(ApiKeyRestrictions restrictions) { + this.restrictions = restrictions; + } + + /** + *

      + * The API key restrictions for the API key resource. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param restrictions

      + * The API key restrictions for the API key resource. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateKeyRequest withRestrictions(ApiKeyRestrictions restrictions) { + this.restrictions = restrictions; + return this; + } + + /** + *

      + * An optional description for the API key resource. *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      * * @return

      - * Optionally set to true to set no expiration time for - * the API key. One of NoExpiry or - * ExpireTime must be set. + * An optional description for the API key resource. *

      */ - public Boolean getNoExpiry() { - return noExpiry; + public String getDescription() { + return description; } /** *

      - * Optionally set to true to set no expiration time for the API - * key. One of NoExpiry or ExpireTime must be set. + * An optional description for the API key resource. *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      * - * @param noExpiry

      - * Optionally set to true to set no expiration time - * for the API key. One of NoExpiry or - * ExpireTime must be set. + * @param description

      + * An optional description for the API key resource. *

      */ - public void setNoExpiry(Boolean noExpiry) { - this.noExpiry = noExpiry; + public void setDescription(String description) { + this.description = description; } /** *

      - * Optionally set to true to set no expiration time for the API - * key. One of NoExpiry or ExpireTime must be set. + * An optional description for the API key resource. *

      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      * - * @param noExpiry

      - * Optionally set to true to set no expiration time - * for the API key. One of NoExpiry or - * ExpireTime must be set. + * @param description

      + * An optional description for the API key resource. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateKeyRequest withNoExpiry(Boolean noExpiry) { - this.noExpiry = noExpiry; + public CreateKeyRequest withDescription(String description) { + this.description = description; return this; } /** *

      - * The API key restrictions for the API key resource. + * The optional timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of + * NoExpiry or ExpireTime must be set. *

      * * @return

      - * The API key restrictions for the API key resource. + * The optional timestamp for when the API key resource will expire + * in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One + * of NoExpiry or ExpireTime must be set. *

      */ - public ApiKeyRestrictions getRestrictions() { - return restrictions; + public java.util.Date getExpireTime() { + return expireTime; } /** *

      - * The API key restrictions for the API key resource. + * The optional timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of + * NoExpiry or ExpireTime must be set. *

      * - * @param restrictions

      - * The API key restrictions for the API key resource. + * @param expireTime

      + * The optional timestamp for when the API key resource will + * expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of + * NoExpiry or ExpireTime must be set. *

      */ - public void setRestrictions(ApiKeyRestrictions restrictions) { - this.restrictions = restrictions; + public void setExpireTime(java.util.Date expireTime) { + this.expireTime = expireTime; } /** *

      - * The API key restrictions for the API key resource. + * The optional timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of + * NoExpiry or ExpireTime must be set. *

      *

      * Returns a reference to this object so that method calls can be chained * together. * - * @param restrictions

      - * The API key restrictions for the API key resource. + * @param expireTime

      + * The optional timestamp for when the API key resource will + * expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. One of + * NoExpiry or ExpireTime must be set. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateKeyRequest withRestrictions(ApiKeyRestrictions restrictions) { - this.restrictions = restrictions; + public CreateKeyRequest withExpireTime(java.util.Date expireTime) { + this.expireTime = expireTime; + return this; + } + + /** + *

      + * Optionally set to true to set no expiration time for the API + * key. One of NoExpiry or ExpireTime must be set. + *

      + * + * @return

      + * Optionally set to true to set no expiration time for + * the API key. One of NoExpiry or + * ExpireTime must be set. + *

      + */ + public Boolean isNoExpiry() { + return noExpiry; + } + + /** + *

      + * Optionally set to true to set no expiration time for the API + * key. One of NoExpiry or ExpireTime must be set. + *

      + * + * @return

      + * Optionally set to true to set no expiration time for + * the API key. One of NoExpiry or + * ExpireTime must be set. + *

      + */ + public Boolean getNoExpiry() { + return noExpiry; + } + + /** + *

      + * Optionally set to true to set no expiration time for the API + * key. One of NoExpiry or ExpireTime must be set. + *

      + * + * @param noExpiry

      + * Optionally set to true to set no expiration time + * for the API key. One of NoExpiry or + * ExpireTime must be set. + *

      + */ + public void setNoExpiry(Boolean noExpiry) { + this.noExpiry = noExpiry; + } + + /** + *

      + * Optionally set to true to set no expiration time for the API + * key. One of NoExpiry or ExpireTime must be set. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param noExpiry

      + * Optionally set to true to set no expiration time + * for the API key. One of NoExpiry or + * ExpireTime must be set. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateKeyRequest withNoExpiry(Boolean noExpiry) { + this.noExpiry = noExpiry; return this; } @@ -944,16 +944,16 @@ public CreateKeyRequest clearTagsEntries() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getKeyName() != null) + sb.append("KeyName: " + getKeyName() + ","); + if (getRestrictions() != null) + sb.append("Restrictions: " + getRestrictions() + ","); if (getDescription() != null) sb.append("Description: " + getDescription() + ","); if (getExpireTime() != null) sb.append("ExpireTime: " + getExpireTime() + ","); - if (getKeyName() != null) - sb.append("KeyName: " + getKeyName() + ","); if (getNoExpiry() != null) sb.append("NoExpiry: " + getNoExpiry() + ","); - if (getRestrictions() != null) - sb.append("Restrictions: " + getRestrictions() + ","); if (getTags() != null) sb.append("Tags: " + getTags()); sb.append("}"); @@ -965,13 +965,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); + hashCode = prime * hashCode + + ((getRestrictions() == null) ? 0 : getRestrictions().hashCode()); hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getExpireTime() == null) ? 0 : getExpireTime().hashCode()); - hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); hashCode = prime * hashCode + ((getNoExpiry() == null) ? 0 : getNoExpiry().hashCode()); - hashCode = prime * hashCode - + ((getRestrictions() == null) ? 0 : getRestrictions().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; } @@ -987,6 +987,15 @@ public boolean equals(Object obj) { return false; CreateKeyRequest other = (CreateKeyRequest) obj; + if (other.getKeyName() == null ^ this.getKeyName() == null) + return false; + if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) + return false; + if (other.getRestrictions() == null ^ this.getRestrictions() == null) + return false; + if (other.getRestrictions() != null + && other.getRestrictions().equals(this.getRestrictions()) == false) + return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null @@ -997,19 +1006,10 @@ public boolean equals(Object obj) { if (other.getExpireTime() != null && other.getExpireTime().equals(this.getExpireTime()) == false) return false; - if (other.getKeyName() == null ^ this.getKeyName() == null) - return false; - if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) - return false; if (other.getNoExpiry() == null ^ this.getNoExpiry() == null) return false; if (other.getNoExpiry() != null && other.getNoExpiry().equals(this.getNoExpiry()) == false) return false; - if (other.getRestrictions() == null ^ this.getRestrictions() == null) - return false; - if (other.getRestrictions() != null - && other.getRestrictions().equals(this.getRestrictions()) == false) - return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateKeyResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateKeyResult.java index 2045a78058..47d5a9b5c1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateKeyResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateKeyResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,15 +18,6 @@ import java.io.Serializable; public class CreateKeyResult implements Serializable { - /** - *

      - * The timestamp for when the API key resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

      - */ - private java.util.Date createTime; - /** *

      * The key value/string of an API key. This value is used when making API @@ -56,8 +47,8 @@ public class CreateKeyResult implements Serializable { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      */ private String keyArn; @@ -68,7 +59,7 @@ public class CreateKeyResult implements Serializable { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      */ private String keyName; @@ -78,56 +69,8 @@ public class CreateKeyResult implements Serializable { * href="https://www.iso.org/iso-8601-date-and-time-format.html"> ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - * - * @return

      - * The timestamp for when the API key resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

      */ - public java.util.Date getCreateTime() { - return createTime; - } - - /** - *

      - * The timestamp for when the API key resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

      - * - * @param createTime

      - * The timestamp for when the API key resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

      - */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } - - /** - *

      - * The timestamp for when the API key resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

      - * The timestamp for when the API key resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateKeyResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } + private java.util.Date createTime; /** *

      @@ -219,8 +162,8 @@ public CreateKeyResult withKey(String key) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      * * @return

      * The Amazon Resource Name (ARN) for the API key resource. Used @@ -256,8 +199,8 @@ public String getKeyArn() { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      * * @param keyArn

      * The Amazon Resource Name (ARN) for the API key resource. Used @@ -296,8 +239,8 @@ public void setKeyArn(String keyArn) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
      * * @param keyArn

      * The Amazon Resource Name (ARN) for the API key resource. Used @@ -327,7 +270,7 @@ public CreateKeyResult withKeyArn(String keyArn) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @return

      * The name of the API key resource. @@ -344,7 +287,7 @@ public String getKeyName() { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param keyName

      * The name of the API key resource. @@ -364,7 +307,7 @@ public void setKeyName(String keyName) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param keyName

      * The name of the API key resource. @@ -377,6 +320,63 @@ public CreateKeyResult withKeyName(String keyName) { return this; } + /** + *

      + * The timestamp for when the API key resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * + * @return

      + * The timestamp for when the API key resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

      + * The timestamp for when the API key resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * + * @param createTime

      + * The timestamp for when the API key resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

      + * The timestamp for when the API key resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

      + * The timestamp for when the API key resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateKeyResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -388,14 +388,14 @@ public CreateKeyResult withKeyName(String keyName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); if (getKey() != null) sb.append("Key: " + getKey() + ","); if (getKeyArn() != null) sb.append("KeyArn: " + getKeyArn() + ","); if (getKeyName() != null) - sb.append("KeyName: " + getKeyName()); + sb.append("KeyName: " + getKeyName() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime()); sb.append("}"); return sb.toString(); } @@ -405,10 +405,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); hashCode = prime * hashCode + ((getKeyArn() == null) ? 0 : getKeyArn().hashCode()); hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); return hashCode; } @@ -423,11 +423,6 @@ public boolean equals(Object obj) { return false; CreateKeyResult other = (CreateKeyResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) - return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) - return false; if (other.getKey() == null ^ this.getKey() == null) return false; if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) @@ -440,6 +435,11 @@ public boolean equals(Object obj) { return false; if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) return false; + if (other.getCreateTime() == null ^ this.getCreateTime() == null) + return false; + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapRequest.java index f2ea502e81..790dc7715a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -35,25 +35,6 @@ * */ public class CreateMapRequest extends AmazonWebServiceRequest implements Serializable { - /** - *

      - * Specifies the MapConfiguration, including the map style, for - * the map resource that you create. The map style defines the look of maps - * and the data provider for your map resource. - *

      - */ - private MapConfiguration configuration; - - /** - *

      - * An optional description for the map resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - */ - private String description; - /** *

      * The name for the map resource. @@ -82,10 +63,19 @@ public class CreateMapRequest extends AmazonWebServiceRequest implements Seriali *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      */ private String mapName; + /** + *

      + * Specifies the MapConfiguration, including the map style, for + * the map resource that you create. The map style defines the look of maps + * and the data provider for your map resource. + *

      + */ + private MapConfiguration configuration; + /** *

      * No longer used. If included, the only allowed value is @@ -98,6 +88,16 @@ public class CreateMapRequest extends AmazonWebServiceRequest implements Seriali */ private String pricingPlan; + /** + *

      + * An optional description for the map resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + */ + private String description; + /** *

      * Applies one or more tags to the map resource. A tag is a key-value pair @@ -146,120 +146,6 @@ public class CreateMapRequest extends AmazonWebServiceRequest implements Seriali */ private java.util.Map tags; - /** - *

      - * Specifies the MapConfiguration, including the map style, for - * the map resource that you create. The map style defines the look of maps - * and the data provider for your map resource. - *

      - * - * @return

      - * Specifies the MapConfiguration, including the map - * style, for the map resource that you create. The map style - * defines the look of maps and the data provider for your map - * resource. - *

      - */ - public MapConfiguration getConfiguration() { - return configuration; - } - - /** - *

      - * Specifies the MapConfiguration, including the map style, for - * the map resource that you create. The map style defines the look of maps - * and the data provider for your map resource. - *

      - * - * @param configuration

      - * Specifies the MapConfiguration, including the map - * style, for the map resource that you create. The map style - * defines the look of maps and the data provider for your map - * resource. - *

      - */ - public void setConfiguration(MapConfiguration configuration) { - this.configuration = configuration; - } - - /** - *

      - * Specifies the MapConfiguration, including the map style, for - * the map resource that you create. The map style defines the look of maps - * and the data provider for your map resource. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param configuration

      - * Specifies the MapConfiguration, including the map - * style, for the map resource that you create. The map style - * defines the look of maps and the data provider for your map - * resource. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateMapRequest withConfiguration(MapConfiguration configuration) { - this.configuration = configuration; - return this; - } - - /** - *

      - * An optional description for the map resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @return

      - * An optional description for the map resource. - *

      - */ - public String getDescription() { - return description; - } - - /** - *

      - * An optional description for the map resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * An optional description for the map resource. - *

      - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

      - * An optional description for the map resource. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * An optional description for the map resource. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateMapRequest withDescription(String description) { - this.description = description; - return this; - } - /** *

      * The name for the map resource. @@ -288,7 +174,7 @@ public CreateMapRequest withDescription(String description) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @return

      * The name for the map resource. @@ -347,7 +233,7 @@ public String getMapName() { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param mapName

      * The name for the map resource. @@ -409,7 +295,7 @@ public void setMapName(String mapName) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param mapName

      * The name for the map resource. @@ -443,6 +329,66 @@ public CreateMapRequest withMapName(String mapName) { return this; } + /** + *

      + * Specifies the MapConfiguration, including the map style, for + * the map resource that you create. The map style defines the look of maps + * and the data provider for your map resource. + *

      + * + * @return

      + * Specifies the MapConfiguration, including the map + * style, for the map resource that you create. The map style + * defines the look of maps and the data provider for your map + * resource. + *

      + */ + public MapConfiguration getConfiguration() { + return configuration; + } + + /** + *

      + * Specifies the MapConfiguration, including the map style, for + * the map resource that you create. The map style defines the look of maps + * and the data provider for your map resource. + *

      + * + * @param configuration

      + * Specifies the MapConfiguration, including the map + * style, for the map resource that you create. The map style + * defines the look of maps and the data provider for your map + * resource. + *

      + */ + public void setConfiguration(MapConfiguration configuration) { + this.configuration = configuration; + } + + /** + *

      + * Specifies the MapConfiguration, including the map style, for + * the map resource that you create. The map style defines the look of maps + * and the data provider for your map resource. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param configuration

      + * Specifies the MapConfiguration, including the map + * style, for the map resource that you create. The map style + * defines the look of maps and the data provider for your map + * resource. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateMapRequest withConfiguration(MapConfiguration configuration) { + this.configuration = configuration; + return this; + } + /** *

      * No longer used. If included, the only allowed value is @@ -555,6 +501,60 @@ public CreateMapRequest withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

      + * An optional description for the map resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @return

      + * An optional description for the map resource. + *

      + */ + public String getDescription() { + return description; + } + + /** + *

      + * An optional description for the map resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * An optional description for the map resource. + *

      + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

      + * An optional description for the map resource. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * An optional description for the map resource. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateMapRequest withDescription(String description) { + this.description = description; + return this; + } + /** *

      * Applies one or more tags to the map resource. A tag is a key-value pair @@ -933,14 +933,14 @@ public CreateMapRequest clearTagsEntries() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getConfiguration() != null) - sb.append("Configuration: " + getConfiguration() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getMapName() != null) sb.append("MapName: " + getMapName() + ","); + if (getConfiguration() != null) + sb.append("Configuration: " + getConfiguration() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); if (getTags() != null) sb.append("Tags: " + getTags()); sb.append("}"); @@ -952,13 +952,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); hashCode = prime * hashCode + ((getConfiguration() == null) ? 0 : getConfiguration().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; } @@ -974,25 +974,25 @@ public boolean equals(Object obj) { return false; CreateMapRequest other = (CreateMapRequest) obj; + if (other.getMapName() == null ^ this.getMapName() == null) + return false; + if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) + return false; if (other.getConfiguration() == null ^ this.getConfiguration() == null) return false; if (other.getConfiguration() != null && other.getConfiguration().equals(this.getConfiguration()) == false) return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; - if (other.getMapName() == null ^ this.getMapName() == null) - return false; - if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapResult.java index e29cf35355..914f65ba9a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateMapResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,12 +20,14 @@ public class CreateMapResult implements Serializable { /** *

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the map resource. *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      */ - private java.util.Date createTime; + private String mapName; /** *

      @@ -43,78 +45,74 @@ public class CreateMapResult implements Serializable { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      */ private String mapArn; /** *

      - * The name of the map resource. + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      */ - private String mapName; + private java.util.Date createTime; /** *

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the map resource. *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * * @return

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the map resource. *

      */ - public java.util.Date getCreateTime() { - return createTime; + public String getMapName() { + return mapName; } /** *

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the map resource. *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * - * @param createTime

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param mapName

      + * The name of the map resource. *

      */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setMapName(String mapName) { + this.mapName = mapName; } /** *

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the map resource. *

      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * - * @param createTime

      - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param mapName

      + * The name of the map resource. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateMapResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public CreateMapResult withMapName(String mapName) { + this.mapName = mapName; return this; } @@ -134,8 +132,8 @@ public CreateMapResult withCreateTime(java.util.Date createTime) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @return

      * The Amazon Resource Name (ARN) for the map resource. Used to @@ -170,8 +168,8 @@ public String getMapArn() { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @param mapArn

      * The Amazon Resource Name (ARN) for the map resource. Used to @@ -209,8 +207,8 @@ public void setMapArn(String mapArn) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @param mapArn

      * The Amazon Resource Name (ARN) for the map resource. Used to @@ -234,58 +232,60 @@ public CreateMapResult withMapArn(String mapArn) { /** *

      - * The name of the map resource. + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * * @return

      - * The name of the map resource. + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      */ - public String getMapName() { - return mapName; + public java.util.Date getCreateTime() { + return createTime; } /** *

      - * The name of the map resource. + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * - * @param mapName

      - * The name of the map resource. + * @param createTime

      + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      */ - public void setMapName(String mapName) { - this.mapName = mapName; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

      - * The name of the map resource. + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      *

      * Returns a reference to this object so that method calls can be chained * together. - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * - * @param mapName

      - * The name of the map resource. + * @param createTime

      + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateMapResult withMapName(String mapName) { - this.mapName = mapName; + public CreateMapResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } @@ -300,12 +300,12 @@ public CreateMapResult withMapName(String mapName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); + if (getMapName() != null) + sb.append("MapName: " + getMapName() + ","); if (getMapArn() != null) sb.append("MapArn: " + getMapArn() + ","); - if (getMapName() != null) - sb.append("MapName: " + getMapName()); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime()); sb.append("}"); return sb.toString(); } @@ -315,9 +315,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - hashCode = prime * hashCode + ((getMapArn() == null) ? 0 : getMapArn().hashCode()); hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); + hashCode = prime * hashCode + ((getMapArn() == null) ? 0 : getMapArn().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); return hashCode; } @@ -332,18 +332,18 @@ public boolean equals(Object obj) { return false; CreateMapResult other = (CreateMapResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getMapName() == null ^ this.getMapName() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) return false; if (other.getMapArn() == null ^ this.getMapArn() == null) return false; if (other.getMapArn() != null && other.getMapArn().equals(this.getMapArn()) == false) return false; - if (other.getMapName() == null ^ this.getMapName() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexRequest.java index 72c7dec1de..cf2b955396 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -39,6 +39,38 @@ * */ public class CreatePlaceIndexRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

      + * The name of the place index resource. + *

      + *

      + * Requirements: + *

      + *
        + *
      • + *

        + * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), + * periods (.), and underscores (_). + *

        + *
        • + *
      • + *

        + * Must be a unique place index resource name. + *

        + *
        • + *
      • + *

        + * No spaces allowed. For example, ExamplePlaceIndex. + *

        + *
        • + *
      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      + */ + private String indexName; + /** *

      * Specifies the geospatial data provider for the new place index. @@ -102,10 +134,15 @@ public class CreatePlaceIndexRequest extends AmazonWebServiceRequest implements /** *

      - * Specifies the data storage option requesting Places. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

      + *

      + * Constraints:
      + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private DataSourceConfiguration dataSourceConfiguration; + private String pricingPlan; /** *

      @@ -117,6 +154,61 @@ public class CreatePlaceIndexRequest extends AmazonWebServiceRequest implements */ private String description; + /** + *

      + * Specifies the data storage option requesting Places. + *

      + */ + private DataSourceConfiguration dataSourceConfiguration; + + /** + *

      + * Applies one or more tags to the place index resource. A tag is a + * key-value pair that helps you manage, identify, search, and filter your + * resources. + *

      + *

      + * Format: "key" : "value" + *

      + *

      + * Restrictions: + *

      + *
        + *
      • + *

        + * Maximum 50 tags per resource. + *

        + *
        • + *
      • + *

        + * Each tag key must be unique and must have exactly one associated value. + *

        + *
        • + *
      • + *

        + * Maximum key length: 128 Unicode characters in UTF-8. + *

        + *
        • + *
      • + *

        + * Maximum value length: 256 Unicode characters in UTF-8. + *

        + *
        • + *
      • + *

        + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following + * characters: + - = . _ : / @ + *

        + *
        • + *
      • + *

        + * Cannot use "aws:" as a prefix for a key. + *

        + *
        • + *
      + */ + private java.util.Map tags; + /** *

      * The name of the place index resource. @@ -145,69 +237,162 @@ public class CreatePlaceIndexRequest extends AmazonWebServiceRequest implements *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      - */ - private String indexName; - - /** - *

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

      - *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Pattern: [-._\w]+
      + * + * @return

      + * The name of the place index resource. + *

      + *

      + * Requirements: + *

      + *
        + *
      • + *

        + * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens + * (-), periods (.), and underscores (_). + *

        + *
        • + *
      • + *

        + * Must be a unique place index resource name. + *

        + *
        • + *
      • + *

        + * No spaces allowed. For example, ExamplePlaceIndex. + *

        + *
        • + *
      */ - private String pricingPlan; + public String getIndexName() { + return indexName; + } /** *

      - * Applies one or more tags to the place index resource. A tag is a - * key-value pair that helps you manage, identify, search, and filter your - * resources. - *

      - *

      - * Format: "key" : "value" + * The name of the place index resource. *

      *

      - * Restrictions: + * Requirements: *

      *
        *
      • *

        - * Maximum 50 tags per resource. + * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), + * periods (.), and underscores (_). *

        *
        • *
      • *

        - * Each tag key must be unique and must have exactly one associated value. + * Must be a unique place index resource name. *

        *
        • *
      • *

        - * Maximum key length: 128 Unicode characters in UTF-8. + * No spaces allowed. For example, ExamplePlaceIndex. *

        *
        • + *
      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      + * + * @param indexName

      + * The name of the place index resource. + *

      + *

      + * Requirements: + *

      + *
        + *
      • + *

        + * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens + * (-), periods (.), and underscores (_). + *

        + *
        • + *
      • + *

        + * Must be a unique place index resource name. + *

        + *
        • + *
      • + *

        + * No spaces allowed. For example, ExamplePlaceIndex + * . + *

        + *
        • + *
      + */ + public void setIndexName(String indexName) { + this.indexName = indexName; + } + + /** + *

      + * The name of the place index resource. + *

      + *

      + * Requirements: + *

      + *
        *
      • *

        - * Maximum value length: 256 Unicode characters in UTF-8. + * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), + * periods (.), and underscores (_). *

        *
        • *
      • *

        - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following - * characters: + - = . _ : / @ + * Must be a unique place index resource name. *

        *
        • *
      • *

        - * Cannot use "aws:" as a prefix for a key. + * No spaces allowed. For example, ExamplePlaceIndex. *

        *
        • *
      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      + * + * @param indexName

      + * The name of the place index resource. + *

      + *

      + * Requirements: + *

      + *
        + *
      • + *

        + * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens + * (-), periods (.), and underscores (_). + *

        + *
        • + *
      • + *

        + * Must be a unique place index resource name. + *

        + *
        • + *
      • + *

        + * No spaces allowed. For example, ExamplePlaceIndex + * . + *

        + *
        • + *
      + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Map tags; + public CreatePlaceIndexRequest withIndexName(String indexName) { + this.indexName = indexName; + return this; + } /** *

      @@ -449,424 +634,139 @@ public String getDataSource() { * "https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html" * >Data providers on the Amazon Location Service * Developer Guide. - *

      - */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; - } - - /** - *

      - * Specifies the geospatial data provider for the new place index. - *

      - * - *

      - * This field is case-sensitive. Enter the valid values as shown. For - * example, entering HERE returns an error. - *

      - *       - *

      - * Valid values include: - *

      - * - *

      - * For additional information , see Data providers on the Amazon Location Service Developer - * Guide. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param dataSource

      - * Specifies the geospatial data provider for the new place - * index. - *

      - * - *

      - * This field is case-sensitive. Enter the valid values as shown. - * For example, entering HERE returns an error. - *

      - *       - *

      - * Valid values include: - *

      - * - *

      - * For additional information , see Data providers on the Amazon Location Service - * Developer Guide. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreatePlaceIndexRequest withDataSource(String dataSource) { - this.dataSource = dataSource; - return this; - } - - /** - *

      - * Specifies the data storage option requesting Places. - *

      - * - * @return

      - * Specifies the data storage option requesting Places. - *

      - */ - public DataSourceConfiguration getDataSourceConfiguration() { - return dataSourceConfiguration; - } - - /** - *

      - * Specifies the data storage option requesting Places. - *

      - * - * @param dataSourceConfiguration

      - * Specifies the data storage option requesting Places. - *

      - */ - public void setDataSourceConfiguration(DataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; - } - - /** - *

      - * Specifies the data storage option requesting Places. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param dataSourceConfiguration

      - * Specifies the data storage option requesting Places. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreatePlaceIndexRequest withDataSourceConfiguration( - DataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; - return this; - } - - /** - *

      - * The optional description for the place index resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @return

      - * The optional description for the place index resource. - *

      - */ - public String getDescription() { - return description; - } - - /** - *

      - * The optional description for the place index resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * The optional description for the place index resource. - *

      - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

      - * The optional description for the place index resource. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * The optional description for the place index resource. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreatePlaceIndexRequest withDescription(String description) { - this.description = description; - return this; - } - - /** - *

      - * The name of the place index resource. - *

      - *

      - * Requirements: - *

      - *
        - *
      • - *

        - * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), - * periods (.), and underscores (_). - *

        - *
        • - *
      • - *

        - * Must be a unique place index resource name. - *

        - *
        • - *
      • - *

        - * No spaces allowed. For example, ExamplePlaceIndex. - *

        - *
        • - *
      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      - * - * @return

      - * The name of the place index resource. - *

      - *

      - * Requirements: - *

      - *
        - *
      • - *

        - * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens - * (-), periods (.), and underscores (_). - *

        - *
        • - *
      • - *

        - * Must be a unique place index resource name. - *

        - *
        • - *
      • - *

        - * No spaces allowed. For example, ExamplePlaceIndex. - *

        - *
        • - *
      - */ - public String getIndexName() { - return indexName; - } - - /** - *

      - * The name of the place index resource. - *

      - *

      - * Requirements: - *

      - *
        - *
      • - *

        - * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), - * periods (.), and underscores (_). - *

        - *
        • - *
      • - *

        - * Must be a unique place index resource name. - *

        - *
        • - *
      • - *

        - * No spaces allowed. For example, ExamplePlaceIndex. - *

        - *
        • - *
      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      - * - * @param indexName

      - * The name of the place index resource. - *

      - *

      - * Requirements: - *

      - *
        - *
      • - *

        - * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens - * (-), periods (.), and underscores (_). - *

        - *
        • - *
      • - *

        - * Must be a unique place index resource name. - *

        - *
        • - *
      • - *

        - * No spaces allowed. For example, ExamplePlaceIndex - * . - *

        - *
        • - *
      + *

      */ - public void setIndexName(String indexName) { - this.indexName = indexName; + public void setDataSource(String dataSource) { + this.dataSource = dataSource; } /** *

      - * The name of the place index resource. + * Specifies the geospatial data provider for the new place index. + *

      + * + *

      + * This field is case-sensitive. Enter the valid values as shown. For + * example, entering HERE returns an error. *

      + *       *

      - * Requirements: + * Valid values include: *

      *
        *
      • *

        - * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), - * periods (.), and underscores (_). + * Esri – For additional information about Esri's coverage in your region of interest, see Esri details on geocoding coverage. *

        *
        • *
      • *

        - * Must be a unique place index resource name. + * Grab – Grab provides place index functionality for Southeast + * Asia. For additional information about GrabMaps' coverage, see GrabMaps countries and areas covered. *

        *
        • *
      • *

        - * No spaces allowed. For example, ExamplePlaceIndex. + * Here – For additional information about HERE Technologies' coverage in your region of interest, see HERE details on goecoding coverage. *

        - *
        • + * + *

        + * If you specify HERE Technologies (Here) as the data + * provider, you may not store results for locations in Japan. For more information, see the + * Amazon Web Services + * Service Terms for Amazon Location Service. + *

        + *         *
      *

      + * For additional information , see Data providers on the Amazon Location Service Developer + * Guide. + *

      + *

      * Returns a reference to this object so that method calls can be chained * together. - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * - * @param indexName

      - * The name of the place index resource. + * @param dataSource

      + * Specifies the geospatial data provider for the new place + * index. *

      + * *

      - * Requirements: + * This field is case-sensitive. Enter the valid values as shown. + * For example, entering HERE returns an error. + *

      + *       + *

      + * Valid values include: *

      *
        *
      • *

        - * Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens - * (-), periods (.), and underscores (_). + * Esri – For additional information about Esri's coverage in your region of interest, see Esri details on geocoding coverage. *

        *
        • *
      • *

        - * Must be a unique place index resource name. + * Grab – Grab provides place index functionality + * for Southeast Asia. For additional information about GrabMaps' coverage, see GrabMaps countries and areas covered. *

        *
        • *
      • *

        - * No spaces allowed. For example, ExamplePlaceIndex - * . + * Here – For additional information about HERE Technologies' coverage in your region of interest, + * see HERE details on goecoding coverage. *

        - *
        • + * + *

        + * If you specify HERE Technologies (Here) as the + * data provider, you may not store results for locations in Japan. For more + * information, see the Amazon Web + * Services Service Terms for Amazon Location Service. + *

        + *         *
      + *

      + * For additional information , see Data providers on the Amazon Location Service + * Developer Guide. + *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreatePlaceIndexRequest withIndexName(String indexName) { - this.indexName = indexName; + public CreatePlaceIndexRequest withDataSource(String dataSource) { + this.dataSource = dataSource; return this; } @@ -982,6 +882,106 @@ public CreatePlaceIndexRequest withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

      + * The optional description for the place index resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @return

      + * The optional description for the place index resource. + *

      + */ + public String getDescription() { + return description; + } + + /** + *

      + * The optional description for the place index resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * The optional description for the place index resource. + *

      + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

      + * The optional description for the place index resource. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * The optional description for the place index resource. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreatePlaceIndexRequest withDescription(String description) { + this.description = description; + return this; + } + + /** + *

      + * Specifies the data storage option requesting Places. + *

      + * + * @return

      + * Specifies the data storage option requesting Places. + *

      + */ + public DataSourceConfiguration getDataSourceConfiguration() { + return dataSourceConfiguration; + } + + /** + *

      + * Specifies the data storage option requesting Places. + *

      + * + * @param dataSourceConfiguration

      + * Specifies the data storage option requesting Places. + *

      + */ + public void setDataSourceConfiguration(DataSourceConfiguration dataSourceConfiguration) { + this.dataSourceConfiguration = dataSourceConfiguration; + } + + /** + *

      + * Specifies the data storage option requesting Places. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param dataSourceConfiguration

      + * Specifies the data storage option requesting Places. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreatePlaceIndexRequest withDataSourceConfiguration( + DataSourceConfiguration dataSourceConfiguration) { + this.dataSourceConfiguration = dataSourceConfiguration; + return this; + } + /** *

      * Applies one or more tags to the place index resource. A tag is a @@ -1363,16 +1363,16 @@ public CreatePlaceIndexRequest clearTagsEntries() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDataSource() != null) - sb.append("DataSource: " + getDataSource() + ","); - if (getDataSourceConfiguration() != null) - sb.append("DataSourceConfiguration: " + getDataSourceConfiguration() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getIndexName() != null) sb.append("IndexName: " + getIndexName() + ","); + if (getDataSource() != null) + sb.append("DataSource: " + getDataSource() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); + if (getDataSourceConfiguration() != null) + sb.append("DataSourceConfiguration: " + getDataSourceConfiguration() + ","); if (getTags() != null) sb.append("Tags: " + getTags()); sb.append("}"); @@ -1384,16 +1384,16 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); + hashCode = prime * hashCode + + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getDataSourceConfiguration() == null) ? 0 : getDataSourceConfiguration() .hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode - + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; } @@ -1409,30 +1409,30 @@ public boolean equals(Object obj) { return false; CreatePlaceIndexRequest other = (CreatePlaceIndexRequest) obj; + if (other.getIndexName() == null ^ this.getIndexName() == null) + return false; + if (other.getIndexName() != null + && other.getIndexName().equals(this.getIndexName()) == false) + return false; if (other.getDataSource() == null ^ this.getDataSource() == null) return false; if (other.getDataSource() != null && other.getDataSource().equals(this.getDataSource()) == false) return false; - if (other.getDataSourceConfiguration() == null ^ this.getDataSourceConfiguration() == null) + if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; - if (other.getDataSourceConfiguration() != null - && other.getDataSourceConfiguration().equals(this.getDataSourceConfiguration()) == false) + if (other.getPricingPlan() != null + && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false; - if (other.getIndexName() == null ^ this.getIndexName() == null) - return false; - if (other.getIndexName() != null - && other.getIndexName().equals(this.getIndexName()) == false) - return false; - if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) + if (other.getDataSourceConfiguration() == null ^ this.getDataSourceConfiguration() == null) return false; - if (other.getPricingPlan() != null - && other.getPricingPlan().equals(this.getPricingPlan()) == false) + if (other.getDataSourceConfiguration() != null + && other.getDataSourceConfiguration().equals(this.getDataSourceConfiguration()) == false) return false; if (other.getTags() == null ^ this.getTags() == null) return false; diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexResult.java index 5abbaa1225..f3531b763e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreatePlaceIndexResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,12 +20,14 @@ public class CreatePlaceIndexResult implements Serializable { /** *

      - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name for the place index resource. *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      */ - private java.util.Date createTime; + private String indexName; /** *

      @@ -44,78 +46,74 @@ public class CreatePlaceIndexResult implements Serializable { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      */ private String indexArn; /** *

      - * The name for the place index resource. + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      */ - private String indexName; + private java.util.Date createTime; /** *

      - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name for the place index resource. *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * * @return

      - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name for the place index resource. *

      */ - public java.util.Date getCreateTime() { - return createTime; + public String getIndexName() { + return indexName; } /** *

      - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name for the place index resource. *

      + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * - * @param createTime

      - * The timestamp for when the place index resource was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param indexName

      + * The name for the place index resource. *

      */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setIndexName(String indexName) { + this.indexName = indexName; } /** *

      - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name for the place index resource. *

      *

      * Returns a reference to this object so that method calls can be chained * together. + *

      + * Constraints:
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * - * @param createTime

      - * The timestamp for when the place index resource was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param indexName

      + * The name for the place index resource. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreatePlaceIndexResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public CreatePlaceIndexResult withIndexName(String indexName) { + this.indexName = indexName; return this; } @@ -136,8 +134,8 @@ public CreatePlaceIndexResult withCreateTime(java.util.Date createTime) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @return

      * The Amazon Resource Name (ARN) for the place index resource. Used @@ -173,8 +171,8 @@ public String getIndexArn() { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @param indexArn

      * The Amazon Resource Name (ARN) for the place index resource. @@ -213,8 +211,8 @@ public void setIndexArn(String indexArn) { * Constraints:
      * Length: 0 - 1600
      * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @param indexArn

      * The Amazon Resource Name (ARN) for the place index resource. @@ -238,58 +236,60 @@ public CreatePlaceIndexResult withIndexArn(String indexArn) { /** *

      - * The name for the place index resource. + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * * @return

      - * The name for the place index resource. + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      */ - public String getIndexName() { - return indexName; + public java.util.Date getCreateTime() { + return createTime; } /** *

      - * The name for the place index resource. + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * - * @param indexName

      - * The name for the place index resource. + * @param createTime

      + * The timestamp for when the place index resource was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      */ - public void setIndexName(String indexName) { - this.indexName = indexName; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

      - * The name for the place index resource. + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      *

      * Returns a reference to this object so that method calls can be chained * together. - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      * - * @param indexName

      - * The name for the place index resource. + * @param createTime

      + * The timestamp for when the place index resource was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreatePlaceIndexResult withIndexName(String indexName) { - this.indexName = indexName; + public CreatePlaceIndexResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } @@ -304,12 +304,12 @@ public CreatePlaceIndexResult withIndexName(String indexName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); + if (getIndexName() != null) + sb.append("IndexName: " + getIndexName() + ","); if (getIndexArn() != null) sb.append("IndexArn: " + getIndexArn() + ","); - if (getIndexName() != null) - sb.append("IndexName: " + getIndexName()); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime()); sb.append("}"); return sb.toString(); } @@ -319,9 +319,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - hashCode = prime * hashCode + ((getIndexArn() == null) ? 0 : getIndexArn().hashCode()); hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); + hashCode = prime * hashCode + ((getIndexArn() == null) ? 0 : getIndexArn().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); return hashCode; } @@ -336,19 +336,19 @@ public boolean equals(Object obj) { return false; CreatePlaceIndexResult other = (CreatePlaceIndexResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getIndexName() == null ^ this.getIndexName() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getIndexName() != null + && other.getIndexName().equals(this.getIndexName()) == false) return false; if (other.getIndexArn() == null ^ this.getIndexArn() == null) return false; if (other.getIndexArn() != null && other.getIndexArn().equals(this.getIndexArn()) == false) return false; - if (other.getIndexName() == null ^ this.getIndexName() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getIndexName() != null - && other.getIndexName().equals(this.getIndexName()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorRequest.java index eca74d453f..02110fc29b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ public class CreateRouteCalculatorRequest extends AmazonWebServiceRequest implem *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      */ private String calculatorName; @@ -131,25 +131,25 @@ public class CreateRouteCalculatorRequest extends AmazonWebServiceRequest implem /** *

      - * The optional description for the route calculator resource. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

      *

      * Constraints:
      - * Length: 0 - 1000
      + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private String description; + private String pricingPlan; /** *

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * The optional description for the route calculator resource. *

      *

      * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Length: 0 - 1000
      */ - private String pricingPlan; + private String description; /** *

      @@ -235,7 +235,7 @@ public class CreateRouteCalculatorRequest extends AmazonWebServiceRequest implem *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @return

      * The name of the route calculator resource. @@ -295,7 +295,7 @@ public String getCalculatorName() { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param calculatorName

      * The name of the route calculator resource. @@ -358,7 +358,7 @@ public void setCalculatorName(String calculatorName) { *

      * Constraints:
      * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Pattern: [-._\w]+
      * * @param calculatorName

      * The name of the route calculator resource. @@ -747,60 +747,6 @@ public CreateRouteCalculatorRequest withDataSource(String dataSource) { return this; } - /** - *

      - * The optional description for the route calculator resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @return

      - * The optional description for the route calculator resource. - *

      - */ - public String getDescription() { - return description; - } - - /** - *

      - * The optional description for the route calculator resource. - *

      - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * The optional description for the route calculator resource. - *

      - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

      - * The optional description for the route calculator resource. - *

      - *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Length: 0 - 1000
      - * - * @param description

      - * The optional description for the route calculator resource. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public CreateRouteCalculatorRequest withDescription(String description) { - this.description = description; - return this; - } - /** *

      * No longer used. If included, the only allowed value is @@ -913,6 +859,60 @@ public CreateRouteCalculatorRequest withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

      + * The optional description for the route calculator resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @return

      + * The optional description for the route calculator resource. + *

      + */ + public String getDescription() { + return description; + } + + /** + *

      + * The optional description for the route calculator resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * The optional description for the route calculator resource. + *

      + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

      + * The optional description for the route calculator resource. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 0 - 1000
      + * + * @param description

      + * The optional description for the route calculator resource. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateRouteCalculatorRequest withDescription(String description) { + this.description = description; + return this; + } + /** *

      * Applies one or more tags to the route calculator resource. A tag is a @@ -1351,10 +1351,10 @@ public String toString() { sb.append("CalculatorName: " + getCalculatorName() + ","); if (getDataSource() != null) sb.append("DataSource: " + getDataSource() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); if (getTags() != null) sb.append("Tags: " + getTags()); sb.append("}"); @@ -1369,10 +1369,10 @@ public int hashCode() { hashCode = prime * hashCode + ((getCalculatorName() == null) ? 0 : getCalculatorName().hashCode()); hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; } @@ -1398,16 +1398,16 @@ public boolean equals(Object obj) { if (other.getDataSource() != null && other.getDataSource().equals(this.getDataSource()) == false) return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorResult.java index 4cb436e0fe..771d2307ad 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateRouteCalculatorResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,43 +20,43 @@ public class CreateRouteCalculatorResult implements Serializable { /** *

      - * The Amazon Resource Name (ARN) for the route calculator resource. Use the - * ARN when you specify a resource across all Amazon Web Services. + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      *

      * Constraints:
      - * Length: 0 - 1600
      - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      */ - private String calculatorArn; + private String calculatorName; /** *

      - * The name of the route calculator resource. + * The Amazon Resource Name (ARN) for the route calculator resource. Use the + * ARN when you specify a resource across all Amazon Web Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      *

      * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Length: 0 - 1600
      + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      */ - private String calculatorName; + private String calculatorArn; /** *

      @@ -76,90 +76,74 @@ public class CreateRouteCalculatorResult implements Serializable { /** *

      - * The Amazon Resource Name (ARN) for the route calculator resource. Use the - * ARN when you specify a resource across all Amazon Web Services. + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      *

      * Constraints:
      - * Length: 0 - 1600
      - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * * @return

      - * The Amazon Resource Name (ARN) for the route calculator resource. - * Use the ARN when you specify a resource across all Amazon Web - * Services. + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      */ - public String getCalculatorArn() { - return calculatorArn; + public String getCalculatorName() { + return calculatorName; } /** *

      - * The Amazon Resource Name (ARN) for the route calculator resource. Use the - * ARN when you specify a resource across all Amazon Web Services. + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      *

      * Constraints:
      - * Length: 0 - 1600
      - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * - * @param calculatorArn

      - * The Amazon Resource Name (ARN) for the route calculator - * resource. Use the ARN when you specify a resource across all - * Amazon Web Services. + * @param calculatorName

      + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      */ - public void setCalculatorArn(String calculatorArn) { - this.calculatorArn = calculatorArn; + public void setCalculatorName(String calculatorName) { + this.calculatorName = calculatorName; } /** *

      - * The Amazon Resource Name (ARN) for the route calculator resource. Use the - * ARN when you specify a resource across all Amazon Web Services. + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      @@ -168,102 +152,113 @@ public void setCalculatorArn(String calculatorArn) { * together. *

      * Constraints:
      - * Length: 0 - 1600
      - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      * - * @param calculatorArn

      - * The Amazon Resource Name (ARN) for the route calculator - * resource. Use the ARN when you specify a resource across all - * Amazon Web Services. + * @param calculatorName

      + * The name of the route calculator resource. *

      *
        *
      • *

        - * Format example: - * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator + * For example, ExampleRouteCalculator. *

        *
        • *
      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateRouteCalculatorResult withCalculatorArn(String calculatorArn) { - this.calculatorArn = calculatorArn; + public CreateRouteCalculatorResult withCalculatorName(String calculatorName) { + this.calculatorName = calculatorName; return this; } /** *

      - * The name of the route calculator resource. + * The Amazon Resource Name (ARN) for the route calculator resource. Use the + * ARN when you specify a resource across all Amazon Web Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      *

      * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Length: 0 - 1600
      + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * * @return

      - * The name of the route calculator resource. + * The Amazon Resource Name (ARN) for the route calculator resource. + * Use the ARN when you specify a resource across all Amazon Web + * Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      */ - public String getCalculatorName() { - return calculatorName; + public String getCalculatorArn() { + return calculatorArn; } /** *

      - * The name of the route calculator resource. + * The Amazon Resource Name (ARN) for the route calculator resource. Use the + * ARN when you specify a resource across all Amazon Web Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      *

      * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Length: 0 - 1600
      + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * - * @param calculatorName

      - * The name of the route calculator resource. + * @param calculatorArn

      + * The Amazon Resource Name (ARN) for the route calculator + * resource. Use the ARN when you specify a resource across all + * Amazon Web Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      */ - public void setCalculatorName(String calculatorName) { - this.calculatorName = calculatorName; + public void setCalculatorArn(String calculatorArn) { + this.calculatorArn = calculatorArn; } /** *

      - * The name of the route calculator resource. + * The Amazon Resource Name (ARN) for the route calculator resource. Use the + * ARN when you specify a resource across all Amazon Web Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      @@ -272,24 +267,29 @@ public void setCalculatorName(String calculatorName) { * together. *

      * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\w]+$
      + * Length: 0 - 1600
      + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
      * - * @param calculatorName

      - * The name of the route calculator resource. + * @param calculatorArn

      + * The Amazon Resource Name (ARN) for the route calculator + * resource. Use the ARN when you specify a resource across all + * Amazon Web Services. *

      *
        *
      • *

        - * For example, ExampleRouteCalculator. + * Format example: + * arn:aws:geo:region:account-id:route-calculator/ExampleCalculator *

        *
        • *
      * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateRouteCalculatorResult withCalculatorName(String calculatorName) { - this.calculatorName = calculatorName; + public CreateRouteCalculatorResult withCalculatorArn(String calculatorArn) { + this.calculatorArn = calculatorArn; return this; } @@ -405,10 +405,10 @@ public CreateRouteCalculatorResult withCreateTime(java.util.Date createTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCalculatorArn() != null) - sb.append("CalculatorArn: " + getCalculatorArn() + ","); if (getCalculatorName() != null) sb.append("CalculatorName: " + getCalculatorName() + ","); + if (getCalculatorArn() != null) + sb.append("CalculatorArn: " + getCalculatorArn() + ","); if (getCreateTime() != null) sb.append("CreateTime: " + getCreateTime()); sb.append("}"); @@ -420,10 +420,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode - + ((getCalculatorArn() == null) ? 0 : getCalculatorArn().hashCode()); hashCode = prime * hashCode + ((getCalculatorName() == null) ? 0 : getCalculatorName().hashCode()); + hashCode = prime * hashCode + + ((getCalculatorArn() == null) ? 0 : getCalculatorArn().hashCode()); hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); return hashCode; } @@ -439,16 +439,16 @@ public boolean equals(Object obj) { return false; CreateRouteCalculatorResult other = (CreateRouteCalculatorResult) obj; - if (other.getCalculatorArn() == null ^ this.getCalculatorArn() == null) - return false; - if (other.getCalculatorArn() != null - && other.getCalculatorArn().equals(this.getCalculatorArn()) == false) - return false; if (other.getCalculatorName() == null ^ this.getCalculatorName() == null) return false; if (other.getCalculatorName() != null && other.getCalculatorName().equals(this.getCalculatorName()) == false) return false; + if (other.getCalculatorArn() == null ^ this.getCalculatorArn() == null) + return false; + if (other.getCalculatorArn() != null + && other.getCalculatorArn().equals(this.getCalculatorArn()) == false) + return false; if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; if (other.getCreateTime() != null diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerRequest.java index b816e0ac39..78bf0b1647 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -28,28 +28,47 @@ public class CreateTrackerRequest extends AmazonWebServiceRequest implements Serializable { /** *

      - * An optional description for the tracker resource. + * The name for the tracker resource. + *

      + *

      + * Requirements: + *

      + *
        + *
      • + *

        + * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), + * periods (.), and underscores (_). + *

        + *
        • + *
      • + *

        + * Must be a unique tracker resource name. *

        + *
        • + *
      • + *

        + * No spaces allowed. For example, ExampleTracker. + *

        + *
        • + *
      *

      * Constraints:
      - * Length: 0 - 1000
      + * Length: 1 - 100
      + * Pattern: [-._\w]+
      */ - private String description; + private String trackerName; /** *

      - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

      - * *

      - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

      - *       + * Constraints:
      + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private Boolean eventBridgeEnabled; + private String pricingPlan; /** *

      @@ -64,6 +83,71 @@ public class CreateTrackerRequest extends AmazonWebServiceRequest implements Ser */ private String kmsKeyId; + /** + *

      + * This parameter is no longer used. + *

      + */ + private String pricingPlanDataSource; + + /** + *

      + * An optional description for the tracker resource. + *

      + *

      + * Constraints:
      + * Length: 0 - 1000
      + */ + private String description; + + /** + *

      + * Applies one or more tags to the tracker resource. A tag is a key-value + * pair helps manage, identify, search, and filter your resources by + * labelling them. + *

      + *

      + * Format: "key" : "value" + *

      + *

      + * Restrictions: + *

      + *
        + *
      • + *

        + * Maximum 50 tags per resource + *

        + *
        • + *
      • + *

        + * Each resource tag must be unique with a maximum of one value. + *

        + *
        • + *
      • + *

        + * Maximum key length: 128 Unicode characters in UTF-8 + *

        + *
        • + *
      • + *

        + * Maximum value length: 256 Unicode characters in UTF-8 + *

        + *
        • + *
      • + *

        + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following + * characters: + - = . _ : / @. + *

        + *
        • + *
      • + *

        + * Cannot use "aws:" as a prefix for a key. + *

        + *
        • + *
      + */ + private java.util.Map tags; + /** *

      * Specifies the position filtering for the tracker resource. @@ -116,70 +200,103 @@ public class CreateTrackerRequest extends AmazonWebServiceRequest implements Ser /** *

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

      + * *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - */ - private String pricingPlan; - - /** - *

      - * This parameter is no longer used. + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. *

      + *       */ - private String pricingPlanDataSource; + private Boolean eventBridgeEnabled; /** *

      - * Applies one or more tags to the tracker resource. A tag is a key-value - * pair helps manage, identify, search, and filter your resources by - * labelling them. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

      *

      - * Format: "key" : "value" + * This parameter is only used if you are using a KMS customer managed key. *

      + * *

      - * Restrictions: + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. *

      - *
        - *
      • *

        - * Maximum 50 tags per resource + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. *

        - *
        • - *
      • + * + */ + private Boolean kmsKeyEnableGeospatialQueries; + + /** *

        - * Each resource tag must be unique with a maximum of one value. + * The name for the tracker resource. *

        - *
        • - *
      • *

        - * Maximum key length: 128 Unicode characters in UTF-8 + * Requirements: *

        - *
        • + *
          *
        • *

          - * Maximum value length: 256 Unicode characters in UTF-8 + * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), + * periods (.), and underscores (_). *

          *
          • *
        • *

          - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following - * characters: + - = . _ : / @. + * Must be a unique tracker resource name. *

          *
          • *
        • *

          - * Cannot use "aws:" as a prefix for a key. + * No spaces allowed. For example, ExampleTracker. *

          *
          • *
        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name for the tracker resource. + *

        + *

        + * Requirements: + *

        + *
          + *
        • + *

          + * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens + * (-), periods (.), and underscores (_). + *

          + *
          • + *
        • + *

          + * Must be a unique tracker resource name. + *

          + *
          • + *
        • + *

          + * No spaces allowed. For example, ExampleTracker. + *

          + *
          • + *
        */ - private java.util.Map tags; + public String getTrackerName() { + return trackerName; + } /** *

        @@ -209,183 +326,211 @@ public class CreateTrackerRequest extends AmazonWebServiceRequest implements Ser *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - */ - private String trackerName; - - /** - *

        - * An optional description for the tracker resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        + * Pattern: [-._\w]+
        * - * @return

        - * An optional description for the tracker resource. - *

        + * @param trackerName

        + * The name for the tracker resource. + *

        + *

        + * Requirements: + *

        + *
          + *
        • + *

          + * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens + * (-), periods (.), and underscores (_). + *

          + *
          • + *
        • + *

          + * Must be a unique tracker resource name. + *

          + *
          • + *
        • + *

          + * No spaces allowed. For example, ExampleTracker. + *

          + *
          • + *
        */ - public String getDescription() { - return description; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; } /** *

        - * An optional description for the tracker resource. + * The name for the tracker resource. *

        *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * An optional description for the tracker resource. - *

        - */ - public void setDescription(String description) { - this.description = description; - } - - /** + * Requirements: + *

        + *
          + *
        • *

          - * An optional description for the tracker resource. + * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), + * periods (.), and underscores (_). *

          + *
          • + *
        • *

          - * Returns a reference to this object so that method calls can be chained + * Must be a unique tracker resource name. + *

          + *
          • + *
        • + *

          + * No spaces allowed. For example, ExampleTracker. + *

          + *
          • + *
        + *

        + * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Length: 0 - 1000
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        * - * @param description

        - * An optional description for the tracker resource. + * @param trackerName

        + * The name for the tracker resource. + *

        + *

        + * Requirements: + *

        + *
          + *
        • + *

          + * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens + * (-), periods (.), and underscores (_). + *

          + *
          • + *
        • + *

          + * Must be a unique tracker resource name. + *

          + *
          • + *
        • + *

          + * No spaces allowed. For example, ExampleTracker. *

          + *
          • + *
        * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateTrackerRequest withDescription(String description) { - this.description = description; + public CreateTrackerRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; return this; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

        - *         + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * * @return

        - * Whether to enable position UPDATE events from this - * tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those - * events are always sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         + * @see PricingPlan */ - public Boolean isEventBridgeEnabled() { - return eventBridgeEnabled; + public String getPricingPlan() { + return pricingPlan; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

        - *         + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @return

        - * Whether to enable position UPDATE events from this - * tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those - * events are always sent to EventBridge. - *

        - *         + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. + *

        + * @see PricingPlan */ - public Boolean getEventBridgeEnabled() { - return eventBridgeEnabled; + public void setPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

        - *         + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param eventBridgeEnabled

        - * Whether to enable position UPDATE events from - * this tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER - * and EXIT events for geofences with this tracker. - * Those events are always sent to EventBridge. + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PricingPlan */ - public void setEventBridgeEnabled(Boolean eventBridgeEnabled) { - this.eventBridgeEnabled = eventBridgeEnabled; + public CreateTrackerRequest withPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; + return this; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. + *

        + * @see PricingPlan + */ + public void setPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + } + + /** + *

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         *

        * Returns a reference to this object so that method calls can be chained * together. + *

        + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param eventBridgeEnabled

        - * Whether to enable position UPDATE events from - * this tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER - * and EXIT events for geofences with this tracker. - * Those events are always sent to EventBridge. + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         * @return A reference to this updated object so that method calls can be * chained together. + * @see PricingPlan */ - public CreateTrackerRequest withEventBridgeEnabled(Boolean eventBridgeEnabled) { - this.eventBridgeEnabled = eventBridgeEnabled; + public CreateTrackerRequest withPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); return this; } @@ -463,309 +608,467 @@ public CreateTrackerRequest withKmsKeyId(String kmsKeyId) { /** *

        - * Specifies the position filtering for the tracker resource. + * This parameter is no longer used. *

        + * + * @return

        + * This parameter is no longer used. + *

        + */ + public String getPricingPlanDataSource() { + return pricingPlanDataSource; + } + + /** *

        - * Valid values: + * This parameter is no longer used. *

        - *
          - *
        • + * + * @param pricingPlanDataSource

          + * This parameter is no longer used. + *

          + */ + public void setPricingPlanDataSource(String pricingPlanDataSource) { + this.pricingPlanDataSource = pricingPlanDataSource; + } + + /** *

          - * TimeBased - Location updates are evaluated against linked - * geofence collections, but not every location update is stored. If your - * update frequency is more often than 30 seconds, only one update per 30 - * seconds is stored for each unique device ID. + * This parameter is no longer used. *

          - *
          • - *
        • *

          - * DistanceBased - If the device has moved less than 30 m (98.4 - * ft), location updates are ignored. Location updates within this area are - * neither evaluated against linked geofence collections, nor stored. This - * helps control costs by reducing the number of geofence evaluations and - * historical device positions to paginate through. Distance-based filtering - * can also reduce the effects of GPS noise when displaying device - * trajectories on a map. + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param pricingPlanDataSource

          + * This parameter is no longer used. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateTrackerRequest withPricingPlanDataSource(String pricingPlanDataSource) { + this.pricingPlanDataSource = pricingPlanDataSource; + return this; + } + + /** + *

          + * An optional description for the tracker resource. *

          - *
          • - *
        • *

          - * AccuracyBased - If the device has moved less than the - * measured accuracy, location updates are ignored. For example, if two - * consecutive updates from a device have a horizontal accuracy of 5 m and - * 10 m, the second update is ignored if the device has moved less than 15 - * m. Ignored location updates are neither evaluated against linked geofence - * collections, nor stored. This can reduce the effects of GPS noise when - * displaying device trajectories on a map, and can help control your costs - * by reducing the number of geofence evaluations. + * Constraints:
          + * Length: 0 - 1000
          + * + * @return

          + * An optional description for the tracker resource. + *

          + */ + public String getDescription() { + return description; + } + + /** + *

          + * An optional description for the tracker resource. *

          - *
          • - *
        *

        - * This field is optional. If not specified, the default value is - * TimeBased. + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * An optional description for the tracker resource. + *

        + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

        + * An optional description for the tracker resource. *

        *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        * Constraints:
        - * Allowed Values: TimeBased, DistanceBased, AccuracyBased + * Length: 0 - 1000
        + * + * @param description

        + * An optional description for the tracker resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateTrackerRequest withDescription(String description) { + this.description = description; + return this; + } + + /** + *

        + * Applies one or more tags to the tracker resource. A tag is a key-value + * pair helps manage, identify, search, and filter your resources by + * labelling them. + *

        + *

        + * Format: "key" : "value" + *

        + *

        + * Restrictions: + *

        + *
          + *
        • + *

          + * Maximum 50 tags per resource + *

          + *
          • + *
        • + *

          + * Each resource tag must be unique with a maximum of one value. + *

          + *
          • + *
        • + *

          + * Maximum key length: 128 Unicode characters in UTF-8 + *

          + *
          • + *
        • + *

          + * Maximum value length: 256 Unicode characters in UTF-8 + *

          + *
          • + *
        • + *

          + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following + * characters: + - = . _ : / @. + *

          + *
          • + *
        • + *

          + * Cannot use "aws:" as a prefix for a key. + *

          + *
          • + *
        * * @return

        - * Specifies the position filtering for the tracker resource. + * Applies one or more tags to the tracker resource. A tag is a + * key-value pair helps manage, identify, search, and filter your + * resources by labelling them. *

        *

        - * Valid values: + * Format: "key" : "value" + *

        + *

        + * Restrictions: *

        *
          *
        • *

          - * TimeBased - Location updates are evaluated against - * linked geofence collections, but not every location update is - * stored. If your update frequency is more often than 30 seconds, - * only one update per 30 seconds is stored for each unique device - * ID. + * Maximum 50 tags per resource *

          *
          • *
        • *

          - * DistanceBased - If the device has moved less than 30 - * m (98.4 ft), location updates are ignored. Location updates - * within this area are neither evaluated against linked geofence - * collections, nor stored. This helps control costs by reducing the - * number of geofence evaluations and historical device positions to - * paginate through. Distance-based filtering can also reduce the - * effects of GPS noise when displaying device trajectories on a - * map. + * Each resource tag must be unique with a maximum of one value. *

          *
          • *
        • *

          - * AccuracyBased - If the device has moved less than - * the measured accuracy, location updates are ignored. For example, - * if two consecutive updates from a device have a horizontal - * accuracy of 5 m and 10 m, the second update is ignored if the - * device has moved less than 15 m. Ignored location updates are - * neither evaluated against linked geofence collections, nor - * stored. This can reduce the effects of GPS noise when displaying - * device trajectories on a map, and can help control your costs by - * reducing the number of geofence evaluations. + * Maximum key length: 128 Unicode characters in UTF-8 *

          *
          • - *
        + *
      • *

        - * This field is optional. If not specified, the default value is - * TimeBased. + * Maximum value length: 256 Unicode characters in UTF-8 *

        - * @see PositionFiltering + *
        • + *
      • + *

        + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the + * following characters: + - = . _ : / @. + *

        + *
        • + *
      • + *

        + * Cannot use "aws:" as a prefix for a key. + *

        + *
        • + *
      */ - public String getPositionFiltering() { - return positionFiltering; + public java.util.Map getTags() { + return tags; } /** *

      - * Specifies the position filtering for the tracker resource. + * Applies one or more tags to the tracker resource. A tag is a key-value + * pair helps manage, identify, search, and filter your resources by + * labelling them. *

      *

      - * Valid values: + * Format: "key" : "value" + *

      + *

      + * Restrictions: *

      *
        *
      • *

        - * TimeBased - Location updates are evaluated against linked - * geofence collections, but not every location update is stored. If your - * update frequency is more often than 30 seconds, only one update per 30 - * seconds is stored for each unique device ID. + * Maximum 50 tags per resource *

        *
        • *
      • *

        - * DistanceBased - If the device has moved less than 30 m (98.4 - * ft), location updates are ignored. Location updates within this area are - * neither evaluated against linked geofence collections, nor stored. This - * helps control costs by reducing the number of geofence evaluations and - * historical device positions to paginate through. Distance-based filtering - * can also reduce the effects of GPS noise when displaying device - * trajectories on a map. + * Each resource tag must be unique with a maximum of one value. *

        *
        • *
      • *

        - * AccuracyBased - If the device has moved less than the - * measured accuracy, location updates are ignored. For example, if two - * consecutive updates from a device have a horizontal accuracy of 5 m and - * 10 m, the second update is ignored if the device has moved less than 15 - * m. Ignored location updates are neither evaluated against linked geofence - * collections, nor stored. This can reduce the effects of GPS noise when - * displaying device trajectories on a map, and can help control your costs - * by reducing the number of geofence evaluations. + * Maximum key length: 128 Unicode characters in UTF-8 *

        *
        • - *
      + *
    • *

      - * This field is optional. If not specified, the default value is - * TimeBased. + * Maximum value length: 256 Unicode characters in UTF-8 *

      + *
      • + *
    • *

      - * Constraints:
      - * Allowed Values: TimeBased, DistanceBased, AccuracyBased + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following + * characters: + - = . _ : / @. + *

      + *
      • + *
    • + *

      + * Cannot use "aws:" as a prefix for a key. + *

      + *
      • + *
    * - * @param positionFiltering

    - * Specifies the position filtering for the tracker resource. + * @param tags

    + * Applies one or more tags to the tracker resource. A tag is a + * key-value pair helps manage, identify, search, and filter your + * resources by labelling them. *

    *

    - * Valid values: + * Format: "key" : "value" + *

    + *

    + * Restrictions: *

    *
      *
    • *

      - * TimeBased - Location updates are evaluated - * against linked geofence collections, but not every location - * update is stored. If your update frequency is more often than - * 30 seconds, only one update per 30 seconds is stored for each - * unique device ID. + * Maximum 50 tags per resource *

      *
      • *
    • *

      - * DistanceBased - If the device has moved less than - * 30 m (98.4 ft), location updates are ignored. Location updates - * within this area are neither evaluated against linked geofence - * collections, nor stored. This helps control costs by reducing - * the number of geofence evaluations and historical device - * positions to paginate through. Distance-based filtering can - * also reduce the effects of GPS noise when displaying device - * trajectories on a map. + * Each resource tag must be unique with a maximum of one value. *

      *
      • *
    • *

      - * AccuracyBased - If the device has moved less than - * the measured accuracy, location updates are ignored. For - * example, if two consecutive updates from a device have a - * horizontal accuracy of 5 m and 10 m, the second update is - * ignored if the device has moved less than 15 m. Ignored - * location updates are neither evaluated against linked geofence - * collections, nor stored. This can reduce the effects of GPS - * noise when displaying device trajectories on a map, and can - * help control your costs by reducing the number of geofence - * evaluations. + * Maximum key length: 128 Unicode characters in UTF-8 *

      *
      • - *
    + *
  • *

    - * This field is optional. If not specified, the default value is - * TimeBased. + * Maximum value length: 256 Unicode characters in UTF-8 *

    - * @see PositionFiltering - */ - public void setPositionFiltering(String positionFiltering) { - this.positionFiltering = positionFiltering; - } - - /** - *

    - * Specifies the position filtering for the tracker resource. - *

    - *

    - * Valid values: + *

    • + *
  • + *

    + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the + * following characters: + - = . _ : / @. + *

    + *
    • + *
  • + *

    + * Cannot use "aws:" as a prefix for a key. + *

    + *
    • + * + */ + public void setTags(java.util.Map tags) { + this.tags = tags; + } + + /** + *

    + * Applies one or more tags to the tracker resource. A tag is a key-value + * pair helps manage, identify, search, and filter your resources by + * labelling them. + *

    + *

    + * Format: "key" : "value" + *

    + *

    + * Restrictions: *

    *
      *
    • *

      - * TimeBased - Location updates are evaluated against linked - * geofence collections, but not every location update is stored. If your - * update frequency is more often than 30 seconds, only one update per 30 - * seconds is stored for each unique device ID. + * Maximum 50 tags per resource *

      *
      • *
    • *

      - * DistanceBased - If the device has moved less than 30 m (98.4 - * ft), location updates are ignored. Location updates within this area are - * neither evaluated against linked geofence collections, nor stored. This - * helps control costs by reducing the number of geofence evaluations and - * historical device positions to paginate through. Distance-based filtering - * can also reduce the effects of GPS noise when displaying device - * trajectories on a map. + * Each resource tag must be unique with a maximum of one value. *

      *
      • *
    • *

      - * AccuracyBased - If the device has moved less than the - * measured accuracy, location updates are ignored. For example, if two - * consecutive updates from a device have a horizontal accuracy of 5 m and - * 10 m, the second update is ignored if the device has moved less than 15 - * m. Ignored location updates are neither evaluated against linked geofence - * collections, nor stored. This can reduce the effects of GPS noise when - * displaying device trajectories on a map, and can help control your costs - * by reducing the number of geofence evaluations. + * Maximum key length: 128 Unicode characters in UTF-8 *

      *
      • - *
    + *
  • *

    - * This field is optional. If not specified, the default value is - * TimeBased. + * Maximum value length: 256 Unicode characters in UTF-8 + *

    + *
    • + *
  • + *

    + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following + * characters: + - = . _ : / @. + *

    + *
    • + *
  • + *

    + * Cannot use "aws:" as a prefix for a key. *

    + *
    • + * *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Allowed Values: TimeBased, DistanceBased, AccuracyBased * - * @param positionFiltering

    - * Specifies the position filtering for the tracker resource. + * @param tags

    + * Applies one or more tags to the tracker resource. A tag is a + * key-value pair helps manage, identify, search, and filter your + * resources by labelling them. *

    *

    - * Valid values: + * Format: "key" : "value" + *

    + *

    + * Restrictions: *

    *
      *
    • *

      - * TimeBased - Location updates are evaluated - * against linked geofence collections, but not every location - * update is stored. If your update frequency is more often than - * 30 seconds, only one update per 30 seconds is stored for each - * unique device ID. + * Maximum 50 tags per resource *

      *
      • *
    • *

      - * DistanceBased - If the device has moved less than - * 30 m (98.4 ft), location updates are ignored. Location updates - * within this area are neither evaluated against linked geofence - * collections, nor stored. This helps control costs by reducing - * the number of geofence evaluations and historical device - * positions to paginate through. Distance-based filtering can - * also reduce the effects of GPS noise when displaying device - * trajectories on a map. + * Each resource tag must be unique with a maximum of one value. *

      *
      • *
    • *

      - * AccuracyBased - If the device has moved less than - * the measured accuracy, location updates are ignored. For - * example, if two consecutive updates from a device have a - * horizontal accuracy of 5 m and 10 m, the second update is - * ignored if the device has moved less than 15 m. Ignored - * location updates are neither evaluated against linked geofence - * collections, nor stored. This can reduce the effects of GPS - * noise when displaying device trajectories on a map, and can - * help control your costs by reducing the number of geofence - * evaluations. + * Maximum key length: 128 Unicode characters in UTF-8 *

      *
      • - *
    + *
  • *

    - * This field is optional. If not specified, the default value is - * TimeBased. + * Maximum value length: 256 Unicode characters in UTF-8 + *

    + *
    • + *
  • + *

    + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the + * following characters: + - = . _ : / @. *

    + *
    • + *
  • + *

    + * Cannot use "aws:" as a prefix for a key. + *

    + *
    • + * * @return A reference to this updated object so that method calls can be * chained together. - * @see PositionFiltering */ - public CreateTrackerRequest withPositionFiltering(String positionFiltering) { - this.positionFiltering = positionFiltering; + public CreateTrackerRequest withTags(java.util.Map tags) { + this.tags = tags; + return this; + } + + /** + *

    + * Applies one or more tags to the tracker resource. A tag is a key-value + * pair helps manage, identify, search, and filter your resources by + * labelling them. + *

    + *

    + * Format: "key" : "value" + *

    + *

    + * Restrictions: + *

    + *
      + *
    • + *

      + * Maximum 50 tags per resource + *

      + *
      • + *
    • + *

      + * Each resource tag must be unique with a maximum of one value. + *

      + *
      • + *
    • + *

      + * Maximum key length: 128 Unicode characters in UTF-8 + *

      + *
      • + *
    • + *

      + * Maximum value length: 256 Unicode characters in UTF-8 + *

      + *
      • + *
    • + *

      + * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following + * characters: + - = . _ : / @. + *

      + *
      • + *
    • + *

      + * Cannot use "aws:" as a prefix for a key. + *

      + *
      • + *
    + *

    + * The method adds a new key-value pair into Tags parameter, and returns a + * reference to this object so that method calls can be chained together. + * + * @param key The key of the entry to be added into Tags. + * @param value The corresponding value of the entry to be added into Tags. + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public CreateTrackerRequest addTagsEntry(String key, String value) { + if (null == this.tags) { + this.tags = new java.util.HashMap(); + } + if (this.tags.containsKey(key)) + throw new IllegalArgumentException("Duplicated keys (" + key.toString() + + ") are provided."); + this.tags.put(key, value); + return this; + } + + /** + * Removes all the entries added into Tags. + *

    + * Returns a reference to this object so that method calls can be chained + * together. + */ + public CreateTrackerRequest clearTagsEntries() { + this.tags = null; return this; } @@ -817,57 +1120,56 @@ public CreateTrackerRequest withPositionFiltering(String positionFiltering) { * Constraints:
    * Allowed Values: TimeBased, DistanceBased, AccuracyBased * - * @param positionFiltering

    - * Specifies the position filtering for the tracker resource. - *

    - *

    - * Valid values: - *

    - *
      - *
    • - *

      - * TimeBased - Location updates are evaluated - * against linked geofence collections, but not every location - * update is stored. If your update frequency is more often than - * 30 seconds, only one update per 30 seconds is stored for each - * unique device ID. - *

      - *
      • - *
    • - *

      - * DistanceBased - If the device has moved less than - * 30 m (98.4 ft), location updates are ignored. Location updates - * within this area are neither evaluated against linked geofence - * collections, nor stored. This helps control costs by reducing - * the number of geofence evaluations and historical device - * positions to paginate through. Distance-based filtering can - * also reduce the effects of GPS noise when displaying device - * trajectories on a map. - *

      - *
      • - *
    • - *

      - * AccuracyBased - If the device has moved less than - * the measured accuracy, location updates are ignored. For - * example, if two consecutive updates from a device have a - * horizontal accuracy of 5 m and 10 m, the second update is - * ignored if the device has moved less than 15 m. Ignored - * location updates are neither evaluated against linked geofence - * collections, nor stored. This can reduce the effects of GPS - * noise when displaying device trajectories on a map, and can - * help control your costs by reducing the number of geofence - * evaluations. - *

      - *
      • - *
    - *

    - * This field is optional. If not specified, the default value is - * TimeBased. - *

    - * @see PositionFiltering + * @return

    + * Specifies the position filtering for the tracker resource. + *

    + *

    + * Valid values: + *

    + *
      + *
    • + *

      + * TimeBased - Location updates are evaluated against + * linked geofence collections, but not every location update is + * stored. If your update frequency is more often than 30 seconds, + * only one update per 30 seconds is stored for each unique device + * ID. + *

      + *
      • + *
    • + *

      + * DistanceBased - If the device has moved less than 30 + * m (98.4 ft), location updates are ignored. Location updates + * within this area are neither evaluated against linked geofence + * collections, nor stored. This helps control costs by reducing the + * number of geofence evaluations and historical device positions to + * paginate through. Distance-based filtering can also reduce the + * effects of GPS noise when displaying device trajectories on a + * map. + *

      + *
      • + *
    • + *

      + * AccuracyBased - If the device has moved less than + * the measured accuracy, location updates are ignored. For example, + * if two consecutive updates from a device have a horizontal + * accuracy of 5 m and 10 m, the second update is ignored if the + * device has moved less than 15 m. Ignored location updates are + * neither evaluated against linked geofence collections, nor + * stored. This can reduce the effects of GPS noise when displaying + * device trajectories on a map, and can help control your costs by + * reducing the number of geofence evaluations. + *

      + *
      • + *
    + *

    + * This field is optional. If not specified, the default value is + * TimeBased. + *

    + * @see PositionFiltering */ - public void setPositionFiltering(PositionFiltering positionFiltering) { - this.positionFiltering = positionFiltering.toString(); + public String getPositionFiltering() { + return positionFiltering; } /** @@ -915,9 +1217,6 @@ public void setPositionFiltering(PositionFiltering positionFiltering) { * TimeBased. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    * Constraints:
    * Allowed Values: TimeBased, DistanceBased, AccuracyBased * @@ -968,719 +1267,673 @@ public void setPositionFiltering(PositionFiltering positionFiltering) { * This field is optional. If not specified, the default value is * TimeBased. *

    - * @return A reference to this updated object so that method calls can be - * chained together. * @see PositionFiltering */ - public CreateTrackerRequest withPositionFiltering(PositionFiltering positionFiltering) { - this.positionFiltering = positionFiltering.toString(); - return this; + public void setPositionFiltering(String positionFiltering) { + this.positionFiltering = positionFiltering; } /** *

    - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Specifies the position filtering for the tracker resource. *

    *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @return

    - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

    - * @see PricingPlan - */ - public String getPricingPlan() { - return pricingPlan; - } - - /** - *

    - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Valid values: *

    + *
      + *
    • *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

      - * @see PricingPlan - */ - public void setPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; - } - - /** - *

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * TimeBased - Location updates are evaluated against linked + * geofence collections, but not every location update is stored. If your + * update frequency is more often than 30 seconds, only one update per 30 + * seconds is stored for each unique device ID. *

      + *
      • + *
    • *

      - * Returns a reference to this object so that method calls can be chained - * together. - *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

      - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PricingPlan - */ - public CreateTrackerRequest withPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; - return this; - } - - /** - *

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * DistanceBased - If the device has moved less than 30 m (98.4 + * ft), location updates are ignored. Location updates within this area are + * neither evaluated against linked geofence collections, nor stored. This + * helps control costs by reducing the number of geofence evaluations and + * historical device positions to paginate through. Distance-based filtering + * can also reduce the effects of GPS noise when displaying device + * trajectories on a map. *

      + *
      • + *
    • *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

      - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

      - * @see PricingPlan - */ - public void setPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); - } - - /** + * AccuracyBased - If the device has moved less than the + * measured accuracy, location updates are ignored. For example, if two + * consecutive updates from a device have a horizontal accuracy of 5 m and + * 10 m, the second update is ignored if the device has moved less than 15 + * m. Ignored location updates are neither evaluated against linked geofence + * collections, nor stored. This can reduce the effects of GPS noise when + * displaying device trajectories on a map, and can help control your costs + * by reducing the number of geofence evaluations. + *

      + *
      • + *
    *

    - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * This field is optional. If not specified, the default value is + * TimeBased. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Allowed Values: TimeBased, DistanceBased, AccuracyBased * - * @param pricingPlan

    - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * @param positionFiltering

    + * Specifies the position filtering for the tracker resource. *

    - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PricingPlan - */ - public CreateTrackerRequest withPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); - return this; - } - - /** - *

    - * This parameter is no longer used. - *

    - * - * @return

    - * This parameter is no longer used. - *

    - */ - public String getPricingPlanDataSource() { - return pricingPlanDataSource; - } - - /** - *

    - * This parameter is no longer used. - *

    - * - * @param pricingPlanDataSource

    - * This parameter is no longer used. + *

    + * Valid values: *

    - */ - public void setPricingPlanDataSource(String pricingPlanDataSource) { - this.pricingPlanDataSource = pricingPlanDataSource; - } - - /** - *

    - * This parameter is no longer used. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param pricingPlanDataSource

    - * This parameter is no longer used. + *

      + *
    • + *

      + * TimeBased - Location updates are evaluated + * against linked geofence collections, but not every location + * update is stored. If your update frequency is more often than + * 30 seconds, only one update per 30 seconds is stored for each + * unique device ID. + *

      + *
      • + *
    • + *

      + * DistanceBased - If the device has moved less than + * 30 m (98.4 ft), location updates are ignored. Location updates + * within this area are neither evaluated against linked geofence + * collections, nor stored. This helps control costs by reducing + * the number of geofence evaluations and historical device + * positions to paginate through. Distance-based filtering can + * also reduce the effects of GPS noise when displaying device + * trajectories on a map. + *

      + *
      • + *
    • + *

      + * AccuracyBased - If the device has moved less than + * the measured accuracy, location updates are ignored. For + * example, if two consecutive updates from a device have a + * horizontal accuracy of 5 m and 10 m, the second update is + * ignored if the device has moved less than 15 m. Ignored + * location updates are neither evaluated against linked geofence + * collections, nor stored. This can reduce the effects of GPS + * noise when displaying device trajectories on a map, and can + * help control your costs by reducing the number of geofence + * evaluations. + *

      + *
      • + *
    + *

    + * This field is optional. If not specified, the default value is + * TimeBased. *

    * @return A reference to this updated object so that method calls can be * chained together. + * @see PositionFiltering */ - public CreateTrackerRequest withPricingPlanDataSource(String pricingPlanDataSource) { - this.pricingPlanDataSource = pricingPlanDataSource; + public CreateTrackerRequest withPositionFiltering(String positionFiltering) { + this.positionFiltering = positionFiltering; return this; } /** *

    - * Applies one or more tags to the tracker resource. A tag is a key-value - * pair helps manage, identify, search, and filter your resources by - * labelling them. - *

    - *

    - * Format: "key" : "value" + * Specifies the position filtering for the tracker resource. *

    *

    - * Restrictions: + * Valid values: *

    *
      *
    • *

      - * Maximum 50 tags per resource - *

      - *
      • - *
    • - *

      - * Each resource tag must be unique with a maximum of one value. - *

      - *
      • - *
    • - *

      - * Maximum key length: 128 Unicode characters in UTF-8 - *

      - *
      • - *
    • - *

      - * Maximum value length: 256 Unicode characters in UTF-8 + * TimeBased - Location updates are evaluated against linked + * geofence collections, but not every location update is stored. If your + * update frequency is more often than 30 seconds, only one update per 30 + * seconds is stored for each unique device ID. *

      *
      • *
    • *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following - * characters: + - = . _ : / @. + * DistanceBased - If the device has moved less than 30 m (98.4 + * ft), location updates are ignored. Location updates within this area are + * neither evaluated against linked geofence collections, nor stored. This + * helps control costs by reducing the number of geofence evaluations and + * historical device positions to paginate through. Distance-based filtering + * can also reduce the effects of GPS noise when displaying device + * trajectories on a map. *

      *
      • *
    • *

      - * Cannot use "aws:" as a prefix for a key. + * AccuracyBased - If the device has moved less than the + * measured accuracy, location updates are ignored. For example, if two + * consecutive updates from a device have a horizontal accuracy of 5 m and + * 10 m, the second update is ignored if the device has moved less than 15 + * m. Ignored location updates are neither evaluated against linked geofence + * collections, nor stored. This can reduce the effects of GPS noise when + * displaying device trajectories on a map, and can help control your costs + * by reducing the number of geofence evaluations. *

      *
      • *
    - * - * @return

    - * Applies one or more tags to the tracker resource. A tag is a - * key-value pair helps manage, identify, search, and filter your - * resources by labelling them. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * Restrictions: - *

    - *
      - *
    • - *

      - * Maximum 50 tags per resource - *

      - *
      • - *
    • - *

      - * Each resource tag must be unique with a maximum of one value. - *

      - *
      • - *
    • - *

      - * Maximum key length: 128 Unicode characters in UTF-8 - *

      - *
      • - *
    • - *

      - * Maximum value length: 256 Unicode characters in UTF-8 - *

      - *
      • - *
    • - *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the - * following characters: + - = . _ : / @. - *

      - *
      • - *
    • - *

      - * Cannot use "aws:" as a prefix for a key. - *

      - *
      • - *
    - */ - public java.util.Map getTags() { - return tags; - } - - /** - *

    - * Applies one or more tags to the tracker resource. A tag is a key-value - * pair helps manage, identify, search, and filter your resources by - * labelling them. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * Restrictions: - *

    - *
      - *
    • - *

      - * Maximum 50 tags per resource - *

      - *
      • - *
    • - *

      - * Each resource tag must be unique with a maximum of one value. - *

      - *
      • - *
    • *

      - * Maximum key length: 128 Unicode characters in UTF-8 - *

      - *
      • - *
    • - *

      - * Maximum value length: 256 Unicode characters in UTF-8 - *

      - *
      • - *
    • - *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following - * characters: + - = . _ : / @. + * This field is optional. If not specified, the default value is + * TimeBased. *

      - *
      • - *
    • *

      - * Cannot use "aws:" as a prefix for a key. - *

      - *
      • - *
    + * Constraints:
    + * Allowed Values: TimeBased, DistanceBased, AccuracyBased * - * @param tags

    - * Applies one or more tags to the tracker resource. A tag is a - * key-value pair helps manage, identify, search, and filter your - * resources by labelling them. - *

    - *

    - * Format: "key" : "value" + * @param positionFiltering

    + * Specifies the position filtering for the tracker resource. *

    *

    - * Restrictions: + * Valid values: *

    *
      *
    • *

      - * Maximum 50 tags per resource - *

      - *
      • - *
    • - *

      - * Each resource tag must be unique with a maximum of one value. - *

      - *
      • - *
    • - *

      - * Maximum key length: 128 Unicode characters in UTF-8 + * TimeBased - Location updates are evaluated + * against linked geofence collections, but not every location + * update is stored. If your update frequency is more often than + * 30 seconds, only one update per 30 seconds is stored for each + * unique device ID. *

      *
      • *
    • *

      - * Maximum value length: 256 Unicode characters in UTF-8 + * DistanceBased - If the device has moved less than + * 30 m (98.4 ft), location updates are ignored. Location updates + * within this area are neither evaluated against linked geofence + * collections, nor stored. This helps control costs by reducing + * the number of geofence evaluations and historical device + * positions to paginate through. Distance-based filtering can + * also reduce the effects of GPS noise when displaying device + * trajectories on a map. *

      *
      • *
    • *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the - * following characters: + - = . _ : / @. + * AccuracyBased - If the device has moved less than + * the measured accuracy, location updates are ignored. For + * example, if two consecutive updates from a device have a + * horizontal accuracy of 5 m and 10 m, the second update is + * ignored if the device has moved less than 15 m. Ignored + * location updates are neither evaluated against linked geofence + * collections, nor stored. This can reduce the effects of GPS + * noise when displaying device trajectories on a map, and can + * help control your costs by reducing the number of geofence + * evaluations. *

      *
      • - *
    • + *
    *

    - * Cannot use "aws:" as a prefix for a key. + * This field is optional. If not specified, the default value is + * TimeBased. *

    - * - * + * @see PositionFiltering */ - public void setTags(java.util.Map tags) { - this.tags = tags; + public void setPositionFiltering(PositionFiltering positionFiltering) { + this.positionFiltering = positionFiltering.toString(); } /** *

    - * Applies one or more tags to the tracker resource. A tag is a key-value - * pair helps manage, identify, search, and filter your resources by - * labelling them. - *

    - *

    - * Format: "key" : "value" + * Specifies the position filtering for the tracker resource. *

    *

    - * Restrictions: + * Valid values: *

    *
      *
    • *

      - * Maximum 50 tags per resource - *

      - *
      • - *
    • - *

      - * Each resource tag must be unique with a maximum of one value. - *

      - *
      • - *
    • - *

      - * Maximum key length: 128 Unicode characters in UTF-8 + * TimeBased - Location updates are evaluated against linked + * geofence collections, but not every location update is stored. If your + * update frequency is more often than 30 seconds, only one update per 30 + * seconds is stored for each unique device ID. *

      *
      • *
    • *

      - * Maximum value length: 256 Unicode characters in UTF-8 + * DistanceBased - If the device has moved less than 30 m (98.4 + * ft), location updates are ignored. Location updates within this area are + * neither evaluated against linked geofence collections, nor stored. This + * helps control costs by reducing the number of geofence evaluations and + * historical device positions to paginate through. Distance-based filtering + * can also reduce the effects of GPS noise when displaying device + * trajectories on a map. *

      *
      • *
    • *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following - * characters: + - = . _ : / @. + * AccuracyBased - If the device has moved less than the + * measured accuracy, location updates are ignored. For example, if two + * consecutive updates from a device have a horizontal accuracy of 5 m and + * 10 m, the second update is ignored if the device has moved less than 15 + * m. Ignored location updates are neither evaluated against linked geofence + * collections, nor stored. This can reduce the effects of GPS noise when + * displaying device trajectories on a map, and can help control your costs + * by reducing the number of geofence evaluations. *

      *
      • - *
    • + *
    *

    - * Cannot use "aws:" as a prefix for a key. + * This field is optional. If not specified, the default value is + * TimeBased. *

    - * - * *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Allowed Values: TimeBased, DistanceBased, AccuracyBased * - * @param tags

    - * Applies one or more tags to the tracker resource. A tag is a - * key-value pair helps manage, identify, search, and filter your - * resources by labelling them. - *

    - *

    - * Format: "key" : "value" + * @param positionFiltering

    + * Specifies the position filtering for the tracker resource. *

    *

    - * Restrictions: + * Valid values: *

    *
      *
    • *

      - * Maximum 50 tags per resource - *

      - *
      • - *
    • - *

      - * Each resource tag must be unique with a maximum of one value. - *

      - *
      • - *
    • - *

      - * Maximum key length: 128 Unicode characters in UTF-8 + * TimeBased - Location updates are evaluated + * against linked geofence collections, but not every location + * update is stored. If your update frequency is more often than + * 30 seconds, only one update per 30 seconds is stored for each + * unique device ID. *

      *
      • *
    • *

      - * Maximum value length: 256 Unicode characters in UTF-8 + * DistanceBased - If the device has moved less than + * 30 m (98.4 ft), location updates are ignored. Location updates + * within this area are neither evaluated against linked geofence + * collections, nor stored. This helps control costs by reducing + * the number of geofence evaluations and historical device + * positions to paginate through. Distance-based filtering can + * also reduce the effects of GPS noise when displaying device + * trajectories on a map. *

      *
      • *
    • *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the - * following characters: + - = . _ : / @. + * AccuracyBased - If the device has moved less than + * the measured accuracy, location updates are ignored. For + * example, if two consecutive updates from a device have a + * horizontal accuracy of 5 m and 10 m, the second update is + * ignored if the device has moved less than 15 m. Ignored + * location updates are neither evaluated against linked geofence + * collections, nor stored. This can reduce the effects of GPS + * noise when displaying device trajectories on a map, and can + * help control your costs by reducing the number of geofence + * evaluations. *

      *
      • - *
    • + *
    *

    - * Cannot use "aws:" as a prefix for a key. + * This field is optional. If not specified, the default value is + * TimeBased. *

    - * - * * @return A reference to this updated object so that method calls can be * chained together. + * @see PositionFiltering */ - public CreateTrackerRequest withTags(java.util.Map tags) { - this.tags = tags; + public CreateTrackerRequest withPositionFiltering(PositionFiltering positionFiltering) { + this.positionFiltering = positionFiltering.toString(); return this; } /** *

    - * Applies one or more tags to the tracker resource. A tag is a key-value - * pair helps manage, identify, search, and filter your resources by - * labelling them. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * Restrictions: - *

    - *
      - *
    • - *

      - * Maximum 50 tags per resource + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

      - *
      • - *
    • + * *

      - * Each resource tag must be unique with a maximum of one value. + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. *

      - *
      • - *
    • + * + * + * @return

      + * Whether to enable position UPDATE events from this + * tracker to be sent to EventBridge. + *

      + * + *

      + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those + * events are always sent to EventBridge. + *

      + *       + */ + public Boolean isEventBridgeEnabled() { + return eventBridgeEnabled; + } + + /** *

      - * Maximum key length: 128 Unicode characters in UTF-8 + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

      - *
      • - *
    • + * *

      - * Maximum value length: 256 Unicode characters in UTF-8 + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. *

      - *
      • - *
    • + * + * + * @return

      + * Whether to enable position UPDATE events from this + * tracker to be sent to EventBridge. + *

      + * + *

      + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those + * events are always sent to EventBridge. + *

      + *       + */ + public Boolean getEventBridgeEnabled() { + return eventBridgeEnabled; + } + + /** *

      - * Can use alphanumeric characters (A–Z, a–z, 0–9), and the following - * characters: + - = . _ : / @. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

      - *
      • - *
    • + * *

      - * Cannot use "aws:" as a prefix for a key. + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. *

      - *
      • - *
    - *

    - * The method adds a new key-value pair into Tags parameter, and returns a - * reference to this object so that method calls can be chained together. + * * - * @param key The key of the entry to be added into Tags. - * @param value The corresponding value of the entry to be added into Tags. - * @return A reference to this updated object so that method calls can be - * chained together. + * @param eventBridgeEnabled

    + * Whether to enable position UPDATE events from + * this tracker to be sent to EventBridge. + *

    + * + *

    + * You do not need enable this feature to get ENTER + * and EXIT events for geofences with this tracker. + * Those events are always sent to EventBridge. + *

    + *     */ - public CreateTrackerRequest addTagsEntry(String key, String value) { - if (null == this.tags) { - this.tags = new java.util.HashMap(); - } - if (this.tags.containsKey(key)) - throw new IllegalArgumentException("Duplicated keys (" + key.toString() - + ") are provided."); - this.tags.put(key, value); - return this; + public void setEventBridgeEnabled(Boolean eventBridgeEnabled) { + this.eventBridgeEnabled = eventBridgeEnabled; } /** - * Removes all the entries added into Tags. + *

    + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. + *

    + * + *

    + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. + *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. + * + * @param eventBridgeEnabled

    + * Whether to enable position UPDATE events from + * this tracker to be sent to EventBridge. + *

    + * + *

    + * You do not need enable this feature to get ENTER + * and EXIT events for geofences with this tracker. + * Those events are always sent to EventBridge. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. */ - public CreateTrackerRequest clearTagsEntries() { - this.tags = null; + public CreateTrackerRequest withEventBridgeEnabled(Boolean eventBridgeEnabled) { + this.eventBridgeEnabled = eventBridgeEnabled; return this; } /** *

    - * The name for the tracker resource. - *

    - *

    - * Requirements: + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

    - *
      - *
    • *

      - * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), - * periods (.), and underscores (_). + * This parameter is only used if you are using a KMS customer managed key. *

      - *
      • - *
    • + * *

      - * Must be a unique tracker resource name. + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. *

      - *
      • - *
    • *

      - * No spaces allowed. For example, ExampleTracker. + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. *

      - *
      • - *
    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * * * @return

    - * The name for the tracker resource. - *

    - *

    - * Requirements: + * Enables GeospatialQueries for a tracker that uses a + * Amazon Web Services KMS customer managed key. *

    - *
      - *
    • *

      - * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens - * (-), periods (.), and underscores (_). + * This parameter is only used if you are using a KMS customer + * managed key. *

      - *
      • - *
    • + * *

      - * Must be a unique tracker resource name. + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. *

      - *
      • - *
    • *

      - * No spaces allowed. For example, ExampleTracker. + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true when + * creating or updating a Tracker. *

      - *
      • - *
    + *     */ - public String getTrackerName() { - return trackerName; + public Boolean isKmsKeyEnableGeospatialQueries() { + return kmsKeyEnableGeospatialQueries; } /** *

    - * The name for the tracker resource. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

    *

    - * Requirements: + * This parameter is only used if you are using a KMS customer managed key. *

    - *
      - *
    • + * *

      - * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), - * periods (.), and underscores (_). + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. *

      - *
      • - *
    • *

      - * Must be a unique tracker resource name. + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. *

      - *
      • - *
    • + * + * + * @return

      + * Enables GeospatialQueries for a tracker that uses a + * Amazon Web Services KMS customer managed key. + *

      + *

      + * This parameter is only used if you are using a KMS customer + * managed key. + *

      + * + *

      + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. + *

      + *

      + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true when + * creating or updating a Tracker. + *

      + *       + */ + public Boolean getKmsKeyEnableGeospatialQueries() { + return kmsKeyEnableGeospatialQueries; + } + + /** *

      - * No spaces allowed. For example, ExampleTracker. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

      - *
      • - *
    *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * This parameter is only used if you are using a KMS customer managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. + *

    + *     * - * @param trackerName

    - * The name for the tracker resource. - *

    - *

    - * Requirements: + * @param kmsKeyEnableGeospatialQueries

    + * Enables GeospatialQueries for a tracker that uses + * a Amazon Web Services KMS customer managed key. *

    - *
      - *
    • *

      - * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens - * (-), periods (.), and underscores (_). + * This parameter is only used if you are using a KMS customer + * managed key. *

      - *
      • - *
    • + * *

      - * Must be a unique tracker resource name. + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. *

      - *
      • - *
    • *

      - * No spaces allowed. For example, ExampleTracker. + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true + * when creating or updating a Tracker. *

      - *
      • - *
    + * */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setKmsKeyEnableGeospatialQueries(Boolean kmsKeyEnableGeospatialQueries) { + this.kmsKeyEnableGeospatialQueries = kmsKeyEnableGeospatialQueries; } /** *

    - * The name for the tracker resource. - *

    - *

    - * Requirements: + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

    - *
      - *
    • *

      - * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), - * periods (.), and underscores (_). + * This parameter is only used if you are using a KMS customer managed key. *

      - *
      • - *
    • + * *

      - * Must be a unique tracker resource name. + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. *

      - *
      • - *
    • *

      - * No spaces allowed. For example, ExampleTracker. + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. *

      - *
      • - *
    + * *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The name for the tracker resource. - *

    - *

    - * Requirements: + * @param kmsKeyEnableGeospatialQueries

    + * Enables GeospatialQueries for a tracker that uses + * a Amazon Web Services KMS customer managed key. *

    - *
      - *
    • *

      - * Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens - * (-), periods (.), and underscores (_). + * This parameter is only used if you are using a KMS customer + * managed key. *

      - *
      • - *
    • + * *

      - * Must be a unique tracker resource name. + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. *

      - *
      • - *
    • *

      - * No spaces allowed. For example, ExampleTracker. + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true + * when creating or updating a Tracker. *

      - *
      • - *
    + * * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateTrackerRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; + public CreateTrackerRequest withKmsKeyEnableGeospatialQueries( + Boolean kmsKeyEnableGeospatialQueries) { + this.kmsKeyEnableGeospatialQueries = kmsKeyEnableGeospatialQueries; return this; } @@ -1695,22 +1948,24 @@ public CreateTrackerRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); - if (getEventBridgeEnabled() != null) - sb.append("EventBridgeEnabled: " + getEventBridgeEnabled() + ","); - if (getKmsKeyId() != null) - sb.append("KmsKeyId: " + getKmsKeyId() + ","); - if (getPositionFiltering() != null) - sb.append("PositionFiltering: " + getPositionFiltering() + ","); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getKmsKeyId() != null) + sb.append("KmsKeyId: " + getKmsKeyId() + ","); if (getPricingPlanDataSource() != null) sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); if (getTags() != null) sb.append("Tags: " + getTags() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + if (getPositionFiltering() != null) + sb.append("PositionFiltering: " + getPositionFiltering() + ","); + if (getEventBridgeEnabled() != null) + sb.append("EventBridgeEnabled: " + getEventBridgeEnabled() + ","); + if (getKmsKeyEnableGeospatialQueries() != null) + sb.append("KmsKeyEnableGeospatialQueries: " + getKmsKeyEnableGeospatialQueries()); sb.append("}"); return sb.toString(); } @@ -1721,20 +1976,24 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode - + ((getEventBridgeEnabled() == null) ? 0 : getEventBridgeEnabled().hashCode()); - hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); - hashCode = prime * hashCode - + ((getPositionFiltering() == null) ? 0 : getPositionFiltering().hashCode()); + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); hashCode = prime * hashCode - + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + + ((getPositionFiltering() == null) ? 0 : getPositionFiltering().hashCode()); + hashCode = prime * hashCode + + ((getEventBridgeEnabled() == null) ? 0 : getEventBridgeEnabled().hashCode()); + hashCode = prime + * hashCode + + ((getKmsKeyEnableGeospatialQueries() == null) ? 0 + : getKmsKeyEnableGeospatialQueries().hashCode()); return hashCode; } @@ -1749,43 +2008,50 @@ public boolean equals(Object obj) { return false; CreateTrackerRequest other = (CreateTrackerRequest) obj; - if (other.getDescription() == null ^ this.getDescription() == null) + if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) return false; - if (other.getEventBridgeEnabled() == null ^ this.getEventBridgeEnabled() == null) + if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; - if (other.getEventBridgeEnabled() != null - && other.getEventBridgeEnabled().equals(this.getEventBridgeEnabled()) == false) + if (other.getPricingPlan() != null + && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) return false; if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) return false; - if (other.getPositionFiltering() == null ^ this.getPositionFiltering() == null) - return false; - if (other.getPositionFiltering() != null - && other.getPositionFiltering().equals(this.getPositionFiltering()) == false) - return false; - if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) - return false; - if (other.getPricingPlan() != null - && other.getPricingPlan().equals(this.getPricingPlan()) == false) - return false; if (other.getPricingPlanDataSource() == null ^ this.getPricingPlanDataSource() == null) return false; if (other.getPricingPlanDataSource() != null && other.getPricingPlanDataSource().equals(this.getPricingPlanDataSource()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getPositionFiltering() == null ^ this.getPositionFiltering() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getPositionFiltering() != null + && other.getPositionFiltering().equals(this.getPositionFiltering()) == false) + return false; + if (other.getEventBridgeEnabled() == null ^ this.getEventBridgeEnabled() == null) + return false; + if (other.getEventBridgeEnabled() != null + && other.getEventBridgeEnabled().equals(this.getEventBridgeEnabled()) == false) + return false; + if (other.getKmsKeyEnableGeospatialQueries() == null + ^ this.getKmsKeyEnableGeospatialQueries() == null) + return false; + if (other.getKmsKeyEnableGeospatialQueries() != null + && other.getKmsKeyEnableGeospatialQueries().equals( + this.getKmsKeyEnableGeospatialQueries()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerResult.java index 168dd6c584..9860a0b5f3 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CreateTrackerResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,12 +20,14 @@ public class CreateTrackerResult implements Serializable { /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private java.util.Date createTime; + private String trackerName; /** *

    @@ -44,76 +46,74 @@ public class CreateTrackerResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    */ private String trackerArn; /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    */ - private String trackerName; + private java.util.Date createTime; /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    */ - public java.util.Date getCreateTime() { - return createTime; + public String getTrackerName() { + return trackerName; } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param createTime

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param trackerName

    + * The name of the tracker resource. *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param createTime

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param trackerName

    + * The name of the tracker resource. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateTrackerResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public CreateTrackerResult withTrackerName(String trackerName) { + this.trackerName = trackerName; return this; } @@ -134,8 +134,8 @@ public CreateTrackerResult withCreateTime(java.util.Date createTime) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @return

    * The Amazon Resource Name (ARN) for the tracker resource. Used @@ -172,8 +172,8 @@ public String getTrackerArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param trackerArn

    * The Amazon Resource Name (ARN) for the tracker resource. Used @@ -213,8 +213,8 @@ public void setTrackerArn(String trackerArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param trackerArn

    * The Amazon Resource Name (ARN) for the tracker resource. Used @@ -239,58 +239,58 @@ public CreateTrackerResult withTrackerArn(String trackerArn) { /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public String getTrackerName() { - return trackerName; + public java.util.Date getCreateTime() { + return createTime; } /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The name of the tracker resource. + * @param createTime

    + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The name of the tracker resource. + * @param createTime

    + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public CreateTrackerResult withTrackerName(String trackerName) { - this.trackerName = trackerName; + public CreateTrackerResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } @@ -305,12 +305,12 @@ public CreateTrackerResult withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getTrackerArn() != null) sb.append("TrackerArn: " + getTrackerArn() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime()); sb.append("}"); return sb.toString(); } @@ -320,10 +320,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - hashCode = prime * hashCode + ((getTrackerArn() == null) ? 0 : getTrackerArn().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getTrackerArn() == null) ? 0 : getTrackerArn().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); return hashCode; } @@ -338,20 +338,20 @@ public boolean equals(Object obj) { return false; CreateTrackerResult other = (CreateTrackerResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) return false; if (other.getTrackerArn() == null ^ this.getTrackerArn() == null) return false; if (other.getTrackerArn() != null && other.getTrackerArn().equals(this.getTrackerArn()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DataSourceConfiguration.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DataSourceConfiguration.java index 2ae5a89fa4..d77627fd26 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DataSourceConfiguration.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DataSourceConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionRequest.java index 82266d1331..6fec087365 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public class DeleteGeofenceCollectionRequest extends AmazonWebServiceRequest imp *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String collectionName; @@ -50,7 +50,7 @@ public class DeleteGeofenceCollectionRequest extends AmazonWebServiceRequest imp *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the geofence collection to be deleted. @@ -67,7 +67,7 @@ public String getCollectionName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection to be deleted. @@ -87,7 +87,7 @@ public void setCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection to be deleted. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionResult.java index 42fa52382f..829faffcdd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteGeofenceCollectionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyRequest.java index 598b28a9f0..f1a6027a59 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,10 +33,31 @@ public class DeleteKeyRequest extends AmazonWebServiceRequest implements Seriali *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String keyName; + /** + *

    + * ForceDelete bypasses an API key's expiry conditions and deletes the key. + * Set the parameter true to delete the key or to + * false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are certain the + * key is no longer in use. + *

    + *     + */ + private Boolean forceDelete; + /** *

    * The name of the API key to delete. @@ -44,7 +65,7 @@ public class DeleteKeyRequest extends AmazonWebServiceRequest implements Seriali *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the API key to delete. @@ -61,7 +82,7 @@ public String getKeyName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param keyName

    * The name of the API key to delete. @@ -81,7 +102,7 @@ public void setKeyName(String keyName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param keyName

    * The name of the API key to delete. @@ -94,6 +115,178 @@ public DeleteKeyRequest withKeyName(String keyName) { return this; } + /** + *

    + * ForceDelete bypasses an API key's expiry conditions and deletes the key. + * Set the parameter true to delete the key or to + * false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are certain the + * key is no longer in use. + *

    + *     + * + * @return

    + * ForceDelete bypasses an API key's expiry conditions and deletes + * the key. Set the parameter true to delete the key or + * to false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are + * certain the key is no longer in use. + *

    + *     + */ + public Boolean isForceDelete() { + return forceDelete; + } + + /** + *

    + * ForceDelete bypasses an API key's expiry conditions and deletes the key. + * Set the parameter true to delete the key or to + * false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are certain the + * key is no longer in use. + *

    + *     + * + * @return

    + * ForceDelete bypasses an API key's expiry conditions and deletes + * the key. Set the parameter true to delete the key or + * to false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are + * certain the key is no longer in use. + *

    + *     + */ + public Boolean getForceDelete() { + return forceDelete; + } + + /** + *

    + * ForceDelete bypasses an API key's expiry conditions and deletes the key. + * Set the parameter true to delete the key or to + * false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are certain the + * key is no longer in use. + *

    + *     + * + * @param forceDelete

    + * ForceDelete bypasses an API key's expiry conditions and + * deletes the key. Set the parameter true to delete + * the key or to false to not preemptively delete + * the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are + * certain the key is no longer in use. + *

    + *     + */ + public void setForceDelete(Boolean forceDelete) { + this.forceDelete = forceDelete; + } + + /** + *

    + * ForceDelete bypasses an API key's expiry conditions and deletes the key. + * Set the parameter true to delete the key or to + * false to not preemptively delete the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are certain the + * key is no longer in use. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param forceDelete

    + * ForceDelete bypasses an API key's expiry conditions and + * deletes the key. Set the parameter true to delete + * the key or to false to not preemptively delete + * the API key. + *

    + *

    + * Valid values: true, or false. + *

    + *

    + * Required: No + *

    + * + *

    + * This action is irreversible. Only use ForceDelete if you are + * certain the key is no longer in use. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeleteKeyRequest withForceDelete(Boolean forceDelete) { + this.forceDelete = forceDelete; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -106,7 +299,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); if (getKeyName() != null) - sb.append("KeyName: " + getKeyName()); + sb.append("KeyName: " + getKeyName() + ","); + if (getForceDelete() != null) + sb.append("ForceDelete: " + getForceDelete()); sb.append("}"); return sb.toString(); } @@ -117,6 +312,8 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); + hashCode = prime * hashCode + + ((getForceDelete() == null) ? 0 : getForceDelete().hashCode()); return hashCode; } @@ -135,6 +332,11 @@ public boolean equals(Object obj) { return false; if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) return false; + if (other.getForceDelete() == null ^ this.getForceDelete() == null) + return false; + if (other.getForceDelete() != null + && other.getForceDelete().equals(this.getForceDelete()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyResult.java index 8e1d82bef1..7a080d0e1d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteKeyResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapRequest.java index a512b01da0..a42a3d2f9f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public class DeleteMapRequest extends AmazonWebServiceRequest implements Seriali *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String mapName; @@ -49,7 +49,7 @@ public class DeleteMapRequest extends AmazonWebServiceRequest implements Seriali *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the map resource to be deleted. @@ -66,7 +66,7 @@ public String getMapName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param mapName

    * The name of the map resource to be deleted. @@ -86,7 +86,7 @@ public void setMapName(String mapName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param mapName

    * The name of the map resource to be deleted. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapResult.java index 76990b523b..f72f6f8294 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteMapResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexRequest.java index 10a9307afa..e0d4ff3e9c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class DeletePlaceIndexRequest extends AmazonWebServiceRequest implements *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String indexName; @@ -48,7 +48,7 @@ public class DeletePlaceIndexRequest extends AmazonWebServiceRequest implements *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the place index resource to be deleted. @@ -65,7 +65,7 @@ public String getIndexName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource to be deleted. @@ -85,7 +85,7 @@ public void setIndexName(String indexName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource to be deleted. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexResult.java index e7ce4e6f1e..862f1bb514 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeletePlaceIndexResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorRequest.java index fc926ae7d9..523858d6b9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class DeleteRouteCalculatorRequest extends AmazonWebServiceRequest implem *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String calculatorName; @@ -48,7 +48,7 @@ public class DeleteRouteCalculatorRequest extends AmazonWebServiceRequest implem *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the route calculator resource to be deleted. @@ -65,7 +65,7 @@ public String getCalculatorName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param calculatorName

    * The name of the route calculator resource to be deleted. @@ -85,7 +85,7 @@ public void setCalculatorName(String calculatorName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param calculatorName

    * The name of the route calculator resource to be deleted. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorResult.java index e879df2022..d7f6f18e59 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteRouteCalculatorResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerRequest.java index bbda946d3f..cb24942ce8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public class DeleteTrackerRequest extends AmazonWebServiceRequest implements Ser *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String trackerName; @@ -50,7 +50,7 @@ public class DeleteTrackerRequest extends AmazonWebServiceRequest implements Ser *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the tracker resource to be deleted. @@ -67,7 +67,7 @@ public String getTrackerName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param trackerName

    * The name of the tracker resource to be deleted. @@ -87,7 +87,7 @@ public void setTrackerName(String trackerName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param trackerName

    * The name of the tracker resource to be deleted. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerResult.java index d4489d6020..0da7253345 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeleteTrackerResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionRequest.java index 98ae0bb6dd..f536f85191 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class DescribeGeofenceCollectionRequest extends AmazonWebServiceRequest i *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String collectionName; @@ -44,7 +44,7 @@ public class DescribeGeofenceCollectionRequest extends AmazonWebServiceRequest i *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the geofence collection. @@ -61,7 +61,7 @@ public String getCollectionName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection. @@ -81,7 +81,7 @@ public void setCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionResult.java index 72977c91f5..c1db52cd8c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeGeofenceCollectionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class DescribeGeofenceCollectionResult implements Serializable { + /** + *

    + * The name of the geofence collection. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String collectionName; + /** *

    * The Amazon Resource Name (ARN) for the geofence collection resource. Used @@ -35,40 +46,38 @@ public class DescribeGeofenceCollectionResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    */ private String collectionArn; /** *

    - * The name of the geofence collection. + * The optional description for the geofence collection. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    */ - private String collectionName; + private String description; /** *

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * No longer used. Always returns RequestBasedUsage. *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private java.util.Date createTime; + private String pricingPlan; /** *

    - * The optional description for the geofence collection. + * No longer used. Always returns an empty string. *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    */ - private String description; + private String pricingPlanDataSource; /** *

    @@ -85,37 +94,95 @@ public class DescribeGeofenceCollectionResult implements Serializable { /** *

    - * No longer used. Always returns RequestBasedUsage. + * Displays the key, value pairs of tags associated with this resource. + *

    + */ + private java.util.Map tags; + + /** + *

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + private java.util.Date createTime; + + /** + *

    + * The timestamp for when the geofence collection was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + private java.util.Date updateTime; + + /** + *

    + * The number of geofences in the geofence collection. *

    *

    * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Range: 0 -
    */ - private String pricingPlan; + private Integer geofenceCount; /** *

    - * No longer used. Always returns an empty string. + * The name of the geofence collection. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the geofence collection. + *

    */ - private String pricingPlanDataSource; + public String getCollectionName() { + return collectionName; + } /** *

    - * Displays the key, value pairs of tags associated with this resource. + * The name of the geofence collection. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param collectionName

    + * The name of the geofence collection. + *

    */ - private java.util.Map tags; + public void setCollectionName(String collectionName) { + this.collectionName = collectionName; + } /** *

    - * The timestamp for when the geofence collection was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The name of the geofence collection. *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param collectionName

    + * The name of the geofence collection. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public DescribeGeofenceCollectionResult withCollectionName(String collectionName) { + this.collectionName = collectionName; + return this; + } /** *

    @@ -134,8 +201,8 @@ public class DescribeGeofenceCollectionResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @return

    * The Amazon Resource Name (ARN) for the geofence collection @@ -172,8 +239,8 @@ public String getCollectionArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param collectionArn

    * The Amazon Resource Name (ARN) for the geofence collection @@ -213,8 +280,8 @@ public void setCollectionArn(String collectionArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param collectionArn

    * The Amazon Resource Name (ARN) for the geofence collection @@ -237,122 +304,6 @@ public DescribeGeofenceCollectionResult withCollectionArn(String collectionArn) return this; } - /** - *

    - * The name of the geofence collection. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @return

    - * The name of the geofence collection. - *

    - */ - public String getCollectionName() { - return collectionName; - } - - /** - *

    - * The name of the geofence collection. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param collectionName

    - * The name of the geofence collection. - *

    - */ - public void setCollectionName(String collectionName) { - this.collectionName = collectionName; - } - - /** - *

    - * The name of the geofence collection. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param collectionName

    - * The name of the geofence collection. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeGeofenceCollectionResult withCollectionName(String collectionName) { - this.collectionName = collectionName; - return this; - } - - /** - *

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * - * @return

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - public java.util.Date getCreateTime() { - return createTime; - } - - /** - *

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * - * @param createTime

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } - - /** - *

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the geofence resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeGeofenceCollectionResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } - /** *

    * The optional description for the geofence collection. @@ -407,78 +358,6 @@ public DescribeGeofenceCollectionResult withDescription(String description) { return this; } - /** - *

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon - * Location resource - *

    - *

    - * Constraints:
    - * Length: 1 - 2048
    - * - * @return

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the - * Amazon Location resource - *

    - */ - public String getKmsKeyId() { - return kmsKeyId; - } - - /** - *

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon - * Location resource - *

    - *

    - * Constraints:
    - * Length: 1 - 2048
    - * - * @param kmsKeyId

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to - * the Amazon Location resource - *

    - */ - public void setKmsKeyId(String kmsKeyId) { - this.kmsKeyId = kmsKeyId; - } - - /** - *

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon - * Location resource - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 2048
    - * - * @param kmsKeyId

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to - * the Amazon Location resource - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeGeofenceCollectionResult withKmsKeyId(String kmsKeyId) { - this.kmsKeyId = kmsKeyId; - return this; - } - /** *

    * No longer used. Always returns RequestBasedUsage. @@ -626,6 +505,78 @@ public DescribeGeofenceCollectionResult withPricingPlanDataSource(String pricing return this; } + /** + *

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon + * Location resource + *

    + *

    + * Constraints:
    + * Length: 1 - 2048
    + * + * @return

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the + * Amazon Location resource + *

    + */ + public String getKmsKeyId() { + return kmsKeyId; + } + + /** + *

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon + * Location resource + *

    + *

    + * Constraints:
    + * Length: 1 - 2048
    + * + * @param kmsKeyId

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to + * the Amazon Location resource + *

    + */ + public void setKmsKeyId(String kmsKeyId) { + this.kmsKeyId = kmsKeyId; + } + + /** + *

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon + * Location resource + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 2048
    + * + * @param kmsKeyId

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to + * the Amazon Location resource + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeGeofenceCollectionResult withKmsKeyId(String kmsKeyId) { + this.kmsKeyId = kmsKeyId; + return this; + } + /** *

    * Displays the key, value pairs of tags associated with this resource. @@ -709,6 +660,65 @@ public DescribeGeofenceCollectionResult clearTagsEntries() { return this; } + /** + *

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @return

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @param createTime

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the geofence resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeGeofenceCollectionResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp for when the geofence collection was last updated in + * The number of geofences in the geofence collection. + *

    + *

    + * Constraints:
    + * Range: 0 -
    + * + * @return

    + * The number of geofences in the geofence collection. + *

    + */ + public Integer getGeofenceCount() { + return geofenceCount; + } + + /** + *

    + * The number of geofences in the geofence collection. + *

    + *

    + * Constraints:
    + * Range: 0 -
    + * + * @param geofenceCount

    + * The number of geofences in the geofence collection. + *

    + */ + public void setGeofenceCount(Integer geofenceCount) { + this.geofenceCount = geofenceCount; + } + + /** + *

    + * The number of geofences in the geofence collection. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 -
    + * + * @param geofenceCount

    + * The number of geofences in the geofence collection. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeGeofenceCollectionResult withGeofenceCount(Integer geofenceCount) { + this.geofenceCount = geofenceCount; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -780,24 +844,26 @@ public DescribeGeofenceCollectionResult withUpdateTime(java.util.Date updateTime public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCollectionArn() != null) - sb.append("CollectionArn: " + getCollectionArn() + ","); if (getCollectionName() != null) sb.append("CollectionName: " + getCollectionName() + ","); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); + if (getCollectionArn() != null) + sb.append("CollectionArn: " + getCollectionArn() + ","); if (getDescription() != null) sb.append("Description: " + getDescription() + ","); - if (getKmsKeyId() != null) - sb.append("KmsKeyId: " + getKmsKeyId() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); if (getPricingPlanDataSource() != null) sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); + if (getKmsKeyId() != null) + sb.append("KmsKeyId: " + getKmsKeyId() + ","); if (getTags() != null) sb.append("Tags: " + getTags() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("UpdateTime: " + getUpdateTime() + ","); + if (getGeofenceCount() != null) + sb.append("GeofenceCount: " + getGeofenceCount()); sb.append("}"); return sb.toString(); } @@ -807,21 +873,23 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode - + ((getCollectionArn() == null) ? 0 : getCollectionArn().hashCode()); hashCode = prime * hashCode + ((getCollectionName() == null) ? 0 : getCollectionName().hashCode()); - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + hashCode = prime * hashCode + + ((getCollectionArn() == null) ? 0 : getCollectionArn().hashCode()); hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); + hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + hashCode = prime * hashCode + + ((getGeofenceCount() == null) ? 0 : getGeofenceCount().hashCode()); return hashCode; } @@ -836,30 +904,21 @@ public boolean equals(Object obj) { return false; DescribeGeofenceCollectionResult other = (DescribeGeofenceCollectionResult) obj; - if (other.getCollectionArn() == null ^ this.getCollectionArn() == null) - return false; - if (other.getCollectionArn() != null - && other.getCollectionArn().equals(this.getCollectionArn()) == false) - return false; if (other.getCollectionName() == null ^ this.getCollectionName() == null) return false; if (other.getCollectionName() != null && other.getCollectionName().equals(this.getCollectionName()) == false) return false; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getCollectionArn() == null ^ this.getCollectionArn() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getCollectionArn() != null + && other.getCollectionArn().equals(this.getCollectionArn()) == false) return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false; - if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) - return false; - if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null @@ -870,15 +929,29 @@ public boolean equals(Object obj) { if (other.getPricingPlanDataSource() != null && other.getPricingPlanDataSource().equals(this.getPricingPlanDataSource()) == false) return false; + if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) + return false; + if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) + return false; if (other.getTags() == null ^ this.getTags() == null) return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; + if (other.getCreateTime() == null ^ this.getCreateTime() == null) + return false; + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) + return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; + if (other.getGeofenceCount() == null ^ this.getGeofenceCount() == null) + return false; + if (other.getGeofenceCount() != null + && other.getGeofenceCount().equals(this.getGeofenceCount()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyRequest.java index af93c36ca7..cdfe1ae566 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class DescribeKeyRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String keyName; @@ -43,7 +43,7 @@ public class DescribeKeyRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the API key resource. @@ -60,7 +60,7 @@ public String getKeyName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param keyName

    * The name of the API key resource. @@ -80,7 +80,7 @@ public void setKeyName(String keyName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param keyName

    * The name of the API key resource. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyResult.java index 37b2baaa9f..b935b9edba 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeKeyResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,34 +18,6 @@ import java.io.Serializable; public class DescribeKeyResult implements Serializable { - /** - *

    - * The timestamp for when the API key resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date createTime; - - /** - *

    - * The optional description for the API key resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - */ - private String description; - - /** - *

    - * The timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date expireTime; - /** *

    * The key value/string of an API key. @@ -72,8 +44,8 @@ public class DescribeKeyResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    */ private String keyArn; @@ -84,7 +56,7 @@ public class DescribeKeyResult implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String keyName; @@ -96,189 +68,49 @@ public class DescribeKeyResult implements Serializable { */ private ApiKeyRestrictions restrictions; - /** - *

    - * Tags associated with the API key resource. - *

    - */ - private java.util.Map tags; - - /** - *

    - * The timestamp for when the API key resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date updateTime; - /** *

    * The timestamp for when the API key resource was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @return

    - * The timestamp for when the API key resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public java.util.Date getCreateTime() { - return createTime; - } + private java.util.Date createTime; /** *

    - * The timestamp for when the API key resource was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @param createTime

    - * The timestamp for when the API key resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } + private java.util.Date expireTime; /** *

    - * The timestamp for when the API key resource was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the API key resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. */ - public DescribeKeyResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } - - /** - *

    - * The optional description for the API key resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @return

    - * The optional description for the API key resource. - *

    - */ - public String getDescription() { - return description; - } - - /** - *

    - * The optional description for the API key resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description for the API key resource. - *

    - */ - public void setDescription(String description) { - this.description = description; - } + private java.util.Date updateTime; /** *

    * The optional description for the API key resource. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    * Constraints:
    * Length: 0 - 1000
    - * - * @param description

    - * The optional description for the API key resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeKeyResult withDescription(String description) { - this.description = description; - return this; - } - - /** - *

    - * The timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp for when the API key resource will expire in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getExpireTime() { - return expireTime; - } - - /** - *

    - * The timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param expireTime

    - * The timestamp for when the API key resource will expire in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public void setExpireTime(java.util.Date expireTime) { - this.expireTime = expireTime; - } + private String description; /** *

    - * The timestamp for when the API key resource will expire in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Tags associated with the API key resource. *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param expireTime

    - * The timestamp for when the API key resource will expire in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. */ - public DescribeKeyResult withExpireTime(java.util.Date expireTime) { - this.expireTime = expireTime; - return this; - } + private java.util.Map tags; /** *

    @@ -350,8 +182,8 @@ public DescribeKeyResult withKey(String key) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @return

    * The Amazon Resource Name (ARN) for the API key resource. Used @@ -387,8 +219,8 @@ public String getKeyArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param keyArn

    * The Amazon Resource Name (ARN) for the API key resource. Used @@ -427,8 +259,8 @@ public void setKeyArn(String keyArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param keyArn

    * The Amazon Resource Name (ARN) for the API key resource. Used @@ -458,7 +290,7 @@ public DescribeKeyResult withKeyArn(String keyArn) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the API key resource. @@ -475,7 +307,7 @@ public String getKeyName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param keyName

    * The name of the API key resource. @@ -495,7 +327,7 @@ public void setKeyName(String keyName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param keyName

    * The name of the API key resource. @@ -561,81 +393,115 @@ public DescribeKeyResult withRestrictions(ApiKeyRestrictions restrictions) { /** *

    - * Tags associated with the API key resource. + * The timestamp for when the API key resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * * @return

    - * Tags associated with the API key resource. + * The timestamp for when the API key resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public java.util.Map getTags() { - return tags; + public java.util.Date getCreateTime() { + return createTime; } /** *

    - * Tags associated with the API key resource. + * The timestamp for when the API key resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * - * @param tags

    - * Tags associated with the API key resource. + * @param createTime

    + * The timestamp for when the API key resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setTags(java.util.Map tags) { - this.tags = tags; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

    - * Tags associated with the API key resource. + * The timestamp for when the API key resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param tags

    - * Tags associated with the API key resource. + * @param createTime

    + * The timestamp for when the API key resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribeKeyResult withTags(java.util.Map tags) { - this.tags = tags; + public DescribeKeyResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } /** *

    - * Tags associated with the API key resource. + * The timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    + * + * @return

    + * The timestamp for when the API key resource will expire in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getExpireTime() { + return expireTime; + } + + /** *

    - * The method adds a new key-value pair into Tags parameter, and returns a - * reference to this object so that method calls can be chained together. + * The timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    * - * @param key The key of the entry to be added into Tags. - * @param value The corresponding value of the entry to be added into Tags. - * @return A reference to this updated object so that method calls can be - * chained together. + * @param expireTime

    + * The timestamp for when the API key resource will expire in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    */ - public DescribeKeyResult addTagsEntry(String key, String value) { - if (null == this.tags) { - this.tags = new java.util.HashMap(); - } - if (this.tags.containsKey(key)) - throw new IllegalArgumentException("Duplicated keys (" + key.toString() - + ") are provided."); - this.tags.put(key, value); - return this; + public void setExpireTime(java.util.Date expireTime) { + this.expireTime = expireTime; } /** - * Removes all the entries added into Tags. + *

    + * The timestamp for when the API key resource will expire in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    *

    * Returns a reference to this object so that method calls can be chained * together. + * + * @param expireTime

    + * The timestamp for when the API key resource will expire in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - public DescribeKeyResult clearTagsEntries() { - this.tags = null; + public DescribeKeyResult withExpireTime(java.util.Date expireTime) { + this.expireTime = expireTime; return this; } @@ -698,6 +564,140 @@ public DescribeKeyResult withUpdateTime(java.util.Date updateTime) { return this; } + /** + *

    + * The optional description for the API key resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @return

    + * The optional description for the API key resource. + *

    + */ + public String getDescription() { + return description; + } + + /** + *

    + * The optional description for the API key resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @param description

    + * The optional description for the API key resource. + *

    + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

    + * The optional description for the API key resource. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @param description

    + * The optional description for the API key resource. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeKeyResult withDescription(String description) { + this.description = description; + return this; + } + + /** + *

    + * Tags associated with the API key resource. + *

    + * + * @return

    + * Tags associated with the API key resource. + *

    + */ + public java.util.Map getTags() { + return tags; + } + + /** + *

    + * Tags associated with the API key resource. + *

    + * + * @param tags

    + * Tags associated with the API key resource. + *

    + */ + public void setTags(java.util.Map tags) { + this.tags = tags; + } + + /** + *

    + * Tags associated with the API key resource. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param tags

    + * Tags associated with the API key resource. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeKeyResult withTags(java.util.Map tags) { + this.tags = tags; + return this; + } + + /** + *

    + * Tags associated with the API key resource. + *

    + *

    + * The method adds a new key-value pair into Tags parameter, and returns a + * reference to this object so that method calls can be chained together. + * + * @param key The key of the entry to be added into Tags. + * @param value The corresponding value of the entry to be added into Tags. + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeKeyResult addTagsEntry(String key, String value) { + if (null == this.tags) { + this.tags = new java.util.HashMap(); + } + if (this.tags.containsKey(key)) + throw new IllegalArgumentException("Duplicated keys (" + key.toString() + + ") are provided."); + this.tags.put(key, value); + return this; + } + + /** + * Removes all the entries added into Tags. + *

    + * Returns a reference to this object so that method calls can be chained + * together. + */ + public DescribeKeyResult clearTagsEntries() { + this.tags = null; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -709,12 +709,6 @@ public DescribeKeyResult withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); - if (getExpireTime() != null) - sb.append("ExpireTime: " + getExpireTime() + ","); if (getKey() != null) sb.append("Key: " + getKey() + ","); if (getKeyArn() != null) @@ -723,10 +717,16 @@ public String toString() { sb.append("KeyName: " + getKeyName() + ","); if (getRestrictions() != null) sb.append("Restrictions: " + getRestrictions() + ","); - if (getTags() != null) - sb.append("Tags: " + getTags() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); + if (getExpireTime() != null) + sb.append("ExpireTime: " + getExpireTime() + ","); if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("UpdateTime: " + getUpdateTime() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); + if (getTags() != null) + sb.append("Tags: " + getTags()); sb.append("}"); return sb.toString(); } @@ -736,17 +736,17 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getExpireTime() == null) ? 0 : getExpireTime().hashCode()); hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); hashCode = prime * hashCode + ((getKeyArn() == null) ? 0 : getKeyArn().hashCode()); hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); hashCode = prime * hashCode + ((getRestrictions() == null) ? 0 : getRestrictions().hashCode()); - hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + hashCode = prime * hashCode + ((getExpireTime() == null) ? 0 : getExpireTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); + hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; } @@ -761,21 +761,6 @@ public boolean equals(Object obj) { return false; DescribeKeyResult other = (DescribeKeyResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) - return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) - return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; - if (other.getExpireTime() == null ^ this.getExpireTime() == null) - return false; - if (other.getExpireTime() != null - && other.getExpireTime().equals(this.getExpireTime()) == false) - return false; if (other.getKey() == null ^ this.getKey() == null) return false; if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) @@ -793,15 +778,30 @@ public boolean equals(Object obj) { if (other.getRestrictions() != null && other.getRestrictions().equals(this.getRestrictions()) == false) return false; - if (other.getTags() == null ^ this.getTags() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) + return false; + if (other.getExpireTime() == null ^ this.getExpireTime() == null) + return false; + if (other.getExpireTime() != null + && other.getExpireTime().equals(this.getExpireTime()) == false) return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; + if (other.getTags() == null ^ this.getTags() == null) + return false; + if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapRequest.java index d55f4b7b58..65dd14fcd2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class DescribeMapRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String mapName; @@ -43,7 +43,7 @@ public class DescribeMapRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the map resource. @@ -60,7 +60,7 @@ public String getMapName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param mapName

    * The name of the map resource. @@ -80,7 +80,7 @@ public void setMapName(String mapName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param mapName

    * The name of the map resource. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapResult.java index 9056e63405..365b208e27 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeMapResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,36 +20,14 @@ public class DescribeMapResult implements Serializable { /** *

    - * Specifies the map tile style selected from a partner data provider. - *

    - */ - private MapConfiguration configuration; - - /** - *

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date createTime; - - /** - *

    - * Specifies the data provider for the associated map tiles. - *

    - */ - private String dataSource; - - /** - *

    - * The optional description for the map resource. + * The map style selected from an available provider. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private String description; + private String mapName; /** *

    @@ -67,22 +45,11 @@ public class DescribeMapResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    */ private String mapArn; - /** - *

    - * The map style selected from an available provider. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - */ - private String mapName; - /** *

    * No longer used. Always returns RequestBasedUsage. @@ -96,84 +63,34 @@ public class DescribeMapResult implements Serializable { /** *

    - * Tags associated with the map resource. - *

    - */ - private java.util.Map tags; - - /** - *

    - * The timestamp for when the map resource was last update in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date updateTime; - - /** - *

    - * Specifies the map tile style selected from a partner data provider. + * Specifies the data provider for the associated map tiles. *

    - * - * @return

    - * Specifies the map tile style selected from a partner data - * provider. - *

    */ - public MapConfiguration getConfiguration() { - return configuration; - } + private String dataSource; /** *

    * Specifies the map tile style selected from a partner data provider. *

    - * - * @param configuration

    - * Specifies the map tile style selected from a partner data - * provider. - *

    */ - public void setConfiguration(MapConfiguration configuration) { - this.configuration = configuration; - } + private MapConfiguration configuration; /** *

    - * Specifies the map tile style selected from a partner data provider. + * The optional description for the map resource. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param configuration

    - * Specifies the map tile style selected from a partner data - * provider. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. + * Constraints:
    + * Length: 0 - 1000
    */ - public DescribeMapResult withConfiguration(MapConfiguration configuration) { - this.configuration = configuration; - return this; - } + private String description; /** *

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Tags associated with the map resource. *

    - * - * @return

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public java.util.Date getCreateTime() { - return createTime; - } + private java.util.Map tags; /** *

    @@ -181,138 +98,72 @@ public java.util.Date getCreateTime() { * href="https://www.iso.org/iso-8601-date-and-time-format.html">ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @param createTime

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } + private java.util.Date createTime; /** *

    - * The timestamp for when the map resource was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeMapResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } - - /** - *

    - * Specifies the data provider for the associated map tiles. - *

    - * - * @return

    - * Specifies the data provider for the associated map tiles. - *

    - */ - public String getDataSource() { - return dataSource; - } - - /** - *

    - * Specifies the data provider for the associated map tiles. - *

    - * - * @param dataSource

    - * Specifies the data provider for the associated map tiles. - *

    - */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; - } - - /** - *

    - * Specifies the data provider for the associated map tiles. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param dataSource

    - * Specifies the data provider for the associated map tiles. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. */ - public DescribeMapResult withDataSource(String dataSource) { - this.dataSource = dataSource; - return this; - } + private java.util.Date updateTime; /** *

    - * The optional description for the map resource. + * The map style selected from an available provider. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The optional description for the map resource. + * The map style selected from an available provider. *

    */ - public String getDescription() { - return description; + public String getMapName() { + return mapName; } /** *

    - * The optional description for the map resource. + * The map style selected from an available provider. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param description

    - * The optional description for the map resource. + * @param mapName

    + * The map style selected from an available provider. *

    */ - public void setDescription(String description) { - this.description = description; + public void setMapName(String mapName) { + this.mapName = mapName; } /** *

    - * The optional description for the map resource. + * The map style selected from an available provider. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param description

    - * The optional description for the map resource. + * @param mapName

    + * The map style selected from an available provider. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribeMapResult withDescription(String description) { - this.description = description; + public DescribeMapResult withMapName(String mapName) { + this.mapName = mapName; return this; } @@ -332,8 +183,8 @@ public DescribeMapResult withDescription(String description) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @return

    * The Amazon Resource Name (ARN) for the map resource. Used to @@ -368,8 +219,8 @@ public String getMapArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @param mapArn

    * The Amazon Resource Name (ARN) for the map resource. Used to @@ -407,8 +258,8 @@ public void setMapArn(String mapArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @param mapArn

    * The Amazon Resource Name (ARN) for the map resource. Used to @@ -432,160 +283,250 @@ public DescribeMapResult withMapArn(String mapArn) { /** *

    - * The map style selected from an available provider. + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @return

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @see PricingPlan + */ + public String getPricingPlan() { + return pricingPlan; + } + + /** + *

    + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @see PricingPlan + */ + public void setPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; + } + + /** + *

    + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PricingPlan + */ + public DescribeMapResult withPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; + return this; + } + + /** + *

    + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @see PricingPlan + */ + public void setPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + } + + /** + *

    + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PricingPlan + */ + public DescribeMapResult withPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + return this; + } + + /** + *

    + * Specifies the data provider for the associated map tiles. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The map style selected from an available provider. + * Specifies the data provider for the associated map tiles. *

    */ - public String getMapName() { - return mapName; + public String getDataSource() { + return dataSource; } /** *

    - * The map style selected from an available provider. + * Specifies the data provider for the associated map tiles. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param mapName

    - * The map style selected from an available provider. + * @param dataSource

    + * Specifies the data provider for the associated map tiles. *

    */ - public void setMapName(String mapName) { - this.mapName = mapName; + public void setDataSource(String dataSource) { + this.dataSource = dataSource; } /** *

    - * The map style selected from an available provider. + * Specifies the data provider for the associated map tiles. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param mapName

    - * The map style selected from an available provider. + * @param dataSource

    + * Specifies the data provider for the associated map tiles. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribeMapResult withMapName(String mapName) { - this.mapName = mapName; + public DescribeMapResult withDataSource(String dataSource) { + this.dataSource = dataSource; return this; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * Specifies the map tile style selected from a partner data provider. *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement * * @return

    - * No longer used. Always returns RequestBasedUsage. + * Specifies the map tile style selected from a partner data + * provider. *

    - * @see PricingPlan */ - public String getPricingPlan() { - return pricingPlan; + public MapConfiguration getConfiguration() { + return configuration; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * Specifies the map tile style selected from a partner data provider. *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @param configuration

    + * Specifies the map tile style selected from a partner data + * provider. *

    - * @see PricingPlan */ - public void setPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; + public void setConfiguration(MapConfiguration configuration) { + this.configuration = configuration; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * Specifies the map tile style selected from a partner data provider. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @param configuration

    + * Specifies the map tile style selected from a partner data + * provider. *

    * @return A reference to this updated object so that method calls can be * chained together. - * @see PricingPlan */ - public DescribeMapResult withPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; + public DescribeMapResult withConfiguration(MapConfiguration configuration) { + this.configuration = configuration; return this; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The optional description for the map resource. *

    *

    * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Length: 0 - 1000
    * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @return

    + * The optional description for the map resource. + *

    + */ + public String getDescription() { + return description; + } + + /** + *

    + * The optional description for the map resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @param description

    + * The optional description for the map resource. *

    - * @see PricingPlan */ - public void setPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); + public void setDescription(String description) { + this.description = description; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The optional description for the map resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Length: 0 - 1000
    * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @param description

    + * The optional description for the map resource. *

    * @return A reference to this updated object so that method calls can be * chained together. - * @see PricingPlan */ - public DescribeMapResult withPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); + public DescribeMapResult withDescription(String description) { + this.description = description; return this; } @@ -669,6 +610,65 @@ public DescribeMapResult clearTagsEntries() { return this; } + /** + *

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @return

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @param createTime

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeMapResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp for when the map resource was last update in * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String indexName; @@ -43,7 +43,7 @@ public class DescribePlaceIndexRequest extends AmazonWebServiceRequest implement *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the place index resource. @@ -60,7 +60,7 @@ public String getIndexName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource. @@ -80,7 +80,7 @@ public void setIndexName(String indexName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribePlaceIndexResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribePlaceIndexResult.java index 268a63897a..a25b573062 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribePlaceIndexResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribePlaceIndexResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,48 +20,47 @@ public class DescribePlaceIndexResult implements Serializable { /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource being described. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private java.util.Date createTime; + private String indexName; /** *

    - * The data provider of geospatial data. Values can be one of the following: + * The Amazon Resource Name (ARN) for the place index resource. Used to + * specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    */ - private String dataSource; + private String indexArn; /** *

    - * The specified data storage option for requesting Places. + * No longer used. Always returns RequestBasedUsage. *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private DataSourceConfiguration dataSourceConfiguration; + private String pricingPlan; /** *

    @@ -75,47 +74,57 @@ public class DescribePlaceIndexResult implements Serializable { /** *

    - * The Amazon Resource Name (ARN) for the place index resource. Used to - * specify a resource across Amazon Web Services. + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date createTime; + + /** + *

    + * The timestamp for when the place index resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date updateTime; + + /** + *

    + * The data provider of geospatial data. Values can be one of the following: *

    *
      *
    • *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * Esri *

      *
      • - *
    + *
  • *

    - * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    - */ - private String indexArn; - - /** + * Grab + *

    + *
    • + *
  • *

    - * The name of the place index resource being described. + * Here *

    + *
    • + * *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * For more information about data providers, see Amazon Location Service data providers. + *

    */ - private String indexName; + private String dataSource; /** *

    - * No longer used. Always returns RequestBasedUsage. + * The specified data storage option for requesting Places. *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement */ - private String pricingPlan; + private DataSourceConfiguration dataSourceConfiguration; /** *

    @@ -126,295 +135,277 @@ public class DescribePlaceIndexResult implements Serializable { /** *

    - * The timestamp for when the place index resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource being described. *

    - */ - private java.util.Date updateTime; - - /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource being described. *

    */ - public java.util.Date getCreateTime() { - return createTime; + public String getIndexName() { + return indexName; } /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource being described. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param createTime

    - * The timestamp for when the place index resource was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param indexName

    + * The name of the place index resource being described. *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setIndexName(String indexName) { + this.indexName = indexName; } /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource being described. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param createTime

    - * The timestamp for when the place index resource was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param indexName

    + * The name of the place index resource being described. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribePlaceIndexResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public DescribePlaceIndexResult withIndexName(String indexName) { + this.indexName = indexName; return this; } /** *

    - * The data provider of geospatial data. Values can be one of the following: + * The Amazon Resource Name (ARN) for the place index resource. Used to + * specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @return

    - * The data provider of geospatial data. Values can be one of the - * following: + * The Amazon Resource Name (ARN) for the place index resource. Used + * to specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    - *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    */ - public String getDataSource() { - return dataSource; + public String getIndexArn() { + return indexArn; } /** *

    - * The data provider of geospatial data. Values can be one of the following: + * The Amazon Resource Name (ARN) for the place index resource. Used to + * specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * - * @param dataSource

    - * The data provider of geospatial data. Values can be one of the - * following: + * @param indexArn

    + * The Amazon Resource Name (ARN) for the place index resource. + * Used to specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    - *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; - } + public void setIndexArn(String indexArn) { + this.indexArn = indexArn; + } /** *

    - * The data provider of geospatial data. Values can be one of the following: + * The Amazon Resource Name (ARN) for the place index resource. Used to + * specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    - *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * - * @param dataSource

    - * The data provider of geospatial data. Values can be one of the - * following: + * @param indexArn

    + * The Amazon Resource Name (ARN) for the place index resource. + * Used to specify a resource across Amazon Web Services. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * Format example: + * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex *

      *
      • *
    - *

    - * For more information about data providers, see Amazon Location Service data providers. - *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribePlaceIndexResult withDataSource(String dataSource) { - this.dataSource = dataSource; + public DescribePlaceIndexResult withIndexArn(String indexArn) { + this.indexArn = indexArn; return this; } /** *

    - * The specified data storage option for requesting Places. + * No longer used. Always returns RequestBasedUsage. *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * * @return

    - * The specified data storage option for requesting Places. + * No longer used. Always returns RequestBasedUsage. *

    + * @see PricingPlan */ - public DataSourceConfiguration getDataSourceConfiguration() { - return dataSourceConfiguration; + public String getPricingPlan() { + return pricingPlan; } /** *

    - * The specified data storage option for requesting Places. + * No longer used. Always returns RequestBasedUsage. *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param dataSourceConfiguration

    - * The specified data storage option for requesting Places. + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. *

    + * @see PricingPlan */ - public void setDataSourceConfiguration(DataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; + public void setPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; } /** *

    - * The specified data storage option for requesting Places. + * No longer used. Always returns RequestBasedUsage. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param dataSourceConfiguration

    - * The specified data storage option for requesting Places. + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. *

    * @return A reference to this updated object so that method calls can be * chained together. + * @see PricingPlan */ - public DescribePlaceIndexResult withDataSourceConfiguration( - DataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; + public DescribePlaceIndexResult withPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; + return this; + } + + /** + *

    + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @see PricingPlan + */ + public void setPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + } + + /** + *

    + * No longer used. Always returns RequestBasedUsage. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * No longer used. Always returns RequestBasedUsage. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PricingPlan + */ + public DescribePlaceIndexResult withPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); return this; } @@ -474,277 +465,346 @@ public DescribePlaceIndexResult withDescription(String description) { /** *

    - * The Amazon Resource Name (ARN) for the place index resource. Used to - * specify a resource across Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    - *

    - * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    * * @return

    - * The Amazon Resource Name (ARN) for the place index resource. Used - * to specify a resource across Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    */ - public String getIndexArn() { - return indexArn; + public java.util.Date getCreateTime() { + return createTime; } /** *

    - * The Amazon Resource Name (ARN) for the place index resource. Used to - * specify a resource across Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    - *

    - * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    * - * @param indexArn

    - * The Amazon Resource Name (ARN) for the place index resource. - * Used to specify a resource across Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * @param createTime

      + * The timestamp for when the place index resource was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    */ - public void setIndexArn(String indexArn) { - this.indexArn = indexArn; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

    - * The Amazon Resource Name (ARN) for the place index resource. Used to - * specify a resource across Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    * - * @param indexArn

    - * The Amazon Resource Name (ARN) for the place index resource. - * Used to specify a resource across Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex + * @param createTime

      + * The timestamp for when the place index resource was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribePlaceIndexResult withIndexArn(String indexArn) { - this.indexArn = indexArn; + public DescribePlaceIndexResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } /** *

    - * The name of the place index resource being described. + * The timestamp for when the place index resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The name of the place index resource being described. + * The timestamp for when the place index resource was last updated + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public String getIndexName() { - return indexName; + public java.util.Date getUpdateTime() { + return updateTime; } /** *

    - * The name of the place index resource being described. + * The timestamp for when the place index resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param indexName

    - * The name of the place index resource being described. + * @param updateTime

    + * The timestamp for when the place index resource was last + * updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setIndexName(String indexName) { - this.indexName = indexName; + public void setUpdateTime(java.util.Date updateTime) { + this.updateTime = updateTime; } /** *

    - * The name of the place index resource being described. + * The timestamp for when the place index resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param indexName

    - * The name of the place index resource being described. + * @param updateTime

    + * The timestamp for when the place index resource was last + * updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribePlaceIndexResult withIndexName(String indexName) { - this.indexName = indexName; + public DescribePlaceIndexResult withUpdateTime(java.util.Date updateTime) { + this.updateTime = updateTime; return this; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The data provider of geospatial data. Values can be one of the following: *

    + *
      + *
    • *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Esri + *

      + *
      • + *
    • + *

      + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    + * For more information about data providers, see Amazon Location Service data providers. + *

    * * @return

    - * No longer used. Always returns RequestBasedUsage. + * The data provider of geospatial data. Values can be one of the + * following: *

    - * @see PricingPlan + *
      + *
    • + *

      + * Esri + *

      + *
      • + *
    • + *

      + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    + * For more information about data providers, see Amazon Location Service data providers. + *

    + */ + public String getDataSource() { + return dataSource; + } + + /** + *

    + * The data provider of geospatial data. Values can be one of the following: + *

    + *
      + *
    • + *

      + * Esri + *

      + *
      • + *
    • + *

      + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    + * For more information about data providers, see Amazon Location Service data providers. + *

    + * + * @param dataSource

    + * The data provider of geospatial data. Values can be one of the + * following: + *

    + *
      + *
    • + *

      + * Esri + *

      + *
      • + *
    • + *

      + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    + * For more information about data providers, see Amazon Location Service data providers. + *

    */ - public String getPricingPlan() { - return pricingPlan; + public void setDataSource(String dataSource) { + this.dataSource = dataSource; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The data provider of geospatial data. Values can be one of the following: *

    + *
      + *
    • *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

      - * No longer used. Always returns RequestBasedUsage. - *

      - * @see PricingPlan - */ - public void setPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; - } - - /** + * Esri + *

      + *
      • + *
    • *

      - * No longer used. Always returns RequestBasedUsage. + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    + * For more information about data providers, see Amazon Location Service data providers. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @param dataSource

    + * The data provider of geospatial data. Values can be one of the + * following: + *

    + *
      + *
    • + *

      + * Esri + *

      + *
      • + *
    • + *

      + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    + * For more information about data providers, see Amazon Location Service data providers. *

    * @return A reference to this updated object so that method calls can be * chained together. - * @see PricingPlan */ - public DescribePlaceIndexResult withPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; + public DescribePlaceIndexResult withDataSource(String dataSource) { + this.dataSource = dataSource; return this; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The specified data storage option for requesting Places. *

    + * + * @return

    + * The specified data storage option for requesting Places. + *

    + */ + public DataSourceConfiguration getDataSourceConfiguration() { + return dataSourceConfiguration; + } + + /** *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * The specified data storage option for requesting Places. + *

    * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @param dataSourceConfiguration

    + * The specified data storage option for requesting Places. *

    - * @see PricingPlan */ - public void setPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); + public void setDataSourceConfiguration(DataSourceConfiguration dataSourceConfiguration) { + this.dataSourceConfiguration = dataSourceConfiguration; } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The specified data storage option for requesting Places. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement * - * @param pricingPlan

    - * No longer used. Always returns RequestBasedUsage. + * @param dataSourceConfiguration

    + * The specified data storage option for requesting Places. *

    * @return A reference to this updated object so that method calls can be * chained together. - * @see PricingPlan */ - public DescribePlaceIndexResult withPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); + public DescribePlaceIndexResult withDataSourceConfiguration( + DataSourceConfiguration dataSourceConfiguration) { + this.dataSourceConfiguration = dataSourceConfiguration; return this; } @@ -828,66 +888,6 @@ public DescribePlaceIndexResult clearTagsEntries() { return this; } - /** - *

    - * The timestamp for when the place index resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp for when the place index resource was last updated - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getUpdateTime() { - return updateTime; - } - - /** - *

    - * The timestamp for when the place index resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param updateTime

    - * The timestamp for when the place index resource was last - * updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public void setUpdateTime(java.util.Date updateTime) { - this.updateTime = updateTime; - } - - /** - *

    - * The timestamp for when the place index resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param updateTime

    - * The timestamp for when the place index resource was last - * updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribePlaceIndexResult withUpdateTime(java.util.Date updateTime) { - this.updateTime = updateTime; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -899,24 +899,24 @@ public DescribePlaceIndexResult withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getIndexName() != null) + sb.append("IndexName: " + getIndexName() + ","); + if (getIndexArn() != null) + sb.append("IndexArn: " + getIndexArn() + ","); + if (getPricingPlan() != null) + sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); if (getCreateTime() != null) sb.append("CreateTime: " + getCreateTime() + ","); + if (getUpdateTime() != null) + sb.append("UpdateTime: " + getUpdateTime() + ","); if (getDataSource() != null) sb.append("DataSource: " + getDataSource() + ","); if (getDataSourceConfiguration() != null) sb.append("DataSourceConfiguration: " + getDataSourceConfiguration() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); - if (getIndexArn() != null) - sb.append("IndexArn: " + getIndexArn() + ","); - if (getIndexName() != null) - sb.append("IndexName: " + getIndexName() + ","); - if (getPricingPlan() != null) - sb.append("PricingPlan: " + getPricingPlan() + ","); if (getTags() != null) - sb.append("Tags: " + getTags() + ","); - if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("Tags: " + getTags()); sb.append("}"); return sb.toString(); } @@ -926,20 +926,20 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); + hashCode = prime * hashCode + ((getIndexArn() == null) ? 0 : getIndexArn().hashCode()); + hashCode = prime * hashCode + + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); hashCode = prime * hashCode + ((getDataSourceConfiguration() == null) ? 0 : getDataSourceConfiguration() .hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getIndexArn() == null) ? 0 : getIndexArn().hashCode()); - hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode - + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); - hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); return hashCode; } @@ -954,48 +954,48 @@ public boolean equals(Object obj) { return false; DescribePlaceIndexResult other = (DescribePlaceIndexResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getIndexName() == null ^ this.getIndexName() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getIndexName() != null + && other.getIndexName().equals(this.getIndexName()) == false) return false; - if (other.getDataSource() == null ^ this.getDataSource() == null) + if (other.getIndexArn() == null ^ this.getIndexArn() == null) return false; - if (other.getDataSource() != null - && other.getDataSource().equals(this.getDataSource()) == false) + if (other.getIndexArn() != null && other.getIndexArn().equals(this.getIndexArn()) == false) return false; - if (other.getDataSourceConfiguration() == null ^ this.getDataSourceConfiguration() == null) + if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; - if (other.getDataSourceConfiguration() != null - && other.getDataSourceConfiguration().equals(this.getDataSourceConfiguration()) == false) + if (other.getPricingPlan() != null + && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false; - if (other.getIndexArn() == null ^ this.getIndexArn() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getIndexArn() != null && other.getIndexArn().equals(this.getIndexArn()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; - if (other.getIndexName() == null ^ this.getIndexName() == null) + if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; - if (other.getIndexName() != null - && other.getIndexName().equals(this.getIndexName()) == false) + if (other.getUpdateTime() != null + && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; - if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) + if (other.getDataSource() == null ^ this.getDataSource() == null) return false; - if (other.getPricingPlan() != null - && other.getPricingPlan().equals(this.getPricingPlan()) == false) + if (other.getDataSource() != null + && other.getDataSource().equals(this.getDataSource()) == false) return false; - if (other.getTags() == null ^ this.getTags() == null) + if (other.getDataSourceConfiguration() == null ^ this.getDataSourceConfiguration() == null) return false; - if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) + if (other.getDataSourceConfiguration() != null + && other.getDataSourceConfiguration().equals(this.getDataSourceConfiguration()) == false) return false; - if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) + if (other.getTags() == null ^ this.getTags() == null) return false; - if (other.getUpdateTime() != null - && other.getUpdateTime().equals(this.getUpdateTime()) == false) + if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorRequest.java index 8251a03ab0..98c8ba3f5c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class DescribeRouteCalculatorRequest extends AmazonWebServiceRequest impl *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String calculatorName; @@ -43,7 +43,7 @@ public class DescribeRouteCalculatorRequest extends AmazonWebServiceRequest impl *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the route calculator resource. @@ -60,7 +60,7 @@ public String getCalculatorName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param calculatorName

    * The name of the route calculator resource. @@ -80,7 +80,7 @@ public void setCalculatorName(String calculatorName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param calculatorName

    * The name of the route calculator resource. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorResult.java index e2f40c2aa2..9b66e56328 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeRouteCalculatorResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class DescribeRouteCalculatorResult implements Serializable { + /** + *

    + * The name of the route calculator resource being described. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String calculatorName; + /** *

    * The Amazon Resource Name (ARN) for the Route calculator resource. Use the @@ -35,21 +46,31 @@ public class DescribeRouteCalculatorResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    */ private String calculatorArn; /** *

    - * The name of the route calculator resource being described. + * Always returns RequestBasedUsage. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private String calculatorName; + private String pricingPlan; + + /** + *

    + * The optional description of the route calculator resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + */ + private String description; /** *

    @@ -67,6 +88,22 @@ public class DescribeRouteCalculatorResult implements Serializable { */ private java.util.Date createTime; + /** + *

    + * The timestamp when the route calculator resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + */ + private java.util.Date updateTime; + /** *

    * The data provider of traffic and road network data. Indicates one of the @@ -99,47 +136,67 @@ public class DescribeRouteCalculatorResult implements Serializable { /** *

    - * The optional description of the route calculator resource. + * Tags associated with route calculator resource. *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    */ - private String description; + private java.util.Map tags; /** *

    - * Always returns RequestBasedUsage. + * The name of the route calculator resource being described. *

    *

    * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the route calculator resource being described. + *

    */ - private String pricingPlan; + public String getCalculatorName() { + return calculatorName; + } /** *

    - * Tags associated with route calculator resource. + * The name of the route calculator resource being described. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param calculatorName

    + * The name of the route calculator resource being described. + *

    */ - private java.util.Map tags; + public void setCalculatorName(String calculatorName) { + this.calculatorName = calculatorName; + } /** *

    - * The timestamp when the route calculator resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the route calculator resource being described. *

    - *
      - *
    • *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param calculatorName

    + * The name of the route calculator resource being described. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public DescribeRouteCalculatorResult withCalculatorName(String calculatorName) { + this.calculatorName = calculatorName; + return this; + } /** *

    @@ -158,8 +215,8 @@ public class DescribeRouteCalculatorResult implements Serializable { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @return

    * The Amazon Resource Name (ARN) for the Route calculator resource. @@ -196,8 +253,8 @@ public String getCalculatorArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @param calculatorArn

    * The Amazon Resource Name (ARN) for the Route calculator @@ -237,8 +294,8 @@ public void setCalculatorArn(String calculatorArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
    * * @param calculatorArn

    * The Amazon Resource Name (ARN) for the Route calculator @@ -263,58 +320,157 @@ public DescribeRouteCalculatorResult withCalculatorArn(String calculatorArn) { /** *

    - * The name of the route calculator resource being described. + * Always returns RequestBasedUsage. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * * @return

    - * The name of the route calculator resource being described. + * Always returns RequestBasedUsage. *

    + * @see PricingPlan */ - public String getCalculatorName() { - return calculatorName; + public String getPricingPlan() { + return pricingPlan; } /** *

    - * The name of the route calculator resource being described. + * Always returns RequestBasedUsage. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param calculatorName

    - * The name of the route calculator resource being described. + * @param pricingPlan

    + * Always returns RequestBasedUsage. *

    + * @see PricingPlan */ - public void setCalculatorName(String calculatorName) { - this.calculatorName = calculatorName; + public void setPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; } /** *

    - * The name of the route calculator resource being described. + * Always returns RequestBasedUsage. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param calculatorName

    - * The name of the route calculator resource being described. + * @param pricingPlan

    + * Always returns RequestBasedUsage. *

    * @return A reference to this updated object so that method calls can be * chained together. + * @see PricingPlan */ - public DescribeRouteCalculatorResult withCalculatorName(String calculatorName) { - this.calculatorName = calculatorName; + public DescribeRouteCalculatorResult withPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; + return this; + } + + /** + *

    + * Always returns RequestBasedUsage. + *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * Always returns RequestBasedUsage. + *

    + * @see PricingPlan + */ + public void setPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + } + + /** + *

    + * Always returns RequestBasedUsage. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

    + * Always returns RequestBasedUsage. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PricingPlan + */ + public DescribeRouteCalculatorResult withPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + return this; + } + + /** + *

    + * The optional description of the route calculator resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @return

    + * The optional description of the route calculator resource. + *

    + */ + public String getDescription() { + return description; + } + + /** + *

    + * The optional description of the route calculator resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @param description

    + * The optional description of the route calculator resource. + *

    + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

    + * The optional description of the route calculator resource. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 0 - 1000
    + * + * @param description

    + * The optional description of the route calculator resource. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeRouteCalculatorResult withDescription(String description) { + this.description = description; return this; } @@ -421,27 +577,129 @@ public DescribeRouteCalculatorResult withCreateTime(java.util.Date createTime) { /** *

    - * The data provider of traffic and road network data. Indicates one of the - * available providers: + * The timestamp when the route calculator resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *
      *
    • *

      - * Esri - *

      - *
      • - *
    • - *

      - * Grab - *

      - *
      • - *
    • - *

      - * Here + * For example, 2020–07-2T12:15:20.000Z+01:00 *

      *
      • *
    - *

    + * + * @return

    + * The timestamp when the route calculator resource was last updated + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + */ + public java.util.Date getUpdateTime() { + return updateTime; + } + + /** + *

    + * The timestamp when the route calculator resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + * + * @param updateTime

    + * The timestamp when the route calculator resource was last + * updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + */ + public void setUpdateTime(java.util.Date updateTime) { + this.updateTime = updateTime; + } + + /** + *

    + * The timestamp when the route calculator resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param updateTime

    + * The timestamp when the route calculator resource was last + * updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeRouteCalculatorResult withUpdateTime(java.util.Date updateTime) { + this.updateTime = updateTime; + return this; + } + + /** + *

    + * The data provider of traffic and road network data. Indicates one of the + * available providers: + *

    + *
      + *
    • + *

      + * Esri + *

      + *
      • + *
    • + *

      + * Grab + *

      + *
      • + *
    • + *

      + * Here + *

      + *
      • + *
    + *

    * For more information about data providers, see Amazon Location Service data providers. @@ -602,162 +860,6 @@ public DescribeRouteCalculatorResult withDataSource(String dataSource) { return this; } - /** - *

    - * The optional description of the route calculator resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @return

    - * The optional description of the route calculator resource. - *

    - */ - public String getDescription() { - return description; - } - - /** - *

    - * The optional description of the route calculator resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description of the route calculator resource. - *

    - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

    - * The optional description of the route calculator resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description of the route calculator resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeRouteCalculatorResult withDescription(String description) { - this.description = description; - return this; - } - - /** - *

    - * Always returns RequestBasedUsage. - *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @return

    - * Always returns RequestBasedUsage. - *

    - * @see PricingPlan - */ - public String getPricingPlan() { - return pricingPlan; - } - - /** - *

    - * Always returns RequestBasedUsage. - *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

    - * Always returns RequestBasedUsage. - *

    - * @see PricingPlan - */ - public void setPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; - } - - /** - *

    - * Always returns RequestBasedUsage. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

    - * Always returns RequestBasedUsage. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PricingPlan - */ - public DescribeRouteCalculatorResult withPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; - return this; - } - - /** - *

    - * Always returns RequestBasedUsage. - *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

    - * Always returns RequestBasedUsage. - *

    - * @see PricingPlan - */ - public void setPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); - } - - /** - *

    - * Always returns RequestBasedUsage. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

    - * Always returns RequestBasedUsage. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PricingPlan - */ - public DescribeRouteCalculatorResult withPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); - return this; - } - /** *

    * Tags associated with route calculator resource. @@ -838,108 +940,6 @@ public DescribeRouteCalculatorResult clearTagsEntries() { return this; } - /** - *

    - * The timestamp when the route calculator resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    - * - * @return

    - * The timestamp when the route calculator resource was last updated - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    - */ - public java.util.Date getUpdateTime() { - return updateTime; - } - - /** - *

    - * The timestamp when the route calculator resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    - * - * @param updateTime

    - * The timestamp when the route calculator resource was last - * updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    - */ - public void setUpdateTime(java.util.Date updateTime) { - this.updateTime = updateTime; - } - - /** - *

    - * The timestamp when the route calculator resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param updateTime

    - * The timestamp when the route calculator resource was last - * updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeRouteCalculatorResult withUpdateTime(java.util.Date updateTime) { - this.updateTime = updateTime; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -951,22 +951,22 @@ public DescribeRouteCalculatorResult withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCalculatorArn() != null) - sb.append("CalculatorArn: " + getCalculatorArn() + ","); if (getCalculatorName() != null) sb.append("CalculatorName: " + getCalculatorName() + ","); + if (getCalculatorArn() != null) + sb.append("CalculatorArn: " + getCalculatorArn() + ","); + if (getPricingPlan() != null) + sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); if (getCreateTime() != null) sb.append("CreateTime: " + getCreateTime() + ","); + if (getUpdateTime() != null) + sb.append("UpdateTime: " + getUpdateTime() + ","); if (getDataSource() != null) sb.append("DataSource: " + getDataSource() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); - if (getPricingPlan() != null) - sb.append("PricingPlan: " + getPricingPlan() + ","); if (getTags() != null) - sb.append("Tags: " + getTags() + ","); - if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("Tags: " + getTags()); sb.append("}"); return sb.toString(); } @@ -976,18 +976,18 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode - + ((getCalculatorArn() == null) ? 0 : getCalculatorArn().hashCode()); hashCode = prime * hashCode + ((getCalculatorName() == null) ? 0 : getCalculatorName().hashCode()); - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); + + ((getCalculatorArn() == null) ? 0 : getCalculatorArn().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); - hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); + hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); return hashCode; } @@ -1002,45 +1002,45 @@ public boolean equals(Object obj) { return false; DescribeRouteCalculatorResult other = (DescribeRouteCalculatorResult) obj; - if (other.getCalculatorArn() == null ^ this.getCalculatorArn() == null) - return false; - if (other.getCalculatorArn() != null - && other.getCalculatorArn().equals(this.getCalculatorArn()) == false) - return false; if (other.getCalculatorName() == null ^ this.getCalculatorName() == null) return false; if (other.getCalculatorName() != null && other.getCalculatorName().equals(this.getCalculatorName()) == false) return false; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getCalculatorArn() == null ^ this.getCalculatorArn() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getCalculatorArn() != null + && other.getCalculatorArn().equals(this.getCalculatorArn()) == false) return false; - if (other.getDataSource() == null ^ this.getDataSource() == null) + if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; - if (other.getDataSource() != null - && other.getDataSource().equals(this.getDataSource()) == false) + if (other.getPricingPlan() != null + && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false; - if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) - return false; - if (other.getPricingPlan() != null - && other.getPricingPlan().equals(this.getPricingPlan()) == false) - return false; - if (other.getTags() == null ^ this.getTags() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; + if (other.getDataSource() == null ^ this.getDataSource() == null) + return false; + if (other.getDataSource() != null + && other.getDataSource().equals(this.getDataSource()) == false) + return false; + if (other.getTags() == null ^ this.getTags() == null) + return false; + if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerRequest.java index 6a35d8da79..2740929af7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class DescribeTrackerRequest extends AmazonWebServiceRequest implements S *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String trackerName; @@ -43,7 +43,7 @@ public class DescribeTrackerRequest extends AmazonWebServiceRequest implements S *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the tracker resource. @@ -60,7 +60,7 @@ public String getTrackerName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param trackerName

    * The name of the tracker resource. @@ -80,7 +80,7 @@ public void setTrackerName(String trackerName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param trackerName

    * The name of the tracker resource. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerResult.java index 41b9214329..c11c296c15 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DescribeTrackerResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,12 +20,36 @@ public class DescribeTrackerResult implements Serializable { /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private java.util.Date createTime; + private String trackerName; + + /** + *

    + * The Amazon Resource Name (ARN) for the tracker resource. Used when you + * need to specify a resource across all Amazon Web Services. + *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker + *

      + *
      • + *
    + *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    + */ + private String trackerArn; /** *

    @@ -39,12 +63,46 @@ public class DescribeTrackerResult implements Serializable { /** *

    - * Whether UPDATE events from this tracker in EventBridge are - * enabled. If set to true these events will be sent to - * EventBridge. + * Always returns RequestBasedUsage. *

    + *

    + * Constraints:
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private Boolean eventBridgeEnabled; + private String pricingPlan; + + /** + *

    + * No longer used. Always returns an empty string. + *

    + */ + private String pricingPlanDataSource; + + /** + *

    + * The tags associated with the tracker resource. + *

    + */ + private java.util.Map tags; + + /** + *

    + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date createTime; + + /** + *

    + * The timestamp for when the tracker resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date updateTime; /** *

    @@ -71,50 +129,55 @@ public class DescribeTrackerResult implements Serializable { /** *

    - * Always returns RequestBasedUsage. + * Whether UPDATE events from this tracker in EventBridge are + * enabled. If set to true these events will be sent to + * EventBridge. *

    - *

    - * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement */ - private String pricingPlan; + private Boolean eventBridgeEnabled; /** *

    - * No longer used. Always returns an empty string. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

    - */ - private String pricingPlanDataSource; - - /** *

    - * The tags associated with the tracker resource. + * This parameter is only used if you are using a KMS customer managed key. *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. + *

    + *     */ - private java.util.Map tags; + private Boolean kmsKeyEnableGeospatialQueries; /** *

    - * The Amazon Resource Name (ARN) for the tracker resource. Used when you - * need to specify a resource across all Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + * The name of the tracker resource. *

      - *
      • - *
    *

    * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the tracker resource. + *

    */ - private String trackerArn; + public String getTrackerName() { + return trackerName; + } /** *

    @@ -123,73 +186,156 @@ public class DescribeTrackerResult implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The name of the tracker resource. + *

    */ - private String trackerName; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } /** *

    - * The timestamp for when the tracker resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The name of the tracker resource. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public DescribeTrackerResult withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The Amazon Resource Name (ARN) for the tracker resource. Used when you + * need to specify a resource across all Amazon Web Services. + *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker *

      + *
      • + *
    + *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @return

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The Amazon Resource Name (ARN) for the tracker resource. Used + * when you need to specify a resource across all Amazon Web + * Services. + *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker *

      + *
      • + *
    */ - public java.util.Date getCreateTime() { - return createTime; + public String getTrackerArn() { + return trackerArn; } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The Amazon Resource Name (ARN) for the tracker resource. Used when you + * need to specify a resource across all Amazon Web Services. *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker + *

      + *
      • + *
    + *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * - * @param createTime

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param trackerArn

    + * The Amazon Resource Name (ARN) for the tracker resource. Used + * when you need to specify a resource across all Amazon Web + * Services. + *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker *

      + *
      • + *
    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setTrackerArn(String trackerArn) { + this.trackerArn = trackerArn; } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The Amazon Resource Name (ARN) for the tracker resource. Used when you + * need to specify a resource across all Amazon Web Services. + *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker *

      + *
      • + *
    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 0 - 1600
    + * Pattern: + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * - * @param createTime

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param trackerArn

    + * The Amazon Resource Name (ARN) for the tracker resource. Used + * when you need to specify a resource across all Amazon Web + * Services. + *

    + *
      + *
    • + *

      + * Format example: + * arn:aws:geo:region:account-id:tracker/ExampleTracker *

      + *
      • + *
    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribeTrackerResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public DescribeTrackerResult withTrackerArn(String trackerArn) { + this.trackerArn = trackerArn; return this; } @@ -247,249 +393,6 @@ public DescribeTrackerResult withDescription(String description) { return this; } - /** - *

    - * Whether UPDATE events from this tracker in EventBridge are - * enabled. If set to true these events will be sent to - * EventBridge. - *

    - * - * @return

    - * Whether UPDATE events from this tracker in - * EventBridge are enabled. If set to true these events - * will be sent to EventBridge. - *

    - */ - public Boolean isEventBridgeEnabled() { - return eventBridgeEnabled; - } - - /** - *

    - * Whether UPDATE events from this tracker in EventBridge are - * enabled. If set to true these events will be sent to - * EventBridge. - *

    - * - * @return

    - * Whether UPDATE events from this tracker in - * EventBridge are enabled. If set to true these events - * will be sent to EventBridge. - *

    - */ - public Boolean getEventBridgeEnabled() { - return eventBridgeEnabled; - } - - /** - *

    - * Whether UPDATE events from this tracker in EventBridge are - * enabled. If set to true these events will be sent to - * EventBridge. - *

    - * - * @param eventBridgeEnabled

    - * Whether UPDATE events from this tracker in - * EventBridge are enabled. If set to true these - * events will be sent to EventBridge. - *

    - */ - public void setEventBridgeEnabled(Boolean eventBridgeEnabled) { - this.eventBridgeEnabled = eventBridgeEnabled; - } - - /** - *

    - * Whether UPDATE events from this tracker in EventBridge are - * enabled. If set to true these events will be sent to - * EventBridge. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param eventBridgeEnabled

    - * Whether UPDATE events from this tracker in - * EventBridge are enabled. If set to true these - * events will be sent to EventBridge. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeTrackerResult withEventBridgeEnabled(Boolean eventBridgeEnabled) { - this.eventBridgeEnabled = eventBridgeEnabled; - return this; - } - - /** - *

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon - * Location resource. - *

    - *

    - * Constraints:
    - * Length: 1 - 2048
    - * - * @return

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the - * Amazon Location resource. - *

    - */ - public String getKmsKeyId() { - return kmsKeyId; - } - - /** - *

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon - * Location resource. - *

    - *

    - * Constraints:
    - * Length: 1 - 2048
    - * - * @param kmsKeyId

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to - * the Amazon Location resource. - *

    - */ - public void setKmsKeyId(String kmsKeyId) { - this.kmsKeyId = kmsKeyId; - } - - /** - *

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon - * Location resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 2048
    - * - * @param kmsKeyId

    - * A key identifier for an Amazon Web Services KMS customer managed key assigned to - * the Amazon Location resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DescribeTrackerResult withKmsKeyId(String kmsKeyId) { - this.kmsKeyId = kmsKeyId; - return this; - } - - /** - *

    - * The position filtering method of the tracker resource. - *

    - *

    - * Constraints:
    - * Allowed Values: TimeBased, DistanceBased, AccuracyBased - * - * @return

    - * The position filtering method of the tracker resource. - *

    - * @see PositionFiltering - */ - public String getPositionFiltering() { - return positionFiltering; - } - - /** - *

    - * The position filtering method of the tracker resource. - *

    - *

    - * Constraints:
    - * Allowed Values: TimeBased, DistanceBased, AccuracyBased - * - * @param positionFiltering

    - * The position filtering method of the tracker resource. - *

    - * @see PositionFiltering - */ - public void setPositionFiltering(String positionFiltering) { - this.positionFiltering = positionFiltering; - } - - /** - *

    - * The position filtering method of the tracker resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Allowed Values: TimeBased, DistanceBased, AccuracyBased - * - * @param positionFiltering

    - * The position filtering method of the tracker resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PositionFiltering - */ - public DescribeTrackerResult withPositionFiltering(String positionFiltering) { - this.positionFiltering = positionFiltering; - return this; - } - - /** - *

    - * The position filtering method of the tracker resource. - *

    - *

    - * Constraints:
    - * Allowed Values: TimeBased, DistanceBased, AccuracyBased - * - * @param positionFiltering

    - * The position filtering method of the tracker resource. - *

    - * @see PositionFiltering - */ - public void setPositionFiltering(PositionFiltering positionFiltering) { - this.positionFiltering = positionFiltering.toString(); - } - - /** - *

    - * The position filtering method of the tracker resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Allowed Values: TimeBased, DistanceBased, AccuracyBased - * - * @param positionFiltering

    - * The position filtering method of the tracker resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PositionFiltering - */ - public DescribeTrackerResult withPositionFiltering(PositionFiltering positionFiltering) { - this.positionFiltering = positionFiltering.toString(); - return this; - } - /** *

    * Always returns RequestBasedUsage. @@ -719,237 +622,587 @@ public DescribeTrackerResult clearTagsEntries() { /** *

    - * The Amazon Resource Name (ARN) for the tracker resource. Used when you - * need to specify a resource across all Amazon Web Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    - *

    - * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    * * @return

    - * The Amazon Resource Name (ARN) for the tracker resource. Used - * when you need to specify a resource across all Amazon Web - * Services. + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

      + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * + * @param createTime

      + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

      + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

      + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeTrackerResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + + /** + *

      + * The timestamp for when the tracker resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * + * @return

      + * The timestamp for when the tracker resource was last updated in + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

      - *
      • - *
    */ - public String getTrackerArn() { - return trackerArn; + public java.util.Date getUpdateTime() { + return updateTime; } /** *

    - * The Amazon Resource Name (ARN) for the tracker resource. Used when you - * need to specify a resource across all Amazon Web Services. + * The timestamp for when the tracker resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *
      - *
    • + * + * @param updateTime

      + * The timestamp for when the tracker resource was last updated + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + */ + public void setUpdateTime(java.util.Date updateTime) { + this.updateTime = updateTime; + } + + /** *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + * The timestamp for when the tracker resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param updateTime

      + * The timestamp for when the tracker resource was last updated + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

      + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DescribeTrackerResult withUpdateTime(java.util.Date updateTime) { + this.updateTime = updateTime; + return this; + } + + /** + *

      + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon + * Location resource. *

      - *
      • - *
    *

    * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * Length: 1 - 2048
    * - * @param trackerArn

    - * The Amazon Resource Name (ARN) for the tracker resource. Used - * when you need to specify a resource across all Amazon Web - * Services. + * @return

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the + * Amazon Location resource. + *

    + */ + public String getKmsKeyId() { + return kmsKeyId; + } + + /** + *

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon + * Location resource. + *

    + *

    + * Constraints:
    + * Length: 1 - 2048
    + * + * @param kmsKeyId

    + * A key identifier for an Amazon Web Services KMS customer managed key assigned to + * the Amazon Location resource. *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + */ + public void setKmsKeyId(String kmsKeyId) { + this.kmsKeyId = kmsKeyId; + } + + /** + *

      + * A key identifier for an Amazon Web Services KMS customer managed key assigned to the Amazon + * Location resource. + *

      + *

      + * Returns a reference to this object so that method calls can be chained + * together. + *

      + * Constraints:
      + * Length: 1 - 2048
      + * + * @param kmsKeyId

      + * A key identifier for an Amazon Web Services KMS customer managed key assigned to + * the Amazon Location resource. *

      - *
      • - *
    + * @return A reference to this updated object so that method calls can be + * chained together. */ - public void setTrackerArn(String trackerArn) { - this.trackerArn = trackerArn; + public DescribeTrackerResult withKmsKeyId(String kmsKeyId) { + this.kmsKeyId = kmsKeyId; + return this; } /** *

    - * The Amazon Resource Name (ARN) for the tracker resource. Used when you - * need to specify a resource across all Amazon Web Services. + * The position filtering method of the tracker resource. *

    - *
      - *
    • *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + * Constraints:
      + * Allowed Values: TimeBased, DistanceBased, AccuracyBased + * + * @return

      + * The position filtering method of the tracker resource. + *

      + * @see PositionFiltering + */ + public String getPositionFiltering() { + return positionFiltering; + } + + /** + *

      + * The position filtering method of the tracker resource. + *

      + *

      + * Constraints:
      + * Allowed Values: TimeBased, DistanceBased, AccuracyBased + * + * @param positionFiltering

      + * The position filtering method of the tracker resource. + *

      + * @see PositionFiltering + */ + public void setPositionFiltering(String positionFiltering) { + this.positionFiltering = positionFiltering; + } + + /** + *

      + * The position filtering method of the tracker resource. *

      - *
      • - *
    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 0 - 1600
    - * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * Allowed Values: TimeBased, DistanceBased, AccuracyBased * - * @param trackerArn

    - * The Amazon Resource Name (ARN) for the tracker resource. Used - * when you need to specify a resource across all Amazon Web - * Services. - *

    - *
      - *
    • - *

      - * Format example: - * arn:aws:geo:region:account-id:tracker/ExampleTracker + * @param positionFiltering

      + * The position filtering method of the tracker resource. *

      - *
      • - *
    * @return A reference to this updated object so that method calls can be * chained together. + * @see PositionFiltering */ - public DescribeTrackerResult withTrackerArn(String trackerArn) { - this.trackerArn = trackerArn; + public DescribeTrackerResult withPositionFiltering(String positionFiltering) { + this.positionFiltering = positionFiltering; + return this; + } + + /** + *

    + * The position filtering method of the tracker resource. + *

    + *

    + * Constraints:
    + * Allowed Values: TimeBased, DistanceBased, AccuracyBased + * + * @param positionFiltering

    + * The position filtering method of the tracker resource. + *

    + * @see PositionFiltering + */ + public void setPositionFiltering(PositionFiltering positionFiltering) { + this.positionFiltering = positionFiltering.toString(); + } + + /** + *

    + * The position filtering method of the tracker resource. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: TimeBased, DistanceBased, AccuracyBased + * + * @param positionFiltering

    + * The position filtering method of the tracker resource. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PositionFiltering + */ + public DescribeTrackerResult withPositionFiltering(PositionFiltering positionFiltering) { + this.positionFiltering = positionFiltering.toString(); return this; } /** *

    - * The name of the tracker resource. + * Whether UPDATE events from this tracker in EventBridge are + * enabled. If set to true these events will be sent to + * EventBridge. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The name of the tracker resource. + * Whether UPDATE events from this tracker in + * EventBridge are enabled. If set to true these events + * will be sent to EventBridge. *

    */ - public String getTrackerName() { - return trackerName; + public Boolean isEventBridgeEnabled() { + return eventBridgeEnabled; } /** *

    - * The name of the tracker resource. + * Whether UPDATE events from this tracker in EventBridge are + * enabled. If set to true these events will be sent to + * EventBridge. *

    + * + * @return

    + * Whether UPDATE events from this tracker in + * EventBridge are enabled. If set to true these events + * will be sent to EventBridge. + *

    + */ + public Boolean getEventBridgeEnabled() { + return eventBridgeEnabled; + } + + /** *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Whether UPDATE events from this tracker in EventBridge are + * enabled. If set to true these events will be sent to + * EventBridge. + *

    * - * @param trackerName

    - * The name of the tracker resource. + * @param eventBridgeEnabled

    + * Whether UPDATE events from this tracker in + * EventBridge are enabled. If set to true these + * events will be sent to EventBridge. *

    */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setEventBridgeEnabled(Boolean eventBridgeEnabled) { + this.eventBridgeEnabled = eventBridgeEnabled; } /** *

    - * The name of the tracker resource. + * Whether UPDATE events from this tracker in EventBridge are + * enabled. If set to true these events will be sent to + * EventBridge. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The name of the tracker resource. + * @param eventBridgeEnabled

    + * Whether UPDATE events from this tracker in + * EventBridge are enabled. If set to true these + * events will be sent to EventBridge. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribeTrackerResult withTrackerName(String trackerName) { - this.trackerName = trackerName; + public DescribeTrackerResult withEventBridgeEnabled(Boolean eventBridgeEnabled) { + this.eventBridgeEnabled = eventBridgeEnabled; return this; } /** *

    - * The timestamp for when the tracker resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. + *

    + *

    + * This parameter is only used if you are using a KMS customer managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. *

    + *     * * @return

    - * The timestamp for when the tracker resource was last updated in - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Enables GeospatialQueries for a tracker that uses a + * Amazon Web Services KMS customer managed key. + *

    + *

    + * This parameter is only used if you are using a KMS customer + * managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true when + * creating or updating a Tracker. *

    + *     */ - public java.util.Date getUpdateTime() { - return updateTime; + public Boolean isKmsKeyEnableGeospatialQueries() { + return kmsKeyEnableGeospatialQueries; } /** *

    - * The timestamp for when the tracker resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. + *

    + *

    + * This parameter is only used if you are using a KMS customer managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. *

    + *     * - * @param updateTime

    - * The timestamp for when the tracker resource was last updated - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @return

    + * Enables GeospatialQueries for a tracker that uses a + * Amazon Web Services KMS customer managed key. + *

    + *

    + * This parameter is only used if you are using a KMS customer + * managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true when + * creating or updating a Tracker. + *

    + *     + */ + public Boolean getKmsKeyEnableGeospatialQueries() { + return kmsKeyEnableGeospatialQueries; + } + + /** + *

    + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. + *

    + *

    + * This parameter is only used if you are using a KMS customer managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. + *

    + *     + * + * @param kmsKeyEnableGeospatialQueries

    + * Enables GeospatialQueries for a tracker that uses + * a Amazon Web Services KMS customer managed key. *

    + *

    + * This parameter is only used if you are using a KMS customer + * managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true + * when creating or updating a Tracker. + *

    + *     */ - public void setUpdateTime(java.util.Date updateTime) { - this.updateTime = updateTime; + public void setKmsKeyEnableGeospatialQueries(Boolean kmsKeyEnableGeospatialQueries) { + this.kmsKeyEnableGeospatialQueries = kmsKeyEnableGeospatialQueries; } /** *

    - * The timestamp for when the tracker resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. + *

    + *

    + * This parameter is only used if you are using a KMS customer managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer managed key, + * then the Bounding Polygon Queries feature will be disabled by default. + * This is because by using this feature, a representation of your device + * positions will not be encrypted using the your KMS managed key. The exact + * device position, however; is still encrypted using your managed key. *

    *

    + * You can choose to opt-in to the Bounding Polygon Quseries feature. This + * is done by setting the KmsKeyEnableGeospatialQueries + * parameter to true when creating or updating a Tracker. + *

    + *     + *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param updateTime

    - * The timestamp for when the tracker resource was last updated - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param kmsKeyEnableGeospatialQueries

    + * Enables GeospatialQueries for a tracker that uses + * a Amazon Web Services KMS customer managed key. *

    + *

    + * This parameter is only used if you are using a KMS customer + * managed key. + *

    + * + *

    + * If you wish to encrypt your data using your own KMS customer + * managed key, then the Bounding Polygon Queries feature will be + * disabled by default. This is because by using this feature, a + * representation of your device positions will not be encrypted + * using the your KMS managed key. The exact device position, + * however; is still encrypted using your managed key. + *

    + *

    + * You can choose to opt-in to the Bounding Polygon Quseries + * feature. This is done by setting the + * KmsKeyEnableGeospatialQueries parameter to true + * when creating or updating a Tracker. + *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ - public DescribeTrackerResult withUpdateTime(java.util.Date updateTime) { - this.updateTime = updateTime; + public DescribeTrackerResult withKmsKeyEnableGeospatialQueries( + Boolean kmsKeyEnableGeospatialQueries) { + this.kmsKeyEnableGeospatialQueries = kmsKeyEnableGeospatialQueries; return this; } @@ -964,28 +1217,30 @@ public DescribeTrackerResult withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); + if (getTrackerArn() != null) + sb.append("TrackerArn: " + getTrackerArn() + ","); if (getDescription() != null) sb.append("Description: " + getDescription() + ","); - if (getEventBridgeEnabled() != null) - sb.append("EventBridgeEnabled: " + getEventBridgeEnabled() + ","); - if (getKmsKeyId() != null) - sb.append("KmsKeyId: " + getKmsKeyId() + ","); - if (getPositionFiltering() != null) - sb.append("PositionFiltering: " + getPositionFiltering() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); if (getPricingPlanDataSource() != null) sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); if (getTags() != null) sb.append("Tags: " + getTags() + ","); - if (getTrackerArn() != null) - sb.append("TrackerArn: " + getTrackerArn() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("UpdateTime: " + getUpdateTime() + ","); + if (getKmsKeyId() != null) + sb.append("KmsKeyId: " + getKmsKeyId() + ","); + if (getPositionFiltering() != null) + sb.append("PositionFiltering: " + getPositionFiltering() + ","); + if (getEventBridgeEnabled() != null) + sb.append("EventBridgeEnabled: " + getEventBridgeEnabled() + ","); + if (getKmsKeyEnableGeospatialQueries() != null) + sb.append("KmsKeyEnableGeospatialQueries: " + getKmsKeyEnableGeospatialQueries()); sb.append("}"); return sb.toString(); } @@ -995,24 +1250,28 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode - + ((getEventBridgeEnabled() == null) ? 0 : getEventBridgeEnabled().hashCode()); - hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getTrackerArn() == null) ? 0 : getTrackerArn().hashCode()); hashCode = prime * hashCode - + ((getPositionFiltering() == null) ? 0 : getPositionFiltering().hashCode()); + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); - hashCode = prime * hashCode + ((getTrackerArn() == null) ? 0 : getTrackerArn().hashCode()); - hashCode = prime * hashCode - + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); + hashCode = prime * hashCode + + ((getPositionFiltering() == null) ? 0 : getPositionFiltering().hashCode()); + hashCode = prime * hashCode + + ((getEventBridgeEnabled() == null) ? 0 : getEventBridgeEnabled().hashCode()); + hashCode = prime + * hashCode + + ((getKmsKeyEnableGeospatialQueries() == null) ? 0 + : getKmsKeyEnableGeospatialQueries().hashCode()); return hashCode; } @@ -1027,30 +1286,21 @@ public boolean equals(Object obj) { return false; DescribeTrackerResult other = (DescribeTrackerResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) + return false; + if (other.getTrackerArn() == null ^ this.getTrackerArn() == null) + return false; + if (other.getTrackerArn() != null + && other.getTrackerArn().equals(this.getTrackerArn()) == false) return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false; - if (other.getEventBridgeEnabled() == null ^ this.getEventBridgeEnabled() == null) - return false; - if (other.getEventBridgeEnabled() != null - && other.getEventBridgeEnabled().equals(this.getEventBridgeEnabled()) == false) - return false; - if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) - return false; - if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) - return false; - if (other.getPositionFiltering() == null ^ this.getPositionFiltering() == null) - return false; - if (other.getPositionFiltering() != null - && other.getPositionFiltering().equals(this.getPositionFiltering()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null @@ -1065,21 +1315,37 @@ public boolean equals(Object obj) { return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; - if (other.getTrackerArn() == null ^ this.getTrackerArn() == null) - return false; - if (other.getTrackerArn() != null - && other.getTrackerArn().equals(this.getTrackerArn()) == false) - return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; + if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null) + return false; + if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) + return false; + if (other.getPositionFiltering() == null ^ this.getPositionFiltering() == null) + return false; + if (other.getPositionFiltering() != null + && other.getPositionFiltering().equals(this.getPositionFiltering()) == false) + return false; + if (other.getEventBridgeEnabled() == null ^ this.getEventBridgeEnabled() == null) + return false; + if (other.getEventBridgeEnabled() != null + && other.getEventBridgeEnabled().equals(this.getEventBridgeEnabled()) == false) + return false; + if (other.getKmsKeyEnableGeospatialQueries() == null + ^ this.getKmsKeyEnableGeospatialQueries() == null) + return false; + if (other.getKmsKeyEnableGeospatialQueries() != null + && other.getKmsKeyEnableGeospatialQueries().equals( + this.getKmsKeyEnableGeospatialQueries()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePosition.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePosition.java index 0f38fe236a..a2e0a90c18 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePosition.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePosition.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,21 +25,32 @@ public class DevicePosition implements Serializable { /** *

    - * The accuracy of the device position. + * The device whose position you retrieved. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    */ - private PositionalAccuracy accuracy; + private String deviceId; /** *

    - * The device whose position you retrieved. + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    + */ + private java.util.Date sampleTime; + + /** *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    */ - private String deviceId; + private java.util.Date receivedTime; /** *

    @@ -48,6 +59,13 @@ public class DevicePosition implements Serializable { */ private java.util.List position; + /** + *

    + * The accuracy of the device position. + *

    + */ + private PositionalAccuracy accuracy; + /** *

    * The properties associated with the position. @@ -57,121 +75,177 @@ public class DevicePosition implements Serializable { /** *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The device whose position you retrieved. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @return

    + * The device whose position you retrieved. + *

    */ - private java.util.Date receivedTime; + public String getDeviceId() { + return deviceId; + } /** *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The device whose position you retrieved. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param deviceId

    + * The device whose position you retrieved. + *

    */ - private java.util.Date sampleTime; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } /** *

    - * The accuracy of the device position. + * The device whose position you retrieved. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param deviceId

    + * The device whose position you retrieved. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DevicePosition withDeviceId(String deviceId) { + this.deviceId = deviceId; + return this; + } + + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * * @return

    - * The accuracy of the device position. + * The timestamp at which the device's position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public PositionalAccuracy getAccuracy() { - return accuracy; + public java.util.Date getSampleTime() { + return sampleTime; } /** *

    - * The accuracy of the device position. + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * - * @param accuracy

    - * The accuracy of the device position. + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; } /** *

    - * The accuracy of the device position. + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param accuracy

    - * The accuracy of the device position. + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DevicePosition withAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; + public DevicePosition withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; return this; } /** *

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * * @return

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device + * position in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public String getDeviceId() { - return deviceId; + public java.util.Date getReceivedTime() { + return receivedTime; } /** *

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param deviceId

    - * The device whose position you retrieved. + * @param receivedTime

    + * The timestamp for when the tracker resource received the + * device position in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; + public void setReceivedTime(java.util.Date receivedTime) { + this.receivedTime = receivedTime; } /** *

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param deviceId

    - * The device whose position you retrieved. + * @param receivedTime

    + * The timestamp for when the tracker resource received the + * device position in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DevicePosition withDeviceId(String deviceId) { - this.deviceId = deviceId; + public DevicePosition withReceivedTime(java.util.Date receivedTime) { + this.receivedTime = receivedTime; return this; } @@ -249,6 +323,51 @@ public DevicePosition withPosition(java.util.Collection position) { return this; } + /** + *

    + * The accuracy of the device position. + *

    + * + * @return

    + * The accuracy of the device position. + *

    + */ + public PositionalAccuracy getAccuracy() { + return accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + * + * @param accuracy

    + * The accuracy of the device position. + *

    + */ + public void setAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param accuracy

    + * The accuracy of the device position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DevicePosition withAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + return this; + } + /** *

    * The properties associated with the position. @@ -331,125 +450,6 @@ public DevicePosition clearPositionPropertiesEntries() { return this; } - /** - *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp for when the tracker resource received the device - * position in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getReceivedTime() { - return receivedTime; - } - - /** - *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param receivedTime

    - * The timestamp for when the tracker resource received the - * device position in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public void setReceivedTime(java.util.Date receivedTime) { - this.receivedTime = receivedTime; - } - - /** - *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param receivedTime

    - * The timestamp for when the tracker resource received the - * device position in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DevicePosition withReceivedTime(java.util.Date receivedTime) { - this.receivedTime = receivedTime; - return this; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp at which the device's position was determined. Uses - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getSampleTime() { - return sampleTime; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param sampleTime

    - * The timestamp at which the device's position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public void setSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param sampleTime

    - * The timestamp at which the device's position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DevicePosition withSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -461,18 +461,18 @@ public DevicePosition withSampleTime(java.util.Date sampleTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getAccuracy() != null) - sb.append("Accuracy: " + getAccuracy() + ","); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); + if (getSampleTime() != null) + sb.append("SampleTime: " + getSampleTime() + ","); + if (getReceivedTime() != null) + sb.append("ReceivedTime: " + getReceivedTime() + ","); if (getPosition() != null) sb.append("Position: " + getPosition() + ","); + if (getAccuracy() != null) + sb.append("Accuracy: " + getAccuracy() + ","); if (getPositionProperties() != null) - sb.append("PositionProperties: " + getPositionProperties() + ","); - if (getReceivedTime() != null) - sb.append("ReceivedTime: " + getReceivedTime() + ","); - if (getSampleTime() != null) - sb.append("SampleTime: " + getSampleTime()); + sb.append("PositionProperties: " + getPositionProperties()); sb.append("}"); return sb.toString(); } @@ -482,14 +482,14 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); + hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); + hashCode = prime * hashCode + + ((getReceivedTime() == null) ? 0 : getReceivedTime().hashCode()); hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getPositionProperties() == null) ? 0 : getPositionProperties().hashCode()); - hashCode = prime * hashCode - + ((getReceivedTime() == null) ? 0 : getReceivedTime().hashCode()); - hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); return hashCode; } @@ -504,32 +504,32 @@ public boolean equals(Object obj) { return false; DevicePosition other = (DevicePosition) obj; - if (other.getAccuracy() == null ^ this.getAccuracy() == null) - return false; - if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) - return false; if (other.getDeviceId() == null ^ this.getDeviceId() == null) return false; if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; - if (other.getPosition() == null ^ this.getPosition() == null) - return false; - if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) - return false; - if (other.getPositionProperties() == null ^ this.getPositionProperties() == null) + if (other.getSampleTime() == null ^ this.getSampleTime() == null) return false; - if (other.getPositionProperties() != null - && other.getPositionProperties().equals(this.getPositionProperties()) == false) + if (other.getSampleTime() != null + && other.getSampleTime().equals(this.getSampleTime()) == false) return false; if (other.getReceivedTime() == null ^ this.getReceivedTime() == null) return false; if (other.getReceivedTime() != null && other.getReceivedTime().equals(this.getReceivedTime()) == false) return false; - if (other.getSampleTime() == null ^ this.getSampleTime() == null) + if (other.getPosition() == null ^ this.getPosition() == null) return false; - if (other.getSampleTime() != null - && other.getSampleTime().equals(this.getSampleTime()) == false) + if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) + return false; + if (other.getAccuracy() == null ^ this.getAccuracy() == null) + return false; + if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) + return false; + if (other.getPositionProperties() == null ^ this.getPositionProperties() == null) + return false; + if (other.getPositionProperties() != null + && other.getPositionProperties().equals(this.getPositionProperties()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePositionUpdate.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePositionUpdate.java index 5fd711bdc1..6e1a909efe 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePositionUpdate.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DevicePositionUpdate.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -23,13 +23,6 @@ *

    */ public class DevicePositionUpdate implements Serializable { - /** - *

    - * The accuracy of the device position. - *

    - */ - private PositionalAccuracy accuracy; - /** *

    * The device associated to the position update. @@ -37,10 +30,19 @@ public class DevicePositionUpdate implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String deviceId; + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + private java.util.Date sampleTime; + /** *

    * The latest device position defined in position; + /** + *

    + * The accuracy of the device position. + *

    + */ + private PositionalAccuracy accuracy; + /** *

    * Associates one of more properties with the position update. A property is @@ -64,112 +73,117 @@ public class DevicePositionUpdate implements Serializable { /** *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The device associated to the position update. *

    - */ - private java.util.Date sampleTime; - - /** *

    - * The accuracy of the device position. - *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    - * The accuracy of the device position. + * The device associated to the position update. *

    */ - public PositionalAccuracy getAccuracy() { - return accuracy; + public String getDeviceId() { + return deviceId; } /** *

    - * The accuracy of the device position. + * The device associated to the position update. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param accuracy

    - * The accuracy of the device position. + * @param deviceId

    + * The device associated to the position update. *

    */ - public void setAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } /** *

    - * The accuracy of the device position. + * The device associated to the position update. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param accuracy

    - * The accuracy of the device position. + * @param deviceId

    + * The device associated to the position update. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DevicePositionUpdate withAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; + public DevicePositionUpdate withDeviceId(String deviceId) { + this.deviceId = deviceId; return this; } /** *

    - * The device associated to the position update. + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * * @return

    - * The device associated to the position update. + * The timestamp at which the device's position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    */ - public String getDeviceId() { - return deviceId; + public java.util.Date getSampleTime() { + return sampleTime; } /** *

    - * The device associated to the position update. + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param deviceId

    - * The device associated to the position update. + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    */ - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; } /** *

    - * The device associated to the position update. + * The timestamp at which the device's position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param deviceId

    - * The device associated to the position update. + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public DevicePositionUpdate withDeviceId(String deviceId) { - this.deviceId = deviceId; + public DevicePositionUpdate withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; return this; } @@ -266,6 +280,51 @@ public DevicePositionUpdate withPosition(java.util.Collection position) return this; } + /** + *

    + * The accuracy of the device position. + *

    + * + * @return

    + * The accuracy of the device position. + *

    + */ + public PositionalAccuracy getAccuracy() { + return accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + * + * @param accuracy

    + * The accuracy of the device position. + *

    + */ + public void setAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param accuracy

    + * The accuracy of the device position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DevicePositionUpdate withAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + return this; + } + /** *

    * Associates one of more properties with the position update. A property is @@ -384,65 +443,6 @@ public DevicePositionUpdate clearPositionPropertiesEntries() { return this; } - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * - * @return

    - * The timestamp at which the device's position was determined. Uses - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - public java.util.Date getSampleTime() { - return sampleTime; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * - * @param sampleTime

    - * The timestamp at which the device's position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - public void setSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param sampleTime

    - * The timestamp at which the device's position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DevicePositionUpdate withSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -454,16 +454,16 @@ public DevicePositionUpdate withSampleTime(java.util.Date sampleTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getAccuracy() != null) - sb.append("Accuracy: " + getAccuracy() + ","); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); + if (getSampleTime() != null) + sb.append("SampleTime: " + getSampleTime() + ","); if (getPosition() != null) sb.append("Position: " + getPosition() + ","); + if (getAccuracy() != null) + sb.append("Accuracy: " + getAccuracy() + ","); if (getPositionProperties() != null) - sb.append("PositionProperties: " + getPositionProperties() + ","); - if (getSampleTime() != null) - sb.append("SampleTime: " + getSampleTime()); + sb.append("PositionProperties: " + getPositionProperties()); sb.append("}"); return sb.toString(); } @@ -473,12 +473,12 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); + hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getPositionProperties() == null) ? 0 : getPositionProperties().hashCode()); - hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); return hashCode; } @@ -493,28 +493,28 @@ public boolean equals(Object obj) { return false; DevicePositionUpdate other = (DevicePositionUpdate) obj; - if (other.getAccuracy() == null ^ this.getAccuracy() == null) - return false; - if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) - return false; if (other.getDeviceId() == null ^ this.getDeviceId() == null) return false; if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; + if (other.getSampleTime() == null ^ this.getSampleTime() == null) + return false; + if (other.getSampleTime() != null + && other.getSampleTime().equals(this.getSampleTime()) == false) + return false; if (other.getPosition() == null ^ this.getPosition() == null) return false; if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) return false; + if (other.getAccuracy() == null ^ this.getAccuracy() == null) + return false; + if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) + return false; if (other.getPositionProperties() == null ^ this.getPositionProperties() == null) return false; if (other.getPositionProperties() != null && other.getPositionProperties().equals(this.getPositionProperties()) == false) return false; - if (other.getSampleTime() == null ^ this.getSampleTime() == null) - return false; - if (other.getSampleTime() != null - && other.getSampleTime().equals(this.getSampleTime()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeviceState.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeviceState.java new file mode 100644 index 0000000000..9dff944632 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DeviceState.java @@ -0,0 +1,588 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * The device's position, IP address, and Wi-Fi access points. + *

    + */ +public class DeviceState implements Serializable { + /** + *

    + * The device identifier. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + */ + private String deviceId; + + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date sampleTime; + + /** + *

    + * The last known device position. + *

    + */ + private java.util.List position; + + /** + *

    + * Defines the level of certainty of the position. + *

    + */ + private PositionalAccuracy accuracy; + + /** + *

    + * The device's Ipv4 address. + *

    + *

    + * Constraints:
    + * Pattern: (?:(?:25[0-5]|(?:2[0-4]|1\d|[0-9]|)\d)\.?\b){4}
    + */ + private String ipv4Address; + + /** + *

    + * The Wi-Fi access points the device is using. + *

    + */ + private java.util.List wiFiAccessPoints; + + /** + *

    + * The cellular network infrastructure that the device is connected to. + *

    + */ + private CellSignals cellSignals; + + /** + *

    + * The device identifier. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @return

    + * The device identifier. + *

    + */ + public String getDeviceId() { + return deviceId; + } + + /** + *

    + * The device identifier. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param deviceId

    + * The device identifier. + *

    + */ + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + /** + *

    + * The device identifier. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param deviceId

    + * The device identifier. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withDeviceId(String deviceId) { + this.deviceId = deviceId; + return this; + } + + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @return

    + * The timestamp at which the device's position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getSampleTime() { + return sampleTime; + } + + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; + } + + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; + return this; + } + + /** + *

    + * The last known device position. + *

    + * + * @return

    + * The last known device position. + *

    + */ + public java.util.List getPosition() { + return position; + } + + /** + *

    + * The last known device position. + *

    + * + * @param position

    + * The last known device position. + *

    + */ + public void setPosition(java.util.Collection position) { + if (position == null) { + this.position = null; + return; + } + + this.position = new java.util.ArrayList(position); + } + + /** + *

    + * The last known device position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The last known device position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withPosition(Double... position) { + if (getPosition() == null) { + this.position = new java.util.ArrayList(position.length); + } + for (Double value : position) { + this.position.add(value); + } + return this; + } + + /** + *

    + * The last known device position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The last known device position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withPosition(java.util.Collection position) { + setPosition(position); + return this; + } + + /** + *

    + * Defines the level of certainty of the position. + *

    + * + * @return

    + * Defines the level of certainty of the position. + *

    + */ + public PositionalAccuracy getAccuracy() { + return accuracy; + } + + /** + *

    + * Defines the level of certainty of the position. + *

    + * + * @param accuracy

    + * Defines the level of certainty of the position. + *

    + */ + public void setAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + } + + /** + *

    + * Defines the level of certainty of the position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param accuracy

    + * Defines the level of certainty of the position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + return this; + } + + /** + *

    + * The device's Ipv4 address. + *

    + *

    + * Constraints:
    + * Pattern: (?:(?:25[0-5]|(?:2[0-4]|1\d|[0-9]|)\d)\.?\b){4}
    + * + * @return

    + * The device's Ipv4 address. + *

    + */ + public String getIpv4Address() { + return ipv4Address; + } + + /** + *

    + * The device's Ipv4 address. + *

    + *

    + * Constraints:
    + * Pattern: (?:(?:25[0-5]|(?:2[0-4]|1\d|[0-9]|)\d)\.?\b){4}
    + * + * @param ipv4Address

    + * The device's Ipv4 address. + *

    + */ + public void setIpv4Address(String ipv4Address) { + this.ipv4Address = ipv4Address; + } + + /** + *

    + * The device's Ipv4 address. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Pattern: (?:(?:25[0-5]|(?:2[0-4]|1\d|[0-9]|)\d)\.?\b){4}
    + * + * @param ipv4Address

    + * The device's Ipv4 address. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withIpv4Address(String ipv4Address) { + this.ipv4Address = ipv4Address; + return this; + } + + /** + *

    + * The Wi-Fi access points the device is using. + *

    + * + * @return

    + * The Wi-Fi access points the device is using. + *

    + */ + public java.util.List getWiFiAccessPoints() { + return wiFiAccessPoints; + } + + /** + *

    + * The Wi-Fi access points the device is using. + *

    + * + * @param wiFiAccessPoints

    + * The Wi-Fi access points the device is using. + *

    + */ + public void setWiFiAccessPoints(java.util.Collection wiFiAccessPoints) { + if (wiFiAccessPoints == null) { + this.wiFiAccessPoints = null; + return; + } + + this.wiFiAccessPoints = new java.util.ArrayList(wiFiAccessPoints); + } + + /** + *

    + * The Wi-Fi access points the device is using. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param wiFiAccessPoints

    + * The Wi-Fi access points the device is using. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withWiFiAccessPoints(WiFiAccessPoint... wiFiAccessPoints) { + if (getWiFiAccessPoints() == null) { + this.wiFiAccessPoints = new java.util.ArrayList( + wiFiAccessPoints.length); + } + for (WiFiAccessPoint value : wiFiAccessPoints) { + this.wiFiAccessPoints.add(value); + } + return this; + } + + /** + *

    + * The Wi-Fi access points the device is using. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param wiFiAccessPoints

    + * The Wi-Fi access points the device is using. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withWiFiAccessPoints(java.util.Collection wiFiAccessPoints) { + setWiFiAccessPoints(wiFiAccessPoints); + return this; + } + + /** + *

    + * The cellular network infrastructure that the device is connected to. + *

    + * + * @return

    + * The cellular network infrastructure that the device is connected + * to. + *

    + */ + public CellSignals getCellSignals() { + return cellSignals; + } + + /** + *

    + * The cellular network infrastructure that the device is connected to. + *

    + * + * @param cellSignals

    + * The cellular network infrastructure that the device is + * connected to. + *

    + */ + public void setCellSignals(CellSignals cellSignals) { + this.cellSignals = cellSignals; + } + + /** + *

    + * The cellular network infrastructure that the device is connected to. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param cellSignals

    + * The cellular network infrastructure that the device is + * connected to. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DeviceState withCellSignals(CellSignals cellSignals) { + this.cellSignals = cellSignals; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getDeviceId() != null) + sb.append("DeviceId: " + getDeviceId() + ","); + if (getSampleTime() != null) + sb.append("SampleTime: " + getSampleTime() + ","); + if (getPosition() != null) + sb.append("Position: " + getPosition() + ","); + if (getAccuracy() != null) + sb.append("Accuracy: " + getAccuracy() + ","); + if (getIpv4Address() != null) + sb.append("Ipv4Address: " + getIpv4Address() + ","); + if (getWiFiAccessPoints() != null) + sb.append("WiFiAccessPoints: " + getWiFiAccessPoints() + ","); + if (getCellSignals() != null) + sb.append("CellSignals: " + getCellSignals()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); + hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); + hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); + hashCode = prime * hashCode + + ((getIpv4Address() == null) ? 0 : getIpv4Address().hashCode()); + hashCode = prime * hashCode + + ((getWiFiAccessPoints() == null) ? 0 : getWiFiAccessPoints().hashCode()); + hashCode = prime * hashCode + + ((getCellSignals() == null) ? 0 : getCellSignals().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof DeviceState == false) + return false; + DeviceState other = (DeviceState) obj; + + if (other.getDeviceId() == null ^ this.getDeviceId() == null) + return false; + if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) + return false; + if (other.getSampleTime() == null ^ this.getSampleTime() == null) + return false; + if (other.getSampleTime() != null + && other.getSampleTime().equals(this.getSampleTime()) == false) + return false; + if (other.getPosition() == null ^ this.getPosition() == null) + return false; + if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) + return false; + if (other.getAccuracy() == null ^ this.getAccuracy() == null) + return false; + if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) + return false; + if (other.getIpv4Address() == null ^ this.getIpv4Address() == null) + return false; + if (other.getIpv4Address() != null + && other.getIpv4Address().equals(this.getIpv4Address()) == false) + return false; + if (other.getWiFiAccessPoints() == null ^ this.getWiFiAccessPoints() == null) + return false; + if (other.getWiFiAccessPoints() != null + && other.getWiFiAccessPoints().equals(this.getWiFiAccessPoints()) == false) + return false; + if (other.getCellSignals() == null ^ this.getCellSignals() == null) + return false; + if (other.getCellSignals() != null + && other.getCellSignals().equals(this.getCellSignals()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DimensionUnit.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DimensionUnit.java index 1d1d81d5b8..d46ce788d2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DimensionUnit.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DimensionUnit.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerRequest.java index 843afb1a37..79bfa2f4cd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,6 +32,17 @@ */ public class DisassociateTrackerConsumerRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

    + * The name of the tracker resource to be dissociated from the consumer. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String trackerName; + /** *

    * The Amazon Resource Name (ARN) for the geofence collection to be @@ -50,8 +61,8 @@ public class DisassociateTrackerConsumerRequest extends AmazonWebServiceRequest * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    */ private String consumerArn; @@ -62,9 +73,58 @@ public class DisassociateTrackerConsumerRequest extends AmazonWebServiceRequest *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the tracker resource to be dissociated from the + * consumer. + *

    */ - private String trackerName; + public String getTrackerName() { + return trackerName; + } + + /** + *

    + * The name of the tracker resource to be dissociated from the consumer. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The name of the tracker resource to be dissociated from the + * consumer. + *

    + */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

    + * The name of the tracker resource to be dissociated from the consumer. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The name of the tracker resource to be dissociated from the + * consumer. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public DisassociateTrackerConsumerRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

    @@ -84,8 +144,8 @@ public class DisassociateTrackerConsumerRequest extends AmazonWebServiceRequest * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @return

    * The Amazon Resource Name (ARN) for the geofence collection to be @@ -123,8 +183,8 @@ public String getConsumerArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param consumerArn

    * The Amazon Resource Name (ARN) for the geofence collection to @@ -165,8 +225,8 @@ public void setConsumerArn(String consumerArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param consumerArn

    * The Amazon Resource Name (ARN) for the geofence collection to @@ -189,66 +249,6 @@ public DisassociateTrackerConsumerRequest withConsumerArn(String consumerArn) { return this; } - /** - *

    - * The name of the tracker resource to be dissociated from the consumer. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @return

    - * The name of the tracker resource to be dissociated from the - * consumer. - *

    - */ - public String getTrackerName() { - return trackerName; - } - - /** - *

    - * The name of the tracker resource to be dissociated from the consumer. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param trackerName

    - * The name of the tracker resource to be dissociated from the - * consumer. - *

    - */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; - } - - /** - *

    - * The name of the tracker resource to be dissociated from the consumer. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param trackerName

    - * The name of the tracker resource to be dissociated from the - * consumer. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public DisassociateTrackerConsumerRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -260,10 +260,10 @@ public DisassociateTrackerConsumerRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getConsumerArn() != null) - sb.append("ConsumerArn: " + getConsumerArn() + ","); if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + sb.append("TrackerName: " + getTrackerName() + ","); + if (getConsumerArn() != null) + sb.append("ConsumerArn: " + getConsumerArn()); sb.append("}"); return sb.toString(); } @@ -273,10 +273,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode - + ((getConsumerArn() == null) ? 0 : getConsumerArn().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + + ((getConsumerArn() == null) ? 0 : getConsumerArn().hashCode()); return hashCode; } @@ -291,16 +291,16 @@ public boolean equals(Object obj) { return false; DisassociateTrackerConsumerRequest other = (DisassociateTrackerConsumerRequest) obj; - if (other.getConsumerArn() == null ^ this.getConsumerArn() == null) - return false; - if (other.getConsumerArn() != null - && other.getConsumerArn().equals(this.getConsumerArn()) == false) - return false; if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; if (other.getTrackerName() != null && other.getTrackerName().equals(this.getTrackerName()) == false) return false; + if (other.getConsumerArn() == null ^ this.getConsumerArn() == null) + return false; + if (other.getConsumerArn() != null + && other.getConsumerArn().equals(this.getConsumerArn()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerResult.java index 1359682b2f..2b2b0eb487 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DisassociateTrackerConsumerResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DistanceUnit.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DistanceUnit.java index 1d247da7a3..43cebaf450 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DistanceUnit.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/DistanceUnit.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsDeviceState.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsDeviceState.java new file mode 100644 index 0000000000..c7b882de7b --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsDeviceState.java @@ -0,0 +1,221 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * The device's position, IP address, and WiFi access points. + *

    + */ +public class ForecastGeofenceEventsDeviceState implements Serializable { + /** + *

    + * The device's position. + *

    + */ + private java.util.List position; + + /** + *

    + * The device's speed. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + */ + private Double speed; + + /** + *

    + * The device's position. + *

    + * + * @return

    + * The device's position. + *

    + */ + public java.util.List getPosition() { + return position; + } + + /** + *

    + * The device's position. + *

    + * + * @param position

    + * The device's position. + *

    + */ + public void setPosition(java.util.Collection position) { + if (position == null) { + this.position = null; + return; + } + + this.position = new java.util.ArrayList(position); + } + + /** + *

    + * The device's position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The device's position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsDeviceState withPosition(Double... position) { + if (getPosition() == null) { + this.position = new java.util.ArrayList(position.length); + } + for (Double value : position) { + this.position.add(value); + } + return this; + } + + /** + *

    + * The device's position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The device's position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsDeviceState withPosition(java.util.Collection position) { + setPosition(position); + return this; + } + + /** + *

    + * The device's speed. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @return

    + * The device's speed. + *

    + */ + public Double getSpeed() { + return speed; + } + + /** + *

    + * The device's speed. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param speed

    + * The device's speed. + *

    + */ + public void setSpeed(Double speed) { + this.speed = speed; + } + + /** + *

    + * The device's speed. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param speed

    + * The device's speed. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsDeviceState withSpeed(Double speed) { + this.speed = speed; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getPosition() != null) + sb.append("Position: " + getPosition() + ","); + if (getSpeed() != null) + sb.append("Speed: " + getSpeed()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getSpeed() == null) ? 0 : getSpeed().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof ForecastGeofenceEventsDeviceState == false) + return false; + ForecastGeofenceEventsDeviceState other = (ForecastGeofenceEventsDeviceState) obj; + + if (other.getPosition() == null ^ this.getPosition() == null) + return false; + if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) + return false; + if (other.getSpeed() == null ^ this.getSpeed() == null) + return false; + if (other.getSpeed() != null && other.getSpeed().equals(this.getSpeed()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsRequest.java new file mode 100644 index 0000000000..b52b99f3af --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsRequest.java @@ -0,0 +1,887 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +import com.amazonaws.AmazonWebServiceRequest; + +/** + *

    + * Evaluates device positions against geofence geometries from a given geofence + * collection. The event forecasts three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would breach + * the fence if the device is moving at its current speed within time horizon + * window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach the + * fence if the device is moving at its current speed within time horizon + * window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is not + * moving. + *

    + */ +public class ForecastGeofenceEventsRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

    + * The name of the geofence collection. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String collectionName; + + /** + *

    + * The device's state, including current position and speed. + *

    + */ + private ForecastGeofenceEventsDeviceState deviceState; + + /** + *

    + * Specifies the time horizon in minutes for the forecasted events. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + */ + private Double timeHorizonMinutes; + + /** + *

    + * The distance unit used for the NearestDistance property + * returned in a forecasted event. The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + */ + private String distanceUnit; + + /** + *

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + */ + private String speedUnit; + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Default value: null + *

    + *

    + * Constraints:
    + * Length: 1 - 60000
    + */ + private String nextToken; + + /** + *

    + * An optional limit for the number of resources returned in a single call. + *

    + *

    + * Default value: 20 + *

    + *

    + * Constraints:
    + * Range: 1 - 20
    + */ + private Integer maxResults; + + /** + *

    + * The name of the geofence collection. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the geofence collection. + *

    + */ + public String getCollectionName() { + return collectionName; + } + + /** + *

    + * The name of the geofence collection. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param collectionName

    + * The name of the geofence collection. + *

    + */ + public void setCollectionName(String collectionName) { + this.collectionName = collectionName; + } + + /** + *

    + * The name of the geofence collection. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param collectionName

    + * The name of the geofence collection. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsRequest withCollectionName(String collectionName) { + this.collectionName = collectionName; + return this; + } + + /** + *

    + * The device's state, including current position and speed. + *

    + * + * @return

    + * The device's state, including current position and speed. + *

    + */ + public ForecastGeofenceEventsDeviceState getDeviceState() { + return deviceState; + } + + /** + *

    + * The device's state, including current position and speed. + *

    + * + * @param deviceState

    + * The device's state, including current position and speed. + *

    + */ + public void setDeviceState(ForecastGeofenceEventsDeviceState deviceState) { + this.deviceState = deviceState; + } + + /** + *

    + * The device's state, including current position and speed. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param deviceState

    + * The device's state, including current position and speed. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsRequest withDeviceState( + ForecastGeofenceEventsDeviceState deviceState) { + this.deviceState = deviceState; + return this; + } + + /** + *

    + * Specifies the time horizon in minutes for the forecasted events. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @return

    + * Specifies the time horizon in minutes for the forecasted events. + *

    + */ + public Double getTimeHorizonMinutes() { + return timeHorizonMinutes; + } + + /** + *

    + * Specifies the time horizon in minutes for the forecasted events. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param timeHorizonMinutes

    + * Specifies the time horizon in minutes for the forecasted + * events. + *

    + */ + public void setTimeHorizonMinutes(Double timeHorizonMinutes) { + this.timeHorizonMinutes = timeHorizonMinutes; + } + + /** + *

    + * Specifies the time horizon in minutes for the forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param timeHorizonMinutes

    + * Specifies the time horizon in minutes for the forecasted + * events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsRequest withTimeHorizonMinutes(Double timeHorizonMinutes) { + this.timeHorizonMinutes = timeHorizonMinutes; + return this; + } + + /** + *

    + * The distance unit used for the NearestDistance property + * returned in a forecasted event. The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @return

    + * The distance unit used for the NearestDistance + * property returned in a forecasted event. The measurement system + * must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified + * for DistanceUnit, then SpeedUnit must + * be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** + *

    + * The distance unit used for the NearestDistance property + * returned in a forecasted event. The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit used for the NearestDistance + * property returned in a forecasted event. The measurement + * system must match for DistanceUnit and + * SpeedUnit; if Kilometers is + * specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** + *

    + * The distance unit used for the NearestDistance property + * returned in a forecasted event. The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit used for the NearestDistance + * property returned in a forecasted event. The measurement + * system must match for DistanceUnit and + * SpeedUnit; if Kilometers is + * specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public ForecastGeofenceEventsRequest withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

    + * The distance unit used for the NearestDistance property + * returned in a forecasted event. The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit used for the NearestDistance + * property returned in a forecasted event. The measurement + * system must match for DistanceUnit and + * SpeedUnit; if Kilometers is + * specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

    + * The distance unit used for the NearestDistance property + * returned in a forecasted event. The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit used for the NearestDistance + * property returned in a forecasted event. The measurement + * system must match for DistanceUnit and + * SpeedUnit; if Kilometers is + * specified for DistanceUnit, then + * SpeedUnit must be KilometersPerHour. + *

    + *

    + * Default Value: Kilometers + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public ForecastGeofenceEventsRequest withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + return this; + } + + /** + *

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @return

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified + * for DistanceUnit, then SpeedUnit must + * be KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + * @see SpeedUnit + */ + public String getSpeedUnit() { + return speedUnit; + } + + /** + *

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the device captured by the device state. + * The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + * @see SpeedUnit + */ + public void setSpeedUnit(String speedUnit) { + this.speedUnit = speedUnit; + } + + /** + *

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the device captured by the device state. + * The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see SpeedUnit + */ + public ForecastGeofenceEventsRequest withSpeedUnit(String speedUnit) { + this.speedUnit = speedUnit; + return this; + } + + /** + *

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the device captured by the device state. + * The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + * @see SpeedUnit + */ + public void setSpeedUnit(SpeedUnit speedUnit) { + this.speedUnit = speedUnit.toString(); + } + + /** + *

    + * The speed unit for the device captured by the device state. The + * measurement system must match for DistanceUnit and + * SpeedUnit; if Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the device captured by the device state. + * The measurement system must match for + * DistanceUnit and SpeedUnit; if + * Kilometers is specified for + * DistanceUnit, then SpeedUnit must be + * KilometersPerHour. + *

    + *

    + * Default Value: KilometersPerHour. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see SpeedUnit + */ + public ForecastGeofenceEventsRequest withSpeedUnit(SpeedUnit speedUnit) { + this.speedUnit = speedUnit.toString(); + return this; + } + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Default value: null + *

    + *

    + * Constraints:
    + * Length: 1 - 60000
    + * + * @return

    + * The pagination token specifying which page of results to return + * in the response. If no token is provided, the default page is the + * first page. + *

    + *

    + * Default value: null + *

    + */ + public String getNextToken() { + return nextToken; + } + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Default value: null + *

    + *

    + * Constraints:
    + * Length: 1 - 60000
    + * + * @param nextToken

    + * The pagination token specifying which page of results to + * return in the response. If no token is provided, the default + * page is the first page. + *

    + *

    + * Default value: null + *

    + */ + public void setNextToken(String nextToken) { + this.nextToken = nextToken; + } + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Default value: null + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 60000
    + * + * @param nextToken

    + * The pagination token specifying which page of results to + * return in the response. If no token is provided, the default + * page is the first page. + *

    + *

    + * Default value: null + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsRequest withNextToken(String nextToken) { + this.nextToken = nextToken; + return this; + } + + /** + *

    + * An optional limit for the number of resources returned in a single call. + *

    + *

    + * Default value: 20 + *

    + *

    + * Constraints:
    + * Range: 1 - 20
    + * + * @return

    + * An optional limit for the number of resources returned in a + * single call. + *

    + *

    + * Default value: 20 + *

    + */ + public Integer getMaxResults() { + return maxResults; + } + + /** + *

    + * An optional limit for the number of resources returned in a single call. + *

    + *

    + * Default value: 20 + *

    + *

    + * Constraints:
    + * Range: 1 - 20
    + * + * @param maxResults

    + * An optional limit for the number of resources returned in a + * single call. + *

    + *

    + * Default value: 20 + *

    + */ + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; + } + + /** + *

    + * An optional limit for the number of resources returned in a single call. + *

    + *

    + * Default value: 20 + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 1 - 20
    + * + * @param maxResults

    + * An optional limit for the number of resources returned in a + * single call. + *

    + *

    + * Default value: 20 + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsRequest withMaxResults(Integer maxResults) { + this.maxResults = maxResults; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getCollectionName() != null) + sb.append("CollectionName: " + getCollectionName() + ","); + if (getDeviceState() != null) + sb.append("DeviceState: " + getDeviceState() + ","); + if (getTimeHorizonMinutes() != null) + sb.append("TimeHorizonMinutes: " + getTimeHorizonMinutes() + ","); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit() + ","); + if (getSpeedUnit() != null) + sb.append("SpeedUnit: " + getSpeedUnit() + ","); + if (getNextToken() != null) + sb.append("NextToken: " + getNextToken() + ","); + if (getMaxResults() != null) + sb.append("MaxResults: " + getMaxResults()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + + ((getCollectionName() == null) ? 0 : getCollectionName().hashCode()); + hashCode = prime * hashCode + + ((getDeviceState() == null) ? 0 : getDeviceState().hashCode()); + hashCode = prime * hashCode + + ((getTimeHorizonMinutes() == null) ? 0 : getTimeHorizonMinutes().hashCode()); + hashCode = prime * hashCode + + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); + hashCode = prime * hashCode + ((getSpeedUnit() == null) ? 0 : getSpeedUnit().hashCode()); + hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); + hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof ForecastGeofenceEventsRequest == false) + return false; + ForecastGeofenceEventsRequest other = (ForecastGeofenceEventsRequest) obj; + + if (other.getCollectionName() == null ^ this.getCollectionName() == null) + return false; + if (other.getCollectionName() != null + && other.getCollectionName().equals(this.getCollectionName()) == false) + return false; + if (other.getDeviceState() == null ^ this.getDeviceState() == null) + return false; + if (other.getDeviceState() != null + && other.getDeviceState().equals(this.getDeviceState()) == false) + return false; + if (other.getTimeHorizonMinutes() == null ^ this.getTimeHorizonMinutes() == null) + return false; + if (other.getTimeHorizonMinutes() != null + && other.getTimeHorizonMinutes().equals(this.getTimeHorizonMinutes()) == false) + return false; + if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) + return false; + if (other.getDistanceUnit() != null + && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) + return false; + if (other.getSpeedUnit() == null ^ this.getSpeedUnit() == null) + return false; + if (other.getSpeedUnit() != null + && other.getSpeedUnit().equals(this.getSpeedUnit()) == false) + return false; + if (other.getNextToken() == null ^ this.getNextToken() == null) + return false; + if (other.getNextToken() != null + && other.getNextToken().equals(this.getNextToken()) == false) + return false; + if (other.getMaxResults() == null ^ this.getMaxResults() == null) + return false; + if (other.getMaxResults() != null + && other.getMaxResults().equals(this.getMaxResults()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsResult.java new file mode 100644 index 0000000000..7c45ea3082 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastGeofenceEventsResult.java @@ -0,0 +1,462 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +public class ForecastGeofenceEventsResult implements Serializable { + /** + *

    + * The list of forecasted events. + *

    + */ + private java.util.List forecastedEvents; + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Constraints:
    + * Length: 1 - 60000
    + */ + private String nextToken; + + /** + *

    + * The distance unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + */ + private String distanceUnit; + + /** + *

    + * The speed unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + */ + private String speedUnit; + + /** + *

    + * The list of forecasted events. + *

    + * + * @return

    + * The list of forecasted events. + *

    + */ + public java.util.List getForecastedEvents() { + return forecastedEvents; + } + + /** + *

    + * The list of forecasted events. + *

    + * + * @param forecastedEvents

    + * The list of forecasted events. + *

    + */ + public void setForecastedEvents(java.util.Collection forecastedEvents) { + if (forecastedEvents == null) { + this.forecastedEvents = null; + return; + } + + this.forecastedEvents = new java.util.ArrayList(forecastedEvents); + } + + /** + *

    + * The list of forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param forecastedEvents

    + * The list of forecasted events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsResult withForecastedEvents(ForecastedEvent... forecastedEvents) { + if (getForecastedEvents() == null) { + this.forecastedEvents = new java.util.ArrayList( + forecastedEvents.length); + } + for (ForecastedEvent value : forecastedEvents) { + this.forecastedEvents.add(value); + } + return this; + } + + /** + *

    + * The list of forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param forecastedEvents

    + * The list of forecasted events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsResult withForecastedEvents( + java.util.Collection forecastedEvents) { + setForecastedEvents(forecastedEvents); + return this; + } + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Constraints:
    + * Length: 1 - 60000
    + * + * @return

    + * The pagination token specifying which page of results to return + * in the response. If no token is provided, the default page is the + * first page. + *

    + */ + public String getNextToken() { + return nextToken; + } + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Constraints:
    + * Length: 1 - 60000
    + * + * @param nextToken

    + * The pagination token specifying which page of results to + * return in the response. If no token is provided, the default + * page is the first page. + *

    + */ + public void setNextToken(String nextToken) { + this.nextToken = nextToken; + } + + /** + *

    + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 60000
    + * + * @param nextToken

    + * The pagination token specifying which page of results to + * return in the response. If no token is provided, the default + * page is the first page. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastGeofenceEventsResult withNextToken(String nextToken) { + this.nextToken = nextToken; + return this; + } + + /** + *

    + * The distance unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @return

    + * The distance unit for the forecasted events. + *

    + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** + *

    + * The distance unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit for the forecasted events. + *

    + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** + *

    + * The distance unit for the forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit for the forecasted events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public ForecastGeofenceEventsResult withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

    + * The distance unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit for the forecasted events. + *

    + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

    + * The distance unit for the forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

    + * The distance unit for the forecasted events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public ForecastGeofenceEventsResult withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + return this; + } + + /** + *

    + * The speed unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @return

    + * The speed unit for the forecasted events. + *

    + * @see SpeedUnit + */ + public String getSpeedUnit() { + return speedUnit; + } + + /** + *

    + * The speed unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the forecasted events. + *

    + * @see SpeedUnit + */ + public void setSpeedUnit(String speedUnit) { + this.speedUnit = speedUnit; + } + + /** + *

    + * The speed unit for the forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the forecasted events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see SpeedUnit + */ + public ForecastGeofenceEventsResult withSpeedUnit(String speedUnit) { + this.speedUnit = speedUnit; + return this; + } + + /** + *

    + * The speed unit for the forecasted events. + *

    + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the forecasted events. + *

    + * @see SpeedUnit + */ + public void setSpeedUnit(SpeedUnit speedUnit) { + this.speedUnit = speedUnit.toString(); + } + + /** + *

    + * The speed unit for the forecasted events. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: KilometersPerHour, MilesPerHour + * + * @param speedUnit

    + * The speed unit for the forecasted events. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see SpeedUnit + */ + public ForecastGeofenceEventsResult withSpeedUnit(SpeedUnit speedUnit) { + this.speedUnit = speedUnit.toString(); + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getForecastedEvents() != null) + sb.append("ForecastedEvents: " + getForecastedEvents() + ","); + if (getNextToken() != null) + sb.append("NextToken: " + getNextToken() + ","); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit() + ","); + if (getSpeedUnit() != null) + sb.append("SpeedUnit: " + getSpeedUnit()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + + ((getForecastedEvents() == null) ? 0 : getForecastedEvents().hashCode()); + hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); + hashCode = prime * hashCode + + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); + hashCode = prime * hashCode + ((getSpeedUnit() == null) ? 0 : getSpeedUnit().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof ForecastGeofenceEventsResult == false) + return false; + ForecastGeofenceEventsResult other = (ForecastGeofenceEventsResult) obj; + + if (other.getForecastedEvents() == null ^ this.getForecastedEvents() == null) + return false; + if (other.getForecastedEvents() != null + && other.getForecastedEvents().equals(this.getForecastedEvents()) == false) + return false; + if (other.getNextToken() == null ^ this.getNextToken() == null) + return false; + if (other.getNextToken() != null + && other.getNextToken().equals(this.getNextToken()) == false) + return false; + if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) + return false; + if (other.getDistanceUnit() != null + && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) + return false; + if (other.getSpeedUnit() == null ^ this.getSpeedUnit() == null) + return false; + if (other.getSpeedUnit() != null + && other.getSpeedUnit().equals(this.getSpeedUnit()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedEvent.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedEvent.java new file mode 100644 index 0000000000..c16f1bcbd7 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedEvent.java @@ -0,0 +1,823 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * A forecasted event represents a geofence event in relation to the requested + * device state, that may occur given the provided device state and time + * horizon. + *

    + */ +public class ForecastedEvent implements Serializable { + /** + *

    + * The forecasted event identifier. + *

    + *

    + * Constraints:
    + * Pattern: + * [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4 + * }-[0-9a-fA-F]{12}
    + */ + private String eventId; + + /** + *

    + * The geofence identifier pertaining to the forecasted event. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + */ + private String geofenceId; + + /** + *

    + * Indicates if the device is located within the geofence. + *

    + */ + private Boolean isDeviceInGeofence; + + /** + *

    + * The closest distance from the device's position to the geofence. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + */ + private Double nearestDistance; + + /** + *

    + * The event type, forecasting three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

    + *

    + * Constraints:
    + * Allowed Values: ENTER, EXIT, IDLE + */ + private String eventType; + + /** + *

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + private java.util.Date forecastedBreachTime; + + /** + *

    + * The geofence properties. + *

    + */ + private java.util.Map geofenceProperties; + + /** + *

    + * The forecasted event identifier. + *

    + *

    + * Constraints:
    + * Pattern: + * [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4 + * }-[0-9a-fA-F]{12}
    + * + * @return

    + * The forecasted event identifier. + *

    + */ + public String getEventId() { + return eventId; + } + + /** + *

    + * The forecasted event identifier. + *

    + *

    + * Constraints:
    + * Pattern: + * [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4 + * }-[0-9a-fA-F]{12}
    + * + * @param eventId

    + * The forecasted event identifier. + *

    + */ + public void setEventId(String eventId) { + this.eventId = eventId; + } + + /** + *

    + * The forecasted event identifier. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Pattern: + * [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4 + * }-[0-9a-fA-F]{12}
    + * + * @param eventId

    + * The forecasted event identifier. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent withEventId(String eventId) { + this.eventId = eventId; + return this; + } + + /** + *

    + * The geofence identifier pertaining to the forecasted event. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @return

    + * The geofence identifier pertaining to the forecasted event. + *

    + */ + public String getGeofenceId() { + return geofenceId; + } + + /** + *

    + * The geofence identifier pertaining to the forecasted event. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param geofenceId

    + * The geofence identifier pertaining to the forecasted event. + *

    + */ + public void setGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; + } + + /** + *

    + * The geofence identifier pertaining to the forecasted event. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param geofenceId

    + * The geofence identifier pertaining to the forecasted event. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent withGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; + return this; + } + + /** + *

    + * Indicates if the device is located within the geofence. + *

    + * + * @return

    + * Indicates if the device is located within the geofence. + *

    + */ + public Boolean isIsDeviceInGeofence() { + return isDeviceInGeofence; + } + + /** + *

    + * Indicates if the device is located within the geofence. + *

    + * + * @return

    + * Indicates if the device is located within the geofence. + *

    + */ + public Boolean getIsDeviceInGeofence() { + return isDeviceInGeofence; + } + + /** + *

    + * Indicates if the device is located within the geofence. + *

    + * + * @param isDeviceInGeofence

    + * Indicates if the device is located within the geofence. + *

    + */ + public void setIsDeviceInGeofence(Boolean isDeviceInGeofence) { + this.isDeviceInGeofence = isDeviceInGeofence; + } + + /** + *

    + * Indicates if the device is located within the geofence. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param isDeviceInGeofence

    + * Indicates if the device is located within the geofence. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent withIsDeviceInGeofence(Boolean isDeviceInGeofence) { + this.isDeviceInGeofence = isDeviceInGeofence; + return this; + } + + /** + *

    + * The closest distance from the device's position to the geofence. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @return

    + * The closest distance from the device's position to the geofence. + *

    + */ + public Double getNearestDistance() { + return nearestDistance; + } + + /** + *

    + * The closest distance from the device's position to the geofence. + *

    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param nearestDistance

    + * The closest distance from the device's position to the + * geofence. + *

    + */ + public void setNearestDistance(Double nearestDistance) { + this.nearestDistance = nearestDistance; + } + + /** + *

    + * The closest distance from the device's position to the geofence. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param nearestDistance

    + * The closest distance from the device's position to the + * geofence. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent withNearestDistance(Double nearestDistance) { + this.nearestDistance = nearestDistance; + return this; + } + + /** + *

    + * The event type, forecasting three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

    + *

    + * Constraints:
    + * Allowed Values: ENTER, EXIT, IDLE + * + * @return

    + * The event type, forecasting three states for which a device can + * be in relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would + * breach the fence if the device is moving at its current speed + * within time horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the + * device is not moving. + *

    + * @see ForecastedGeofenceEventType + */ + public String getEventType() { + return eventType; + } + + /** + *

    + * The event type, forecasting three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

    + *

    + * Constraints:
    + * Allowed Values: ENTER, EXIT, IDLE + * + * @param eventType

    + * The event type, forecasting three states for which a device + * can be in relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and + * the device is not moving. + *

    + * @see ForecastedGeofenceEventType + */ + public void setEventType(String eventType) { + this.eventType = eventType; + } + + /** + *

    + * The event type, forecasting three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: ENTER, EXIT, IDLE + * + * @param eventType

    + * The event type, forecasting three states for which a device + * can be in relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and + * the device is not moving. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see ForecastedGeofenceEventType + */ + public ForecastedEvent withEventType(String eventType) { + this.eventType = eventType; + return this; + } + + /** + *

    + * The event type, forecasting three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

    + *

    + * Constraints:
    + * Allowed Values: ENTER, EXIT, IDLE + * + * @param eventType

    + * The event type, forecasting three states for which a device + * can be in relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and + * the device is not moving. + *

    + * @see ForecastedGeofenceEventType + */ + public void setEventType(ForecastedGeofenceEventType eventType) { + this.eventType = eventType.toString(); + } + + /** + *

    + * The event type, forecasting three states for which a device can be in + * relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but would + * breach the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but would breach + * the fence if the device is moving at its current speed within time + * horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and the device is + * not moving. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Allowed Values: ENTER, EXIT, IDLE + * + * @param eventType

    + * The event type, forecasting three states for which a device + * can be in relative to a geofence: + *

    + *

    + * ENTER: If a device is outside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * EXIT: If a device is inside of a geofence, but + * would breach the fence if the device is moving at its current + * speed within time horizon window. + *

    + *

    + * IDLE: If a device is inside of a geofence, and + * the device is not moving. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + * @see ForecastedGeofenceEventType + */ + public ForecastedEvent withEventType(ForecastedGeofenceEventType eventType) { + this.eventType = eventType.toString(); + return this; + } + + /** + *

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @return

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public java.util.Date getForecastedBreachTime() { + return forecastedBreachTime; + } + + /** + *

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @param forecastedBreachTime

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public void setForecastedBreachTime(java.util.Date forecastedBreachTime) { + this.forecastedBreachTime = forecastedBreachTime; + } + + /** + *

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param forecastedBreachTime

    + * The forecasted time the device will breach the geofence in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent withForecastedBreachTime(java.util.Date forecastedBreachTime) { + this.forecastedBreachTime = forecastedBreachTime; + return this; + } + + /** + *

    + * The geofence properties. + *

    + * + * @return

    + * The geofence properties. + *

    + */ + public java.util.Map getGeofenceProperties() { + return geofenceProperties; + } + + /** + *

    + * The geofence properties. + *

    + * + * @param geofenceProperties

    + * The geofence properties. + *

    + */ + public void setGeofenceProperties(java.util.Map geofenceProperties) { + this.geofenceProperties = geofenceProperties; + } + + /** + *

    + * The geofence properties. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param geofenceProperties

    + * The geofence properties. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent withGeofenceProperties(java.util.Map geofenceProperties) { + this.geofenceProperties = geofenceProperties; + return this; + } + + /** + *

    + * The geofence properties. + *

    + *

    + * The method adds a new key-value pair into GeofenceProperties parameter, + * and returns a reference to this object so that method calls can be + * chained together. + * + * @param key The key of the entry to be added into GeofenceProperties. + * @param value The corresponding value of the entry to be added into + * GeofenceProperties. + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ForecastedEvent addGeofencePropertiesEntry(String key, String value) { + if (null == this.geofenceProperties) { + this.geofenceProperties = new java.util.HashMap(); + } + if (this.geofenceProperties.containsKey(key)) + throw new IllegalArgumentException("Duplicated keys (" + key.toString() + + ") are provided."); + this.geofenceProperties.put(key, value); + return this; + } + + /** + * Removes all the entries added into GeofenceProperties. + *

    + * Returns a reference to this object so that method calls can be chained + * together. + */ + public ForecastedEvent clearGeofencePropertiesEntries() { + this.geofenceProperties = null; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getEventId() != null) + sb.append("EventId: " + getEventId() + ","); + if (getGeofenceId() != null) + sb.append("GeofenceId: " + getGeofenceId() + ","); + if (getIsDeviceInGeofence() != null) + sb.append("IsDeviceInGeofence: " + getIsDeviceInGeofence() + ","); + if (getNearestDistance() != null) + sb.append("NearestDistance: " + getNearestDistance() + ","); + if (getEventType() != null) + sb.append("EventType: " + getEventType() + ","); + if (getForecastedBreachTime() != null) + sb.append("ForecastedBreachTime: " + getForecastedBreachTime() + ","); + if (getGeofenceProperties() != null) + sb.append("GeofenceProperties: " + getGeofenceProperties()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getEventId() == null) ? 0 : getEventId().hashCode()); + hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); + hashCode = prime * hashCode + + ((getIsDeviceInGeofence() == null) ? 0 : getIsDeviceInGeofence().hashCode()); + hashCode = prime * hashCode + + ((getNearestDistance() == null) ? 0 : getNearestDistance().hashCode()); + hashCode = prime * hashCode + ((getEventType() == null) ? 0 : getEventType().hashCode()); + hashCode = prime * hashCode + + ((getForecastedBreachTime() == null) ? 0 : getForecastedBreachTime().hashCode()); + hashCode = prime * hashCode + + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof ForecastedEvent == false) + return false; + ForecastedEvent other = (ForecastedEvent) obj; + + if (other.getEventId() == null ^ this.getEventId() == null) + return false; + if (other.getEventId() != null && other.getEventId().equals(this.getEventId()) == false) + return false; + if (other.getGeofenceId() == null ^ this.getGeofenceId() == null) + return false; + if (other.getGeofenceId() != null + && other.getGeofenceId().equals(this.getGeofenceId()) == false) + return false; + if (other.getIsDeviceInGeofence() == null ^ this.getIsDeviceInGeofence() == null) + return false; + if (other.getIsDeviceInGeofence() != null + && other.getIsDeviceInGeofence().equals(this.getIsDeviceInGeofence()) == false) + return false; + if (other.getNearestDistance() == null ^ this.getNearestDistance() == null) + return false; + if (other.getNearestDistance() != null + && other.getNearestDistance().equals(this.getNearestDistance()) == false) + return false; + if (other.getEventType() == null ^ this.getEventType() == null) + return false; + if (other.getEventType() != null + && other.getEventType().equals(this.getEventType()) == false) + return false; + if (other.getForecastedBreachTime() == null ^ this.getForecastedBreachTime() == null) + return false; + if (other.getForecastedBreachTime() != null + && other.getForecastedBreachTime().equals(this.getForecastedBreachTime()) == false) + return false; + if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) + return false; + if (other.getGeofenceProperties() != null + && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedGeofenceEventType.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedGeofenceEventType.java new file mode 100644 index 0000000000..4f2a65dae3 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ForecastedGeofenceEventType.java @@ -0,0 +1,64 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.util.HashMap; +import java.util.Map; + +/** + * Forecasted Geofence Event Type + */ +public enum ForecastedGeofenceEventType { + + ENTER("ENTER"), + EXIT("EXIT"), + IDLE("IDLE"); + + private String value; + + private ForecastedGeofenceEventType(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + + private static final Map enumMap; + static { + enumMap = new HashMap(); + enumMap.put("ENTER", ENTER); + enumMap.put("EXIT", EXIT); + enumMap.put("IDLE", IDLE); + } + + /** + * Use this in place of valueOf. + * + * @param value real value + * @return ForecastedGeofenceEventType corresponding to the value + */ + public static ForecastedGeofenceEventType fromValue(String value) { + if (value == null || value.isEmpty()) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } else if (enumMap.containsKey(value)) { + return enumMap.get(value); + } else { + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java index afd87a5a5c..ecabb9570b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -22,8 +22,9 @@ * Contains the geofence geometry details. *

    *

    - * A geofence geometry is made up of either a polygon or a circle. Can be either - * a polygon or a circle. Including both will return a validation error. + * A geofence geometry is made up of either a polygon or a circle. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including multiple + * selections will return a validation error. *

    * *

    @@ -33,13 +34,6 @@ * */ public class GeofenceGeometry implements Serializable { - /** - *

    - * A circle on the earth, as defined by a center point and a radius. - *

    - */ - private Circle circle; - /** *

    * A polygon is a list of linear rings which are each made up of a list of @@ -74,48 +68,23 @@ public class GeofenceGeometry implements Serializable { *

    * A circle on the earth, as defined by a center point and a radius. *

    - * - * @return

    - * A circle on the earth, as defined by a center point and a radius. - *

    */ - public Circle getCircle() { - return circle; - } + private Circle circle; /** *

    - * A circle on the earth, as defined by a center point and a radius. + * Geobuf is a compact binary encoding for geographic data that provides + * lossless compression of GeoJSON polygons. The Geobuf must be + * Base64-encoded. *

    - * - * @param circle

    - * A circle on the earth, as defined by a center point and a - * radius. - *

    - */ - public void setCircle(Circle circle) { - this.circle = circle; - } - - /** *

    - * A circle on the earth, as defined by a center point and a radius. + * A polygon in Geobuf format can have up to 100,000 vertices. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param circle

    - * A circle on the earth, as defined by a center point and a - * radius. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. + * Constraints:
    + * Length: 0 - 600000
    */ - public GeofenceGeometry withCircle(Circle circle) { - this.circle = circle; - return this; - } + private java.nio.ByteBuffer geobuf; /** *

    @@ -387,6 +356,137 @@ public GeofenceGeometry withPolygon( return this; } + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + * + * @return

    + * A circle on the earth, as defined by a center point and a radius. + *

    + */ + public Circle getCircle() { + return circle; + } + + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + * + * @param circle

    + * A circle on the earth, as defined by a center point and a + * radius. + *

    + */ + public void setCircle(Circle circle) { + this.circle = circle; + } + + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param circle

    + * A circle on the earth, as defined by a center point and a + * radius. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GeofenceGeometry withCircle(Circle circle) { + this.circle = circle; + return this; + } + + /** + *

    + * Geobuf is a compact binary encoding for geographic data that provides + * lossless compression of GeoJSON polygons. The Geobuf must be + * Base64-encoded. + *

    + *

    + * A polygon in Geobuf format can have up to 100,000 vertices. + *

    + *

    + * Constraints:
    + * Length: 0 - 600000
    + * + * @return

    + * Geobuf is a compact binary encoding for geographic data that + * provides lossless compression of GeoJSON polygons. The Geobuf + * must be Base64-encoded. + *

    + *

    + * A polygon in Geobuf format can have up to 100,000 vertices. + *

    + */ + public java.nio.ByteBuffer getGeobuf() { + return geobuf; + } + + /** + *

    + * Geobuf is a compact binary encoding for geographic data that provides + * lossless compression of GeoJSON polygons. The Geobuf must be + * Base64-encoded. + *

    + *

    + * A polygon in Geobuf format can have up to 100,000 vertices. + *

    + *

    + * Constraints:
    + * Length: 0 - 600000
    + * + * @param geobuf

    + * Geobuf is a compact binary encoding for geographic data that + * provides lossless compression of GeoJSON polygons. The Geobuf + * must be Base64-encoded. + *

    + *

    + * A polygon in Geobuf format can have up to 100,000 vertices. + *

    + */ + public void setGeobuf(java.nio.ByteBuffer geobuf) { + this.geobuf = geobuf; + } + + /** + *

    + * Geobuf is a compact binary encoding for geographic data that provides + * lossless compression of GeoJSON polygons. The Geobuf must be + * Base64-encoded. + *

    + *

    + * A polygon in Geobuf format can have up to 100,000 vertices. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 0 - 600000
    + * + * @param geobuf

    + * Geobuf is a compact binary encoding for geographic data that + * provides lossless compression of GeoJSON polygons. The Geobuf + * must be Base64-encoded. + *

    + *

    + * A polygon in Geobuf format can have up to 100,000 vertices. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GeofenceGeometry withGeobuf(java.nio.ByteBuffer geobuf) { + this.geobuf = geobuf; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -398,10 +498,12 @@ public GeofenceGeometry withPolygon( public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getPolygon() != null) + sb.append("Polygon: " + getPolygon() + ","); if (getCircle() != null) sb.append("Circle: " + getCircle() + ","); - if (getPolygon() != null) - sb.append("Polygon: " + getPolygon()); + if (getGeobuf() != null) + sb.append("Geobuf: " + getGeobuf()); sb.append("}"); return sb.toString(); } @@ -411,8 +513,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCircle() == null) ? 0 : getCircle().hashCode()); hashCode = prime * hashCode + ((getPolygon() == null) ? 0 : getPolygon().hashCode()); + hashCode = prime * hashCode + ((getCircle() == null) ? 0 : getCircle().hashCode()); + hashCode = prime * hashCode + ((getGeobuf() == null) ? 0 : getGeobuf().hashCode()); return hashCode; } @@ -427,13 +530,17 @@ public boolean equals(Object obj) { return false; GeofenceGeometry other = (GeofenceGeometry) obj; + if (other.getPolygon() == null ^ this.getPolygon() == null) + return false; + if (other.getPolygon() != null && other.getPolygon().equals(this.getPolygon()) == false) + return false; if (other.getCircle() == null ^ this.getCircle() == null) return false; if (other.getCircle() != null && other.getCircle().equals(this.getCircle()) == false) return false; - if (other.getPolygon() == null ^ this.getPolygon() == null) + if (other.getGeobuf() == null ^ this.getGeobuf() == null) return false; - if (other.getPolygon() != null && other.getPolygon().equals(this.getPolygon()) == false) + if (other.getGeobuf() != null && other.getGeobuf().equals(this.getGeobuf()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryRequest.java index 9735f5693d..0acacdc41c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,49 +34,26 @@ public class GetDevicePositionHistoryRequest extends AmazonWebServiceRequest imp Serializable { /** *

    - * The device whose position history you want to retrieve. + * The tracker resource receiving the request for the device position + * history. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\w]+
    */ - private String deviceId; - - /** - *

    - * Specify the end time for the position history in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the - * value will be the time that the request is made. - *

    - *

    - * Requirement: - *

    - *
      - *
    • - *

      - * The time specified for EndTimeExclusive must be after the - * time for StartTimeInclusive. - *

      - *
      • - *
    - */ - private java.util.Date endTimeExclusive; + private String trackerName; /** *

    - * An optional limit for the number of device positions returned in a single - * call. - *

    - *

    - * Default value: 100 + * The device whose position history you want to retrieve. *

    *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    */ - private Integer maxResults; + private String deviceId; /** *

    @@ -115,277 +92,156 @@ public class GetDevicePositionHistoryRequest extends AmazonWebServiceRequest imp /** *

    - * The tracker resource receiving the request for the device position - * history. + * Specify the end time for the position history in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the + * value will be the time that the request is made. *

    *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - */ - private String trackerName; - - /** - *

    - * The device whose position history you want to retrieve. + * Requirement: *

    + *
      + *
    • *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\p{L}\p{N}]+$
      - * - * @return

      - * The device whose position history you want to retrieve. - *

      - */ - public String getDeviceId() { - return deviceId; - } - - /** - *

      - * The device whose position history you want to retrieve. + * The time specified for EndTimeExclusive must be after the + * time for StartTimeInclusive. *

      - *

      - * Constraints:
      - * Length: 1 - 100
      - * Pattern: ^[-._\p{L}\p{N}]+$
      - * - * @param deviceId

      - * The device whose position history you want to retrieve. - *

      + *
      • + *
    */ - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } + private java.util.Date endTimeExclusive; /** *

    - * The device whose position history you want to retrieve. + * An optional limit for the number of device positions returned in a single + * call. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. + * Default value: 100 + *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    - * - * @param deviceId

    - * The device whose position history you want to retrieve. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. + * Range: 1 - 100
    */ - public GetDevicePositionHistoryRequest withDeviceId(String deviceId) { - this.deviceId = deviceId; - return this; - } + private Integer maxResults; /** *

    - * Specify the end time for the position history in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the - * value will be the time that the request is made. - *

    - *

    - * Requirement: + * The tracker resource receiving the request for the device position + * history. *

    - *
      - *
    • *

      - * The time specified for EndTimeExclusive must be after the - * time for StartTimeInclusive. - *

      - *
      • - *
    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * Specify the end time for the position history in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By - * default, the value will be the time that the request is made. - *

    - *

    - * Requirement: - *

    - *
      - *
    • - *

      - * The time specified for EndTimeExclusive must be - * after the time for StartTimeInclusive. + * The tracker resource receiving the request for the device + * position history. *

      - *
      • - *
    */ - public java.util.Date getEndTimeExclusive() { - return endTimeExclusive; + public String getTrackerName() { + return trackerName; } /** *

    - * Specify the end time for the position history in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the - * value will be the time that the request is made. - *

    - *

    - * Requirement: + * The tracker resource receiving the request for the device position + * history. *

    - *
      - *
    • *

      - * The time specified for EndTimeExclusive must be after the - * time for StartTimeInclusive. - *

      - *
      • - *
    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param endTimeExclusive

    - * Specify the end time for the position history in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By - * default, the value will be the time that the request is made. - *

    - *

    - * Requirement: - *

    - *
      - *
    • - *

      - * The time specified for EndTimeExclusive must be - * after the time for StartTimeInclusive. + * @param trackerName

      + * The tracker resource receiving the request for the device + * position history. *

      - *
      • - *
    */ - public void setEndTimeExclusive(java.util.Date endTimeExclusive) { - this.endTimeExclusive = endTimeExclusive; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; } /** *

    - * Specify the end time for the position history in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the - * value will be the time that the request is made. - *

    - *

    - * Requirement: + * The tracker resource receiving the request for the device position + * history. *

    - *
      - *
    • - *

      - * The time specified for EndTimeExclusive must be after the - * time for StartTimeInclusive. - *

      - *
      • - *
    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param endTimeExclusive

    - * Specify the end time for the position history in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By - * default, the value will be the time that the request is made. - *

    - *

    - * Requirement: - *

    - *
      - *
    • - *

      - * The time specified for EndTimeExclusive must be - * after the time for StartTimeInclusive. + * @param trackerName

      + * The tracker resource receiving the request for the device + * position history. *

      - *
      • - *
    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionHistoryRequest withEndTimeExclusive(java.util.Date endTimeExclusive) { - this.endTimeExclusive = endTimeExclusive; + public GetDevicePositionHistoryRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; return this; } /** *

    - * An optional limit for the number of device positions returned in a single - * call. - *

    - *

    - * Default value: 100 + * The device whose position history you want to retrieve. *

    *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    - * An optional limit for the number of device positions returned in - * a single call. - *

    - *

    - * Default value: 100 + * The device whose position history you want to retrieve. *

    */ - public Integer getMaxResults() { - return maxResults; + public String getDeviceId() { + return deviceId; } /** *

    - * An optional limit for the number of device positions returned in a single - * call. - *

    - *

    - * Default value: 100 + * The device whose position history you want to retrieve. *

    *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param maxResults

    - * An optional limit for the number of device positions returned - * in a single call. - *

    - *

    - * Default value: 100 + * @param deviceId

    + * The device whose position history you want to retrieve. *

    */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } /** *

    - * An optional limit for the number of device positions returned in a single - * call. - *

    - *

    - * Default value: 100 + * The device whose position history you want to retrieve. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param maxResults

    - * An optional limit for the number of device positions returned - * in a single call. - *

    - *

    - * Default value: 100 + * @param deviceId

    + * The device whose position history you want to retrieve. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionHistoryRequest withMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public GetDevicePositionHistoryRequest withDeviceId(String deviceId) { + this.deviceId = deviceId; return this; } @@ -604,64 +460,208 @@ public GetDevicePositionHistoryRequest withStartTimeInclusive(java.util.Date sta /** *

    - * The tracker resource receiving the request for the device position - * history. + * Specify the end time for the position history in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the + * value will be the time that the request is made. + *

    + *

    + * Requirement: + *

    + *
      + *
    • + *

      + * The time specified for EndTimeExclusive must be after the + * time for StartTimeInclusive. + *

      + *
      • + *
    + * + * @return

    + * Specify the end time for the position history in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By + * default, the value will be the time that the request is made. + *

    + *

    + * Requirement: + *

    + *
      + *
    • + *

      + * The time specified for EndTimeExclusive must be + * after the time for StartTimeInclusive. + *

      + *
      • + *
    + */ + public java.util.Date getEndTimeExclusive() { + return endTimeExclusive; + } + + /** + *

    + * Specify the end time for the position history in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the + * value will be the time that the request is made. + *

    + *

    + * Requirement: + *

    + *
      + *
    • + *

      + * The time specified for EndTimeExclusive must be after the + * time for StartTimeInclusive. + *

      + *
      • + *
    + * + * @param endTimeExclusive

    + * Specify the end time for the position history in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By + * default, the value will be the time that the request is made. + *

    + *

    + * Requirement: + *

    + *
      + *
    • + *

      + * The time specified for EndTimeExclusive must be + * after the time for StartTimeInclusive. + *

      + *
      • + *
    + */ + public void setEndTimeExclusive(java.util.Date endTimeExclusive) { + this.endTimeExclusive = endTimeExclusive; + } + + /** + *

    + * Specify the end time for the position history in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By default, the + * value will be the time that the request is made. + *

    + *

    + * Requirement: + *

    + *
      + *
    • + *

      + * The time specified for EndTimeExclusive must be after the + * time for StartTimeInclusive. + *

      + *
      • + *
    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param endTimeExclusive

    + * Specify the end time for the position history in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. By + * default, the value will be the time that the request is made. + *

    + *

    + * Requirement: + *

    + *
      + *
    • + *

      + * The time specified for EndTimeExclusive must be + * after the time for StartTimeInclusive. + *

      + *
      • + *
    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetDevicePositionHistoryRequest withEndTimeExclusive(java.util.Date endTimeExclusive) { + this.endTimeExclusive = endTimeExclusive; + return this; + } + + /** + *

    + * An optional limit for the number of device positions returned in a single + * call. + *

    + *

    + * Default value: 100 *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Range: 1 - 100
    * * @return

    - * The tracker resource receiving the request for the device - * position history. + * An optional limit for the number of device positions returned in + * a single call. + *

    + *

    + * Default value: 100 *

    */ - public String getTrackerName() { - return trackerName; + public Integer getMaxResults() { + return maxResults; } /** *

    - * The tracker resource receiving the request for the device position - * history. + * An optional limit for the number of device positions returned in a single + * call. + *

    + *

    + * Default value: 100 *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Range: 1 - 100
    * - * @param trackerName

    - * The tracker resource receiving the request for the device - * position history. + * @param maxResults

    + * An optional limit for the number of device positions returned + * in a single call. + *

    + *

    + * Default value: 100 *

    */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

    - * The tracker resource receiving the request for the device position - * history. + * An optional limit for the number of device positions returned in a single + * call. + *

    + *

    + * Default value: 100 *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Range: 1 - 100
    * - * @param trackerName

    - * The tracker resource receiving the request for the device - * position history. + * @param maxResults

    + * An optional limit for the number of device positions returned + * in a single call. + *

    + *

    + * Default value: 100 *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionHistoryRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; + public GetDevicePositionHistoryRequest withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } @@ -676,18 +676,18 @@ public GetDevicePositionHistoryRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); - if (getEndTimeExclusive() != null) - sb.append("EndTimeExclusive: " + getEndTimeExclusive() + ","); - if (getMaxResults() != null) - sb.append("MaxResults: " + getMaxResults() + ","); if (getNextToken() != null) sb.append("NextToken: " + getNextToken() + ","); if (getStartTimeInclusive() != null) sb.append("StartTimeInclusive: " + getStartTimeInclusive() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + if (getEndTimeExclusive() != null) + sb.append("EndTimeExclusive: " + getEndTimeExclusive() + ","); + if (getMaxResults() != null) + sb.append("MaxResults: " + getMaxResults()); sb.append("}"); return sb.toString(); } @@ -697,15 +697,15 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); hashCode = prime * hashCode - + ((getEndTimeExclusive() == null) ? 0 : getEndTimeExclusive().hashCode()); - hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); hashCode = prime * hashCode + ((getStartTimeInclusive() == null) ? 0 : getStartTimeInclusive().hashCode()); hashCode = prime * hashCode - + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + + ((getEndTimeExclusive() == null) ? 0 : getEndTimeExclusive().hashCode()); + hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); return hashCode; } @@ -720,19 +720,14 @@ public boolean equals(Object obj) { return false; GetDevicePositionHistoryRequest other = (GetDevicePositionHistoryRequest) obj; - if (other.getDeviceId() == null ^ this.getDeviceId() == null) - return false; - if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) - return false; - if (other.getEndTimeExclusive() == null ^ this.getEndTimeExclusive() == null) + if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; - if (other.getEndTimeExclusive() != null - && other.getEndTimeExclusive().equals(this.getEndTimeExclusive()) == false) + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) return false; - if (other.getMaxResults() == null ^ this.getMaxResults() == null) + if (other.getDeviceId() == null ^ this.getDeviceId() == null) return false; - if (other.getMaxResults() != null - && other.getMaxResults().equals(this.getMaxResults()) == false) + if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; if (other.getNextToken() == null ^ this.getNextToken() == null) return false; @@ -744,10 +739,15 @@ public boolean equals(Object obj) { if (other.getStartTimeInclusive() != null && other.getStartTimeInclusive().equals(this.getStartTimeInclusive()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getEndTimeExclusive() == null ^ this.getEndTimeExclusive() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getEndTimeExclusive() != null + && other.getEndTimeExclusive().equals(this.getEndTimeExclusive()) == false) + return false; + if (other.getMaxResults() == null ^ this.getMaxResults() == null) + return false; + if (other.getMaxResults() != null + && other.getMaxResults().equals(this.getMaxResults()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryResult.java index 21dbff5008..5ef04539f0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionHistoryResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionRequest.java index 3a92a5475b..6fc4c455b4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,63 +32,63 @@ public class GetDevicePositionRequest extends AmazonWebServiceRequest implements Serializable { /** *

    - * The device whose position you want to retrieve. + * The tracker resource receiving the position update. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\w]+
    */ - private String deviceId; + private String trackerName; /** *

    - * The tracker resource receiving the position update. + * The device whose position you want to retrieve. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ - private String trackerName; + private String deviceId; /** *

    - * The device whose position you want to retrieve. + * The tracker resource receiving the position update. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\w]+
    * * @return

    - * The device whose position you want to retrieve. + * The tracker resource receiving the position update. *

    */ - public String getDeviceId() { - return deviceId; + public String getTrackerName() { + return trackerName; } /** *

    - * The device whose position you want to retrieve. + * The tracker resource receiving the position update. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\w]+
    * - * @param deviceId

    - * The device whose position you want to retrieve. + * @param trackerName

    + * The tracker resource receiving the position update. *

    */ - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; } /** *

    - * The device whose position you want to retrieve. + * The tracker resource receiving the position update. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -96,56 +96,56 @@ public void setDeviceId(String deviceId) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\w]+
    * - * @param deviceId

    - * The device whose position you want to retrieve. + * @param trackerName

    + * The tracker resource receiving the position update. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionRequest withDeviceId(String deviceId) { - this.deviceId = deviceId; + public GetDevicePositionRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; return this; } /** *

    - * The tracker resource receiving the position update. + * The device whose position you want to retrieve. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    - * The tracker resource receiving the position update. + * The device whose position you want to retrieve. *

    */ - public String getTrackerName() { - return trackerName; + public String getDeviceId() { + return deviceId; } /** *

    - * The tracker resource receiving the position update. + * The device whose position you want to retrieve. *

    *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param trackerName

    - * The tracker resource receiving the position update. + * @param deviceId

    + * The device whose position you want to retrieve. *

    */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } /** *

    - * The tracker resource receiving the position update. + * The device whose position you want to retrieve. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -153,16 +153,16 @@ public void setTrackerName(String trackerName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param trackerName

    - * The tracker resource receiving the position update. + * @param deviceId

    + * The device whose position you want to retrieve. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; + public GetDevicePositionRequest withDeviceId(String deviceId) { + this.deviceId = deviceId; return this; } @@ -177,10 +177,10 @@ public GetDevicePositionRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDeviceId() != null) - sb.append("DeviceId: " + getDeviceId() + ","); if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + sb.append("TrackerName: " + getTrackerName() + ","); + if (getDeviceId() != null) + sb.append("DeviceId: " + getDeviceId()); sb.append("}"); return sb.toString(); } @@ -190,9 +190,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); return hashCode; } @@ -207,15 +207,15 @@ public boolean equals(Object obj) { return false; GetDevicePositionRequest other = (GetDevicePositionRequest) obj; - if (other.getDeviceId() == null ^ this.getDeviceId() == null) - return false; - if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) - return false; if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; if (other.getTrackerName() != null && other.getTrackerName().equals(this.getTrackerName()) == false) return false; + if (other.getDeviceId() == null ^ this.getDeviceId() == null) + return false; + if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionResult.java index ab76535dfa..1ff7bc0430 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetDevicePositionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,21 +20,32 @@ public class GetDevicePositionResult implements Serializable { /** *

    - * The accuracy of the device position. + * The device whose position you retrieved. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    */ - private PositionalAccuracy accuracy; + private String deviceId; /** *

    - * The device whose position you retrieved. + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. *

    + */ + private java.util.Date sampleTime; + + /** *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * The timestamp for when the tracker resource received the device position. + * Uses + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    */ - private String deviceId; + private java.util.Date receivedTime; /** *

    @@ -43,6 +54,13 @@ public class GetDevicePositionResult implements Serializable { */ private java.util.List position; + /** + *

    + * The accuracy of the device position. + *

    + */ + private PositionalAccuracy accuracy; + /** *

    * The properties associated with the position. @@ -52,121 +70,177 @@ public class GetDevicePositionResult implements Serializable { /** *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The device whose position you retrieved. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @return

    + * The device whose position you retrieved. + *

    */ - private java.util.Date receivedTime; + public String getDeviceId() { + return deviceId; + } /** *

    - * The timestamp at which the device's position was determined. Uses ISO 8601 - * format: YYYY-MM-DDThh:mm:ss.sssZ. + * The device whose position you retrieved. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param deviceId

    + * The device whose position you retrieved. + *

    */ - private java.util.Date sampleTime; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } /** *

    - * The accuracy of the device position. + * The device whose position you retrieved. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    + * + * @param deviceId

    + * The device whose position you retrieved. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetDevicePositionResult withDeviceId(String deviceId) { + this.deviceId = deviceId; + return this; + } + + /** + *

    + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * * @return

    - * The accuracy of the device position. + * The timestamp at which the device's position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public PositionalAccuracy getAccuracy() { - return accuracy; + public java.util.Date getSampleTime() { + return sampleTime; } /** *

    - * The accuracy of the device position. + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * - * @param accuracy

    - * The accuracy of the device position. + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; } /** *

    - * The accuracy of the device position. + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param accuracy

    - * The accuracy of the device position. + * @param sampleTime

    + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionResult withAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; + public GetDevicePositionResult withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; return this; } /** *

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device position. + * Uses + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * * @return

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device + * position. Uses + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public String getDeviceId() { - return deviceId; + public java.util.Date getReceivedTime() { + return receivedTime; } /** *

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device position. + * Uses + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param deviceId

    - * The device whose position you retrieved. + * @param receivedTime

    + * The timestamp for when the tracker resource received the + * device position. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; + public void setReceivedTime(java.util.Date receivedTime) { + this.receivedTime = receivedTime; } /** *

    - * The device whose position you retrieved. + * The timestamp for when the tracker resource received the device position. + * Uses + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param deviceId

    - * The device whose position you retrieved. + * @param receivedTime

    + * The timestamp for when the tracker resource received the + * device position. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetDevicePositionResult withDeviceId(String deviceId) { - this.deviceId = deviceId; + public GetDevicePositionResult withReceivedTime(java.util.Date receivedTime) { + this.receivedTime = receivedTime; return this; } @@ -244,6 +318,51 @@ public GetDevicePositionResult withPosition(java.util.Collection positio return this; } + /** + *

    + * The accuracy of the device position. + *

    + * + * @return

    + * The accuracy of the device position. + *

    + */ + public PositionalAccuracy getAccuracy() { + return accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + * + * @param accuracy

    + * The accuracy of the device position. + *

    + */ + public void setAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param accuracy

    + * The accuracy of the device position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetDevicePositionResult withAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + return this; + } + /** *

    * The properties associated with the position. @@ -327,125 +446,6 @@ public GetDevicePositionResult clearPositionPropertiesEntries() { return this; } - /** - *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp for when the tracker resource received the device - * position in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getReceivedTime() { - return receivedTime; - } - - /** - *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param receivedTime

    - * The timestamp for when the tracker resource received the - * device position in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public void setReceivedTime(java.util.Date receivedTime) { - this.receivedTime = receivedTime; - } - - /** - *

    - * The timestamp for when the tracker resource received the device position - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param receivedTime

    - * The timestamp for when the tracker resource received the - * device position in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public GetDevicePositionResult withReceivedTime(java.util.Date receivedTime) { - this.receivedTime = receivedTime; - return this; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO 8601 - * format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp at which the device's position was determined. Uses - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getSampleTime() { - return sampleTime; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO 8601 - * format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param sampleTime

    - * The timestamp at which the device's position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public void setSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - } - - /** - *

    - * The timestamp at which the device's position was determined. Uses ISO 8601 - * format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param sampleTime

    - * The timestamp at which the device's position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public GetDevicePositionResult withSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -457,18 +457,18 @@ public GetDevicePositionResult withSampleTime(java.util.Date sampleTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getAccuracy() != null) - sb.append("Accuracy: " + getAccuracy() + ","); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); + if (getSampleTime() != null) + sb.append("SampleTime: " + getSampleTime() + ","); + if (getReceivedTime() != null) + sb.append("ReceivedTime: " + getReceivedTime() + ","); if (getPosition() != null) sb.append("Position: " + getPosition() + ","); + if (getAccuracy() != null) + sb.append("Accuracy: " + getAccuracy() + ","); if (getPositionProperties() != null) - sb.append("PositionProperties: " + getPositionProperties() + ","); - if (getReceivedTime() != null) - sb.append("ReceivedTime: " + getReceivedTime() + ","); - if (getSampleTime() != null) - sb.append("SampleTime: " + getSampleTime()); + sb.append("PositionProperties: " + getPositionProperties()); sb.append("}"); return sb.toString(); } @@ -478,14 +478,14 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); + hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); + hashCode = prime * hashCode + + ((getReceivedTime() == null) ? 0 : getReceivedTime().hashCode()); hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getPositionProperties() == null) ? 0 : getPositionProperties().hashCode()); - hashCode = prime * hashCode - + ((getReceivedTime() == null) ? 0 : getReceivedTime().hashCode()); - hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); return hashCode; } @@ -500,32 +500,32 @@ public boolean equals(Object obj) { return false; GetDevicePositionResult other = (GetDevicePositionResult) obj; - if (other.getAccuracy() == null ^ this.getAccuracy() == null) - return false; - if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) - return false; if (other.getDeviceId() == null ^ this.getDeviceId() == null) return false; if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; - if (other.getPosition() == null ^ this.getPosition() == null) - return false; - if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) - return false; - if (other.getPositionProperties() == null ^ this.getPositionProperties() == null) + if (other.getSampleTime() == null ^ this.getSampleTime() == null) return false; - if (other.getPositionProperties() != null - && other.getPositionProperties().equals(this.getPositionProperties()) == false) + if (other.getSampleTime() != null + && other.getSampleTime().equals(this.getSampleTime()) == false) return false; if (other.getReceivedTime() == null ^ this.getReceivedTime() == null) return false; if (other.getReceivedTime() != null && other.getReceivedTime().equals(this.getReceivedTime()) == false) return false; - if (other.getSampleTime() == null ^ this.getSampleTime() == null) + if (other.getPosition() == null ^ this.getPosition() == null) return false; - if (other.getSampleTime() != null - && other.getSampleTime().equals(this.getSampleTime()) == false) + if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) + return false; + if (other.getAccuracy() == null ^ this.getAccuracy() == null) + return false; + if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) + return false; + if (other.getPositionProperties() == null ^ this.getPositionProperties() == null) + return false; + if (other.getPositionProperties() != null + && other.getPositionProperties().equals(this.getPositionProperties()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceRequest.java index 2cc425dce8..858ae795a8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -23,6 +23,12 @@ *

    * Retrieves the geofence details from a geofence collection. *

    + * + *

    + * The returned geometry will always match the geometry format used when the + * geofence was created. + *

    + *     */ public class GetGeofenceRequest extends AmazonWebServiceRequest implements Serializable { /** @@ -32,7 +38,7 @@ public class GetGeofenceRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String collectionName; @@ -43,7 +49,7 @@ public class GetGeofenceRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String geofenceId; @@ -54,7 +60,7 @@ public class GetGeofenceRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The geofence collection storing the target geofence. @@ -71,7 +77,7 @@ public String getCollectionName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The geofence collection storing the target geofence. @@ -91,7 +97,7 @@ public void setCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The geofence collection storing the target geofence. @@ -111,7 +117,7 @@ public GetGeofenceRequest withCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    * The geofence you're retrieving details for. @@ -128,7 +134,7 @@ public String getGeofenceId() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * The geofence you're retrieving details for. @@ -148,7 +154,7 @@ public void setGeofenceId(String geofenceId) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * The geofence you're retrieving details for. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java index 5a0ff33d99..7a0bc0e9d7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,15 +18,6 @@ import java.io.Serializable; public class GetGeofenceResult implements Serializable { - /** - *

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - private java.util.Date createTime; - /** *

    * The geofence identifier. @@ -34,22 +25,10 @@ public class GetGeofenceResult implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String geofenceId; - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - */ - private java.util.Map geofenceProperties; - /** *

    * Contains the geofence geometry details describing a polygon or a circle. @@ -94,73 +73,35 @@ public class GetGeofenceResult implements Serializable { */ private String status; - /** - *

    - * The timestamp for when the geofence collection was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - private java.util.Date updateTime; - /** *

    * The timestamp for when the geofence collection was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - * - * @return

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    */ - public java.util.Date getCreateTime() { - return createTime; - } + private java.util.Date createTime; /** *

    - * The timestamp for when the geofence collection was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - * - * @param createTime

    - * The timestamp for when the geofence collection was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } + private java.util.Date updateTime; /** *

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the geofence collection was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * @return A reference to this updated object so that method calls can be - * chained together. + * Format: "key" : "value" + *

    */ - public GetGeofenceResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } + private java.util.Map geofenceProperties; /** *

    @@ -169,7 +110,7 @@ public GetGeofenceResult withCreateTime(java.util.Date createTime) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    * The geofence identifier. @@ -186,7 +127,7 @@ public String getGeofenceId() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * The geofence identifier. @@ -206,7 +147,7 @@ public void setGeofenceId(String geofenceId) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * The geofence identifier. @@ -219,123 +160,6 @@ public GetGeofenceResult withGeofenceId(String geofenceId) { return this; } - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - * - * @return

    - * User defined properties of the geofence. A property is a - * key-value pair stored with the geofence and added to any geofence - * event triggered with that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - */ - public java.util.Map getGeofenceProperties() { - return geofenceProperties; - } - - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - * - * @param geofenceProperties

    - * User defined properties of the geofence. A property is a - * key-value pair stored with the geofence and added to any - * geofence event triggered with that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - */ - public void setGeofenceProperties(java.util.Map geofenceProperties) { - this.geofenceProperties = geofenceProperties; - } - - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param geofenceProperties

    - * User defined properties of the geofence. A property is a - * key-value pair stored with the geofence and added to any - * geofence event triggered with that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public GetGeofenceResult withGeofenceProperties(java.util.Map geofenceProperties) { - this.geofenceProperties = geofenceProperties; - return this; - } - - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * The method adds a new key-value pair into GeofenceProperties parameter, - * and returns a reference to this object so that method calls can be - * chained together. - * - * @param key The key of the entry to be added into GeofenceProperties. - * @param value The corresponding value of the entry to be added into - * GeofenceProperties. - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public GetGeofenceResult addGeofencePropertiesEntry(String key, String value) { - if (null == this.geofenceProperties) { - this.geofenceProperties = new java.util.HashMap(); - } - if (this.geofenceProperties.containsKey(key)) - throw new IllegalArgumentException("Duplicated keys (" + key.toString() - + ") are provided."); - this.geofenceProperties.put(key, value); - return this; - } - - /** - * Removes all the entries added into GeofenceProperties. - *

    - * Returns a reference to this object so that method calls can be chained - * together. - */ - public GetGeofenceResult clearGeofencePropertiesEntries() { - this.geofenceProperties = null; - return this; - } - /** *

    * Contains the geofence geometry details describing a polygon or a circle. @@ -618,6 +442,65 @@ public GetGeofenceResult withStatus(String status) { return this; } + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @return

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @param createTime

    + * The timestamp for when the geofence collection was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the geofence collection was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetGeofenceResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp for when the geofence collection was last updated in + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + * + * @return

    + * User defined properties of the geofence. A property is a + * key-value pair stored with the geofence and added to any geofence + * event triggered with that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + */ + public java.util.Map getGeofenceProperties() { + return geofenceProperties; + } + + /** + *

    + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + * + * @param geofenceProperties

    + * User defined properties of the geofence. A property is a + * key-value pair stored with the geofence and added to any + * geofence event triggered with that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + */ + public void setGeofenceProperties(java.util.Map geofenceProperties) { + this.geofenceProperties = geofenceProperties; + } + + /** + *

    + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param geofenceProperties

    + * User defined properties of the geofence. A property is a + * key-value pair stored with the geofence and added to any + * geofence event triggered with that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetGeofenceResult withGeofenceProperties(java.util.Map geofenceProperties) { + this.geofenceProperties = geofenceProperties; + return this; + } + + /** + *

    + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + *

    + * The method adds a new key-value pair into GeofenceProperties parameter, + * and returns a reference to this object so that method calls can be + * chained together. + * + * @param key The key of the entry to be added into GeofenceProperties. + * @param value The corresponding value of the entry to be added into + * GeofenceProperties. + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetGeofenceResult addGeofencePropertiesEntry(String key, String value) { + if (null == this.geofenceProperties) { + this.geofenceProperties = new java.util.HashMap(); + } + if (this.geofenceProperties.containsKey(key)) + throw new IllegalArgumentException("Duplicated keys (" + key.toString() + + ") are provided."); + this.geofenceProperties.put(key, value); + return this; + } + + /** + * Removes all the entries added into GeofenceProperties. + *

    + * Returns a reference to this object so that method calls can be chained + * together. + */ + public GetGeofenceResult clearGeofencePropertiesEntries() { + this.geofenceProperties = null; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -689,18 +689,18 @@ public GetGeofenceResult withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); if (getGeofenceId() != null) sb.append("GeofenceId: " + getGeofenceId() + ","); - if (getGeofenceProperties() != null) - sb.append("GeofenceProperties: " + getGeofenceProperties() + ","); if (getGeometry() != null) sb.append("Geometry: " + getGeometry() + ","); if (getStatus() != null) sb.append("Status: " + getStatus() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("UpdateTime: " + getUpdateTime() + ","); + if (getGeofenceProperties() != null) + sb.append("GeofenceProperties: " + getGeofenceProperties()); sb.append("}"); return sb.toString(); } @@ -710,13 +710,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); - hashCode = prime * hashCode - + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + hashCode = prime * hashCode + + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); return hashCode; } @@ -731,21 +731,11 @@ public boolean equals(Object obj) { return false; GetGeofenceResult other = (GetGeofenceResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) - return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) - return false; if (other.getGeofenceId() == null ^ this.getGeofenceId() == null) return false; if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; - if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) - return false; - if (other.getGeofenceProperties() != null - && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) - return false; if (other.getGeometry() == null ^ this.getGeometry() == null) return false; if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) @@ -754,11 +744,21 @@ public boolean equals(Object obj) { return false; if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false) return false; + if (other.getCreateTime() == null ^ this.getCreateTime() == null) + return false; + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) + return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; + if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) + return false; + if (other.getGeofenceProperties() != null + && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java index 0eac16a083..bf50bfee68 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,13 +25,24 @@ *

    */ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

    + * The map resource associated with the glyph file. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String mapName; + /** *

    * A comma-separated list of fonts to load glyphs from in order of * preference. For example, Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -154,7 +165,7 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri *

    *

    * Constraints:
    - * Pattern: ^[0-9]+-[0-9]+\.pbf$
    + * Pattern: [0-9]+-[0-9]+\.pbf
    */ private String fontUnicodeRange; @@ -177,9 +188,55 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @return

    + * The map resource associated with the glyph file. + *

    */ - private String mapName; + public String getMapName() { + return mapName; + } + + /** + *

    + * The map resource associated with the glyph file. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param mapName

    + * The map resource associated with the glyph file. + *

    + */ + public void setMapName(String mapName) { + this.mapName = mapName; + } + + /** + *

    + * The map resource associated with the glyph file. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param mapName

    + * The map resource associated with the glyph file. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetMapGlyphsRequest withMapName(String mapName) { + this.mapName = mapName; + return this; + } /** *

    @@ -187,7 +244,7 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri * preference. For example, Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -305,7 +362,7 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri * Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -431,7 +488,7 @@ public String getFontStack() { * preference. For example, Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -549,7 +606,7 @@ public String getFontStack() { * Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -676,7 +733,7 @@ public void setFontStack(String fontStack) { * preference. For example, Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -797,7 +854,7 @@ public void setFontStack(String fontStack) { * Noto Sans Regular, Arial Unicode. *

    *

    - * Valid fonts stacks for Esri styles: *

    @@ -930,7 +987,7 @@ public GetMapGlyphsRequest withFontStack(String fontStack) { *

    *

    * Constraints:
    - * Pattern: ^[0-9]+-[0-9]+\.pbf$
    + * Pattern: [0-9]+-[0-9]+\.pbf
    * * @return

    * A Unicode range of characters to download glyphs for. Each @@ -952,7 +1009,7 @@ public String getFontUnicodeRange() { *

    *

    * Constraints:
    - * Pattern: ^[0-9]+-[0-9]+\.pbf$
    + * Pattern: [0-9]+-[0-9]+\.pbf
    * * @param fontUnicodeRange

    * A Unicode range of characters to download glyphs for. Each @@ -977,7 +1034,7 @@ public void setFontUnicodeRange(String fontUnicodeRange) { * together. *

    * Constraints:
    - * Pattern: ^[0-9]+-[0-9]+\.pbf$
    + * Pattern: [0-9]+-[0-9]+\.pbf
    * * @param fontUnicodeRange

    * A Unicode range of characters to download glyphs for. Each @@ -1059,63 +1116,6 @@ public GetMapGlyphsRequest withKey(String key) { return this; } - /** - *

    - * The map resource associated with the glyph file. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @return

    - * The map resource associated with the glyph file. - *

    - */ - public String getMapName() { - return mapName; - } - - /** - *

    - * The map resource associated with the glyph file. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param mapName

    - * The map resource associated with the glyph file. - *

    - */ - public void setMapName(String mapName) { - this.mapName = mapName; - } - - /** - *

    - * The map resource associated with the glyph file. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param mapName

    - * The map resource associated with the glyph file. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public GetMapGlyphsRequest withMapName(String mapName) { - this.mapName = mapName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -1127,14 +1127,14 @@ public GetMapGlyphsRequest withMapName(String mapName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getMapName() != null) + sb.append("MapName: " + getMapName() + ","); if (getFontStack() != null) sb.append("FontStack: " + getFontStack() + ","); if (getFontUnicodeRange() != null) sb.append("FontUnicodeRange: " + getFontUnicodeRange() + ","); if (getKey() != null) - sb.append("Key: " + getKey() + ","); - if (getMapName() != null) - sb.append("MapName: " + getMapName()); + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -1144,11 +1144,11 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); hashCode = prime * hashCode + ((getFontStack() == null) ? 0 : getFontStack().hashCode()); hashCode = prime * hashCode + ((getFontUnicodeRange() == null) ? 0 : getFontUnicodeRange().hashCode()); hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); return hashCode; } @@ -1163,6 +1163,10 @@ public boolean equals(Object obj) { return false; GetMapGlyphsRequest other = (GetMapGlyphsRequest) obj; + if (other.getMapName() == null ^ this.getMapName() == null) + return false; + if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) + return false; if (other.getFontStack() == null ^ this.getFontStack() == null) return false; if (other.getFontStack() != null @@ -1177,10 +1181,6 @@ public boolean equals(Object obj) { return false; if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; - if (other.getMapName() == null ^ this.getMapName() == null) - return false; - if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsResult.java index 5b936d28a6..50c5a25aee 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,18 +27,18 @@ public class GetMapGlyphsResult implements Serializable { /** *

    - * The HTTP Cache-Control directive for the value. + * The map glyph content type. For example, + * application/octet-stream. *

    */ - private String cacheControl; + private String contentType; /** *

    - * The map glyph content type. For example, - * application/octet-stream. + * The HTTP Cache-Control directive for the value. *

    */ - private String contentType; + private String cacheControl; /** *

    @@ -87,97 +87,97 @@ public GetMapGlyphsResult withBlob(java.nio.ByteBuffer blob) { /** *

    - * The HTTP Cache-Control directive for the value. + * The map glyph content type. For example, + * application/octet-stream. *

    * * @return

    - * The HTTP Cache-Control directive for the value. + * The map glyph content type. For example, + * application/octet-stream. *

    */ - public String getCacheControl() { - return cacheControl; + public String getContentType() { + return contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The map glyph content type. For example, + * application/octet-stream. *

    * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The map glyph content type. For example, + * application/octet-stream. *

    */ - public void setCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public void setContentType(String contentType) { + this.contentType = contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The map glyph content type. For example, + * application/octet-stream. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The map glyph content type. For example, + * application/octet-stream. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapGlyphsResult withCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public GetMapGlyphsResult withContentType(String contentType) { + this.contentType = contentType; return this; } /** *

    - * The map glyph content type. For example, - * application/octet-stream. + * The HTTP Cache-Control directive for the value. *

    * * @return

    - * The map glyph content type. For example, - * application/octet-stream. + * The HTTP Cache-Control directive for the value. *

    */ - public String getContentType() { - return contentType; + public String getCacheControl() { + return cacheControl; } /** *

    - * The map glyph content type. For example, - * application/octet-stream. + * The HTTP Cache-Control directive for the value. *

    * - * @param contentType

    - * The map glyph content type. For example, - * application/octet-stream. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    */ - public void setContentType(String contentType) { - this.contentType = contentType; + public void setCacheControl(String cacheControl) { + this.cacheControl = cacheControl; } /** *

    - * The map glyph content type. For example, - * application/octet-stream. + * The HTTP Cache-Control directive for the value. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param contentType

    - * The map glyph content type. For example, - * application/octet-stream. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapGlyphsResult withContentType(String contentType) { - this.contentType = contentType; + public GetMapGlyphsResult withCacheControl(String cacheControl) { + this.cacheControl = cacheControl; return this; } @@ -194,10 +194,10 @@ public String toString() { sb.append("{"); if (getBlob() != null) sb.append("Blob: " + getBlob() + ","); - if (getCacheControl() != null) - sb.append("CacheControl: " + getCacheControl() + ","); if (getContentType() != null) - sb.append("ContentType: " + getContentType()); + sb.append("ContentType: " + getContentType() + ","); + if (getCacheControl() != null) + sb.append("CacheControl: " + getCacheControl()); sb.append("}"); return sb.toString(); } @@ -208,10 +208,10 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getBlob() == null) ? 0 : getBlob().hashCode()); - hashCode = prime * hashCode - + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); hashCode = prime * hashCode + ((getContentType() == null) ? 0 : getContentType().hashCode()); + hashCode = prime * hashCode + + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); return hashCode; } @@ -230,16 +230,16 @@ public boolean equals(Object obj) { return false; if (other.getBlob() != null && other.getBlob().equals(this.getBlob()) == false) return false; - if (other.getCacheControl() == null ^ this.getCacheControl() == null) - return false; - if (other.getCacheControl() != null - && other.getCacheControl().equals(this.getCacheControl()) == false) - return false; if (other.getContentType() == null ^ this.getContentType() == null) return false; if (other.getContentType() != null && other.getContentType().equals(this.getContentType()) == false) return false; + if (other.getCacheControl() == null ^ this.getCacheControl() == null) + return false; + if (other.getCacheControl() != null + && other.getCacheControl().equals(this.getCacheControl()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesRequest.java index 62deb19ec5..511755b7b5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,6 +27,17 @@ *

    */ public class GetMapSpritesRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

    + * The map resource associated with the sprite file. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String mapName; + /** *

    * The name of the sprite file. Use the following file names for the sprite @@ -62,7 +73,7 @@ public class GetMapSpritesRequest extends AmazonWebServiceRequest implements Ser * *

    * Constraints:
    - * Pattern: ^sprites(@2x)?\.(png|json)$
    + * Pattern: sprites(@2x)?\.(png|json)
    */ private String fileName; @@ -85,9 +96,55 @@ public class GetMapSpritesRequest extends AmazonWebServiceRequest implements Ser *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @return

    + * The map resource associated with the sprite file. + *

    */ - private String mapName; + public String getMapName() { + return mapName; + } + + /** + *

    + * The map resource associated with the sprite file. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param mapName

    + * The map resource associated with the sprite file. + *

    + */ + public void setMapName(String mapName) { + this.mapName = mapName; + } + + /** + *

    + * The map resource associated with the sprite file. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param mapName

    + * The map resource associated with the sprite file. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GetMapSpritesRequest withMapName(String mapName) { + this.mapName = mapName; + return this; + } /** *

    @@ -124,7 +181,7 @@ public class GetMapSpritesRequest extends AmazonWebServiceRequest implements Ser * *

    * Constraints:
    - * Pattern: ^sprites(@2x)?\.(png|json)$
    + * Pattern: sprites(@2x)?\.(png|json)
    * * @return

    * The name of the sprite file. Use the following file names for the @@ -198,7 +255,7 @@ public String getFileName() { * *

    * Constraints:
    - * Pattern: ^sprites(@2x)?\.(png|json)$
    + * Pattern: sprites(@2x)?\.(png|json)
    * * @param fileName

    * The name of the sprite file. Use the following file names for @@ -275,7 +332,7 @@ public void setFileName(String fileName) { * together. *

    * Constraints:
    - * Pattern: ^sprites(@2x)?\.(png|json)$
    + * Pattern: sprites(@2x)?\.(png|json)
    * * @param fileName

    * The name of the sprite file. Use the following file names for @@ -383,63 +440,6 @@ public GetMapSpritesRequest withKey(String key) { return this; } - /** - *

    - * The map resource associated with the sprite file. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @return

    - * The map resource associated with the sprite file. - *

    - */ - public String getMapName() { - return mapName; - } - - /** - *

    - * The map resource associated with the sprite file. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param mapName

    - * The map resource associated with the sprite file. - *

    - */ - public void setMapName(String mapName) { - this.mapName = mapName; - } - - /** - *

    - * The map resource associated with the sprite file. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param mapName

    - * The map resource associated with the sprite file. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public GetMapSpritesRequest withMapName(String mapName) { - this.mapName = mapName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -451,12 +451,12 @@ public GetMapSpritesRequest withMapName(String mapName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getMapName() != null) + sb.append("MapName: " + getMapName() + ","); if (getFileName() != null) sb.append("FileName: " + getFileName() + ","); if (getKey() != null) - sb.append("Key: " + getKey() + ","); - if (getMapName() != null) - sb.append("MapName: " + getMapName()); + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -466,9 +466,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); hashCode = prime * hashCode + ((getFileName() == null) ? 0 : getFileName().hashCode()); hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); return hashCode; } @@ -483,6 +483,10 @@ public boolean equals(Object obj) { return false; GetMapSpritesRequest other = (GetMapSpritesRequest) obj; + if (other.getMapName() == null ^ this.getMapName() == null) + return false; + if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) + return false; if (other.getFileName() == null ^ this.getFileName() == null) return false; if (other.getFileName() != null && other.getFileName().equals(this.getFileName()) == false) @@ -491,10 +495,6 @@ public boolean equals(Object obj) { return false; if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; - if (other.getMapName() == null ^ this.getMapName() == null) - return false; - if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesResult.java index d31ba9c097..ba8013d936 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapSpritesResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,19 +27,19 @@ public class GetMapSpritesResult implements Serializable { /** *

    - * The HTTP Cache-Control directive for the value. + * The content type of the sprite sheet and offsets. For example, the sprite + * sheet content type is image/png, and the sprite offset JSON + * document is application/json. *

    */ - private String cacheControl; + private String contentType; /** *

    - * The content type of the sprite sheet and offsets. For example, the sprite - * sheet content type is image/png, and the sprite offset JSON - * document is application/json. + * The HTTP Cache-Control directive for the value. *

    */ - private String contentType; + private String cacheControl; /** *

    @@ -88,105 +88,105 @@ public GetMapSpritesResult withBlob(java.nio.ByteBuffer blob) { /** *

    - * The HTTP Cache-Control directive for the value. + * The content type of the sprite sheet and offsets. For example, the sprite + * sheet content type is image/png, and the sprite offset JSON + * document is application/json. *

    * * @return

    - * The HTTP Cache-Control directive for the value. + * The content type of the sprite sheet and offsets. For example, + * the sprite sheet content type is image/png, and the + * sprite offset JSON document is application/json. *

    */ - public String getCacheControl() { - return cacheControl; + public String getContentType() { + return contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The content type of the sprite sheet and offsets. For example, the sprite + * sheet content type is image/png, and the sprite offset JSON + * document is application/json. *

    * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The content type of the sprite sheet and offsets. For example, + * the sprite sheet content type is image/png, and + * the sprite offset JSON document is + * application/json. *

    */ - public void setCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public void setContentType(String contentType) { + this.contentType = contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The content type of the sprite sheet and offsets. For example, the sprite + * sheet content type is image/png, and the sprite offset JSON + * document is application/json. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The content type of the sprite sheet and offsets. For example, + * the sprite sheet content type is image/png, and + * the sprite offset JSON document is + * application/json. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapSpritesResult withCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public GetMapSpritesResult withContentType(String contentType) { + this.contentType = contentType; return this; } /** *

    - * The content type of the sprite sheet and offsets. For example, the sprite - * sheet content type is image/png, and the sprite offset JSON - * document is application/json. + * The HTTP Cache-Control directive for the value. *

    * * @return

    - * The content type of the sprite sheet and offsets. For example, - * the sprite sheet content type is image/png, and the - * sprite offset JSON document is application/json. + * The HTTP Cache-Control directive for the value. *

    */ - public String getContentType() { - return contentType; + public String getCacheControl() { + return cacheControl; } /** *

    - * The content type of the sprite sheet and offsets. For example, the sprite - * sheet content type is image/png, and the sprite offset JSON - * document is application/json. + * The HTTP Cache-Control directive for the value. *

    * - * @param contentType

    - * The content type of the sprite sheet and offsets. For example, - * the sprite sheet content type is image/png, and - * the sprite offset JSON document is - * application/json. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    */ - public void setContentType(String contentType) { - this.contentType = contentType; + public void setCacheControl(String cacheControl) { + this.cacheControl = cacheControl; } /** *

    - * The content type of the sprite sheet and offsets. For example, the sprite - * sheet content type is image/png, and the sprite offset JSON - * document is application/json. + * The HTTP Cache-Control directive for the value. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param contentType

    - * The content type of the sprite sheet and offsets. For example, - * the sprite sheet content type is image/png, and - * the sprite offset JSON document is - * application/json. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapSpritesResult withContentType(String contentType) { - this.contentType = contentType; + public GetMapSpritesResult withCacheControl(String cacheControl) { + this.cacheControl = cacheControl; return this; } @@ -203,10 +203,10 @@ public String toString() { sb.append("{"); if (getBlob() != null) sb.append("Blob: " + getBlob() + ","); - if (getCacheControl() != null) - sb.append("CacheControl: " + getCacheControl() + ","); if (getContentType() != null) - sb.append("ContentType: " + getContentType()); + sb.append("ContentType: " + getContentType() + ","); + if (getCacheControl() != null) + sb.append("CacheControl: " + getCacheControl()); sb.append("}"); return sb.toString(); } @@ -217,10 +217,10 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getBlob() == null) ? 0 : getBlob().hashCode()); - hashCode = prime * hashCode - + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); hashCode = prime * hashCode + ((getContentType() == null) ? 0 : getContentType().hashCode()); + hashCode = prime * hashCode + + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); return hashCode; } @@ -239,16 +239,16 @@ public boolean equals(Object obj) { return false; if (other.getBlob() != null && other.getBlob().equals(this.getBlob()) == false) return false; - if (other.getCacheControl() == null ^ this.getCacheControl() == null) - return false; - if (other.getCacheControl() != null - && other.getCacheControl().equals(this.getCacheControl()) == false) - return false; if (other.getContentType() == null ^ this.getContentType() == null) return false; if (other.getContentType() != null && other.getContentType().equals(this.getContentType()) == false) return false; + if (other.getCacheControl() == null ^ this.getCacheControl() == null) + return false; + if (other.getCacheControl() != null + && other.getCacheControl().equals(this.getCacheControl()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorRequest.java index 6c3190c6cc..0449f68fdb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -30,18 +30,6 @@ *

    */ public class GetMapStyleDescriptorRequest extends AmazonWebServiceRequest implements Serializable { - /** - *

    - * The optional API key to authorize the request. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - */ - private String key; - /** *

    * The map resource to retrieve the style descriptor from. @@ -49,7 +37,7 @@ public class GetMapStyleDescriptorRequest extends AmazonWebServiceRequest implem *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String mapName; @@ -62,117 +50,129 @@ public class GetMapStyleDescriptorRequest extends AmazonWebServiceRequest implem *

    * Constraints:
    * Length: 0 - 1000
    + */ + private String key; + + /** + *

    + * The map resource to retrieve the style descriptor from. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The optional API key to authorize the request. + * The map resource to retrieve the style descriptor from. *

    */ - public String getKey() { - return key; + public String getMapName() { + return mapName; } /** *

    - * The optional API key to authorize the request. + * The map resource to retrieve the style descriptor from. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param key

    - * The optional API key to authorize the request. + * @param mapName

    + * The map resource to retrieve the style descriptor from. *

    */ - public void setKey(String key) { - this.key = key; + public void setMapName(String mapName) { + this.mapName = mapName; } /** *

    - * The optional API key to authorize the request. + * The map resource to retrieve the style descriptor from. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param key

    - * The optional API key to authorize the request. + * @param mapName

    + * The map resource to retrieve the style descriptor from. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapStyleDescriptorRequest withKey(String key) { - this.key = key; + public GetMapStyleDescriptorRequest withMapName(String mapName) { + this.mapName = mapName; return this; } /** *

    - * The map resource to retrieve the style descriptor from. + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    * * @return

    - * The map resource to retrieve the style descriptor from. + * The optional API key to authorize the request. *

    */ - public String getMapName() { - return mapName; + public String getKey() { + return key; } /** *

    - * The map resource to retrieve the style descriptor from. + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    * - * @param mapName

    - * The map resource to retrieve the style descriptor from. + * @param key

    + * The optional API key to authorize the request. *

    */ - public void setMapName(String mapName) { - this.mapName = mapName; + public void setKey(String key) { + this.key = key; } /** *

    - * The map resource to retrieve the style descriptor from. + * The optional API key to authorize the request. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    * - * @param mapName

    - * The map resource to retrieve the style descriptor from. + * @param key

    + * The optional API key to authorize the request. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapStyleDescriptorRequest withMapName(String mapName) { - this.mapName = mapName; + public GetMapStyleDescriptorRequest withKey(String key) { + this.key = key; return this; } @@ -187,10 +187,10 @@ public GetMapStyleDescriptorRequest withMapName(String mapName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); if (getMapName() != null) - sb.append("MapName: " + getMapName()); + sb.append("MapName: " + getMapName() + ","); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -200,8 +200,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -216,14 +216,14 @@ public boolean equals(Object obj) { return false; GetMapStyleDescriptorRequest other = (GetMapStyleDescriptorRequest) obj; - if (other.getKey() == null ^ this.getKey() == null) - return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) - return false; if (other.getMapName() == null ^ this.getMapName() == null) return false; if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) return false; + if (other.getKey() == null ^ this.getKey() == null) + return false; + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorResult.java index 4cdc14f7d4..84f5339bb0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapStyleDescriptorResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,18 +27,18 @@ public class GetMapStyleDescriptorResult implements Serializable { /** *

    - * The HTTP Cache-Control directive for the value. + * The style descriptor's content type. For example, + * application/json. *

    */ - private String cacheControl; + private String contentType; /** *

    - * The style descriptor's content type. For example, - * application/json. + * The HTTP Cache-Control directive for the value. *

    */ - private String contentType; + private String cacheControl; /** *

    @@ -87,97 +87,97 @@ public GetMapStyleDescriptorResult withBlob(java.nio.ByteBuffer blob) { /** *

    - * The HTTP Cache-Control directive for the value. + * The style descriptor's content type. For example, + * application/json. *

    * * @return

    - * The HTTP Cache-Control directive for the value. + * The style descriptor's content type. For example, + * application/json. *

    */ - public String getCacheControl() { - return cacheControl; + public String getContentType() { + return contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The style descriptor's content type. For example, + * application/json. *

    * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The style descriptor's content type. For example, + * application/json. *

    */ - public void setCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public void setContentType(String contentType) { + this.contentType = contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The style descriptor's content type. For example, + * application/json. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The style descriptor's content type. For example, + * application/json. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapStyleDescriptorResult withCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public GetMapStyleDescriptorResult withContentType(String contentType) { + this.contentType = contentType; return this; } /** *

    - * The style descriptor's content type. For example, - * application/json. + * The HTTP Cache-Control directive for the value. *

    * * @return

    - * The style descriptor's content type. For example, - * application/json. + * The HTTP Cache-Control directive for the value. *

    */ - public String getContentType() { - return contentType; + public String getCacheControl() { + return cacheControl; } /** *

    - * The style descriptor's content type. For example, - * application/json. + * The HTTP Cache-Control directive for the value. *

    * - * @param contentType

    - * The style descriptor's content type. For example, - * application/json. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    */ - public void setContentType(String contentType) { - this.contentType = contentType; + public void setCacheControl(String cacheControl) { + this.cacheControl = cacheControl; } /** *

    - * The style descriptor's content type. For example, - * application/json. + * The HTTP Cache-Control directive for the value. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param contentType

    - * The style descriptor's content type. For example, - * application/json. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapStyleDescriptorResult withContentType(String contentType) { - this.contentType = contentType; + public GetMapStyleDescriptorResult withCacheControl(String cacheControl) { + this.cacheControl = cacheControl; return this; } @@ -194,10 +194,10 @@ public String toString() { sb.append("{"); if (getBlob() != null) sb.append("Blob: " + getBlob() + ","); - if (getCacheControl() != null) - sb.append("CacheControl: " + getCacheControl() + ","); if (getContentType() != null) - sb.append("ContentType: " + getContentType()); + sb.append("ContentType: " + getContentType() + ","); + if (getCacheControl() != null) + sb.append("CacheControl: " + getCacheControl()); sb.append("}"); return sb.toString(); } @@ -208,10 +208,10 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getBlob() == null) ? 0 : getBlob().hashCode()); - hashCode = prime * hashCode - + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); hashCode = prime * hashCode + ((getContentType() == null) ? 0 : getContentType().hashCode()); + hashCode = prime * hashCode + + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); return hashCode; } @@ -230,16 +230,16 @@ public boolean equals(Object obj) { return false; if (other.getBlob() != null && other.getBlob().equals(this.getBlob()) == false) return false; - if (other.getCacheControl() == null ^ this.getCacheControl() == null) - return false; - if (other.getCacheControl() != null - && other.getCacheControl().equals(this.getCacheControl()) == false) - return false; if (other.getContentType() == null ^ this.getContentType() == null) return false; if (other.getContentType() != null && other.getContentType().equals(this.getContentType()) == false) return false; + if (other.getCacheControl() == null ^ this.getCacheControl() == null) + return false; + if (other.getCacheControl() != null + && other.getCacheControl().equals(this.getCacheControl()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileRequest.java index d1ed5eaf4e..dab3d5f27d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -35,26 +35,24 @@ public class GetMapTileRequest extends AmazonWebServiceRequest implements Serializable { /** *

    - * The optional API key to authorize the request. + * The map resource to retrieve the map tiles from. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private String key; + private String mapName; /** *

    - * The map resource to retrieve the map tiles from. + * The zoom value for the map tile. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: .*\d+.*
    */ - private String mapName; + private String z; /** *

    @@ -62,7 +60,7 @@ public class GetMapTileRequest extends AmazonWebServiceRequest implements Serial *

    *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    */ private String x; @@ -72,140 +70,130 @@ public class GetMapTileRequest extends AmazonWebServiceRequest implements Serial *

    *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    */ private String y; /** *

    - * The zoom value for the map tile. + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Pattern: \d+
    + * Length: 0 - 1000
    */ - private String z; + private String key; /** *

    - * The optional API key to authorize the request. + * The map resource to retrieve the map tiles from. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The optional API key to authorize the request. + * The map resource to retrieve the map tiles from. *

    */ - public String getKey() { - return key; + public String getMapName() { + return mapName; } /** *

    - * The optional API key to authorize the request. + * The map resource to retrieve the map tiles from. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param key

    - * The optional API key to authorize the request. + * @param mapName

    + * The map resource to retrieve the map tiles from. *

    */ - public void setKey(String key) { - this.key = key; + public void setMapName(String mapName) { + this.mapName = mapName; } /** *

    - * The optional API key to authorize the request. + * The map resource to retrieve the map tiles from. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param key

    - * The optional API key to authorize the request. + * @param mapName

    + * The map resource to retrieve the map tiles from. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapTileRequest withKey(String key) { - this.key = key; + public GetMapTileRequest withMapName(String mapName) { + this.mapName = mapName; return this; } /** *

    - * The map resource to retrieve the map tiles from. + * The zoom value for the map tile. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: .*\d+.*
    * * @return

    - * The map resource to retrieve the map tiles from. + * The zoom value for the map tile. *

    */ - public String getMapName() { - return mapName; + public String getZ() { + return z; } /** *

    - * The map resource to retrieve the map tiles from. + * The zoom value for the map tile. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: .*\d+.*
    * - * @param mapName

    - * The map resource to retrieve the map tiles from. + * @param z

    + * The zoom value for the map tile. *

    */ - public void setMapName(String mapName) { - this.mapName = mapName; + public void setZ(String z) { + this.z = z; } /** *

    - * The map resource to retrieve the map tiles from. + * The zoom value for the map tile. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: .*\d+.*
    * - * @param mapName

    - * The map resource to retrieve the map tiles from. + * @param z

    + * The zoom value for the map tile. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapTileRequest withMapName(String mapName) { - this.mapName = mapName; + public GetMapTileRequest withZ(String z) { + this.z = z; return this; } @@ -215,7 +203,7 @@ public GetMapTileRequest withMapName(String mapName) { *

    *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    * * @return

    * The X axis value for the map tile. @@ -231,7 +219,7 @@ public String getX() { *

    *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    * * @param x

    * The X axis value for the map tile. @@ -250,7 +238,7 @@ public void setX(String x) { * together. *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    * * @param x

    * The X axis value for the map tile. @@ -269,7 +257,7 @@ public GetMapTileRequest withX(String x) { *

    *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    * * @return

    * The Y axis value for the map tile. @@ -285,7 +273,7 @@ public String getY() { *

    *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    * * @param y

    * The Y axis value for the map tile. @@ -304,7 +292,7 @@ public void setY(String y) { * together. *

    * Constraints:
    - * Pattern: \d+
    + * Pattern: .*\d+.*
    * * @param y

    * The Y axis value for the map tile. @@ -319,55 +307,67 @@ public GetMapTileRequest withY(String y) { /** *

    - * The zoom value for the map tile. + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Pattern: \d+
    + * Length: 0 - 1000
    * * @return

    - * The zoom value for the map tile. + * The optional API key to authorize the request. *

    */ - public String getZ() { - return z; + public String getKey() { + return key; } /** *

    - * The zoom value for the map tile. + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Pattern: \d+
    + * Length: 0 - 1000
    * - * @param z

    - * The zoom value for the map tile. + * @param key

    + * The optional API key to authorize the request. *

    */ - public void setZ(String z) { - this.z = z; + public void setKey(String key) { + this.key = key; } /** *

    - * The zoom value for the map tile. + * The optional API key to authorize the request. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Pattern: \d+
    + * Length: 0 - 1000
    * - * @param z

    - * The zoom value for the map tile. + * @param key

    + * The optional API key to authorize the request. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapTileRequest withZ(String z) { - this.z = z; + public GetMapTileRequest withKey(String key) { + this.key = key; return this; } @@ -382,16 +382,16 @@ public GetMapTileRequest withZ(String z) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); if (getMapName() != null) sb.append("MapName: " + getMapName() + ","); + if (getZ() != null) + sb.append("Z: " + getZ() + ","); if (getX() != null) sb.append("X: " + getX() + ","); if (getY() != null) sb.append("Y: " + getY() + ","); - if (getZ() != null) - sb.append("Z: " + getZ()); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -401,11 +401,11 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); + hashCode = prime * hashCode + ((getZ() == null) ? 0 : getZ().hashCode()); hashCode = prime * hashCode + ((getX() == null) ? 0 : getX().hashCode()); hashCode = prime * hashCode + ((getY() == null) ? 0 : getY().hashCode()); - hashCode = prime * hashCode + ((getZ() == null) ? 0 : getZ().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -420,14 +420,14 @@ public boolean equals(Object obj) { return false; GetMapTileRequest other = (GetMapTileRequest) obj; - if (other.getKey() == null ^ this.getKey() == null) - return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) - return false; if (other.getMapName() == null ^ this.getMapName() == null) return false; if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) return false; + if (other.getZ() == null ^ this.getZ() == null) + return false; + if (other.getZ() != null && other.getZ().equals(this.getZ()) == false) + return false; if (other.getX() == null ^ this.getX() == null) return false; if (other.getX() != null && other.getX().equals(this.getX()) == false) @@ -436,9 +436,9 @@ public boolean equals(Object obj) { return false; if (other.getY() != null && other.getY().equals(this.getY()) == false) return false; - if (other.getZ() == null ^ this.getZ() == null) + if (other.getKey() == null ^ this.getKey() == null) return false; - if (other.getZ() != null && other.getZ().equals(this.getZ()) == false) + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileResult.java index bc4ac34c44..48b24276ad 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapTileResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,18 +27,18 @@ public class GetMapTileResult implements Serializable { /** *

    - * The HTTP Cache-Control directive for the value. + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    */ - private String cacheControl; + private String contentType; /** *

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * The HTTP Cache-Control directive for the value. *

    */ - private String contentType; + private String cacheControl; /** *

    @@ -87,97 +87,97 @@ public GetMapTileResult withBlob(java.nio.ByteBuffer blob) { /** *

    - * The HTTP Cache-Control directive for the value. + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    * * @return

    - * The HTTP Cache-Control directive for the value. + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    */ - public String getCacheControl() { - return cacheControl; + public String getContentType() { + return contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    */ - public void setCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public void setContentType(String contentType) { + this.contentType = contentType; } /** *

    - * The HTTP Cache-Control directive for the value. + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param cacheControl

    - * The HTTP Cache-Control directive for the value. + * @param contentType

    + * The map tile's content type. For example, + * application/vnd.mapbox-vector-tile. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapTileResult withCacheControl(String cacheControl) { - this.cacheControl = cacheControl; + public GetMapTileResult withContentType(String contentType) { + this.contentType = contentType; return this; } /** *

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * The HTTP Cache-Control directive for the value. *

    * * @return

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * The HTTP Cache-Control directive for the value. *

    */ - public String getContentType() { - return contentType; + public String getCacheControl() { + return cacheControl; } /** *

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * The HTTP Cache-Control directive for the value. *

    * - * @param contentType

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    */ - public void setContentType(String contentType) { - this.contentType = contentType; + public void setCacheControl(String cacheControl) { + this.cacheControl = cacheControl; } /** *

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * The HTTP Cache-Control directive for the value. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param contentType

    - * The map tile's content type. For example, - * application/vnd.mapbox-vector-tile. + * @param cacheControl

    + * The HTTP Cache-Control directive for the value. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetMapTileResult withContentType(String contentType) { - this.contentType = contentType; + public GetMapTileResult withCacheControl(String cacheControl) { + this.cacheControl = cacheControl; return this; } @@ -194,10 +194,10 @@ public String toString() { sb.append("{"); if (getBlob() != null) sb.append("Blob: " + getBlob() + ","); - if (getCacheControl() != null) - sb.append("CacheControl: " + getCacheControl() + ","); if (getContentType() != null) - sb.append("ContentType: " + getContentType()); + sb.append("ContentType: " + getContentType() + ","); + if (getCacheControl() != null) + sb.append("CacheControl: " + getCacheControl()); sb.append("}"); return sb.toString(); } @@ -208,10 +208,10 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getBlob() == null) ? 0 : getBlob().hashCode()); - hashCode = prime * hashCode - + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); hashCode = prime * hashCode + ((getContentType() == null) ? 0 : getContentType().hashCode()); + hashCode = prime * hashCode + + ((getCacheControl() == null) ? 0 : getCacheControl().hashCode()); return hashCode; } @@ -230,16 +230,16 @@ public boolean equals(Object obj) { return false; if (other.getBlob() != null && other.getBlob().equals(this.getBlob()) == false) return false; - if (other.getCacheControl() == null ^ this.getCacheControl() == null) - return false; - if (other.getCacheControl() != null - && other.getCacheControl().equals(this.getCacheControl()) == false) - return false; if (other.getContentType() == null ^ this.getContentType() == null) return false; if (other.getContentType() != null && other.getContentType().equals(this.getContentType()) == false) return false; + if (other.getCacheControl() == null ^ this.getCacheControl() == null) + return false; + if (other.getCacheControl() != null + && other.getCacheControl().equals(this.getCacheControl()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceRequest.java index 192a891eda..4bd320eacf 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -56,21 +56,16 @@ public class GetPlaceRequest extends AmazonWebServiceRequest implements Serializ *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String indexName; /** *

    - * The optional API key to authorize the request. + * The identifier of the place to find. *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    */ - private String key; + private String placeId; /** *

    @@ -107,10 +102,15 @@ public class GetPlaceRequest extends AmazonWebServiceRequest implements Serializ /** *

    - * The identifier of the place to find. + * The optional API key to authorize the request. *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    */ - private String placeId; + private String key; /** *

    @@ -119,7 +119,7 @@ public class GetPlaceRequest extends AmazonWebServiceRequest implements Serializ *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the place index resource that you want to use for the @@ -137,7 +137,7 @@ public String getIndexName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource that you want to use for @@ -158,7 +158,7 @@ public void setIndexName(String indexName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource that you want to use for @@ -174,67 +174,46 @@ public GetPlaceRequest withIndexName(String indexName) { /** *

    - * The optional API key to authorize the request. + * The identifier of the place to find. *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    * * @return

    - * The optional API key to authorize the request. + * The identifier of the place to find. *

    */ - public String getKey() { - return key; + public String getPlaceId() { + return placeId; } /** *

    - * The optional API key to authorize the request. + * The identifier of the place to find. *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    * - * @param key

    - * The optional API key to authorize the request. + * @param placeId

    + * The identifier of the place to find. *

    */ - public void setKey(String key) { - this.key = key; + public void setPlaceId(String placeId) { + this.placeId = placeId; } /** *

    - * The optional API key to authorize the request. + * The identifier of the place to find. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 0 - 1000
    * - * @param key

    - * The optional API key to authorize the request. + * @param placeId

    + * The identifier of the place to find. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetPlaceRequest withKey(String key) { - this.key = key; + public GetPlaceRequest withPlaceId(String placeId) { + this.placeId = placeId; return this; } @@ -432,46 +411,67 @@ public GetPlaceRequest withLanguage(String language) { /** *

    - * The identifier of the place to find. + * The optional API key to authorize the request. *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    * * @return

    - * The identifier of the place to find. + * The optional API key to authorize the request. *

    */ - public String getPlaceId() { - return placeId; + public String getKey() { + return key; } /** *

    - * The identifier of the place to find. + * The optional API key to authorize the request. *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    * - * @param placeId

    - * The identifier of the place to find. + * @param key

    + * The optional API key to authorize the request. *

    */ - public void setPlaceId(String placeId) { - this.placeId = placeId; + public void setKey(String key) { + this.key = key; } /** *

    - * The identifier of the place to find. + * The optional API key to authorize the request. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 0 - 1000
    * - * @param placeId

    - * The identifier of the place to find. + * @param key

    + * The optional API key to authorize the request. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public GetPlaceRequest withPlaceId(String placeId) { - this.placeId = placeId; + public GetPlaceRequest withKey(String key) { + this.key = key; return this; } @@ -488,12 +488,12 @@ public String toString() { sb.append("{"); if (getIndexName() != null) sb.append("IndexName: " + getIndexName() + ","); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); + if (getPlaceId() != null) + sb.append("PlaceId: " + getPlaceId() + ","); if (getLanguage() != null) sb.append("Language: " + getLanguage() + ","); - if (getPlaceId() != null) - sb.append("PlaceId: " + getPlaceId()); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -504,9 +504,9 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); hashCode = prime * hashCode + ((getPlaceId() == null) ? 0 : getPlaceId().hashCode()); + hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -526,17 +526,17 @@ public boolean equals(Object obj) { if (other.getIndexName() != null && other.getIndexName().equals(this.getIndexName()) == false) return false; - if (other.getKey() == null ^ this.getKey() == null) + if (other.getPlaceId() == null ^ this.getPlaceId() == null) return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) + if (other.getPlaceId() != null && other.getPlaceId().equals(this.getPlaceId()) == false) return false; if (other.getLanguage() == null ^ this.getLanguage() == null) return false; if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) return false; - if (other.getPlaceId() == null ^ this.getPlaceId() == null) + if (other.getKey() == null ^ this.getKey() == null) return false; - if (other.getPlaceId() != null && other.getPlaceId().equals(this.getPlaceId()) == false) + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceResult.java index ddf96e13c2..53ba146acf 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetPlaceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InferredState.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InferredState.java new file mode 100644 index 0000000000..3d94648e9e --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InferredState.java @@ -0,0 +1,361 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * The inferred state of the device, given the provided position, IP address, + * cellular signals, and Wi-Fi- access points. + *

    + */ +public class InferredState implements Serializable { + /** + *

    + * The device position inferred by the provided position, IP address, + * cellular signals, and Wi-Fi- access points. + *

    + */ + private java.util.List position; + + /** + *

    + * The level of certainty of the inferred position. + *

    + */ + private PositionalAccuracy accuracy; + + /** + *

    + * The distance between the inferred position and the device's self-reported + * position. + *

    + */ + private Double deviationDistance; + + /** + *

    + * Indicates if a proxy was used. + *

    + */ + private Boolean proxyDetected; + + /** + *

    + * The device position inferred by the provided position, IP address, + * cellular signals, and Wi-Fi- access points. + *

    + * + * @return

    + * The device position inferred by the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

    + */ + public java.util.List getPosition() { + return position; + } + + /** + *

    + * The device position inferred by the provided position, IP address, + * cellular signals, and Wi-Fi- access points. + *

    + * + * @param position

    + * The device position inferred by the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

    + */ + public void setPosition(java.util.Collection position) { + if (position == null) { + this.position = null; + return; + } + + this.position = new java.util.ArrayList(position); + } + + /** + *

    + * The device position inferred by the provided position, IP address, + * cellular signals, and Wi-Fi- access points. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The device position inferred by the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public InferredState withPosition(Double... position) { + if (getPosition() == null) { + this.position = new java.util.ArrayList(position.length); + } + for (Double value : position) { + this.position.add(value); + } + return this; + } + + /** + *

    + * The device position inferred by the provided position, IP address, + * cellular signals, and Wi-Fi- access points. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The device position inferred by the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public InferredState withPosition(java.util.Collection position) { + setPosition(position); + return this; + } + + /** + *

    + * The level of certainty of the inferred position. + *

    + * + * @return

    + * The level of certainty of the inferred position. + *

    + */ + public PositionalAccuracy getAccuracy() { + return accuracy; + } + + /** + *

    + * The level of certainty of the inferred position. + *

    + * + * @param accuracy

    + * The level of certainty of the inferred position. + *

    + */ + public void setAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + } + + /** + *

    + * The level of certainty of the inferred position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param accuracy

    + * The level of certainty of the inferred position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public InferredState withAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + return this; + } + + /** + *

    + * The distance between the inferred position and the device's self-reported + * position. + *

    + * + * @return

    + * The distance between the inferred position and the device's + * self-reported position. + *

    + */ + public Double getDeviationDistance() { + return deviationDistance; + } + + /** + *

    + * The distance between the inferred position and the device's self-reported + * position. + *

    + * + * @param deviationDistance

    + * The distance between the inferred position and the device's + * self-reported position. + *

    + */ + public void setDeviationDistance(Double deviationDistance) { + this.deviationDistance = deviationDistance; + } + + /** + *

    + * The distance between the inferred position and the device's self-reported + * position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param deviationDistance

    + * The distance between the inferred position and the device's + * self-reported position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public InferredState withDeviationDistance(Double deviationDistance) { + this.deviationDistance = deviationDistance; + return this; + } + + /** + *

    + * Indicates if a proxy was used. + *

    + * + * @return

    + * Indicates if a proxy was used. + *

    + */ + public Boolean isProxyDetected() { + return proxyDetected; + } + + /** + *

    + * Indicates if a proxy was used. + *

    + * + * @return

    + * Indicates if a proxy was used. + *

    + */ + public Boolean getProxyDetected() { + return proxyDetected; + } + + /** + *

    + * Indicates if a proxy was used. + *

    + * + * @param proxyDetected

    + * Indicates if a proxy was used. + *

    + */ + public void setProxyDetected(Boolean proxyDetected) { + this.proxyDetected = proxyDetected; + } + + /** + *

    + * Indicates if a proxy was used. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param proxyDetected

    + * Indicates if a proxy was used. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public InferredState withProxyDetected(Boolean proxyDetected) { + this.proxyDetected = proxyDetected; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getPosition() != null) + sb.append("Position: " + getPosition() + ","); + if (getAccuracy() != null) + sb.append("Accuracy: " + getAccuracy() + ","); + if (getDeviationDistance() != null) + sb.append("DeviationDistance: " + getDeviationDistance() + ","); + if (getProxyDetected() != null) + sb.append("ProxyDetected: " + getProxyDetected()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); + hashCode = prime * hashCode + + ((getDeviationDistance() == null) ? 0 : getDeviationDistance().hashCode()); + hashCode = prime * hashCode + + ((getProxyDetected() == null) ? 0 : getProxyDetected().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof InferredState == false) + return false; + InferredState other = (InferredState) obj; + + if (other.getPosition() == null ^ this.getPosition() == null) + return false; + if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) + return false; + if (other.getAccuracy() == null ^ this.getAccuracy() == null) + return false; + if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) + return false; + if (other.getDeviationDistance() == null ^ this.getDeviationDistance() == null) + return false; + if (other.getDeviationDistance() != null + && other.getDeviationDistance().equals(this.getDeviationDistance()) == false) + return false; + if (other.getProxyDetected() == null ^ this.getProxyDetected() == null) + return false; + if (other.getProxyDetected() != null + && other.getProxyDetected().equals(this.getProxyDetected()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/IntendedUse.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/IntendedUse.java index 5812446c42..3ca4e799f7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/IntendedUse.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/IntendedUse.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InternalServerException.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InternalServerException.java index 155174a640..07c673e5f0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InternalServerException.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/InternalServerException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Leg.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Leg.java index 9164f824ab..1fbd1793b2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Leg.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Leg.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,6 +61,36 @@ * */ public class Leg implements Serializable { + /** + *

    + * The starting position of the leg. Follows the format + * [longitude,latitude]. + *

    + * + *

    + * If the StartPosition isn't located on a road, it's snapped to a nearby road. + *

    + *     + */ + private java.util.List startPosition; + + /** + *

    + * The terminating position of the leg. Follows the format + * [longitude,latitude]. + *

    + * + *

    + * If the EndPosition isn't located on a road, it's snapped to a nearby road. + *

    + *     + */ + private java.util.List endPosition; + /** *

    * The distance between the leg's StartPosition and @@ -92,21 +122,6 @@ public class Leg implements Serializable { */ private Double durationSeconds; - /** - *

    - * The terminating position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the EndPosition isn't located on a road, it's snapped to a nearby road. - *

    - *     - */ - private java.util.List endPosition; - /** *

    * Contains the calculated route's path as a linestring geometry. @@ -114,21 +129,6 @@ public class Leg implements Serializable { */ private LegGeometry geometry; - /** - *

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, it's snapped to a nearby road. - *

    - *     - */ - private java.util.List startPosition; - /** *

    * Contains a list of steps, which represent subsections of a leg. Each step @@ -141,181 +141,143 @@ public class Leg implements Serializable { /** *

    - * The distance between the leg's StartPosition and - * EndPosition along a calculated route. + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    - *
      - *
    • + * *

      - * The default measurement is Kilometers unless the request - * specifies a DistanceUnit of Miles. + * If the StartPosition isn't located on a road, it's snapped to a nearby road. *

      - *
      • - *
    - *

    - * Constraints:
    - * Range: 0.0 -
    + * * * @return

    - * The distance between the leg's StartPosition and - * EndPosition along a calculated route. + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    - *
      - *
    • + * *

      - * The default measurement is Kilometers unless the - * request specifies a DistanceUnit of - * Miles. + * If the StartPosition isn't located on a road, it's + * snapped to a nearby road. *

      - *
      • - *
    + *     */ - public Double getDistance() { - return distance; + public java.util.List getStartPosition() { + return startPosition; } /** *

    - * The distance between the leg's StartPosition and - * EndPosition along a calculated route. + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    - *
      - *
    • + * *

      - * The default measurement is Kilometers unless the request - * specifies a DistanceUnit of Miles. + * If the StartPosition isn't located on a road, it's snapped to a nearby road. *

      - *
      • - *
    - *

    - * Constraints:
    - * Range: 0.0 -
    + * * - * @param distance

    - * The distance between the leg's StartPosition and - * EndPosition along a calculated route. + * @param startPosition

    + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    - *
      - *
    • + * *

      - * The default measurement is Kilometers unless the - * request specifies a DistanceUnit of - * Miles. + * If the StartPosition isn't located on a road, + * it's snapped to a nearby road. *

      - *
      • - *
    + * */ - public void setDistance(Double distance) { - this.distance = distance; + public void setStartPosition(java.util.Collection startPosition) { + if (startPosition == null) { + this.startPosition = null; + return; + } + + this.startPosition = new java.util.ArrayList(startPosition); } /** *

    - * The distance between the leg's StartPosition and - * EndPosition along a calculated route. + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    - *
      - *
    • + * *

      - * The default measurement is Kilometers unless the request - * specifies a DistanceUnit of Miles. + * If the StartPosition isn't located on a road, it's snapped to a nearby road. *

      - *
      • - *
    + * *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Range: 0.0 -
    * - * @param distance

    - * The distance between the leg's StartPosition and - * EndPosition along a calculated route. + * @param startPosition

    + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    - *
      - *
    • + * *

      - * The default measurement is Kilometers unless the - * request specifies a DistanceUnit of - * Miles. + * If the StartPosition isn't located on a road, + * it's snapped to a nearby road. *

      - *
      • - *
    + * * @return A reference to this updated object so that method calls can be * chained together. */ - public Leg withDistance(Double distance) { - this.distance = distance; + public Leg withStartPosition(Double... startPosition) { + if (getStartPosition() == null) { + this.startPosition = new java.util.ArrayList(startPosition.length); + } + for (Double value : startPosition) { + this.startPosition.add(value); + } return this; } /** *

    - * The estimated travel time between the leg's StartPosition - * and EndPosition. The travel mode and departure time that you - * specify in the request determines the calculated time. - *

    - *

    - * Constraints:
    - * Range: 0.0 -
    - * - * @return

    - * The estimated travel time between the leg's - * StartPosition and EndPosition. The - * travel mode and departure time that you specify in the request - * determines the calculated time. - *

    - */ - public Double getDurationSeconds() { - return durationSeconds; - } - - /** - *

    - * The estimated travel time between the leg's StartPosition - * and EndPosition. The travel mode and departure time that you - * specify in the request determines the calculated time. + * The starting position of the leg. Follows the format + * [longitude,latitude]. *

    + * *

    - * Constraints:
    - * Range: 0.0 -
    - * - * @param durationSeconds

    - * The estimated travel time between the leg's - * StartPosition and EndPosition. The - * travel mode and departure time that you specify in the request - * determines the calculated time. - *

    - */ - public void setDurationSeconds(Double durationSeconds) { - this.durationSeconds = durationSeconds; - } - - /** - *

    - * The estimated travel time between the leg's StartPosition - * and EndPosition. The travel mode and departure time that you - * specify in the request determines the calculated time. + * If the StartPosition isn't located on a road, it's snapped to a nearby road. *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Range: 0.0 -
    * - * @param durationSeconds

    - * The estimated travel time between the leg's - * StartPosition and EndPosition. The - * travel mode and departure time that you specify in the request - * determines the calculated time. + * @param startPosition

    + * The starting position of the leg. Follows the format + * [longitude,latitude]. + *

    + * + *

    + * If the StartPosition isn't located on a road, + * it's snapped to a nearby road. *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ - public Leg withDurationSeconds(Double durationSeconds) { - this.durationSeconds = durationSeconds; + public Leg withStartPosition(java.util.Collection startPosition) { + setStartPosition(startPosition); return this; } @@ -427,224 +389,262 @@ public Leg withEndPosition(Double... endPosition) { /** *

    - * The terminating position of the leg. Follows the format - * [longitude,latitude]. + * The terminating position of the leg. Follows the format + * [longitude,latitude]. + *

    + * + *

    + * If the EndPosition isn't located on a road, it's snapped to a nearby road. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param endPosition

    + * The terminating position of the leg. Follows the format + * [longitude,latitude]. + *

    + * + *

    + * If the EndPosition isn't located on a road, it's + * snapped to a nearby road. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Leg withEndPosition(java.util.Collection endPosition) { + setEndPosition(endPosition); + return this; + } + + /** + *

    + * The distance between the leg's StartPosition and + * EndPosition along a calculated route. + *

    + *
      + *
    • + *

      + * The default measurement is Kilometers unless the request + * specifies a DistanceUnit of Miles. + *

      + *
      • + *
    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @return

    + * The distance between the leg's StartPosition and + * EndPosition along a calculated route. + *

    + *
      + *
    • + *

      + * The default measurement is Kilometers unless the + * request specifies a DistanceUnit of + * Miles. + *

      + *
      • + *
    + */ + public Double getDistance() { + return distance; + } + + /** + *

    + * The distance between the leg's StartPosition and + * EndPosition along a calculated route. + *

    + *
      + *
    • + *

      + * The default measurement is Kilometers unless the request + * specifies a DistanceUnit of Miles. + *

      + *
      • + *
    + *

    + * Constraints:
    + * Range: 0.0 -
    + * + * @param distance

    + * The distance between the leg's StartPosition and + * EndPosition along a calculated route. + *

    + *
      + *
    • + *

      + * The default measurement is Kilometers unless the + * request specifies a DistanceUnit of + * Miles. + *

      + *
      • + *
    + */ + public void setDistance(Double distance) { + this.distance = distance; + } + + /** + *

    + * The distance between the leg's StartPosition and + * EndPosition along a calculated route. *

    - * + *
      + *
    • *

      - * If the EndPosition isn't located on a road, it's snapped to a nearby road. + * The default measurement is Kilometers unless the request + * specifies a DistanceUnit of Miles. *

      - * + *
      • + *
    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Range: 0.0 -
    * - * @param endPosition

    - * The terminating position of the leg. Follows the format - * [longitude,latitude]. + * @param distance

    + * The distance between the leg's StartPosition and + * EndPosition along a calculated route. *

    - * + *
      + *
    • *

      - * If the EndPosition isn't located on a road, it's - * snapped to a nearby road. + * The default measurement is Kilometers unless the + * request specifies a DistanceUnit of + * Miles. *

      - * + *
      • + *
    * @return A reference to this updated object so that method calls can be * chained together. */ - public Leg withEndPosition(java.util.Collection endPosition) { - setEndPosition(endPosition); + public Leg withDistance(Double distance) { + this.distance = distance; return this; } /** *

    - * Contains the calculated route's path as a linestring geometry. + * The estimated travel time between the leg's StartPosition + * and EndPosition. The travel mode and departure time that you + * specify in the request determines the calculated time. *

    + *

    + * Constraints:
    + * Range: 0.0 -
    * * @return

    - * Contains the calculated route's path as a linestring geometry. + * The estimated travel time between the leg's + * StartPosition and EndPosition. The + * travel mode and departure time that you specify in the request + * determines the calculated time. *

    */ - public LegGeometry getGeometry() { - return geometry; + public Double getDurationSeconds() { + return durationSeconds; } /** *

    - * Contains the calculated route's path as a linestring geometry. + * The estimated travel time between the leg's StartPosition + * and EndPosition. The travel mode and departure time that you + * specify in the request determines the calculated time. *

    + *

    + * Constraints:
    + * Range: 0.0 -
    * - * @param geometry

    - * Contains the calculated route's path as a linestring geometry. + * @param durationSeconds

    + * The estimated travel time between the leg's + * StartPosition and EndPosition. The + * travel mode and departure time that you specify in the request + * determines the calculated time. *

    */ - public void setGeometry(LegGeometry geometry) { - this.geometry = geometry; + public void setDurationSeconds(Double durationSeconds) { + this.durationSeconds = durationSeconds; } /** *

    - * Contains the calculated route's path as a linestring geometry. + * The estimated travel time between the leg's StartPosition + * and EndPosition. The travel mode and departure time that you + * specify in the request determines the calculated time. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Range: 0.0 -
    * - * @param geometry

    - * Contains the calculated route's path as a linestring geometry. + * @param durationSeconds

    + * The estimated travel time between the leg's + * StartPosition and EndPosition. The + * travel mode and departure time that you specify in the request + * determines the calculated time. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Leg withGeometry(LegGeometry geometry) { - this.geometry = geometry; + public Leg withDurationSeconds(Double durationSeconds) { + this.durationSeconds = durationSeconds; return this; } /** *

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, it's snapped to a nearby road. + * Contains the calculated route's path as a linestring geometry. *

    - *     * * @return

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, it's - * snapped to a nearby road. + * Contains the calculated route's path as a linestring geometry. *

    - *     - */ - public java.util.List getStartPosition() { - return startPosition; - } - - /** - *

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, it's snapped to a nearby road. - *

    - *     - * - * @param startPosition

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, - * it's snapped to a nearby road. - *

    - *     */ - public void setStartPosition(java.util.Collection startPosition) { - if (startPosition == null) { - this.startPosition = null; - return; - } - - this.startPosition = new java.util.ArrayList(startPosition); + public LegGeometry getGeometry() { + return geometry; } /** *

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, it's snapped to a nearby road. + * Contains the calculated route's path as a linestring geometry. *

    - *     - *

    - * Returns a reference to this object so that method calls can be chained - * together. * - * @param startPosition

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, - * it's snapped to a nearby road. + * @param geometry

    + * Contains the calculated route's path as a linestring geometry. *

    - *     - * @return A reference to this updated object so that method calls can be - * chained together. */ - public Leg withStartPosition(Double... startPosition) { - if (getStartPosition() == null) { - this.startPosition = new java.util.ArrayList(startPosition.length); - } - for (Double value : startPosition) { - this.startPosition.add(value); - } - return this; + public void setGeometry(LegGeometry geometry) { + this.geometry = geometry; } /** *

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, it's snapped to a nearby road. + * Contains the calculated route's path as a linestring geometry. *

    - *     *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param startPosition

    - * The starting position of the leg. Follows the format - * [longitude,latitude]. - *

    - * - *

    - * If the StartPosition isn't located on a road, - * it's snapped to a nearby road. + * @param geometry

    + * Contains the calculated route's path as a linestring geometry. *

    - *     * @return A reference to this updated object so that method calls can be * chained together. */ - public Leg withStartPosition(java.util.Collection startPosition) { - setStartPosition(startPosition); + public Leg withGeometry(LegGeometry geometry) { + this.geometry = geometry; return this; } @@ -760,16 +760,16 @@ public Leg withSteps(java.util.Collection steps) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getStartPosition() != null) + sb.append("StartPosition: " + getStartPosition() + ","); + if (getEndPosition() != null) + sb.append("EndPosition: " + getEndPosition() + ","); if (getDistance() != null) sb.append("Distance: " + getDistance() + ","); if (getDurationSeconds() != null) sb.append("DurationSeconds: " + getDurationSeconds() + ","); - if (getEndPosition() != null) - sb.append("EndPosition: " + getEndPosition() + ","); if (getGeometry() != null) sb.append("Geometry: " + getGeometry() + ","); - if (getStartPosition() != null) - sb.append("StartPosition: " + getStartPosition() + ","); if (getSteps() != null) sb.append("Steps: " + getSteps()); sb.append("}"); @@ -781,14 +781,14 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode - + ((getDurationSeconds() == null) ? 0 : getDurationSeconds().hashCode()); + + ((getStartPosition() == null) ? 0 : getStartPosition().hashCode()); hashCode = prime * hashCode + ((getEndPosition() == null) ? 0 : getEndPosition().hashCode()); - hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); + hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode - + ((getStartPosition() == null) ? 0 : getStartPosition().hashCode()); + + ((getDurationSeconds() == null) ? 0 : getDurationSeconds().hashCode()); + hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); hashCode = prime * hashCode + ((getSteps() == null) ? 0 : getSteps().hashCode()); return hashCode; } @@ -804,6 +804,16 @@ public boolean equals(Object obj) { return false; Leg other = (Leg) obj; + if (other.getStartPosition() == null ^ this.getStartPosition() == null) + return false; + if (other.getStartPosition() != null + && other.getStartPosition().equals(this.getStartPosition()) == false) + return false; + if (other.getEndPosition() == null ^ this.getEndPosition() == null) + return false; + if (other.getEndPosition() != null + && other.getEndPosition().equals(this.getEndPosition()) == false) + return false; if (other.getDistance() == null ^ this.getDistance() == null) return false; if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) @@ -813,20 +823,10 @@ public boolean equals(Object obj) { if (other.getDurationSeconds() != null && other.getDurationSeconds().equals(this.getDurationSeconds()) == false) return false; - if (other.getEndPosition() == null ^ this.getEndPosition() == null) - return false; - if (other.getEndPosition() != null - && other.getEndPosition().equals(this.getEndPosition()) == false) - return false; if (other.getGeometry() == null ^ this.getGeometry() == null) return false; if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) return false; - if (other.getStartPosition() == null ^ this.getStartPosition() == null) - return false; - if (other.getStartPosition() != null - && other.getStartPosition().equals(this.getStartPosition()) == false) - return false; if (other.getSteps() == null ^ this.getSteps() == null) return false; if (other.getSteps() != null && other.getSteps().equals(this.getSteps()) == false) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LegGeometry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LegGeometry.java index bba76cc361..66f93da831 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LegGeometry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LegGeometry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsRequest.java index 5b1db2d9c5..7897f135aa 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,6 +25,17 @@ *

    */ public class ListDevicePositionsRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

    + * The tracker resource containing the requested devices. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String trackerName; + /** *

    * An optional limit for the number of entries returned in a single call. @@ -52,6 +63,13 @@ public class ListDevicePositionsRequest extends AmazonWebServiceRequest implemen */ private String nextToken; + /** + *

    + * The geometry used to filter device positions. + *

    + */ + private TrackingFilterGeometry filterGeometry; + /** *

    * The tracker resource containing the requested devices. @@ -59,9 +77,55 @@ public class ListDevicePositionsRequest extends AmazonWebServiceRequest implemen *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @return

    + * The tracker resource containing the requested devices. + *

    */ - private String trackerName; + public String getTrackerName() { + return trackerName; + } + + /** + *

    + * The tracker resource containing the requested devices. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The tracker resource containing the requested devices. + *

    + */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

    + * The tracker resource containing the requested devices. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The tracker resource containing the requested devices. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListDevicePositionsRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

    @@ -221,58 +285,46 @@ public ListDevicePositionsRequest withNextToken(String nextToken) { /** *

    - * The tracker resource containing the requested devices. + * The geometry used to filter device positions. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The tracker resource containing the requested devices. + * The geometry used to filter device positions. *

    */ - public String getTrackerName() { - return trackerName; + public TrackingFilterGeometry getFilterGeometry() { + return filterGeometry; } /** *

    - * The tracker resource containing the requested devices. + * The geometry used to filter device positions. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The tracker resource containing the requested devices. + * @param filterGeometry

    + * The geometry used to filter device positions. *

    */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setFilterGeometry(TrackingFilterGeometry filterGeometry) { + this.filterGeometry = filterGeometry; } /** *

    - * The tracker resource containing the requested devices. + * The geometry used to filter device positions. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The tracker resource containing the requested devices. + * @param filterGeometry

    + * The geometry used to filter device positions. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListDevicePositionsRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; + public ListDevicePositionsRequest withFilterGeometry(TrackingFilterGeometry filterGeometry) { + this.filterGeometry = filterGeometry; return this; } @@ -287,12 +339,14 @@ public ListDevicePositionsRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); if (getNextToken() != null) sb.append("NextToken: " + getNextToken() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + if (getFilterGeometry() != null) + sb.append("FilterGeometry: " + getFilterGeometry()); sb.append("}"); return sb.toString(); } @@ -302,10 +356,12 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); hashCode = prime * hashCode - + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + + ((getFilterGeometry() == null) ? 0 : getFilterGeometry().hashCode()); return hashCode; } @@ -320,6 +376,11 @@ public boolean equals(Object obj) { return false; ListDevicePositionsRequest other = (ListDevicePositionsRequest) obj; + if (other.getTrackerName() == null ^ this.getTrackerName() == null) + return false; + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) + return false; if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; if (other.getMaxResults() != null @@ -330,10 +391,10 @@ public boolean equals(Object obj) { if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getFilterGeometry() == null ^ this.getFilterGeometry() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getFilterGeometry() != null + && other.getFilterGeometry().equals(this.getFilterGeometry()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResponseEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResponseEntry.java index 039ab14eff..f50e2cb81a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResponseEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResponseEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -23,13 +23,6 @@ *

    */ public class ListDevicePositionsResponseEntry implements Serializable { - /** - *

    - * The accuracy of the device position. - *

    - */ - private PositionalAccuracy accuracy; - /** *

    * The ID of the device for this position. @@ -37,24 +30,10 @@ public class ListDevicePositionsResponseEntry implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String deviceId; - /** - *

    - * The last known device position. Empty if no positions currently stored. - *

    - */ - private java.util.List position; - - /** - *

    - * The properties associated with the position. - *

    - */ - private java.util.Map positionProperties; - /** *

    * The timestamp at which the device position was determined. Uses - * The accuracy of the device position. + * The last known device position. Empty if no positions currently stored. *

    - * - * @return

    - * The accuracy of the device position. - *

    */ - public PositionalAccuracy getAccuracy() { - return accuracy; - } + private java.util.List position; /** *

    * The accuracy of the device position. *

    - * - * @param accuracy

    - * The accuracy of the device position. - *

    */ - public void setAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; - } + private PositionalAccuracy accuracy; /** *

    - * The accuracy of the device position. + * The properties associated with the position. *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param accuracy

    - * The accuracy of the device position. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. */ - public ListDevicePositionsResponseEntry withAccuracy(PositionalAccuracy accuracy) { - this.accuracy = accuracy; - return this; - } + private java.util.Map positionProperties; /** *

    @@ -116,7 +71,7 @@ public ListDevicePositionsResponseEntry withAccuracy(PositionalAccuracy accuracy *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    * The ID of the device for this position. @@ -133,7 +88,7 @@ public String getDeviceId() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param deviceId

    * The ID of the device for this position. @@ -153,7 +108,7 @@ public void setDeviceId(String deviceId) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param deviceId

    * The ID of the device for this position. @@ -166,6 +121,65 @@ public ListDevicePositionsResponseEntry withDeviceId(String deviceId) { return this; } + /** + *

    + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @return

    + * The timestamp at which the device position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getSampleTime() { + return sampleTime; + } + + /** + *

    + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @param sampleTime

    + * The timestamp at which the device position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; + } + + /** + *

    + * The timestamp at which the device position was determined. Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param sampleTime

    + * The timestamp at which the device position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListDevicePositionsResponseEntry withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; + return this; + } + /** *

    * The last known device position. Empty if no positions currently stored. @@ -244,6 +258,51 @@ public ListDevicePositionsResponseEntry withPosition(java.util.Collection + * The accuracy of the device position. + *

    + * + * @return

    + * The accuracy of the device position. + *

    + */ + public PositionalAccuracy getAccuracy() { + return accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + * + * @param accuracy

    + * The accuracy of the device position. + *

    + */ + public void setAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + } + + /** + *

    + * The accuracy of the device position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param accuracy

    + * The accuracy of the device position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListDevicePositionsResponseEntry withAccuracy(PositionalAccuracy accuracy) { + this.accuracy = accuracy; + return this; + } + /** *

    * The properties associated with the position. @@ -327,65 +386,6 @@ public ListDevicePositionsResponseEntry clearPositionPropertiesEntries() { return this; } - /** - *

    - * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @return

    - * The timestamp at which the device position was determined. Uses - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public java.util.Date getSampleTime() { - return sampleTime; - } - - /** - *

    - * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * - * @param sampleTime

    - * The timestamp at which the device position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - public void setSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - } - - /** - *

    - * The timestamp at which the device position was determined. Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param sampleTime

    - * The timestamp at which the device position was determined. - * Uses ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListDevicePositionsResponseEntry withSampleTime(java.util.Date sampleTime) { - this.sampleTime = sampleTime; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -397,16 +397,16 @@ public ListDevicePositionsResponseEntry withSampleTime(java.util.Date sampleTime public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getAccuracy() != null) - sb.append("Accuracy: " + getAccuracy() + ","); if (getDeviceId() != null) sb.append("DeviceId: " + getDeviceId() + ","); + if (getSampleTime() != null) + sb.append("SampleTime: " + getSampleTime() + ","); if (getPosition() != null) sb.append("Position: " + getPosition() + ","); + if (getAccuracy() != null) + sb.append("Accuracy: " + getAccuracy() + ","); if (getPositionProperties() != null) - sb.append("PositionProperties: " + getPositionProperties() + ","); - if (getSampleTime() != null) - sb.append("SampleTime: " + getSampleTime()); + sb.append("PositionProperties: " + getPositionProperties()); sb.append("}"); return sb.toString(); } @@ -416,12 +416,12 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); + hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getAccuracy() == null) ? 0 : getAccuracy().hashCode()); hashCode = prime * hashCode + ((getPositionProperties() == null) ? 0 : getPositionProperties().hashCode()); - hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); return hashCode; } @@ -436,28 +436,28 @@ public boolean equals(Object obj) { return false; ListDevicePositionsResponseEntry other = (ListDevicePositionsResponseEntry) obj; - if (other.getAccuracy() == null ^ this.getAccuracy() == null) - return false; - if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) - return false; if (other.getDeviceId() == null ^ this.getDeviceId() == null) return false; if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) return false; + if (other.getSampleTime() == null ^ this.getSampleTime() == null) + return false; + if (other.getSampleTime() != null + && other.getSampleTime().equals(this.getSampleTime()) == false) + return false; if (other.getPosition() == null ^ this.getPosition() == null) return false; if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) return false; + if (other.getAccuracy() == null ^ this.getAccuracy() == null) + return false; + if (other.getAccuracy() != null && other.getAccuracy().equals(this.getAccuracy()) == false) + return false; if (other.getPositionProperties() == null ^ this.getPositionProperties() == null) return false; if (other.getPositionProperties() != null && other.getPositionProperties().equals(this.getPositionProperties()) == false) return false; - if (other.getSampleTime() == null ^ this.getSampleTime() == null) - return false; - if (other.getSampleTime() != null - && other.getSampleTime().equals(this.getSampleTime()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResult.java index 7feec077d2..50a318d702 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListDevicePositionsResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -20,10 +20,7 @@ public class ListDevicePositionsResult implements Serializable { /** *

    - * Contains details about each device's last known position. These details - * includes the device ID, the time when the position was sampled on the - * device, the time that the service received the update, and the most - * recent coordinates. + * Contains details about each device's last known position. *

    */ private java.util.List entries; @@ -42,17 +39,11 @@ public class ListDevicePositionsResult implements Serializable { /** *

    - * Contains details about each device's last known position. These details - * includes the device ID, the time when the position was sampled on the - * device, the time that the service received the update, and the most - * recent coordinates. + * Contains details about each device's last known position. *

    * * @return

    - * Contains details about each device's last known position. These - * details includes the device ID, the time when the position was - * sampled on the device, the time that the service received the - * update, and the most recent coordinates. + * Contains details about each device's last known position. *

    */ public java.util.List getEntries() { @@ -61,17 +52,11 @@ public java.util.List getEntries() { /** *

    - * Contains details about each device's last known position. These details - * includes the device ID, the time when the position was sampled on the - * device, the time that the service received the update, and the most - * recent coordinates. + * Contains details about each device's last known position. *

    * * @param entries

    * Contains details about each device's last known position. - * These details includes the device ID, the time when the - * position was sampled on the device, the time that the service - * received the update, and the most recent coordinates. *

    */ public void setEntries(java.util.Collection entries) { @@ -85,10 +70,7 @@ public void setEntries(java.util.Collection en /** *

    - * Contains details about each device's last known position. These details - * includes the device ID, the time when the position was sampled on the - * device, the time that the service received the update, and the most - * recent coordinates. + * Contains details about each device's last known position. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -96,9 +78,6 @@ public void setEntries(java.util.Collection en * * @param entries

    * Contains details about each device's last known position. - * These details includes the device ID, the time when the - * position was sampled on the device, the time that the service - * received the update, and the most recent coordinates. *

    * @return A reference to this updated object so that method calls can be * chained together. @@ -115,10 +94,7 @@ public ListDevicePositionsResult withEntries(ListDevicePositionsResponseEntry... /** *

    - * Contains details about each device's last known position. These details - * includes the device ID, the time when the position was sampled on the - * device, the time that the service received the update, and the most - * recent coordinates. + * Contains details about each device's last known position. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -126,9 +102,6 @@ public ListDevicePositionsResult withEntries(ListDevicePositionsResponseEntry... * * @param entries

    * Contains details about each device's last known position. - * These details includes the device ID, the time when the - * position was sampled on the device, the time that the service - * received the update, and the most recent coordinates. *

    * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsRequest.java index 42d3d67ff0..d9ae9bd310 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsResponseEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsResponseEntry.java index fd66dc3bf9..8ab4b13156 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsResponseEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceCollectionsResponseEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -21,6 +21,12 @@ *

    * Contains the geofence collection details. *

    + * + *

    + * The returned geometry will always match the geometry format used when the + * geofence was created. + *

    + *     */ public class ListGeofenceCollectionsResponseEntry implements Serializable { /** @@ -30,19 +36,10 @@ public class ListGeofenceCollectionsResponseEntry implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String collectionName; - /** - *

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - private java.util.Date createTime; - /** *

    * The description for the geofence collection @@ -71,6 +68,15 @@ public class ListGeofenceCollectionsResponseEntry implements Serializable { */ private String pricingPlanDataSource; + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + private java.util.Date createTime; + /** *

    * Specifies a timestamp for when the resource was last updated in * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the geofence collection. @@ -104,7 +110,7 @@ public String getCollectionName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection. @@ -124,7 +130,7 @@ public void setCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection. @@ -137,65 +143,6 @@ public ListGeofenceCollectionsResponseEntry withCollectionName(String collection return this; } - /** - *

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * - * @return

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - public java.util.Date getCreateTime() { - return createTime; - } - - /** - *

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * - * @param createTime

    - * The timestamp for when the geofence collection was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } - - /** - *

    - * The timestamp for when the geofence collection was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the geofence collection was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListGeofenceCollectionsResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } - /** *

    * The description for the geofence collection @@ -398,6 +345,65 @@ public ListGeofenceCollectionsResponseEntry withPricingPlanDataSource( return this; } + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @return

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @param createTime

    + * The timestamp for when the geofence collection was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the geofence collection was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the geofence collection was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListGeofenceCollectionsResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * Specifies a timestamp for when the resource was last updated in * Contains a list of geofences stored in a given geofence collection. *

    + * + *

    + * The returned geometry will always match the geometry format used when the + * geofence was created. + *

    + *     */ public class ListGeofenceResponseEntry implements Serializable { - /** - *

    - * The timestamp for when the geofence was stored in a geofence collection - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - private java.util.Date createTime; - /** *

    * The geofence identifier. @@ -39,22 +36,10 @@ public class ListGeofenceResponseEntry implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String geofenceId; - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - */ - private java.util.Map geofenceProperties; - /** *

    * Contains the geofence geometry details describing a polygon or a circle. @@ -99,74 +84,35 @@ public class ListGeofenceResponseEntry implements Serializable { */ private String status; - /** - *

    - * The timestamp for when the geofence was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - private java.util.Date updateTime; - /** *

    * The timestamp for when the geofence was stored in a geofence collection * in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - * - * @return

    - * The timestamp for when the geofence was stored in a geofence - * collection in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    */ - public java.util.Date getCreateTime() { - return createTime; - } + private java.util.Date createTime; /** *

    - * The timestamp for when the geofence was stored in a geofence collection - * in ISO + * The timestamp for when the geofence was last updated in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - * - * @param createTime

    - * The timestamp for when the geofence was stored in a geofence - * collection in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } + private java.util.Date updateTime; /** *

    - * The timestamp for when the geofence was stored in a geofence collection - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the geofence was stored in a geofence - * collection in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - * @return A reference to this updated object so that method calls can be - * chained together. + * Format: "key" : "value" + *

    */ - public ListGeofenceResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } + private java.util.Map geofenceProperties; /** *

    @@ -175,7 +121,7 @@ public ListGeofenceResponseEntry withCreateTime(java.util.Date createTime) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    * The geofence identifier. @@ -192,7 +138,7 @@ public String getGeofenceId() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * The geofence identifier. @@ -212,7 +158,7 @@ public void setGeofenceId(String geofenceId) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * The geofence identifier. @@ -225,124 +171,6 @@ public ListGeofenceResponseEntry withGeofenceId(String geofenceId) { return this; } - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - * - * @return

    - * User defined properties of the geofence. A property is a - * key-value pair stored with the geofence and added to any geofence - * event triggered with that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - */ - public java.util.Map getGeofenceProperties() { - return geofenceProperties; - } - - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - * - * @param geofenceProperties

    - * User defined properties of the geofence. A property is a - * key-value pair stored with the geofence and added to any - * geofence event triggered with that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - */ - public void setGeofenceProperties(java.util.Map geofenceProperties) { - this.geofenceProperties = geofenceProperties; - } - - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param geofenceProperties

    - * User defined properties of the geofence. A property is a - * key-value pair stored with the geofence and added to any - * geofence event triggered with that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListGeofenceResponseEntry withGeofenceProperties( - java.util.Map geofenceProperties) { - this.geofenceProperties = geofenceProperties; - return this; - } - - /** - *

    - * User defined properties of the geofence. A property is a key-value pair - * stored with the geofence and added to any geofence event triggered with - * that geofence. - *

    - *

    - * Format: "key" : "value" - *

    - *

    - * The method adds a new key-value pair into GeofenceProperties parameter, - * and returns a reference to this object so that method calls can be - * chained together. - * - * @param key The key of the entry to be added into GeofenceProperties. - * @param value The corresponding value of the entry to be added into - * GeofenceProperties. - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListGeofenceResponseEntry addGeofencePropertiesEntry(String key, String value) { - if (null == this.geofenceProperties) { - this.geofenceProperties = new java.util.HashMap(); - } - if (this.geofenceProperties.containsKey(key)) - throw new IllegalArgumentException("Duplicated keys (" + key.toString() - + ") are provided."); - this.geofenceProperties.put(key, value); - return this; - } - - /** - * Removes all the entries added into GeofenceProperties. - *

    - * Returns a reference to this object so that method calls can be chained - * together. - */ - public ListGeofenceResponseEntry clearGeofencePropertiesEntries() { - this.geofenceProperties = null; - return this; - } - /** *

    * Contains the geofence geometry details describing a polygon or a circle. @@ -625,6 +453,66 @@ public ListGeofenceResponseEntry withStatus(String status) { return this; } + /** + *

    + * The timestamp for when the geofence was stored in a geofence collection + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @return

    + * The timestamp for when the geofence was stored in a geofence + * collection in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the geofence was stored in a geofence collection + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * + * @param createTime

    + * The timestamp for when the geofence was stored in a geofence + * collection in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the geofence was stored in a geofence collection + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the geofence was stored in a geofence + * collection in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListGeofenceResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp for when the geofence was last updated in + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + * + * @return

    + * User defined properties of the geofence. A property is a + * key-value pair stored with the geofence and added to any geofence + * event triggered with that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + */ + public java.util.Map getGeofenceProperties() { + return geofenceProperties; + } + + /** + *

    + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + * + * @param geofenceProperties

    + * User defined properties of the geofence. A property is a + * key-value pair stored with the geofence and added to any + * geofence event triggered with that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + */ + public void setGeofenceProperties(java.util.Map geofenceProperties) { + this.geofenceProperties = geofenceProperties; + } + + /** + *

    + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param geofenceProperties

    + * User defined properties of the geofence. A property is a + * key-value pair stored with the geofence and added to any + * geofence event triggered with that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListGeofenceResponseEntry withGeofenceProperties( + java.util.Map geofenceProperties) { + this.geofenceProperties = geofenceProperties; + return this; + } + + /** + *

    + * User defined properties of the geofence. A property is a key-value pair + * stored with the geofence and added to any geofence event triggered with + * that geofence. + *

    + *

    + * Format: "key" : "value" + *

    + *

    + * The method adds a new key-value pair into GeofenceProperties parameter, + * and returns a reference to this object so that method calls can be + * chained together. + * + * @param key The key of the entry to be added into GeofenceProperties. + * @param value The corresponding value of the entry to be added into + * GeofenceProperties. + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListGeofenceResponseEntry addGeofencePropertiesEntry(String key, String value) { + if (null == this.geofenceProperties) { + this.geofenceProperties = new java.util.HashMap(); + } + if (this.geofenceProperties.containsKey(key)) + throw new IllegalArgumentException("Duplicated keys (" + key.toString() + + ") are provided."); + this.geofenceProperties.put(key, value); + return this; + } + + /** + * Removes all the entries added into GeofenceProperties. + *

    + * Returns a reference to this object so that method calls can be chained + * together. + */ + public ListGeofenceResponseEntry clearGeofencePropertiesEntries() { + this.geofenceProperties = null; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -695,18 +701,18 @@ public ListGeofenceResponseEntry withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); if (getGeofenceId() != null) sb.append("GeofenceId: " + getGeofenceId() + ","); - if (getGeofenceProperties() != null) - sb.append("GeofenceProperties: " + getGeofenceProperties() + ","); if (getGeometry() != null) sb.append("Geometry: " + getGeometry() + ","); if (getStatus() != null) sb.append("Status: " + getStatus() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); if (getUpdateTime() != null) - sb.append("UpdateTime: " + getUpdateTime()); + sb.append("UpdateTime: " + getUpdateTime() + ","); + if (getGeofenceProperties() != null) + sb.append("GeofenceProperties: " + getGeofenceProperties()); sb.append("}"); return sb.toString(); } @@ -716,13 +722,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); - hashCode = prime * hashCode - + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + hashCode = prime * hashCode + + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); return hashCode; } @@ -737,21 +743,11 @@ public boolean equals(Object obj) { return false; ListGeofenceResponseEntry other = (ListGeofenceResponseEntry) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) - return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) - return false; if (other.getGeofenceId() == null ^ this.getGeofenceId() == null) return false; if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; - if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) - return false; - if (other.getGeofenceProperties() != null - && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) - return false; if (other.getGeometry() == null ^ this.getGeometry() == null) return false; if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) @@ -760,11 +756,21 @@ public boolean equals(Object obj) { return false; if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false) return false; + if (other.getCreateTime() == null ^ this.getCreateTime() == null) + return false; + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) + return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null && other.getUpdateTime().equals(this.getUpdateTime()) == false) return false; + if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) + return false; + if (other.getGeofenceProperties() != null + && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesRequest.java index ce851d518e..d97ad7250a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,36 +32,36 @@ public class ListGeofencesRequest extends AmazonWebServiceRequest implements Ser *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String collectionName; /** *

    - * An optional limit for the number of geofences returned in a single call. + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. *

    *

    - * Default value: 100 + * Default value: null *

    *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 60000
    */ - private Integer maxResults; + private String nextToken; /** *

    - * The pagination token specifying which page of results to return in the - * response. If no token is provided, the default page is the first page. + * An optional limit for the number of geofences returned in a single call. *

    *

    - * Default value: null + * Default value: 100 *

    *

    * Constraints:
    - * Length: 1 - 2000
    + * Range: 1 - 100
    */ - private String nextToken; + private Integer maxResults; /** *

    @@ -70,7 +70,7 @@ public class ListGeofencesRequest extends AmazonWebServiceRequest implements Ser *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the geofence collection storing the list of @@ -88,7 +88,7 @@ public String getCollectionName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection storing the list of @@ -109,7 +109,7 @@ public void setCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The name of the geofence collection storing the list of @@ -125,157 +125,157 @@ public ListGeofencesRequest withCollectionName(String collectionName) { /** *

    - * An optional limit for the number of geofences returned in a single call. + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. *

    *

    - * Default value: 100 + * Default value: null *

    *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 60000
    * * @return

    - * An optional limit for the number of geofences returned in a - * single call. + * The pagination token specifying which page of results to return + * in the response. If no token is provided, the default page is the + * first page. *

    *

    - * Default value: 100 + * Default value: null *

    */ - public Integer getMaxResults() { - return maxResults; + public String getNextToken() { + return nextToken; } /** *

    - * An optional limit for the number of geofences returned in a single call. + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. *

    *

    - * Default value: 100 + * Default value: null *

    *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 60000
    * - * @param maxResults

    - * An optional limit for the number of geofences returned in a - * single call. + * @param nextToken

    + * The pagination token specifying which page of results to + * return in the response. If no token is provided, the default + * page is the first page. *

    *

    - * Default value: 100 + * Default value: null *

    */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setNextToken(String nextToken) { + this.nextToken = nextToken; } /** *

    - * An optional limit for the number of geofences returned in a single call. + * The pagination token specifying which page of results to return in the + * response. If no token is provided, the default page is the first page. *

    *

    - * Default value: 100 + * Default value: null *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Range: 1 - 100
    + * Length: 1 - 60000
    * - * @param maxResults

    - * An optional limit for the number of geofences returned in a - * single call. + * @param nextToken

    + * The pagination token specifying which page of results to + * return in the response. If no token is provided, the default + * page is the first page. *

    *

    - * Default value: 100 + * Default value: null *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListGeofencesRequest withMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public ListGeofencesRequest withNextToken(String nextToken) { + this.nextToken = nextToken; return this; } /** *

    - * The pagination token specifying which page of results to return in the - * response. If no token is provided, the default page is the first page. + * An optional limit for the number of geofences returned in a single call. *

    *

    - * Default value: null + * Default value: 100 *

    *

    * Constraints:
    - * Length: 1 - 2000
    + * Range: 1 - 100
    * * @return

    - * The pagination token specifying which page of results to return - * in the response. If no token is provided, the default page is the - * first page. + * An optional limit for the number of geofences returned in a + * single call. *

    *

    - * Default value: null + * Default value: 100 *

    */ - public String getNextToken() { - return nextToken; + public Integer getMaxResults() { + return maxResults; } /** *

    - * The pagination token specifying which page of results to return in the - * response. If no token is provided, the default page is the first page. + * An optional limit for the number of geofences returned in a single call. *

    *

    - * Default value: null + * Default value: 100 *

    *

    * Constraints:
    - * Length: 1 - 2000
    + * Range: 1 - 100
    * - * @param nextToken

    - * The pagination token specifying which page of results to - * return in the response. If no token is provided, the default - * page is the first page. + * @param maxResults

    + * An optional limit for the number of geofences returned in a + * single call. *

    *

    - * Default value: null + * Default value: 100 *

    */ - public void setNextToken(String nextToken) { - this.nextToken = nextToken; + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

    - * The pagination token specifying which page of results to return in the - * response. If no token is provided, the default page is the first page. + * An optional limit for the number of geofences returned in a single call. *

    *

    - * Default value: null + * Default value: 100 *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 1 - 2000
    + * Range: 1 - 100
    * - * @param nextToken

    - * The pagination token specifying which page of results to - * return in the response. If no token is provided, the default - * page is the first page. + * @param maxResults

    + * An optional limit for the number of geofences returned in a + * single call. *

    *

    - * Default value: null + * Default value: 100 *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListGeofencesRequest withNextToken(String nextToken) { - this.nextToken = nextToken; + public ListGeofencesRequest withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } @@ -292,10 +292,10 @@ public String toString() { sb.append("{"); if (getCollectionName() != null) sb.append("CollectionName: " + getCollectionName() + ","); - if (getMaxResults() != null) - sb.append("MaxResults: " + getMaxResults() + ","); if (getNextToken() != null) - sb.append("NextToken: " + getNextToken()); + sb.append("NextToken: " + getNextToken() + ","); + if (getMaxResults() != null) + sb.append("MaxResults: " + getMaxResults()); sb.append("}"); return sb.toString(); } @@ -307,8 +307,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getCollectionName() == null) ? 0 : getCollectionName().hashCode()); - hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); + hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); return hashCode; } @@ -328,16 +328,16 @@ public boolean equals(Object obj) { if (other.getCollectionName() != null && other.getCollectionName().equals(this.getCollectionName()) == false) return false; - if (other.getMaxResults() == null ^ this.getMaxResults() == null) - return false; - if (other.getMaxResults() != null - && other.getMaxResults().equals(this.getMaxResults()) == false) - return false; if (other.getNextToken() == null ^ this.getNextToken() == null) return false; if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false; + if (other.getMaxResults() == null ^ this.getMaxResults() == null) + return false; + if (other.getMaxResults() != null + && other.getMaxResults().equals(this.getMaxResults()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesResult.java index d3f69bfc90..673457cf2b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofencesResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class ListGeofencesResult implements Serializable { *

    *

    * Constraints:
    - * Length: 1 - 2000
    + * Length: 1 - 60000
    */ private String nextToken; @@ -122,7 +122,7 @@ public ListGeofencesResult withEntries(java.util.Collection *

    * Constraints:
    - * Length: 1 - 2000
    + * Length: 1 - 60000
    * * @return

    * A pagination token indicating there are additional pages @@ -142,7 +142,7 @@ public String getNextToken() { *

    *

    * Constraints:
    - * Length: 1 - 2000
    + * Length: 1 - 60000
    * * @param nextToken

    * A pagination token indicating there are additional pages @@ -165,7 +165,7 @@ public void setNextToken(String nextToken) { * together. *

    * Constraints:
    - * Length: 1 - 2000
    + * Length: 1 - 60000
    * * @param nextToken

    * A pagination token indicating there are additional pages diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysRequest.java index 0b139c6989..31a8ef4a26 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,14 +25,6 @@ *

    */ public class ListKeysRequest extends AmazonWebServiceRequest implements Serializable { - /** - *

    - * Optionally filter the list to only Active or - * Expired API keys. - *

    - */ - private ApiKeyFilter filter; - /** *

    * An optional limit for the number of resources returned in a single call. @@ -65,51 +57,8 @@ public class ListKeysRequest extends AmazonWebServiceRequest implements Serializ * Optionally filter the list to only Active or * Expired API keys. *

    - * - * @return

    - * Optionally filter the list to only Active or - * Expired API keys. - *

    - */ - public ApiKeyFilter getFilter() { - return filter; - } - - /** - *

    - * Optionally filter the list to only Active or - * Expired API keys. - *

    - * - * @param filter

    - * Optionally filter the list to only Active or - * Expired API keys. - *

    - */ - public void setFilter(ApiKeyFilter filter) { - this.filter = filter; - } - - /** - *

    - * Optionally filter the list to only Active or - * Expired API keys. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filter

    - * Optionally filter the list to only Active or - * Expired API keys. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. */ - public ListKeysRequest withFilter(ApiKeyFilter filter) { - this.filter = filter; - return this; - } + private ApiKeyFilter filter; /** *

    @@ -267,6 +216,57 @@ public ListKeysRequest withNextToken(String nextToken) { return this; } + /** + *

    + * Optionally filter the list to only Active or + * Expired API keys. + *

    + * + * @return

    + * Optionally filter the list to only Active or + * Expired API keys. + *

    + */ + public ApiKeyFilter getFilter() { + return filter; + } + + /** + *

    + * Optionally filter the list to only Active or + * Expired API keys. + *

    + * + * @param filter

    + * Optionally filter the list to only Active or + * Expired API keys. + *

    + */ + public void setFilter(ApiKeyFilter filter) { + this.filter = filter; + } + + /** + *

    + * Optionally filter the list to only Active or + * Expired API keys. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param filter

    + * Optionally filter the list to only Active or + * Expired API keys. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListKeysRequest withFilter(ApiKeyFilter filter) { + this.filter = filter; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -278,12 +278,12 @@ public ListKeysRequest withNextToken(String nextToken) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getFilter() != null) - sb.append("Filter: " + getFilter() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); if (getNextToken() != null) - sb.append("NextToken: " + getNextToken()); + sb.append("NextToken: " + getNextToken() + ","); + if (getFilter() != null) + sb.append("Filter: " + getFilter()); sb.append("}"); return sb.toString(); } @@ -293,9 +293,9 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getFilter() == null) ? 0 : getFilter().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); + hashCode = prime * hashCode + ((getFilter() == null) ? 0 : getFilter().hashCode()); return hashCode; } @@ -310,10 +310,6 @@ public boolean equals(Object obj) { return false; ListKeysRequest other = (ListKeysRequest) obj; - if (other.getFilter() == null ^ this.getFilter() == null) - return false; - if (other.getFilter() != null && other.getFilter().equals(this.getFilter()) == false) - return false; if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; if (other.getMaxResults() != null @@ -324,6 +320,10 @@ public boolean equals(Object obj) { if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false; + if (other.getFilter() == null ^ this.getFilter() == null) + return false; + if (other.getFilter() != null && other.getFilter().equals(this.getFilter()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysResponseEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysResponseEntry.java index 1e5f87a59e..2a6a104014 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysResponseEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListKeysResponseEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,22 +25,14 @@ public class ListKeysResponseEntry implements Serializable { /** *

    - * The timestamp of when the API key was created, in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date createTime; - - /** - *

    - * The optional description for the API key resource. + * The name of the API key resource. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private String description; + private String keyName; /** *

    @@ -53,14 +45,13 @@ public class ListKeysResponseEntry implements Serializable { /** *

    - * The name of the API key resource. + * The optional description for the API key resource. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    */ - private String keyName; + private String description; /** *

    @@ -70,123 +61,78 @@ public class ListKeysResponseEntry implements Serializable { */ private ApiKeyRestrictions restrictions; - /** - *

    - * The timestamp of when the API key was last updated, in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date updateTime; - /** *

    * The timestamp of when the API key was created, in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @return

    - * The timestamp of when the API key was created, in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public java.util.Date getCreateTime() { - return createTime; - } + private java.util.Date createTime; /** *

    - * The timestamp of when the API key was created, in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @param createTime

    - * The timestamp of when the API key was created, in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } - - /** - *

    - * The timestamp of when the API key was created, in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp of when the API key was created, in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListKeysResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } + private java.util.Date updateTime; /** *

    - * The optional description for the API key resource. + * The name of the API key resource. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The optional description for the API key resource. + * The name of the API key resource. *

    */ - public String getDescription() { - return description; + public String getKeyName() { + return keyName; } /** *

    - * The optional description for the API key resource. + * The name of the API key resource. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param description

    - * The optional description for the API key resource. + * @param keyName

    + * The name of the API key resource. *

    */ - public void setDescription(String description) { - this.description = description; + public void setKeyName(String keyName) { + this.keyName = keyName; } /** *

    - * The optional description for the API key resource. + * The name of the API key resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 0 - 1000
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param description

    - * The optional description for the API key resource. + * @param keyName

    + * The name of the API key resource. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListKeysResponseEntry withDescription(String description) { - this.description = description; + public ListKeysResponseEntry withKeyName(String keyName) { + this.keyName = keyName; return this; } @@ -249,58 +195,55 @@ public ListKeysResponseEntry withExpireTime(java.util.Date expireTime) { /** *

    - * The name of the API key resource. + * The optional description for the API key resource. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    * * @return

    - * The name of the API key resource. + * The optional description for the API key resource. *

    */ - public String getKeyName() { - return keyName; + public String getDescription() { + return description; } /** *

    - * The name of the API key resource. + * The optional description for the API key resource. *

    *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    * - * @param keyName

    - * The name of the API key resource. + * @param description

    + * The optional description for the API key resource. *

    */ - public void setKeyName(String keyName) { - this.keyName = keyName; + public void setDescription(String description) { + this.description = description; } /** *

    - * The name of the API key resource. + * The optional description for the API key resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Length: 0 - 1000
    * - * @param keyName

    - * The name of the API key resource. + * @param description

    + * The optional description for the API key resource. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListKeysResponseEntry withKeyName(String keyName) { - this.keyName = keyName; + public ListKeysResponseEntry withDescription(String description) { + this.description = description; return this; } @@ -355,6 +298,63 @@ public ListKeysResponseEntry withRestrictions(ApiKeyRestrictions restrictions) { return this; } + /** + *

    + * The timestamp of when the API key was created, in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @return

    + * The timestamp of when the API key was created, in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp of when the API key was created, in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @param createTime

    + * The timestamp of when the API key was created, in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp of when the API key was created, in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp of when the API key was created, in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListKeysResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp of when the API key was last updated, in - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the associated map resource. *

    - */ - private java.util.Date createTime; - - /** *

    - * Specifies the data provider for the associated map tiles. - *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private String dataSource; + private String mapName; /** *

    @@ -52,14 +47,10 @@ public class ListMapsResponseEntry implements Serializable { /** *

    - * The name of the associated map resource. + * Specifies the data provider for the associated map tiles. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    */ - private String mapName; + private String dataSource; /** *

    @@ -72,116 +63,78 @@ public class ListMapsResponseEntry implements Serializable { */ private String pricingPlan; - /** - *

    - * The timestamp for when the map resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - */ - private java.util.Date updateTime; - /** *

    * The timestamp for when the map resource was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @return

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public java.util.Date getCreateTime() { - return createTime; - } + private java.util.Date createTime; /** *

    - * The timestamp for when the map resource was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - * - * @param createTime

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; - } + private java.util.Date updateTime; /** *

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the associated map resource. *

    *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param createTime

    - * The timestamp for when the map resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListMapsResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; - return this; - } - - /** - *

    - * Specifies the data provider for the associated map tiles. - *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * Specifies the data provider for the associated map tiles. + * The name of the associated map resource. *

    */ - public String getDataSource() { - return dataSource; + public String getMapName() { + return mapName; } /** *

    - * Specifies the data provider for the associated map tiles. + * The name of the associated map resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param dataSource

    - * Specifies the data provider for the associated map tiles. + * @param mapName

    + * The name of the associated map resource. *

    */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; + public void setMapName(String mapName) { + this.mapName = mapName; } /** *

    - * Specifies the data provider for the associated map tiles. + * The name of the associated map resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param dataSource

    - * Specifies the data provider for the associated map tiles. + * @param mapName

    + * The name of the associated map resource. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListMapsResponseEntry withDataSource(String dataSource) { - this.dataSource = dataSource; + public ListMapsResponseEntry withMapName(String mapName) { + this.mapName = mapName; return this; } @@ -241,58 +194,46 @@ public ListMapsResponseEntry withDescription(String description) { /** *

    - * The name of the associated map resource. + * Specifies the data provider for the associated map tiles. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The name of the associated map resource. + * Specifies the data provider for the associated map tiles. *

    */ - public String getMapName() { - return mapName; + public String getDataSource() { + return dataSource; } /** *

    - * The name of the associated map resource. + * Specifies the data provider for the associated map tiles. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param mapName

    - * The name of the associated map resource. + * @param dataSource

    + * Specifies the data provider for the associated map tiles. *

    */ - public void setMapName(String mapName) { - this.mapName = mapName; + public void setDataSource(String dataSource) { + this.dataSource = dataSource; } /** *

    - * The name of the associated map resource. + * Specifies the data provider for the associated map tiles. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param mapName

    - * The name of the associated map resource. + * @param dataSource

    + * Specifies the data provider for the associated map tiles. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListMapsResponseEntry withMapName(String mapName) { - this.mapName = mapName; + public ListMapsResponseEntry withDataSource(String dataSource) { + this.dataSource = dataSource; return this; } @@ -398,6 +339,65 @@ public ListMapsResponseEntry withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @return

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @param createTime

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the map resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListMapsResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp for when the map resource was last updated in - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private java.util.Date createTime; + private String indexName; + + /** + *

    + * The optional description for the place index resource. + *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    + */ + private String description; /** *

    @@ -63,13 +75,32 @@ public class ListPlaceIndexesResponseEntry implements Serializable { /** *

    - * The optional description for the place index resource. + * No longer used. Always returns RequestBasedUsage. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private String description; + private String pricingPlan; + + /** + *

    + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date createTime; + + /** + *

    + * The timestamp for when the place index resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + private java.util.Date updateTime; /** *

    @@ -78,86 +109,107 @@ public class ListPlaceIndexesResponseEntry implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the place index resource. + *

    */ - private String indexName; + public String getIndexName() { + return indexName; + } /** *

    - * No longer used. Always returns RequestBasedUsage. + * The name of the place index resource. *

    *

    * Constraints:
    - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param indexName

    + * The name of the place index resource. + *

    */ - private String pricingPlan; + public void setIndexName(String indexName) { + this.indexName = indexName; + } /** *

    - * The timestamp for when the place index resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the place index resource. *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param indexName

    + * The name of the place index resource. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public ListPlaceIndexesResponseEntry withIndexName(String indexName) { + this.indexName = indexName; + return this; + } /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description for the place index resource. *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    * * @return

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description for the place index resource. *

    */ - public java.util.Date getCreateTime() { - return createTime; + public String getDescription() { + return description; } /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description for the place index resource. *

    + *

    + * Constraints:
    + * Length: 0 - 1000
    * - * @param createTime

    - * The timestamp for when the place index resource was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param description

    + * The optional description for the place index resource. *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setDescription(String description) { + this.description = description; } /** *

    - * The timestamp for when the place index resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description for the place index resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 0 - 1000
    * - * @param createTime

    - * The timestamp for when the place index resource was created in - * ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param description

    + * The optional description for the place index resource. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListPlaceIndexesResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public ListPlaceIndexesResponseEntry withDescription(String description) { + this.description = description; return this; } @@ -341,117 +393,6 @@ public ListPlaceIndexesResponseEntry withDataSource(String dataSource) { return this; } - /** - *

    - * The optional description for the place index resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @return

    - * The optional description for the place index resource. - *

    - */ - public String getDescription() { - return description; - } - - /** - *

    - * The optional description for the place index resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description for the place index resource. - *

    - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

    - * The optional description for the place index resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description for the place index resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListPlaceIndexesResponseEntry withDescription(String description) { - this.description = description; - return this; - } - - /** - *

    - * The name of the place index resource. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @return

    - * The name of the place index resource. - *

    - */ - public String getIndexName() { - return indexName; - } - - /** - *

    - * The name of the place index resource. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param indexName

    - * The name of the place index resource. - *

    - */ - public void setIndexName(String indexName) { - this.indexName = indexName; - } - - /** - *

    - * The name of the place index resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param indexName

    - * The name of the place index resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListPlaceIndexesResponseEntry withIndexName(String indexName) { - this.indexName = indexName; - return this; - } - /** *

    * No longer used. Always returns RequestBasedUsage. @@ -554,6 +495,65 @@ public ListPlaceIndexesResponseEntry withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

    + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @return

    + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * + * @param createTime

    + * The timestamp for when the place index resource was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp for when the place index resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp for when the place index resource was created in + * ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListPlaceIndexesResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp for when the place index resource was last updated in * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String calculatorName; /** *

    - * The timestamp when the route calculator resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description of the route calculator resource. *

    - *
      - *
    • *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    + * Constraints:
    + * Length: 0 - 1000
    */ - private java.util.Date createTime; + private String description; /** *

    @@ -82,24 +76,30 @@ public class ListRouteCalculatorsResponseEntry implements Serializable { /** *

    - * The optional description of the route calculator resource. + * Always returns RequestBasedUsage. *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private String description; + private String pricingPlan; /** *

    - * Always returns RequestBasedUsage. + * The timestamp when the route calculator resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    + *
      + *
    • *

      - * Constraints:
      - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    */ - private String pricingPlan; + private java.util.Date createTime; /** *

    @@ -124,7 +124,7 @@ public class ListRouteCalculatorsResponseEntry implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the route calculator resource. @@ -141,7 +141,7 @@ public String getCalculatorName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param calculatorName

    * The name of the route calculator resource. @@ -161,7 +161,7 @@ public void setCalculatorName(String calculatorName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param calculatorName

    * The name of the route calculator resource. @@ -176,102 +176,55 @@ public ListRouteCalculatorsResponseEntry withCalculatorName(String calculatorNam /** *

    - * The timestamp when the route calculator resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description of the route calculator resource. *

    - *
      - *
    • *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    + * Constraints:
    + * Length: 0 - 1000
    * * @return

    - * The timestamp when the route calculator resource was created in - * - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 + * The optional description of the route calculator resource. *

      - *
      • - *
    */ - public java.util.Date getCreateTime() { - return createTime; + public String getDescription() { + return description; } /** *

    - * The timestamp when the route calculator resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The optional description of the route calculator resource. *

    - *
      - *
    • *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 - *

      - *
      • - *
    + * Constraints:
    + * Length: 0 - 1000
    * - * @param createTime

    - * The timestamp when the route calculator resource was created - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 + * @param description

      + * The optional description of the route calculator resource. *

      - *
      • - *
    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setDescription(String description) { + this.description = description; } /** *

    - * The timestamp when the route calculator resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 + * The optional description of the route calculator resource. *

      - *
      • - *
    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 0 - 1000
    * - * @param createTime

    - * The timestamp when the route calculator resource was created - * in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. - *

    - *
      - *
    • - *

      - * For example, 2020–07-2T12:15:20.000Z+01:00 + * @param description

      + * The optional description of the route calculator resource. *

      - *
      • - *
    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListRouteCalculatorsResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public ListRouteCalculatorsResponseEntry withDescription(String description) { + this.description = description; return this; } @@ -458,60 +411,6 @@ public ListRouteCalculatorsResponseEntry withDataSource(String dataSource) { return this; } - /** - *

    - * The optional description of the route calculator resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @return

    - * The optional description of the route calculator resource. - *

    - */ - public String getDescription() { - return description; - } - - /** - *

    - * The optional description of the route calculator resource. - *

    - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description of the route calculator resource. - *

    - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

    - * The optional description of the route calculator resource. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 0 - 1000
    - * - * @param description

    - * The optional description of the route calculator resource. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListRouteCalculatorsResponseEntry withDescription(String description) { - this.description = description; - return this; - } - /** *

    * Always returns RequestBasedUsage. @@ -614,6 +513,107 @@ public ListRouteCalculatorsResponseEntry withPricingPlan(PricingPlan pricingPlan return this; } + /** + *

    + * The timestamp when the route calculator resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + * + * @return

    + * The timestamp when the route calculator resource was created in + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + */ + public java.util.Date getCreateTime() { + return createTime; + } + + /** + *

    + * The timestamp when the route calculator resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + * + * @param createTime

    + * The timestamp when the route calculator resource was created + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + */ + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; + } + + /** + *

    + * The timestamp when the route calculator resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param createTime

    + * The timestamp when the route calculator resource was created + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

    + *
      + *
    • + *

      + * For example, 2020–07-2T12:15:20.000Z+01:00 + *

      + *
      • + *
    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListRouteCalculatorsResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; + return this; + } + /** *

    * The timestamp when the route calculator resource was last updated in Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    */ private String resourceArn; @@ -65,8 +65,8 @@ public class ListTagsForResourceRequest extends AmazonWebServiceRequest implemen * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @return

    * The Amazon Resource Name (ARN) of the resource whose tags you @@ -102,8 +102,8 @@ public String getResourceArn() { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param resourceArn

    * The Amazon Resource Name (ARN) of the resource whose tags you @@ -142,8 +142,8 @@ public void setResourceArn(String resourceArn) { * Constraints:
    * Length: 0 - 1600
    * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
    + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
    * * @param resourceArn

    * The Amazon Resource Name (ARN) of the resource whose tags you diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTagsForResourceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTagsForResourceResult.java index 95ce936841..6a5c305aef 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTagsForResourceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTagsForResourceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersRequest.java index 74702cf940..933262cbdc 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,6 +26,18 @@ *

    */ public class ListTrackerConsumersRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

    + * The tracker resource whose associated geofence collections you want to + * list. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String trackerName; + /** *

    * An optional limit for the number of resources returned in a single call. @@ -61,9 +73,60 @@ public class ListTrackerConsumersRequest extends AmazonWebServiceRequest impleme *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    + * + * @return

    + * The tracker resource whose associated geofence collections you + * want to list. + *

    */ - private String trackerName; + public String getTrackerName() { + return trackerName; + } + + /** + *

    + * The tracker resource whose associated geofence collections you want to + * list. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The tracker resource whose associated geofence collections you + * want to list. + *

    + */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

    + * The tracker resource whose associated geofence collections you want to + * list. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param trackerName

    + * The tracker resource whose associated geofence collections you + * want to list. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListTrackerConsumersRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

    @@ -221,69 +284,6 @@ public ListTrackerConsumersRequest withNextToken(String nextToken) { return this; } - /** - *

    - * The tracker resource whose associated geofence collections you want to - * list. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @return

    - * The tracker resource whose associated geofence collections you - * want to list. - *

    - */ - public String getTrackerName() { - return trackerName; - } - - /** - *

    - * The tracker resource whose associated geofence collections you want to - * list. - *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param trackerName

    - * The tracker resource whose associated geofence collections you - * want to list. - *

    - */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; - } - - /** - *

    - * The tracker resource whose associated geofence collections you want to - * list. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - * - * @param trackerName

    - * The tracker resource whose associated geofence collections you - * want to list. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public ListTrackerConsumersRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -295,12 +295,12 @@ public ListTrackerConsumersRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); if (getNextToken() != null) - sb.append("NextToken: " + getNextToken() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + sb.append("NextToken: " + getNextToken()); sb.append("}"); return sb.toString(); } @@ -310,10 +310,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); - hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); hashCode = prime * hashCode + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); + hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode()); return hashCode; } @@ -328,6 +328,11 @@ public boolean equals(Object obj) { return false; ListTrackerConsumersRequest other = (ListTrackerConsumersRequest) obj; + if (other.getTrackerName() == null ^ this.getTrackerName() == null) + return false; + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) + return false; if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; if (other.getMaxResults() != null @@ -338,11 +343,6 @@ public boolean equals(Object obj) { if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) - return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersResult.java index 2930c8fa8b..094ea83844 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackerConsumersResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersRequest.java index d674821a75..5345424c50 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResponseEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResponseEntry.java index afd4f0cfd5..86d4bb98b1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResponseEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResponseEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,12 +25,14 @@ public class ListTrackersResponseEntry implements Serializable { /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    */ - private java.util.Date createTime; + private String trackerName; /** *

    @@ -62,14 +64,12 @@ public class ListTrackersResponseEntry implements Serializable { /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    */ - private String trackerName; + private java.util.Date createTime; /** *

    @@ -82,58 +82,58 @@ public class ListTrackersResponseEntry implements Serializable { /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * * @return

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    */ - public java.util.Date getCreateTime() { - return createTime; + public String getTrackerName() { + return trackerName; } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param createTime

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param trackerName

    + * The name of the tracker resource. *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; } /** *

    - * The timestamp for when the tracker resource was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the tracker resource. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    * - * @param createTime

    - * The timestamp for when the tracker resource was created in - * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * @param trackerName

    + * The name of the tracker resource. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListTrackersResponseEntry withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public ListTrackersResponseEntry withTrackerName(String trackerName) { + this.trackerName = trackerName; return this; } @@ -340,58 +340,58 @@ public ListTrackersResponseEntry withPricingPlanDataSource(String pricingPlanDat /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * * @return

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public String getTrackerName() { - return trackerName; + public java.util.Date getCreateTime() { + return createTime; } /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The name of the tracker resource. + * @param createTime

    + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

    - * The name of the tracker resource. + * The timestamp for when the tracker resource was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    * - * @param trackerName

    - * The name of the tracker resource. + * @param createTime

    + * The timestamp for when the tracker resource was created in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public ListTrackersResponseEntry withTrackerName(String trackerName) { - this.trackerName = trackerName; + public ListTrackersResponseEntry withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } @@ -465,16 +465,16 @@ public ListTrackersResponseEntry withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getDescription() != null) sb.append("Description: " + getDescription() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); if (getPricingPlanDataSource() != null) sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); if (getUpdateTime() != null) sb.append("UpdateTime: " + getUpdateTime()); sb.append("}"); @@ -486,7 +486,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + hashCode = prime * hashCode + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode @@ -494,8 +495,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); - hashCode = prime * hashCode - + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); return hashCode; } @@ -511,10 +511,10 @@ public boolean equals(Object obj) { return false; ListTrackersResponseEntry other = (ListTrackersResponseEntry) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) + if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; @@ -531,10 +531,10 @@ public boolean equals(Object obj) { if (other.getPricingPlanDataSource() != null && other.getPricingPlanDataSource().equals(this.getPricingPlanDataSource()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getCreateTime() == null ^ this.getCreateTime() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResult.java index 70e9324da4..0b0ab4390c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListTrackersResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteCellDetails.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteCellDetails.java new file mode 100644 index 0000000000..42d9741e97 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteCellDetails.java @@ -0,0 +1,805 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * Details about the Long-Term Evolution (LTE) network. + *

    + */ +public class LteCellDetails implements Serializable { + /** + *

    + * The E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Constraints:
    + * Range: 0 - 268435455
    + */ + private Integer cellId; + + /** + *

    + * The Mobile Country Code (MCC). + *

    + *

    + * Constraints:
    + * Range: 200 - 999
    + */ + private Integer mcc; + + /** + *

    + * The Mobile Network Code (MNC) + *

    + *

    + * Constraints:
    + * Range: 0 - 999
    + */ + private Integer mnc; + + /** + *

    + * The LTE local identification information (local ID). + *

    + */ + private LteLocalId localId; + + /** + *

    + * The network measurements. + *

    + */ + private java.util.List networkMeasurements; + + /** + *

    + * Timing Advance (TA). + *

    + *

    + * Constraints:
    + * Range: 0 - 1282
    + */ + private Integer timingAdvance; + + /** + *

    + * Indicates whether the LTE object is capable of supporting NR (new radio). + *

    + */ + private Boolean nrCapable; + + /** + *

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + *

    + * Constraints:
    + * Range: -140 - -44
    + */ + private Integer rsrp; + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + */ + private Float rsrq; + + /** + *

    + * LTE Tracking Area Code (TAC). + *

    + *

    + * Constraints:
    + * Range: 0 - 65535
    + */ + private Integer tac; + + /** + *

    + * The E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Constraints:
    + * Range: 0 - 268435455
    + * + * @return

    + * The E-UTRAN Cell Identifier (ECI). + *

    + */ + public Integer getCellId() { + return cellId; + } + + /** + *

    + * The E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Constraints:
    + * Range: 0 - 268435455
    + * + * @param cellId

    + * The E-UTRAN Cell Identifier (ECI). + *

    + */ + public void setCellId(Integer cellId) { + this.cellId = cellId; + } + + /** + *

    + * The E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 268435455
    + * + * @param cellId

    + * The E-UTRAN Cell Identifier (ECI). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withCellId(Integer cellId) { + this.cellId = cellId; + return this; + } + + /** + *

    + * The Mobile Country Code (MCC). + *

    + *

    + * Constraints:
    + * Range: 200 - 999
    + * + * @return

    + * The Mobile Country Code (MCC). + *

    + */ + public Integer getMcc() { + return mcc; + } + + /** + *

    + * The Mobile Country Code (MCC). + *

    + *

    + * Constraints:
    + * Range: 200 - 999
    + * + * @param mcc

    + * The Mobile Country Code (MCC). + *

    + */ + public void setMcc(Integer mcc) { + this.mcc = mcc; + } + + /** + *

    + * The Mobile Country Code (MCC). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 200 - 999
    + * + * @param mcc

    + * The Mobile Country Code (MCC). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withMcc(Integer mcc) { + this.mcc = mcc; + return this; + } + + /** + *

    + * The Mobile Network Code (MNC) + *

    + *

    + * Constraints:
    + * Range: 0 - 999
    + * + * @return

    + * The Mobile Network Code (MNC) + *

    + */ + public Integer getMnc() { + return mnc; + } + + /** + *

    + * The Mobile Network Code (MNC) + *

    + *

    + * Constraints:
    + * Range: 0 - 999
    + * + * @param mnc

    + * The Mobile Network Code (MNC) + *

    + */ + public void setMnc(Integer mnc) { + this.mnc = mnc; + } + + /** + *

    + * The Mobile Network Code (MNC) + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 999
    + * + * @param mnc

    + * The Mobile Network Code (MNC) + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withMnc(Integer mnc) { + this.mnc = mnc; + return this; + } + + /** + *

    + * The LTE local identification information (local ID). + *

    + * + * @return

    + * The LTE local identification information (local ID). + *

    + */ + public LteLocalId getLocalId() { + return localId; + } + + /** + *

    + * The LTE local identification information (local ID). + *

    + * + * @param localId

    + * The LTE local identification information (local ID). + *

    + */ + public void setLocalId(LteLocalId localId) { + this.localId = localId; + } + + /** + *

    + * The LTE local identification information (local ID). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param localId

    + * The LTE local identification information (local ID). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withLocalId(LteLocalId localId) { + this.localId = localId; + return this; + } + + /** + *

    + * The network measurements. + *

    + * + * @return

    + * The network measurements. + *

    + */ + public java.util.List getNetworkMeasurements() { + return networkMeasurements; + } + + /** + *

    + * The network measurements. + *

    + * + * @param networkMeasurements

    + * The network measurements. + *

    + */ + public void setNetworkMeasurements( + java.util.Collection networkMeasurements) { + if (networkMeasurements == null) { + this.networkMeasurements = null; + return; + } + + this.networkMeasurements = new java.util.ArrayList( + networkMeasurements); + } + + /** + *

    + * The network measurements. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param networkMeasurements

    + * The network measurements. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withNetworkMeasurements(LteNetworkMeasurements... networkMeasurements) { + if (getNetworkMeasurements() == null) { + this.networkMeasurements = new java.util.ArrayList( + networkMeasurements.length); + } + for (LteNetworkMeasurements value : networkMeasurements) { + this.networkMeasurements.add(value); + } + return this; + } + + /** + *

    + * The network measurements. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param networkMeasurements

    + * The network measurements. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withNetworkMeasurements( + java.util.Collection networkMeasurements) { + setNetworkMeasurements(networkMeasurements); + return this; + } + + /** + *

    + * Timing Advance (TA). + *

    + *

    + * Constraints:
    + * Range: 0 - 1282
    + * + * @return

    + * Timing Advance (TA). + *

    + */ + public Integer getTimingAdvance() { + return timingAdvance; + } + + /** + *

    + * Timing Advance (TA). + *

    + *

    + * Constraints:
    + * Range: 0 - 1282
    + * + * @param timingAdvance

    + * Timing Advance (TA). + *

    + */ + public void setTimingAdvance(Integer timingAdvance) { + this.timingAdvance = timingAdvance; + } + + /** + *

    + * Timing Advance (TA). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 1282
    + * + * @param timingAdvance

    + * Timing Advance (TA). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withTimingAdvance(Integer timingAdvance) { + this.timingAdvance = timingAdvance; + return this; + } + + /** + *

    + * Indicates whether the LTE object is capable of supporting NR (new radio). + *

    + * + * @return

    + * Indicates whether the LTE object is capable of supporting NR (new + * radio). + *

    + */ + public Boolean isNrCapable() { + return nrCapable; + } + + /** + *

    + * Indicates whether the LTE object is capable of supporting NR (new radio). + *

    + * + * @return

    + * Indicates whether the LTE object is capable of supporting NR (new + * radio). + *

    + */ + public Boolean getNrCapable() { + return nrCapable; + } + + /** + *

    + * Indicates whether the LTE object is capable of supporting NR (new radio). + *

    + * + * @param nrCapable

    + * Indicates whether the LTE object is capable of supporting NR + * (new radio). + *

    + */ + public void setNrCapable(Boolean nrCapable) { + this.nrCapable = nrCapable; + } + + /** + *

    + * Indicates whether the LTE object is capable of supporting NR (new radio). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param nrCapable

    + * Indicates whether the LTE object is capable of supporting NR + * (new radio). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withNrCapable(Boolean nrCapable) { + this.nrCapable = nrCapable; + return this; + } + + /** + *

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + *

    + * Constraints:
    + * Range: -140 - -44
    + * + * @return

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + */ + public Integer getRsrp() { + return rsrp; + } + + /** + *

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + *

    + * Constraints:
    + * Range: -140 - -44
    + * + * @param rsrp

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + */ + public void setRsrp(Integer rsrp) { + this.rsrp = rsrp; + } + + /** + *

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: -140 - -44
    + * + * @param rsrp

    + * Signal power of the reference signal received, measured in + * decibel-milliwatts (dBm). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withRsrp(Integer rsrp) { + this.rsrp = rsrp; + return this; + } + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + * + * @return

    + * Signal quality of the reference Signal received, measured in + * decibels (dB). + *

    + */ + public Float getRsrq() { + return rsrq; + } + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + * + * @param rsrq

    + * Signal quality of the reference Signal received, measured in + * decibels (dB). + *

    + */ + public void setRsrq(Float rsrq) { + this.rsrq = rsrq; + } + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + * + * @param rsrq

    + * Signal quality of the reference Signal received, measured in + * decibels (dB). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withRsrq(Float rsrq) { + this.rsrq = rsrq; + return this; + } + + /** + *

    + * LTE Tracking Area Code (TAC). + *

    + *

    + * Constraints:
    + * Range: 0 - 65535
    + * + * @return

    + * LTE Tracking Area Code (TAC). + *

    + */ + public Integer getTac() { + return tac; + } + + /** + *

    + * LTE Tracking Area Code (TAC). + *

    + *

    + * Constraints:
    + * Range: 0 - 65535
    + * + * @param tac

    + * LTE Tracking Area Code (TAC). + *

    + */ + public void setTac(Integer tac) { + this.tac = tac; + } + + /** + *

    + * LTE Tracking Area Code (TAC). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 65535
    + * + * @param tac

    + * LTE Tracking Area Code (TAC). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteCellDetails withTac(Integer tac) { + this.tac = tac; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getCellId() != null) + sb.append("CellId: " + getCellId() + ","); + if (getMcc() != null) + sb.append("Mcc: " + getMcc() + ","); + if (getMnc() != null) + sb.append("Mnc: " + getMnc() + ","); + if (getLocalId() != null) + sb.append("LocalId: " + getLocalId() + ","); + if (getNetworkMeasurements() != null) + sb.append("NetworkMeasurements: " + getNetworkMeasurements() + ","); + if (getTimingAdvance() != null) + sb.append("TimingAdvance: " + getTimingAdvance() + ","); + if (getNrCapable() != null) + sb.append("NrCapable: " + getNrCapable() + ","); + if (getRsrp() != null) + sb.append("Rsrp: " + getRsrp() + ","); + if (getRsrq() != null) + sb.append("Rsrq: " + getRsrq() + ","); + if (getTac() != null) + sb.append("Tac: " + getTac()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getCellId() == null) ? 0 : getCellId().hashCode()); + hashCode = prime * hashCode + ((getMcc() == null) ? 0 : getMcc().hashCode()); + hashCode = prime * hashCode + ((getMnc() == null) ? 0 : getMnc().hashCode()); + hashCode = prime * hashCode + ((getLocalId() == null) ? 0 : getLocalId().hashCode()); + hashCode = prime * hashCode + + ((getNetworkMeasurements() == null) ? 0 : getNetworkMeasurements().hashCode()); + hashCode = prime * hashCode + + ((getTimingAdvance() == null) ? 0 : getTimingAdvance().hashCode()); + hashCode = prime * hashCode + ((getNrCapable() == null) ? 0 : getNrCapable().hashCode()); + hashCode = prime * hashCode + ((getRsrp() == null) ? 0 : getRsrp().hashCode()); + hashCode = prime * hashCode + ((getRsrq() == null) ? 0 : getRsrq().hashCode()); + hashCode = prime * hashCode + ((getTac() == null) ? 0 : getTac().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof LteCellDetails == false) + return false; + LteCellDetails other = (LteCellDetails) obj; + + if (other.getCellId() == null ^ this.getCellId() == null) + return false; + if (other.getCellId() != null && other.getCellId().equals(this.getCellId()) == false) + return false; + if (other.getMcc() == null ^ this.getMcc() == null) + return false; + if (other.getMcc() != null && other.getMcc().equals(this.getMcc()) == false) + return false; + if (other.getMnc() == null ^ this.getMnc() == null) + return false; + if (other.getMnc() != null && other.getMnc().equals(this.getMnc()) == false) + return false; + if (other.getLocalId() == null ^ this.getLocalId() == null) + return false; + if (other.getLocalId() != null && other.getLocalId().equals(this.getLocalId()) == false) + return false; + if (other.getNetworkMeasurements() == null ^ this.getNetworkMeasurements() == null) + return false; + if (other.getNetworkMeasurements() != null + && other.getNetworkMeasurements().equals(this.getNetworkMeasurements()) == false) + return false; + if (other.getTimingAdvance() == null ^ this.getTimingAdvance() == null) + return false; + if (other.getTimingAdvance() != null + && other.getTimingAdvance().equals(this.getTimingAdvance()) == false) + return false; + if (other.getNrCapable() == null ^ this.getNrCapable() == null) + return false; + if (other.getNrCapable() != null + && other.getNrCapable().equals(this.getNrCapable()) == false) + return false; + if (other.getRsrp() == null ^ this.getRsrp() == null) + return false; + if (other.getRsrp() != null && other.getRsrp().equals(this.getRsrp()) == false) + return false; + if (other.getRsrq() == null ^ this.getRsrq() == null) + return false; + if (other.getRsrq() != null && other.getRsrq().equals(this.getRsrq()) == false) + return false; + if (other.getTac() == null ^ this.getTac() == null) + return false; + if (other.getTac() != null && other.getTac().equals(this.getTac()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteLocalId.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteLocalId.java new file mode 100644 index 0000000000..dd92d63986 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteLocalId.java @@ -0,0 +1,211 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * LTE local identification information (local ID). + *

    + */ +public class LteLocalId implements Serializable { + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Constraints:
    + * Range: 0 - 262143
    + */ + private Integer earfcn; + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Constraints:
    + * Range: 0 - 503
    + */ + private Integer pci; + + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Constraints:
    + * Range: 0 - 262143
    + * + * @return

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute + * radio frequency channel number (EARFCN). + *

    + */ + public Integer getEarfcn() { + return earfcn; + } + + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Constraints:
    + * Range: 0 - 262143
    + * + * @param earfcn

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute + * radio frequency channel number (EARFCN). + *

    + */ + public void setEarfcn(Integer earfcn) { + this.earfcn = earfcn; + } + + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 262143
    + * + * @param earfcn

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute + * radio frequency channel number (EARFCN). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteLocalId withEarfcn(Integer earfcn) { + this.earfcn = earfcn; + return this; + } + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Constraints:
    + * Range: 0 - 503
    + * + * @return

    + * Physical Cell ID (PCI). + *

    + */ + public Integer getPci() { + return pci; + } + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Constraints:
    + * Range: 0 - 503
    + * + * @param pci

    + * Physical Cell ID (PCI). + *

    + */ + public void setPci(Integer pci) { + this.pci = pci; + } + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 503
    + * + * @param pci

    + * Physical Cell ID (PCI). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteLocalId withPci(Integer pci) { + this.pci = pci; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getEarfcn() != null) + sb.append("Earfcn: " + getEarfcn() + ","); + if (getPci() != null) + sb.append("Pci: " + getPci()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getEarfcn() == null) ? 0 : getEarfcn().hashCode()); + hashCode = prime * hashCode + ((getPci() == null) ? 0 : getPci().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof LteLocalId == false) + return false; + LteLocalId other = (LteLocalId) obj; + + if (other.getEarfcn() == null ^ this.getEarfcn() == null) + return false; + if (other.getEarfcn() != null && other.getEarfcn().equals(this.getEarfcn()) == false) + return false; + if (other.getPci() == null ^ this.getPci() == null) + return false; + if (other.getPci() != null && other.getPci().equals(this.getPci()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteNetworkMeasurements.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteNetworkMeasurements.java new file mode 100644 index 0000000000..61a96b11e6 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/LteNetworkMeasurements.java @@ -0,0 +1,438 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * LTE network measurements. + *

    + */ +public class LteNetworkMeasurements implements Serializable { + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Constraints:
    + * Range: 0 - 262143
    + */ + private Integer earfcn; + + /** + *

    + * E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Constraints:
    + * Range: 0 - 268435455
    + */ + private Integer cellId; + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Constraints:
    + * Range: 0 - 503
    + */ + private Integer pci; + + /** + *

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + *

    + * Constraints:
    + * Range: -140 - -44
    + */ + private Integer rsrp; + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + */ + private Float rsrq; + + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Constraints:
    + * Range: 0 - 262143
    + * + * @return

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute + * radio frequency channel number (EARFCN). + *

    + */ + public Integer getEarfcn() { + return earfcn; + } + + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Constraints:
    + * Range: 0 - 262143
    + * + * @param earfcn

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute + * radio frequency channel number (EARFCN). + *

    + */ + public void setEarfcn(Integer earfcn) { + this.earfcn = earfcn; + } + + /** + *

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio + * frequency channel number (EARFCN). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 262143
    + * + * @param earfcn

    + * E-UTRA (Evolved Universal Terrestrial Radio Access) absolute + * radio frequency channel number (EARFCN). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteNetworkMeasurements withEarfcn(Integer earfcn) { + this.earfcn = earfcn; + return this; + } + + /** + *

    + * E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Constraints:
    + * Range: 0 - 268435455
    + * + * @return

    + * E-UTRAN Cell Identifier (ECI). + *

    + */ + public Integer getCellId() { + return cellId; + } + + /** + *

    + * E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Constraints:
    + * Range: 0 - 268435455
    + * + * @param cellId

    + * E-UTRAN Cell Identifier (ECI). + *

    + */ + public void setCellId(Integer cellId) { + this.cellId = cellId; + } + + /** + *

    + * E-UTRAN Cell Identifier (ECI). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 268435455
    + * + * @param cellId

    + * E-UTRAN Cell Identifier (ECI). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteNetworkMeasurements withCellId(Integer cellId) { + this.cellId = cellId; + return this; + } + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Constraints:
    + * Range: 0 - 503
    + * + * @return

    + * Physical Cell ID (PCI). + *

    + */ + public Integer getPci() { + return pci; + } + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Constraints:
    + * Range: 0 - 503
    + * + * @param pci

    + * Physical Cell ID (PCI). + *

    + */ + public void setPci(Integer pci) { + this.pci = pci; + } + + /** + *

    + * Physical Cell ID (PCI). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 0 - 503
    + * + * @param pci

    + * Physical Cell ID (PCI). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteNetworkMeasurements withPci(Integer pci) { + this.pci = pci; + return this; + } + + /** + *

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + *

    + * Constraints:
    + * Range: -140 - -44
    + * + * @return

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + */ + public Integer getRsrp() { + return rsrp; + } + + /** + *

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + *

    + * Constraints:
    + * Range: -140 - -44
    + * + * @param rsrp

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + */ + public void setRsrp(Integer rsrp) { + this.rsrp = rsrp; + } + + /** + *

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: -140 - -44
    + * + * @param rsrp

    + * Signal power of the reference signal received, measured in dBm + * (decibel-milliwatts). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteNetworkMeasurements withRsrp(Integer rsrp) { + this.rsrp = rsrp; + return this; + } + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + * + * @return

    + * Signal quality of the reference Signal received, measured in + * decibels (dB). + *

    + */ + public Float getRsrq() { + return rsrq; + } + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + * + * @param rsrq

    + * Signal quality of the reference Signal received, measured in + * decibels (dB). + *

    + */ + public void setRsrq(Float rsrq) { + this.rsrq = rsrq; + } + + /** + *

    + * Signal quality of the reference Signal received, measured in decibels + * (dB). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: -19.5 - -3.0
    + * + * @param rsrq

    + * Signal quality of the reference Signal received, measured in + * decibels (dB). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public LteNetworkMeasurements withRsrq(Float rsrq) { + this.rsrq = rsrq; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getEarfcn() != null) + sb.append("Earfcn: " + getEarfcn() + ","); + if (getCellId() != null) + sb.append("CellId: " + getCellId() + ","); + if (getPci() != null) + sb.append("Pci: " + getPci() + ","); + if (getRsrp() != null) + sb.append("Rsrp: " + getRsrp() + ","); + if (getRsrq() != null) + sb.append("Rsrq: " + getRsrq()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getEarfcn() == null) ? 0 : getEarfcn().hashCode()); + hashCode = prime * hashCode + ((getCellId() == null) ? 0 : getCellId().hashCode()); + hashCode = prime * hashCode + ((getPci() == null) ? 0 : getPci().hashCode()); + hashCode = prime * hashCode + ((getRsrp() == null) ? 0 : getRsrp().hashCode()); + hashCode = prime * hashCode + ((getRsrq() == null) ? 0 : getRsrq().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof LteNetworkMeasurements == false) + return false; + LteNetworkMeasurements other = (LteNetworkMeasurements) obj; + + if (other.getEarfcn() == null ^ this.getEarfcn() == null) + return false; + if (other.getEarfcn() != null && other.getEarfcn().equals(this.getEarfcn()) == false) + return false; + if (other.getCellId() == null ^ this.getCellId() == null) + return false; + if (other.getCellId() != null && other.getCellId().equals(this.getCellId()) == false) + return false; + if (other.getPci() == null ^ this.getPci() == null) + return false; + if (other.getPci() != null && other.getPci().equals(this.getPci()) == false) + return false; + if (other.getRsrp() == null ^ this.getRsrp() == null) + return false; + if (other.getRsrp() != null && other.getRsrp().equals(this.getRsrp()) == false) + return false; + if (other.getRsrq() == null ^ this.getRsrq() == null) + return false; + if (other.getRsrq() != null && other.getRsrq().equals(this.getRsrq()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java index 2d29d095f1..416e37508a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -23,30 +23,6 @@ *

    */ public class MapConfiguration implements Serializable { - /** - *

    - * Specifies the political view for the style. Leave unset to not use a - * political view, or, for styles that support specific political views, you - * can choose a view, such as IND for the Indian view. - *

    - *

    - * Default is unset. - *

    - * - *

    - * Not all map resources or styles support political view styles. See Political views for more information. - *

    - *     - *

    - * Constraints:
    - * Length: 3 - 3
    - * Pattern: ^[A-Z]{3}$
    - */ - private String politicalView; - /** *

    * Specifies the map style selected from an available data provider. @@ -232,7 +208,7 @@ public class MapConfiguration implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String style; @@ -256,123 +232,25 @@ public class MapConfiguration implements Serializable { *

    * Constraints:
    * Length: 3 - 3
    - * Pattern: ^[A-Z]{3}$
    - * - * @return

    - * Specifies the political view for the style. Leave unset to not - * use a political view, or, for styles that support specific - * political views, you can choose a view, such as IND - * for the Indian view. - *

    - *

    - * Default is unset. - *

    - * - *

    - * Not all map resources or styles support political view styles. - * See Political views for more information. - *

    - *     - */ - public String getPoliticalView() { - return politicalView; - } - - /** - *

    - * Specifies the political view for the style. Leave unset to not use a - * political view, or, for styles that support specific political views, you - * can choose a view, such as IND for the Indian view. - *

    - *

    - * Default is unset. - *

    - * - *

    - * Not all map resources or styles support political view styles. See Political views for more information. - *

    - *     - *

    - * Constraints:
    - * Length: 3 - 3
    - * Pattern: ^[A-Z]{3}$
    - * - * @param politicalView

    - * Specifies the political view for the style. Leave unset to not - * use a political view, or, for styles that support specific - * political views, you can choose a view, such as - * IND for the Indian view. - *

    - *

    - * Default is unset. - *

    - * - *

    - * Not all map resources or styles support political view styles. - * See Political views for more information. - *

    - *     + * Pattern: [A-Z]{3}
    */ - public void setPoliticalView(String politicalView) { - this.politicalView = politicalView; - } + private String politicalView; /** *

    - * Specifies the political view for the style. Leave unset to not use a - * political view, or, for styles that support specific political views, you - * can choose a view, such as IND for the Indian view. - *

    - *

    - * Default is unset. + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. *

    * *

    - * Not all map resources or styles support political view styles. See Political views for more information. + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. *

    *     - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Length: 3 - 3
    - * Pattern: ^[A-Z]{3}$
    - * - * @param politicalView

    - * Specifies the political view for the style. Leave unset to not - * use a political view, or, for styles that support specific - * political views, you can choose a view, such as - * IND for the Indian view. - *

    - *

    - * Default is unset. - *

    - * - *

    - * Not all map resources or styles support political view styles. - * See Political views for more information. - *

    - *     - * @return A reference to this updated object so that method calls can be - * chained together. */ - public MapConfiguration withPoliticalView(String politicalView) { - this.politicalView = politicalView; - return this; - } + private java.util.List customLayers; /** *

    @@ -559,7 +437,7 @@ public MapConfiguration withPoliticalView(String politicalView) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * Specifies the map style selected from an available data provider. @@ -942,7 +820,7 @@ public String getStyle() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param style

    * Specifies the map style selected from an available data @@ -1332,7 +1210,7 @@ public void setStyle(String style) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param style

    * Specifies the map style selected from an available data @@ -1537,6 +1415,290 @@ public MapConfiguration withStyle(String style) { return this; } + /** + *

    + * Specifies the political view for the style. Leave unset to not use a + * political view, or, for styles that support specific political views, you + * can choose a view, such as IND for the Indian view. + *

    + *

    + * Default is unset. + *

    + * + *

    + * Not all map resources or styles support political view styles. See Political views for more information. + *

    + *     + *

    + * Constraints:
    + * Length: 3 - 3
    + * Pattern: [A-Z]{3}
    + * + * @return

    + * Specifies the political view for the style. Leave unset to not + * use a political view, or, for styles that support specific + * political views, you can choose a view, such as IND + * for the Indian view. + *

    + *

    + * Default is unset. + *

    + * + *

    + * Not all map resources or styles support political view styles. + * See Political views for more information. + *

    + *     + */ + public String getPoliticalView() { + return politicalView; + } + + /** + *

    + * Specifies the political view for the style. Leave unset to not use a + * political view, or, for styles that support specific political views, you + * can choose a view, such as IND for the Indian view. + *

    + *

    + * Default is unset. + *

    + * + *

    + * Not all map resources or styles support political view styles. See Political views for more information. + *

    + *     + *

    + * Constraints:
    + * Length: 3 - 3
    + * Pattern: [A-Z]{3}
    + * + * @param politicalView

    + * Specifies the political view for the style. Leave unset to not + * use a political view, or, for styles that support specific + * political views, you can choose a view, such as + * IND for the Indian view. + *

    + *

    + * Default is unset. + *

    + * + *

    + * Not all map resources or styles support political view styles. + * See Political views for more information. + *

    + *     + */ + public void setPoliticalView(String politicalView) { + this.politicalView = politicalView; + } + + /** + *

    + * Specifies the political view for the style. Leave unset to not use a + * political view, or, for styles that support specific political views, you + * can choose a view, such as IND for the Indian view. + *

    + *

    + * Default is unset. + *

    + * + *

    + * Not all map resources or styles support political view styles. See Political views for more information. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 3 - 3
    + * Pattern: [A-Z]{3}
    + * + * @param politicalView

    + * Specifies the political view for the style. Leave unset to not + * use a political view, or, for styles that support specific + * political views, you can choose a view, such as + * IND for the Indian view. + *

    + *

    + * Default is unset. + *

    + * + *

    + * Not all map resources or styles support political view styles. + * See Political views for more information. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public MapConfiguration withPoliticalView(String politicalView) { + this.politicalView = politicalView; + return this; + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + * + * @return

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom + * Layers for more information. + *

    + *     + */ + public java.util.List getCustomLayers() { + return customLayers; + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + * + * @param customLayers

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See + * Custom Layers for more information. + *

    + *     + */ + public void setCustomLayers(java.util.Collection customLayers) { + if (customLayers == null) { + this.customLayers = null; + return; + } + + this.customLayers = new java.util.ArrayList(customLayers); + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param customLayers

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See + * Custom Layers for more information. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public MapConfiguration withCustomLayers(String... customLayers) { + if (getCustomLayers() == null) { + this.customLayers = new java.util.ArrayList(customLayers.length); + } + for (String value : customLayers) { + this.customLayers.add(value); + } + return this; + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param customLayers

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See + * Custom Layers for more information. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public MapConfiguration withCustomLayers(java.util.Collection customLayers) { + setCustomLayers(customLayers); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -1548,10 +1710,12 @@ public MapConfiguration withStyle(String style) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getStyle() != null) + sb.append("Style: " + getStyle() + ","); if (getPoliticalView() != null) sb.append("PoliticalView: " + getPoliticalView() + ","); - if (getStyle() != null) - sb.append("Style: " + getStyle()); + if (getCustomLayers() != null) + sb.append("CustomLayers: " + getCustomLayers()); sb.append("}"); return sb.toString(); } @@ -1561,9 +1725,11 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getStyle() == null) ? 0 : getStyle().hashCode()); hashCode = prime * hashCode + ((getPoliticalView() == null) ? 0 : getPoliticalView().hashCode()); - hashCode = prime * hashCode + ((getStyle() == null) ? 0 : getStyle().hashCode()); + hashCode = prime * hashCode + + ((getCustomLayers() == null) ? 0 : getCustomLayers().hashCode()); return hashCode; } @@ -1578,14 +1744,19 @@ public boolean equals(Object obj) { return false; MapConfiguration other = (MapConfiguration) obj; + if (other.getStyle() == null ^ this.getStyle() == null) + return false; + if (other.getStyle() != null && other.getStyle().equals(this.getStyle()) == false) + return false; if (other.getPoliticalView() == null ^ this.getPoliticalView() == null) return false; if (other.getPoliticalView() != null && other.getPoliticalView().equals(this.getPoliticalView()) == false) return false; - if (other.getStyle() == null ^ this.getStyle() == null) + if (other.getCustomLayers() == null ^ this.getCustomLayers() == null) return false; - if (other.getStyle() != null && other.getStyle().equals(this.getStyle()) == false) + if (other.getCustomLayers() != null + && other.getCustomLayers().equals(this.getCustomLayers()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfigurationUpdate.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfigurationUpdate.java index a3055dac0f..9ffa1bdc7d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfigurationUpdate.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfigurationUpdate.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -41,10 +41,26 @@ public class MapConfigurationUpdate implements Serializable { *

    * Constraints:
    * Length: 0 - 3
    - * Pattern: ^[A-Z]{3}$|^$
    + * Pattern: [A-Z]{3}$|^
    */ private String politicalView; + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + */ + private java.util.List customLayers; + /** *

    * Specifies the political view for the style. Set to an empty string to not @@ -63,7 +79,7 @@ public class MapConfigurationUpdate implements Serializable { *

    * Constraints:
    * Length: 0 - 3
    - * Pattern: ^[A-Z]{3}$|^$
    + * Pattern: [A-Z]{3}$|^
    * * @return

    * Specifies the political view for the style. Set to an empty @@ -102,7 +118,7 @@ public String getPoliticalView() { *

    * Constraints:
    * Length: 0 - 3
    - * Pattern: ^[A-Z]{3}$|^$
    + * Pattern: [A-Z]{3}$|^
    * * @param politicalView

    * Specifies the political view for the style. Set to an empty @@ -144,7 +160,7 @@ public void setPoliticalView(String politicalView) { *

    * Constraints:
    * Length: 0 - 3
    - * Pattern: ^[A-Z]{3}$|^$
    + * Pattern: [A-Z]{3}$|^
    * * @param politicalView

    * Specifies the political view for the style. Set to an empty @@ -168,6 +184,152 @@ public MapConfigurationUpdate withPoliticalView(String politicalView) { return this; } + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + * + * @return

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom + * Layers for more information. + *

    + *     + */ + public java.util.List getCustomLayers() { + return customLayers; + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + * + * @param customLayers

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See + * Custom Layers for more information. + *

    + *     + */ + public void setCustomLayers(java.util.Collection customLayers) { + if (customLayers == null) { + this.customLayers = null; + return; + } + + this.customLayers = new java.util.ArrayList(customLayers); + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param customLayers

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See + * Custom Layers for more information. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public MapConfigurationUpdate withCustomLayers(String... customLayers) { + if (getCustomLayers() == null) { + this.customLayers = new java.util.ArrayList(customLayers.length); + } + for (String value : customLayers) { + this.customLayers.add(value); + } + return this; + } + + /** + *

    + * Specifies the custom layers for the style. Leave unset to not enable any + * custom layer, or, for styles that support custom layers, you can enable + * layer(s), such as POI layer for the VectorEsriNavigation style. Default + * is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See Custom Layers + * for more information. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param customLayers

    + * Specifies the custom layers for the style. Leave unset to not + * enable any custom layer, or, for styles that support custom + * layers, you can enable layer(s), such as POI layer for the + * VectorEsriNavigation style. Default is unset. + *

    + * + *

    + * Not all map resources or styles support custom layers. See + * Custom Layers for more information. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public MapConfigurationUpdate withCustomLayers(java.util.Collection customLayers) { + setCustomLayers(customLayers); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -180,7 +342,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); if (getPoliticalView() != null) - sb.append("PoliticalView: " + getPoliticalView()); + sb.append("PoliticalView: " + getPoliticalView() + ","); + if (getCustomLayers() != null) + sb.append("CustomLayers: " + getCustomLayers()); sb.append("}"); return sb.toString(); } @@ -192,6 +356,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getPoliticalView() == null) ? 0 : getPoliticalView().hashCode()); + hashCode = prime * hashCode + + ((getCustomLayers() == null) ? 0 : getCustomLayers().hashCode()); return hashCode; } @@ -211,6 +377,11 @@ public boolean equals(Object obj) { if (other.getPoliticalView() != null && other.getPoliticalView().equals(this.getPoliticalView()) == false) return false; + if (other.getCustomLayers() == null ^ this.getCustomLayers() == null) + return false; + if (other.getCustomLayers() != null + && other.getCustomLayers().equals(this.getCustomLayers()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/OptimizationMode.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/OptimizationMode.java new file mode 100644 index 0000000000..9131af1da6 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/OptimizationMode.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.util.HashMap; +import java.util.Map; + +/** + * Optimization Mode + */ +public enum OptimizationMode { + + FastestRoute("FastestRoute"), + ShortestRoute("ShortestRoute"); + + private String value; + + private OptimizationMode(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + + private static final Map enumMap; + static { + enumMap = new HashMap(); + enumMap.put("FastestRoute", FastestRoute); + enumMap.put("ShortestRoute", ShortestRoute); + } + + /** + * Use this in place of valueOf. + * + * @param value real value + * @return OptimizationMode corresponding to the value + */ + public static OptimizationMode fromValue(String value) { + if (value == null || value.isEmpty()) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } else if (enumMap.containsKey(value)) { + return enumMap.get(value); + } else { + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Place.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Place.java index 275afebedb..135e98897d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Place.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Place.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -28,6 +28,22 @@ *

    */ public class Place implements Serializable { + /** + *

    + * The full name and address of the point of interest such as a city, + * region, or country. For example, + * 123 Any Street, Any Town, USA. + *

    + */ + private String label; + + /** + *

    + * Places uses a point geometry to specify a location or a Place. + *

    + */ + private PlaceGeometry geometry; + /** *

    * The numerical portion of an address, such as a building number. @@ -37,17 +53,42 @@ public class Place implements Serializable { /** *

    - * The Amazon Location categories that describe this Place. + * The name for a street or a road to identify a location. For example, + * Main Street. *

    + */ + private String street; + + /** *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The name of a community district. For example, Downtown. *

    */ - private java.util.List categories; + private String neighborhood; + + /** + *

    + * A name for a local area, such as a city or town name. For example, + * Toronto. + *

    + */ + private String municipality; + + /** + *

    + * A county, or an area that's part of a larger region. For example, + * Metro Vancouver. + *

    + */ + private String subRegion; + + /** + *

    + * A name for an area or geographical division, such as a province or state + * name. For example, British Columbia. + *

    + */ + private String region; /** *

    @@ -60,10 +101,11 @@ public class Place implements Serializable { /** *

    - * Places uses a point geometry to specify a location or a Place. + * A group of numbers and letters in a country-specific format, which + * accompanies the address for the purpose of identifying a location. *

    */ - private PlaceGeometry geometry; + private String postalCode; /** *

    @@ -86,103 +128,178 @@ public class Place implements Serializable { /** *

    - * The full name and address of the point of interest such as a city, - * region, or country. For example, - * 123 Any Street, Any Town, USA. + * The time zone in which the Place is located. Returned only + * when using HERE or Grab as the selected partner. *

    */ - private String label; + private TimeZone timeZone; /** *

    - * A name for a local area, such as a city or town name. For example, - * Toronto. + * For addresses with a UnitNumber, the type of unit. For + * example, Apartment. + *

    + * + *

    + * Returned only for a place index that uses Esri as a data provider. *

    + *     */ - private String municipality; + private String unitType; /** *

    - * The name of a community district. For example, Downtown. + * For addresses with multiple units, the unit identifier. Can include + * numbers and letters, for example 3B or Unit 123 + * . + *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a data + * provider. Is not returned for SearchPlaceIndexForPosition. *

    + *     */ - private String neighborhood; + private String unitNumber; /** *

    - * A group of numbers and letters in a country-specific format, which - * accompanies the address for the purpose of identifying a location. + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

    */ - private String postalCode; + private java.util.List categories; /** *

    - * A name for an area or geographical division, such as a province or state - * name. For example, British Columbia. + * Categories from the data provider that describe the Place that are not + * mapped to any Amazon Location categories. *

    */ - private String region; + private java.util.List supplementalCategories; /** *

    - * The name for a street or a road to identify a location. For example, - * Main Street. + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen County in New + * York. + *

    + * + *

    + * This property supported by Esri and OpenData. The Esri property is + * district, and the OpenData property is borough. *

    + *     */ - private String street; + private String subMunicipality; /** *

    - * A county, or an area that's part of a larger region. For example, - * Metro Vancouver. + * The full name and address of the point of interest such as a city, + * region, or country. For example, + * 123 Any Street, Any Town, USA. *

    + * + * @return

    + * The full name and address of the point of interest such as a + * city, region, or country. For example, + * 123 Any Street, Any Town, USA. + *

    */ - private String subRegion; + public String getLabel() { + return label; + } /** *

    - * Categories from the data provider that describe the Place that are not - * mapped to any Amazon Location categories. + * The full name and address of the point of interest such as a city, + * region, or country. For example, + * 123 Any Street, Any Town, USA. *

    + * + * @param label

    + * The full name and address of the point of interest such as a + * city, region, or country. For example, + * 123 Any Street, Any Town, USA. + *

    */ - private java.util.List supplementalCategories; + public void setLabel(String label) { + this.label = label; + } /** *

    - * The time zone in which the Place is located. Returned only - * when using HERE or Grab as the selected partner. + * The full name and address of the point of interest such as a city, + * region, or country. For example, + * 123 Any Street, Any Town, USA. *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param label

    + * The full name and address of the point of interest such as a + * city, region, or country. For example, + * 123 Any Street, Any Town, USA. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private TimeZone timeZone; + public Place withLabel(String label) { + this.label = label; + return this; + } /** *

    - * For addresses with multiple units, the unit identifier. Can include - * numbers and letters, for example 3B or Unit 123 - * . + * Places uses a point geometry to specify a location or a Place. *

    - * + * + * @return

    + * Places uses a point geometry to specify a location or a Place. + *

    + */ + public PlaceGeometry getGeometry() { + return geometry; + } + + /** *

    - * Returned only for a place index that uses Esri or Grab as a data - * provider. Is not returned for SearchPlaceIndexForPosition. + * Places uses a point geometry to specify a location or a Place. *

    - *     + * + * @param geometry

    + * Places uses a point geometry to specify a location or a Place. + *

    */ - private String unitNumber; + public void setGeometry(PlaceGeometry geometry) { + this.geometry = geometry; + } /** *

    - * For addresses with a UnitNumber, the type of unit. For - * example, Apartment. + * Places uses a point geometry to specify a location or a Place. *

    - * *

    - * Returned only for a place index that uses Esri as a data provider. - *

    - *     + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param geometry

    + * Places uses a point geometry to specify a location or a Place. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private String unitType; + public Place withGeometry(PlaceGeometry geometry) { + this.geometry = geometry; + return this; + } /** *

    @@ -233,321 +350,454 @@ public Place withAddressNumber(String addressNumber) { /** *

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The name for a street or a road to identify a location. For example, + * Main Street. *

    * * @return

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list of - * Amazon Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The name for a street or a road to identify a location. For + * example, Main Street. *

    */ - public java.util.List getCategories() { - return categories; + public String getStreet() { + return street; } /** *

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The name for a street or a road to identify a location. For example, + * Main Street. *

    * - * @param categories

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. + * @param street

    + * The name for a street or a road to identify a location. For + * example, Main Street. *

    */ - public void setCategories(java.util.Collection categories) { - if (categories == null) { - this.categories = null; - return; - } - - this.categories = new java.util.ArrayList(categories); + public void setStreet(String street) { + this.street = street; } /** *

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The name for a street or a road to identify a location. For example, + * Main Street. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param categories

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. + * @param street

    + * The name for a street or a road to identify a location. For + * example, Main Street. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withCategories(String... categories) { - if (getCategories() == null) { - this.categories = new java.util.ArrayList(categories.length); - } - for (String value : categories) { - this.categories.add(value); - } + public Place withStreet(String street) { + this.street = street; return this; } /** *

    - * The Amazon Location categories that describe this Place. + * The name of a community district. For example, Downtown. *

    + * + * @return

    + * The name of a community district. For example, + * Downtown. + *

    + */ + public String getNeighborhood() { + return neighborhood; + } + + /** *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The name of a community district. For example, Downtown. + *

    + * + * @param neighborhood

    + * The name of a community district. For example, + * Downtown. + *

    + */ + public void setNeighborhood(String neighborhood) { + this.neighborhood = neighborhood; + } + + /** + *

    + * The name of a community district. For example, Downtown. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param categories

    - * The Amazon Location categories that describe this Place. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. + * @param neighborhood

    + * The name of a community district. For example, + * Downtown. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withCategories(java.util.Collection categories) { - setCategories(categories); + public Place withNeighborhood(String neighborhood) { + this.neighborhood = neighborhood; return this; } /** *

    - * A country/region specified using ISO 3166 - * 3-digit country/region code. For example, CAN. + * A name for a local area, such as a city or town name. For example, + * Toronto. *

    * * @return

    - * A country/region specified using ISO - * 3166 3-digit country/region code. For example, - * CAN. + * A name for a local area, such as a city or town name. For + * example, Toronto. *

    */ - public String getCountry() { - return country; + public String getMunicipality() { + return municipality; } /** *

    - * A country/region specified using ISO 3166 - * 3-digit country/region code. For example, CAN. + * A name for a local area, such as a city or town name. For example, + * Toronto. *

    * - * @param country

    - * A country/region specified using ISO - * 3166 3-digit country/region code. For example, - * CAN. + * @param municipality

    + * A name for a local area, such as a city or town name. For + * example, Toronto. *

    */ - public void setCountry(String country) { - this.country = country; + public void setMunicipality(String municipality) { + this.municipality = municipality; } /** *

    - * A country/region specified using ISO 3166 - * 3-digit country/region code. For example, CAN. + * A name for a local area, such as a city or town name. For example, + * Toronto. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param country

    - * A country/region specified using ISO - * 3166 3-digit country/region code. For example, - * CAN. + * @param municipality

    + * A name for a local area, such as a city or town name. For + * example, Toronto. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withCountry(String country) { - this.country = country; + public Place withMunicipality(String municipality) { + this.municipality = municipality; return this; } /** *

    - * Places uses a point geometry to specify a location or a Place. + * A county, or an area that's part of a larger region. For example, + * Metro Vancouver. *

    * * @return

    - * Places uses a point geometry to specify a location or a Place. + * A county, or an area that's part of a larger region. For example, + * Metro Vancouver. *

    */ - public PlaceGeometry getGeometry() { - return geometry; + public String getSubRegion() { + return subRegion; } /** *

    - * Places uses a point geometry to specify a location or a Place. + * A county, or an area that's part of a larger region. For example, + * Metro Vancouver. *

    * - * @param geometry

    - * Places uses a point geometry to specify a location or a Place. + * @param subRegion

    + * A county, or an area that's part of a larger region. For + * example, Metro Vancouver. *

    */ - public void setGeometry(PlaceGeometry geometry) { - this.geometry = geometry; + public void setSubRegion(String subRegion) { + this.subRegion = subRegion; } /** *

    - * Places uses a point geometry to specify a location or a Place. + * A county, or an area that's part of a larger region. For example, + * Metro Vancouver. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param geometry

    - * Places uses a point geometry to specify a location or a Place. + * @param subRegion

    + * A county, or an area that's part of a larger region. For + * example, Metro Vancouver. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withGeometry(PlaceGeometry geometry) { - this.geometry = geometry; + public Place withSubRegion(String subRegion) { + this.subRegion = subRegion; return this; } /** *

    - * True if the result is interpolated from other known places. - *

    - *

    - * False if the Place is a known place. - *

    - *

    - * Not returned when the partner does not provide the information. - *

    - *

    - * For example, returns False for an address location that is - * found in the partner data, but returns True if an address - * does not exist in the partner data and its location is calculated by - * interpolating between other known addresses. + * A name for an area or geographical division, such as a province or state + * name. For example, British Columbia. *

    * * @return

    - * True if the result is interpolated from other known - * places. - *

    - *

    - * False if the Place is a known place. - *

    - *

    - * Not returned when the partner does not provide the information. - *

    - *

    - * For example, returns False for an address location - * that is found in the partner data, but returns True - * if an address does not exist in the partner data and its location - * is calculated by interpolating between other known addresses. + * A name for an area or geographical division, such as a province + * or state name. For example, British Columbia. *

    */ - public Boolean isInterpolated() { - return interpolated; + public String getRegion() { + return region; } /** *

    - * True if the result is interpolated from other known places. - *

    - *

    - * False if the Place is a known place. - *

    - *

    - * Not returned when the partner does not provide the information. - *

    - *

    - * For example, returns False for an address location that is - * found in the partner data, but returns True if an address - * does not exist in the partner data and its location is calculated by - * interpolating between other known addresses. + * A name for an area or geographical division, such as a province or state + * name. For example, British Columbia. *

    * - * @return

    - * True if the result is interpolated from other known - * places. - *

    - *

    - * False if the Place is a known place. - *

    - *

    - * Not returned when the partner does not provide the information. - *

    - *

    - * For example, returns False for an address location - * that is found in the partner data, but returns True - * if an address does not exist in the partner data and its location - * is calculated by interpolating between other known addresses. - *

    + * @param region

    + * A name for an area or geographical division, such as a + * province or state name. For example, + * British Columbia. + *

    */ - public Boolean getInterpolated() { - return interpolated; + public void setRegion(String region) { + this.region = region; } /** *

    - * True if the result is interpolated from other known places. - *

    - *

    - * False if the Place is a known place. + * A name for an area or geographical division, such as a province or state + * name. For example, British Columbia. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param region

    + * A name for an area or geographical division, such as a + * province or state name. For example, + * British Columbia. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Place withRegion(String region) { + this.region = region; + return this; + } + + /** + *

    + * A country/region specified using ISO 3166 + * 3-digit country/region code. For example, CAN. + *

    + * + * @return

    + * A country/region specified using ISO + * 3166 3-digit country/region code. For example, + * CAN. + *

    + */ + public String getCountry() { + return country; + } + + /** + *

    + * A country/region specified using ISO 3166 + * 3-digit country/region code. For example, CAN. + *

    + * + * @param country

    + * A country/region specified using ISO + * 3166 3-digit country/region code. For example, + * CAN. + *

    + */ + public void setCountry(String country) { + this.country = country; + } + + /** + *

    + * A country/region specified using ISO 3166 + * 3-digit country/region code. For example, CAN. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param country

    + * A country/region specified using ISO + * 3166 3-digit country/region code. For example, + * CAN. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Place withCountry(String country) { + this.country = country; + return this; + } + + /** + *

    + * A group of numbers and letters in a country-specific format, which + * accompanies the address for the purpose of identifying a location. + *

    + * + * @return

    + * A group of numbers and letters in a country-specific format, + * which accompanies the address for the purpose of identifying a + * location. + *

    + */ + public String getPostalCode() { + return postalCode; + } + + /** + *

    + * A group of numbers and letters in a country-specific format, which + * accompanies the address for the purpose of identifying a location. + *

    + * + * @param postalCode

    + * A group of numbers and letters in a country-specific format, + * which accompanies the address for the purpose of identifying a + * location. + *

    + */ + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + /** + *

    + * A group of numbers and letters in a country-specific format, which + * accompanies the address for the purpose of identifying a location. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param postalCode

    + * A group of numbers and letters in a country-specific format, + * which accompanies the address for the purpose of identifying a + * location. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Place withPostalCode(String postalCode) { + this.postalCode = postalCode; + return this; + } + + /** + *

    + * True if the result is interpolated from other known places. + *

    + *

    + * False if the Place is a known place. + *

    + *

    + * Not returned when the partner does not provide the information. + *

    + *

    + * For example, returns False for an address location that is + * found in the partner data, but returns True if an address + * does not exist in the partner data and its location is calculated by + * interpolating between other known addresses. + *

    + * + * @return

    + * True if the result is interpolated from other known + * places. + *

    + *

    + * False if the Place is a known place. + *

    + *

    + * Not returned when the partner does not provide the information. + *

    + *

    + * For example, returns False for an address location + * that is found in the partner data, but returns True + * if an address does not exist in the partner data and its location + * is calculated by interpolating between other known addresses. + *

    + */ + public Boolean isInterpolated() { + return interpolated; + } + + /** + *

    + * True if the result is interpolated from other known places. + *

    + *

    + * False if the Place is a known place. + *

    + *

    + * Not returned when the partner does not provide the information. + *

    + *

    + * For example, returns False for an address location that is + * found in the partner data, but returns True if an address + * does not exist in the partner data and its location is calculated by + * interpolating between other known addresses. + *

    + * + * @return

    + * True if the result is interpolated from other known + * places. + *

    + *

    + * False if the Place is a known place. + *

    + *

    + * Not returned when the partner does not provide the information. + *

    + *

    + * For example, returns False for an address location + * that is found in the partner data, but returns True + * if an address does not exist in the partner data and its location + * is calculated by interpolating between other known addresses. + *

    + */ + public Boolean getInterpolated() { + return interpolated; + } + + /** + *

    + * True if the result is interpolated from other known places. + *

    + *

    + * False if the Place is a known place. *

    *

    * Not returned when the partner does not provide the information. @@ -630,366 +880,362 @@ public Place withInterpolated(Boolean interpolated) { /** *

    - * The full name and address of the point of interest such as a city, - * region, or country. For example, - * 123 Any Street, Any Town, USA. + * The time zone in which the Place is located. Returned only + * when using HERE or Grab as the selected partner. *

    * * @return

    - * The full name and address of the point of interest such as a - * city, region, or country. For example, - * 123 Any Street, Any Town, USA. + * The time zone in which the Place is located. + * Returned only when using HERE or Grab as the selected partner. *

    */ - public String getLabel() { - return label; + public TimeZone getTimeZone() { + return timeZone; } /** *

    - * The full name and address of the point of interest such as a city, - * region, or country. For example, - * 123 Any Street, Any Town, USA. + * The time zone in which the Place is located. Returned only + * when using HERE or Grab as the selected partner. *

    * - * @param label

    - * The full name and address of the point of interest such as a - * city, region, or country. For example, - * 123 Any Street, Any Town, USA. + * @param timeZone

    + * The time zone in which the Place is located. + * Returned only when using HERE or Grab as the selected partner. *

    */ - public void setLabel(String label) { - this.label = label; + public void setTimeZone(TimeZone timeZone) { + this.timeZone = timeZone; } /** *

    - * The full name and address of the point of interest such as a city, - * region, or country. For example, - * 123 Any Street, Any Town, USA. + * The time zone in which the Place is located. Returned only + * when using HERE or Grab as the selected partner. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param label

    - * The full name and address of the point of interest such as a - * city, region, or country. For example, - * 123 Any Street, Any Town, USA. + * @param timeZone

    + * The time zone in which the Place is located. + * Returned only when using HERE or Grab as the selected partner. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withLabel(String label) { - this.label = label; + public Place withTimeZone(TimeZone timeZone) { + this.timeZone = timeZone; return this; } /** *

    - * A name for a local area, such as a city or town name. For example, - * Toronto. + * For addresses with a UnitNumber, the type of unit. For + * example, Apartment. *

    + * + *

    + * Returned only for a place index that uses Esri as a data provider. + *

    + *     * * @return

    - * A name for a local area, such as a city or town name. For - * example, Toronto. + * For addresses with a UnitNumber, the type of unit. + * For example, Apartment. + *

    + * + *

    + * Returned only for a place index that uses Esri as a data + * provider. *

    + *     */ - public String getMunicipality() { - return municipality; + public String getUnitType() { + return unitType; } /** *

    - * A name for a local area, such as a city or town name. For example, - * Toronto. + * For addresses with a UnitNumber, the type of unit. For + * example, Apartment. + *

    + * + *

    + * Returned only for a place index that uses Esri as a data provider. *

    + *     * - * @param municipality

    - * A name for a local area, such as a city or town name. For - * example, Toronto. + * @param unitType

    + * For addresses with a UnitNumber, the type of + * unit. For example, Apartment. + *

    + * + *

    + * Returned only for a place index that uses Esri as a data + * provider. *

    + *     */ - public void setMunicipality(String municipality) { - this.municipality = municipality; + public void setUnitType(String unitType) { + this.unitType = unitType; } /** *

    - * A name for a local area, such as a city or town name. For example, - * Toronto. + * For addresses with a UnitNumber, the type of unit. For + * example, Apartment. *

    + * + *

    + * Returned only for a place index that uses Esri as a data provider. + *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param municipality

    - * A name for a local area, such as a city or town name. For - * example, Toronto. + * @param unitType

    + * For addresses with a UnitNumber, the type of + * unit. For example, Apartment. + *

    + * + *

    + * Returned only for a place index that uses Esri as a data + * provider. *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withMunicipality(String municipality) { - this.municipality = municipality; + public Place withUnitType(String unitType) { + this.unitType = unitType; return this; } /** *

    - * The name of a community district. For example, Downtown. + * For addresses with multiple units, the unit identifier. Can include + * numbers and letters, for example 3B or Unit 123 + * . + *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a data + * provider. Is not returned for SearchPlaceIndexForPosition. *

    + *     * * @return

    - * The name of a community district. For example, - * Downtown. + * For addresses with multiple units, the unit identifier. Can + * include numbers and letters, for example 3B or + * Unit 123. + *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a data + * provider. Is not returned for + * SearchPlaceIndexForPosition. *

    + *     */ - public String getNeighborhood() { - return neighborhood; + public String getUnitNumber() { + return unitNumber; } /** *

    - * The name of a community district. For example, Downtown. + * For addresses with multiple units, the unit identifier. Can include + * numbers and letters, for example 3B or Unit 123 + * . + *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a data + * provider. Is not returned for SearchPlaceIndexForPosition. *

    + *     * - * @param neighborhood

    - * The name of a community district. For example, - * Downtown. + * @param unitNumber

    + * For addresses with multiple units, the unit identifier. Can + * include numbers and letters, for example 3B or + * Unit 123. *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a + * data provider. Is not returned for + * SearchPlaceIndexForPosition. + *

    + *     */ - public void setNeighborhood(String neighborhood) { - this.neighborhood = neighborhood; + public void setUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; } /** *

    - * The name of a community district. For example, Downtown. + * For addresses with multiple units, the unit identifier. Can include + * numbers and letters, for example 3B or Unit 123 + * . + *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a data + * provider. Is not returned for SearchPlaceIndexForPosition. *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param neighborhood

    - * The name of a community district. For example, - * Downtown. + * @param unitNumber

    + * For addresses with multiple units, the unit identifier. Can + * include numbers and letters, for example 3B or + * Unit 123. + *

    + * + *

    + * Returned only for a place index that uses Esri or Grab as a + * data provider. Is not returned for + * SearchPlaceIndexForPosition. *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withNeighborhood(String neighborhood) { - this.neighborhood = neighborhood; + public Place withUnitNumber(String unitNumber) { + this.unitNumber = unitNumber; return this; } /** *

    - * A group of numbers and letters in a country-specific format, which - * accompanies the address for the purpose of identifying a location. + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

    * * @return

    - * A group of numbers and letters in a country-specific format, - * which accompanies the address for the purpose of identifying a - * location. + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list of + * Amazon Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

    */ - public String getPostalCode() { - return postalCode; + public java.util.List getCategories() { + return categories; } /** *

    - * A group of numbers and letters in a country-specific format, which - * accompanies the address for the purpose of identifying a location. + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

    * - * @param postalCode

    - * A group of numbers and letters in a country-specific format, - * which accompanies the address for the purpose of identifying a - * location. + * @param categories

    + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

    */ - public void setPostalCode(String postalCode) { - this.postalCode = postalCode; + public void setCategories(java.util.Collection categories) { + if (categories == null) { + this.categories = null; + return; + } + + this.categories = new java.util.ArrayList(categories); } /** *

    - * A group of numbers and letters in a country-specific format, which - * accompanies the address for the purpose of identifying a location. + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param postalCode

    - * A group of numbers and letters in a country-specific format, - * which accompanies the address for the purpose of identifying a - * location. + * @param categories

    + * The Amazon Location categories that describe this Place. + *

    + *

    + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withPostalCode(String postalCode) { - this.postalCode = postalCode; + public Place withCategories(String... categories) { + if (getCategories() == null) { + this.categories = new java.util.ArrayList(categories.length); + } + for (String value : categories) { + this.categories.add(value); + } return this; } /** *

    - * A name for an area or geographical division, such as a province or state - * name. For example, British Columbia. + * The Amazon Location categories that describe this Place. *

    - * - * @return

    - * A name for an area or geographical division, such as a province - * or state name. For example, British Columbia. - *

    - */ - public String getRegion() { - return region; - } - - /** - *

    - * A name for an area or geographical division, such as a province or state - * name. For example, British Columbia. - *

    - * - * @param region

    - * A name for an area or geographical division, such as a - * province or state name. For example, - * British Columbia. - *

    - */ - public void setRegion(String region) { - this.region = region; - } - - /** - *

    - * A name for an area or geographical division, such as a province or state - * name. For example, British Columbia. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param region

    - * A name for an area or geographical division, such as a - * province or state name. For example, - * British Columbia. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Place withRegion(String region) { - this.region = region; - return this; - } - - /** - *

    - * The name for a street or a road to identify a location. For example, - * Main Street. - *

    - * - * @return

    - * The name for a street or a road to identify a location. For - * example, Main Street. - *

    - */ - public String getStreet() { - return street; - } - - /** - *

    - * The name for a street or a road to identify a location. For example, - * Main Street. - *

    - * - * @param street

    - * The name for a street or a road to identify a location. For - * example, Main Street. - *

    - */ - public void setStreet(String street) { - this.street = street; - } - - /** *

    - * The name for a street or a road to identify a location. For example, - * Main Street. + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param street

    - * The name for a street or a road to identify a location. For - * example, Main Street. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Place withStreet(String street) { - this.street = street; - return this; - } - - /** - *

    - * A county, or an area that's part of a larger region. For example, - * Metro Vancouver. - *

    - * - * @return

    - * A county, or an area that's part of a larger region. For example, - * Metro Vancouver. - *

    - */ - public String getSubRegion() { - return subRegion; - } - - /** - *

    - * A county, or an area that's part of a larger region. For example, - * Metro Vancouver. - *

    - * - * @param subRegion

    - * A county, or an area that's part of a larger region. For - * example, Metro Vancouver. + * @param categories

    + * The Amazon Location categories that describe this Place. *

    - */ - public void setSubRegion(String subRegion) { - this.subRegion = subRegion; - } - - /** - *

    - * A county, or an area that's part of a larger region. For example, - * Metro Vancouver. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param subRegion

    - * A county, or an area that's part of a larger region. For - * example, Metro Vancouver. + *

    + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withSubRegion(String subRegion) { - this.subRegion = subRegion; + public Place withCategories(java.util.Collection categories) { + setCategories(categories); return this; } @@ -1010,300 +1256,165 @@ public java.util.List getSupplementalCategories() { /** *

    - * Categories from the data provider that describe the Place that are not - * mapped to any Amazon Location categories. - *

    - * - * @param supplementalCategories

    - * Categories from the data provider that describe the Place that - * are not mapped to any Amazon Location categories. - *

    - */ - public void setSupplementalCategories(java.util.Collection supplementalCategories) { - if (supplementalCategories == null) { - this.supplementalCategories = null; - return; - } - - this.supplementalCategories = new java.util.ArrayList(supplementalCategories); - } - - /** - *

    - * Categories from the data provider that describe the Place that are not - * mapped to any Amazon Location categories. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param supplementalCategories

    - * Categories from the data provider that describe the Place that - * are not mapped to any Amazon Location categories. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Place withSupplementalCategories(String... supplementalCategories) { - if (getSupplementalCategories() == null) { - this.supplementalCategories = new java.util.ArrayList( - supplementalCategories.length); - } - for (String value : supplementalCategories) { - this.supplementalCategories.add(value); - } - return this; - } - - /** - *

    - * Categories from the data provider that describe the Place that are not - * mapped to any Amazon Location categories. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param supplementalCategories

    - * Categories from the data provider that describe the Place that - * are not mapped to any Amazon Location categories. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Place withSupplementalCategories(java.util.Collection supplementalCategories) { - setSupplementalCategories(supplementalCategories); - return this; - } - - /** - *

    - * The time zone in which the Place is located. Returned only - * when using HERE or Grab as the selected partner. - *

    - * - * @return

    - * The time zone in which the Place is located. - * Returned only when using HERE or Grab as the selected partner. - *

    - */ - public TimeZone getTimeZone() { - return timeZone; - } - - /** - *

    - * The time zone in which the Place is located. Returned only - * when using HERE or Grab as the selected partner. - *

    - * - * @param timeZone

    - * The time zone in which the Place is located. - * Returned only when using HERE or Grab as the selected partner. - *

    - */ - public void setTimeZone(TimeZone timeZone) { - this.timeZone = timeZone; - } - - /** - *

    - * The time zone in which the Place is located. Returned only - * when using HERE or Grab as the selected partner. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param timeZone

    - * The time zone in which the Place is located. - * Returned only when using HERE or Grab as the selected partner. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Place withTimeZone(TimeZone timeZone) { - this.timeZone = timeZone; - return this; - } - - /** - *

    - * For addresses with multiple units, the unit identifier. Can include - * numbers and letters, for example 3B or Unit 123 - * . - *

    - * - *

    - * Returned only for a place index that uses Esri or Grab as a data - * provider. Is not returned for SearchPlaceIndexForPosition. - *

    - *     - * - * @return

    - * For addresses with multiple units, the unit identifier. Can - * include numbers and letters, for example 3B or - * Unit 123. - *

    - * - *

    - * Returned only for a place index that uses Esri or Grab as a data - * provider. Is not returned for - * SearchPlaceIndexForPosition. - *

    - *     - */ - public String getUnitNumber() { - return unitNumber; - } - - /** - *

    - * For addresses with multiple units, the unit identifier. Can include - * numbers and letters, for example 3B or Unit 123 - * . - *

    - * - *

    - * Returned only for a place index that uses Esri or Grab as a data - * provider. Is not returned for SearchPlaceIndexForPosition. + * Categories from the data provider that describe the Place that are not + * mapped to any Amazon Location categories. *

    - *     * - * @param unitNumber

    - * For addresses with multiple units, the unit identifier. Can - * include numbers and letters, for example 3B or - * Unit 123. - *

    - * - *

    - * Returned only for a place index that uses Esri or Grab as a - * data provider. Is not returned for - * SearchPlaceIndexForPosition. + * @param supplementalCategories

    + * Categories from the data provider that describe the Place that + * are not mapped to any Amazon Location categories. *

    - *     */ - public void setUnitNumber(String unitNumber) { - this.unitNumber = unitNumber; + public void setSupplementalCategories(java.util.Collection supplementalCategories) { + if (supplementalCategories == null) { + this.supplementalCategories = null; + return; + } + + this.supplementalCategories = new java.util.ArrayList(supplementalCategories); } /** *

    - * For addresses with multiple units, the unit identifier. Can include - * numbers and letters, for example 3B or Unit 123 - * . + * Categories from the data provider that describe the Place that are not + * mapped to any Amazon Location categories. *

    - * *

    - * Returned only for a place index that uses Esri or Grab as a data - * provider. Is not returned for SearchPlaceIndexForPosition. + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param supplementalCategories

    + * Categories from the data provider that describe the Place that + * are not mapped to any Amazon Location categories. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Place withSupplementalCategories(String... supplementalCategories) { + if (getSupplementalCategories() == null) { + this.supplementalCategories = new java.util.ArrayList( + supplementalCategories.length); + } + for (String value : supplementalCategories) { + this.supplementalCategories.add(value); + } + return this; + } + + /** + *

    + * Categories from the data provider that describe the Place that are not + * mapped to any Amazon Location categories. *

    - *     *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param unitNumber

    - * For addresses with multiple units, the unit identifier. Can - * include numbers and letters, for example 3B or - * Unit 123. - *

    - * - *

    - * Returned only for a place index that uses Esri or Grab as a - * data provider. Is not returned for - * SearchPlaceIndexForPosition. + * @param supplementalCategories

    + * Categories from the data provider that describe the Place that + * are not mapped to any Amazon Location categories. *

    - *     * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withUnitNumber(String unitNumber) { - this.unitNumber = unitNumber; + public Place withSupplementalCategories(java.util.Collection supplementalCategories) { + setSupplementalCategories(supplementalCategories); return this; } /** *

    - * For addresses with a UnitNumber, the type of unit. For - * example, Apartment. + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen County in New + * York. *

    * *

    - * Returned only for a place index that uses Esri as a data provider. + * This property supported by Esri and OpenData. The Esri property is + * district, and the OpenData property is borough. *

    *     * * @return

    - * For addresses with a UnitNumber, the type of unit. - * For example, Apartment. + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen County + * in New York. *

    * *

    - * Returned only for a place index that uses Esri as a data - * provider. + * This property supported by Esri and OpenData. The Esri property + * is district, and the OpenData property is + * borough. *

    *     */ - public String getUnitType() { - return unitType; + public String getSubMunicipality() { + return subMunicipality; } /** *

    - * For addresses with a UnitNumber, the type of unit. For - * example, Apartment. + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen County in New + * York. *

    * *

    - * Returned only for a place index that uses Esri as a data provider. + * This property supported by Esri and OpenData. The Esri property is + * district, and the OpenData property is borough. *

    *     * - * @param unitType

    - * For addresses with a UnitNumber, the type of - * unit. For example, Apartment. + * @param subMunicipality

    + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen + * County in New York. *

    * *

    - * Returned only for a place index that uses Esri as a data - * provider. + * This property supported by Esri and OpenData. The Esri + * property is district, and the OpenData property + * is borough. *

    *     */ - public void setUnitType(String unitType) { - this.unitType = unitType; + public void setSubMunicipality(String subMunicipality) { + this.subMunicipality = subMunicipality; } /** *

    - * For addresses with a UnitNumber, the type of unit. For - * example, Apartment. + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen County in New + * York. *

    * *

    - * Returned only for a place index that uses Esri as a data provider. + * This property supported by Esri and OpenData. The Esri property is + * district, and the OpenData property is borough. *

    *     *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param unitType

    - * For addresses with a UnitNumber, the type of - * unit. For example, Apartment. + * @param subMunicipality

    + * An area that's part of a larger municipality. For example, + * Blissville is a submunicipality in the Queen + * County in New York. *

    * *

    - * Returned only for a place index that uses Esri as a data - * provider. + * This property supported by Esri and OpenData. The Esri + * property is district, and the OpenData property + * is borough. *

    *     * @return A reference to this updated object so that method calls can be * chained together. */ - public Place withUnitType(String unitType) { - this.unitType = unitType; + public Place withSubMunicipality(String subMunicipality) { + this.subMunicipality = subMunicipality; return this; } @@ -1318,38 +1429,40 @@ public Place withUnitType(String unitType) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getAddressNumber() != null) - sb.append("AddressNumber: " + getAddressNumber() + ","); - if (getCategories() != null) - sb.append("Categories: " + getCategories() + ","); - if (getCountry() != null) - sb.append("Country: " + getCountry() + ","); - if (getGeometry() != null) - sb.append("Geometry: " + getGeometry() + ","); - if (getInterpolated() != null) - sb.append("Interpolated: " + getInterpolated() + ","); if (getLabel() != null) sb.append("Label: " + getLabel() + ","); - if (getMunicipality() != null) - sb.append("Municipality: " + getMunicipality() + ","); - if (getNeighborhood() != null) - sb.append("Neighborhood: " + getNeighborhood() + ","); - if (getPostalCode() != null) - sb.append("PostalCode: " + getPostalCode() + ","); - if (getRegion() != null) - sb.append("Region: " + getRegion() + ","); + if (getGeometry() != null) + sb.append("Geometry: " + getGeometry() + ","); + if (getAddressNumber() != null) + sb.append("AddressNumber: " + getAddressNumber() + ","); if (getStreet() != null) sb.append("Street: " + getStreet() + ","); + if (getNeighborhood() != null) + sb.append("Neighborhood: " + getNeighborhood() + ","); + if (getMunicipality() != null) + sb.append("Municipality: " + getMunicipality() + ","); if (getSubRegion() != null) sb.append("SubRegion: " + getSubRegion() + ","); - if (getSupplementalCategories() != null) - sb.append("SupplementalCategories: " + getSupplementalCategories() + ","); + if (getRegion() != null) + sb.append("Region: " + getRegion() + ","); + if (getCountry() != null) + sb.append("Country: " + getCountry() + ","); + if (getPostalCode() != null) + sb.append("PostalCode: " + getPostalCode() + ","); + if (getInterpolated() != null) + sb.append("Interpolated: " + getInterpolated() + ","); if (getTimeZone() != null) sb.append("TimeZone: " + getTimeZone() + ","); + if (getUnitType() != null) + sb.append("UnitType: " + getUnitType() + ","); if (getUnitNumber() != null) sb.append("UnitNumber: " + getUnitNumber() + ","); - if (getUnitType() != null) - sb.append("UnitType: " + getUnitType()); + if (getCategories() != null) + sb.append("Categories: " + getCategories() + ","); + if (getSupplementalCategories() != null) + sb.append("SupplementalCategories: " + getSupplementalCategories() + ","); + if (getSubMunicipality() != null) + sb.append("SubMunicipality: " + getSubMunicipality()); sb.append("}"); return sb.toString(); } @@ -1359,29 +1472,31 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getLabel() == null) ? 0 : getLabel().hashCode()); + hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); hashCode = prime * hashCode + ((getAddressNumber() == null) ? 0 : getAddressNumber().hashCode()); - hashCode = prime * hashCode + ((getCategories() == null) ? 0 : getCategories().hashCode()); - hashCode = prime * hashCode + ((getCountry() == null) ? 0 : getCountry().hashCode()); - hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); + hashCode = prime * hashCode + ((getStreet() == null) ? 0 : getStreet().hashCode()); hashCode = prime * hashCode - + ((getInterpolated() == null) ? 0 : getInterpolated().hashCode()); - hashCode = prime * hashCode + ((getLabel() == null) ? 0 : getLabel().hashCode()); + + ((getNeighborhood() == null) ? 0 : getNeighborhood().hashCode()); hashCode = prime * hashCode + ((getMunicipality() == null) ? 0 : getMunicipality().hashCode()); - hashCode = prime * hashCode - + ((getNeighborhood() == null) ? 0 : getNeighborhood().hashCode()); - hashCode = prime * hashCode + ((getPostalCode() == null) ? 0 : getPostalCode().hashCode()); - hashCode = prime * hashCode + ((getRegion() == null) ? 0 : getRegion().hashCode()); - hashCode = prime * hashCode + ((getStreet() == null) ? 0 : getStreet().hashCode()); hashCode = prime * hashCode + ((getSubRegion() == null) ? 0 : getSubRegion().hashCode()); + hashCode = prime * hashCode + ((getRegion() == null) ? 0 : getRegion().hashCode()); + hashCode = prime * hashCode + ((getCountry() == null) ? 0 : getCountry().hashCode()); + hashCode = prime * hashCode + ((getPostalCode() == null) ? 0 : getPostalCode().hashCode()); + hashCode = prime * hashCode + + ((getInterpolated() == null) ? 0 : getInterpolated().hashCode()); + hashCode = prime * hashCode + ((getTimeZone() == null) ? 0 : getTimeZone().hashCode()); + hashCode = prime * hashCode + ((getUnitType() == null) ? 0 : getUnitType().hashCode()); + hashCode = prime * hashCode + ((getUnitNumber() == null) ? 0 : getUnitNumber().hashCode()); + hashCode = prime * hashCode + ((getCategories() == null) ? 0 : getCategories().hashCode()); hashCode = prime * hashCode + ((getSupplementalCategories() == null) ? 0 : getSupplementalCategories() .hashCode()); - hashCode = prime * hashCode + ((getTimeZone() == null) ? 0 : getTimeZone().hashCode()); - hashCode = prime * hashCode + ((getUnitNumber() == null) ? 0 : getUnitNumber().hashCode()); - hashCode = prime * hashCode + ((getUnitType() == null) ? 0 : getUnitType().hashCode()); + hashCode = prime * hashCode + + ((getSubMunicipality() == null) ? 0 : getSubMunicipality().hashCode()); return hashCode; } @@ -1396,78 +1511,83 @@ public boolean equals(Object obj) { return false; Place other = (Place) obj; - if (other.getAddressNumber() == null ^ this.getAddressNumber() == null) - return false; - if (other.getAddressNumber() != null - && other.getAddressNumber().equals(this.getAddressNumber()) == false) - return false; - if (other.getCategories() == null ^ this.getCategories() == null) - return false; - if (other.getCategories() != null - && other.getCategories().equals(this.getCategories()) == false) - return false; - if (other.getCountry() == null ^ this.getCountry() == null) + if (other.getLabel() == null ^ this.getLabel() == null) return false; - if (other.getCountry() != null && other.getCountry().equals(this.getCountry()) == false) + if (other.getLabel() != null && other.getLabel().equals(this.getLabel()) == false) return false; if (other.getGeometry() == null ^ this.getGeometry() == null) return false; if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) return false; - if (other.getInterpolated() == null ^ this.getInterpolated() == null) - return false; - if (other.getInterpolated() != null - && other.getInterpolated().equals(this.getInterpolated()) == false) - return false; - if (other.getLabel() == null ^ this.getLabel() == null) + if (other.getAddressNumber() == null ^ this.getAddressNumber() == null) return false; - if (other.getLabel() != null && other.getLabel().equals(this.getLabel()) == false) + if (other.getAddressNumber() != null + && other.getAddressNumber().equals(this.getAddressNumber()) == false) return false; - if (other.getMunicipality() == null ^ this.getMunicipality() == null) + if (other.getStreet() == null ^ this.getStreet() == null) return false; - if (other.getMunicipality() != null - && other.getMunicipality().equals(this.getMunicipality()) == false) + if (other.getStreet() != null && other.getStreet().equals(this.getStreet()) == false) return false; if (other.getNeighborhood() == null ^ this.getNeighborhood() == null) return false; if (other.getNeighborhood() != null && other.getNeighborhood().equals(this.getNeighborhood()) == false) return false; - if (other.getPostalCode() == null ^ this.getPostalCode() == null) + if (other.getMunicipality() == null ^ this.getMunicipality() == null) return false; - if (other.getPostalCode() != null - && other.getPostalCode().equals(this.getPostalCode()) == false) + if (other.getMunicipality() != null + && other.getMunicipality().equals(this.getMunicipality()) == false) + return false; + if (other.getSubRegion() == null ^ this.getSubRegion() == null) + return false; + if (other.getSubRegion() != null + && other.getSubRegion().equals(this.getSubRegion()) == false) return false; if (other.getRegion() == null ^ this.getRegion() == null) return false; if (other.getRegion() != null && other.getRegion().equals(this.getRegion()) == false) return false; - if (other.getStreet() == null ^ this.getStreet() == null) + if (other.getCountry() == null ^ this.getCountry() == null) return false; - if (other.getStreet() != null && other.getStreet().equals(this.getStreet()) == false) + if (other.getCountry() != null && other.getCountry().equals(this.getCountry()) == false) return false; - if (other.getSubRegion() == null ^ this.getSubRegion() == null) + if (other.getPostalCode() == null ^ this.getPostalCode() == null) return false; - if (other.getSubRegion() != null - && other.getSubRegion().equals(this.getSubRegion()) == false) + if (other.getPostalCode() != null + && other.getPostalCode().equals(this.getPostalCode()) == false) return false; - if (other.getSupplementalCategories() == null ^ this.getSupplementalCategories() == null) + if (other.getInterpolated() == null ^ this.getInterpolated() == null) return false; - if (other.getSupplementalCategories() != null - && other.getSupplementalCategories().equals(this.getSupplementalCategories()) == false) + if (other.getInterpolated() != null + && other.getInterpolated().equals(this.getInterpolated()) == false) return false; if (other.getTimeZone() == null ^ this.getTimeZone() == null) return false; if (other.getTimeZone() != null && other.getTimeZone().equals(this.getTimeZone()) == false) return false; + if (other.getUnitType() == null ^ this.getUnitType() == null) + return false; + if (other.getUnitType() != null && other.getUnitType().equals(this.getUnitType()) == false) + return false; if (other.getUnitNumber() == null ^ this.getUnitNumber() == null) return false; if (other.getUnitNumber() != null && other.getUnitNumber().equals(this.getUnitNumber()) == false) return false; - if (other.getUnitType() == null ^ this.getUnitType() == null) + if (other.getCategories() == null ^ this.getCategories() == null) return false; - if (other.getUnitType() != null && other.getUnitType().equals(this.getUnitType()) == false) + if (other.getCategories() != null + && other.getCategories().equals(this.getCategories()) == false) + return false; + if (other.getSupplementalCategories() == null ^ this.getSupplementalCategories() == null) + return false; + if (other.getSupplementalCategories() != null + && other.getSupplementalCategories().equals(this.getSupplementalCategories()) == false) + return false; + if (other.getSubMunicipality() == null ^ this.getSubMunicipality() == null) + return false; + if (other.getSubMunicipality() != null + && other.getSubMunicipality().equals(this.getSubMunicipality()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PlaceGeometry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PlaceGeometry.java index e70250f63e..6194598077 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PlaceGeometry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PlaceGeometry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionFiltering.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionFiltering.java index 193d3826ff..92d9570fd0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionFiltering.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionFiltering.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionalAccuracy.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionalAccuracy.java index cc8d490398..8c2ef921dd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionalAccuracy.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PositionalAccuracy.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ public class PositionalAccuracy implements Serializable { *

    *

    * Constraints:
    - * Range: 0.0 - 10000.0
    + * Range: 0.0 - 1.0E7
    */ private Double horizontal; @@ -41,7 +41,7 @@ public class PositionalAccuracy implements Serializable { *

    *

    * Constraints:
    - * Range: 0.0 - 10000.0
    + * Range: 0.0 - 1.0E7
    * * @return

    * Estimated maximum distance, in meters, between the measured @@ -60,7 +60,7 @@ public Double getHorizontal() { *

    *

    * Constraints:
    - * Range: 0.0 - 10000.0
    + * Range: 0.0 - 1.0E7
    * * @param horizontal

    * Estimated maximum distance, in meters, between the measured @@ -82,7 +82,7 @@ public void setHorizontal(Double horizontal) { * together. *

    * Constraints:
    - * Range: 0.0 - 10000.0
    + * Range: 0.0 - 1.0E7
    * * @param horizontal

    * Estimated maximum distance, in meters, between the measured diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PricingPlan.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PricingPlan.java index 08cc2daaa2..5b73252088 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PricingPlan.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PricingPlan.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java index 1b413884d0..426f1c0c61 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ public class PutGeofenceRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String collectionName; @@ -45,37 +45,40 @@ public class PutGeofenceRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String geofenceId; /** *

    - * Associates one of more properties with the geofence. A property is a - * key-value pair stored with the geofence and added to any geofence event - * triggered with that geofence. + * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. *

    + * *

    - * Format: "key" : "value" + * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence Geobuf format supports a maximum of 100,000 vertices. *

    + *     */ - private java.util.Map geofenceProperties; + private GeofenceGeometry geometry; /** *

    - * Contains the details to specify the position of the geofence. Can be - * either a polygon or a circle. Including both will return a validation - * error. + * Associates one of more properties with the geofence. A property is a + * key-value pair stored with the geofence and added to any geofence event + * triggered with that geofence. *

    - * *

    - * Each geofence polygon can have a maximum of 1,000 vertices. + * Format: "key" : "value" *

    - *     */ - private GeofenceGeometry geometry; + private java.util.Map geofenceProperties; /** *

    @@ -84,7 +87,7 @@ public class PutGeofenceRequest extends AmazonWebServiceRequest implements Seria *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The geofence collection to store the geofence in. @@ -101,7 +104,7 @@ public String getCollectionName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The geofence collection to store the geofence in. @@ -121,7 +124,7 @@ public void setCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param collectionName

    * The geofence collection to store the geofence in. @@ -142,7 +145,7 @@ public PutGeofenceRequest withCollectionName(String collectionName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    * An identifier for the geofence. For example, @@ -161,7 +164,7 @@ public String getGeofenceId() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * An identifier for the geofence. For example, @@ -183,7 +186,7 @@ public void setGeofenceId(String geofenceId) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    * * @param geofenceId

    * An identifier for the geofence. For example, @@ -197,6 +200,128 @@ public PutGeofenceRequest withGeofenceId(String geofenceId) { return this; } + /** + *

    + * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. + *

    + * + *

    + * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence Geobuf format supports a maximum of 100,000 vertices. + *

    + *     + * + * @return

    + * Contains the details to specify the position of the geofence. Can + * be a polygon, a circle or a polygon encoded in Geobuf format. + * Including multiple selections will return a validation error. + *

    + * + *

    + * The geofence polygon format supports a maximum of 1,000 + * vertices. The Geofence Geobuf format supports a maximum of 100,000 + * vertices. + *

    + *     + */ + public GeofenceGeometry getGeometry() { + return geometry; + } + + /** + *

    + * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. + *

    + * + *

    + * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence Geobuf format supports a maximum of 100,000 vertices. + *

    + *     + * + * @param geometry

    + * Contains the details to specify the position of the geofence. + * Can be a polygon, a circle or a polygon encoded in Geobuf + * format. Including multiple selections will return a validation + * error. + *

    + * + *

    + * The geofence polygon format supports a maximum of 1,000 + * vertices. The Geofence Geobuf format supports a maximum of 100,000 + * vertices. + *

    + *     + */ + public void setGeometry(GeofenceGeometry geometry) { + this.geometry = geometry; + } + + /** + *

    + * Contains the details to specify the position of the geofence. Can be a + * polygon, a circle or a polygon encoded in Geobuf format. Including + * multiple selections will return a validation error. + *

    + * + *

    + * The geofence polygon format supports a maximum of 1,000 vertices. The + * Geofence Geobuf format supports a maximum of 100,000 vertices. + *

    + *     + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param geometry

    + * Contains the details to specify the position of the geofence. + * Can be a polygon, a circle or a polygon encoded in Geobuf + * format. Including multiple selections will return a validation + * error. + *

    + * + *

    + * The geofence polygon format supports a maximum of 1,000 + * vertices. The Geofence Geobuf format supports a maximum of 100,000 + * vertices. + *

    + *     + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public PutGeofenceRequest withGeometry(GeofenceGeometry geometry) { + this.geometry = geometry; + return this; + } + /** *

    * Associates one of more properties with the geofence. A property is a @@ -315,105 +440,6 @@ public PutGeofenceRequest clearGeofencePropertiesEntries() { return this; } - /** - *

    - * Contains the details to specify the position of the geofence. Can be - * either a polygon or a circle. Including both will return a validation - * error. - *

    - * - *

    - * Each geofence polygon can have a maximum of 1,000 vertices. - *

    - *     - * - * @return

    - * Contains the details to specify the position of the geofence. Can - * be either a polygon or a circle. Including both will return a - * validation error. - *

    - * - *

    - * Each geofence polygon can have a maximum of 1,000 vertices. - *

    - *     - */ - public GeofenceGeometry getGeometry() { - return geometry; - } - - /** - *

    - * Contains the details to specify the position of the geofence. Can be - * either a polygon or a circle. Including both will return a validation - * error. - *

    - * - *

    - * Each geofence polygon can have a maximum of 1,000 vertices. - *

    - *     - * - * @param geometry

    - * Contains the details to specify the position of the geofence. - * Can be either a polygon or a circle. Including both will - * return a validation error. - *

    - * - *

    - * Each geofence polygon can have a maximum of 1,000 vertices. - *

    - *     - */ - public void setGeometry(GeofenceGeometry geometry) { - this.geometry = geometry; - } - - /** - *

    - * Contains the details to specify the position of the geofence. Can be - * either a polygon or a circle. Including both will return a validation - * error. - *

    - * - *

    - * Each geofence polygon can have a maximum of 1,000 vertices. - *

    - *     - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param geometry

    - * Contains the details to specify the position of the geofence. - * Can be either a polygon or a circle. Including both will - * return a validation error. - *

    - * - *

    - * Each geofence polygon can have a maximum of 1,000 vertices. - *

    - *     - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public PutGeofenceRequest withGeometry(GeofenceGeometry geometry) { - this.geometry = geometry; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -429,10 +455,10 @@ public String toString() { sb.append("CollectionName: " + getCollectionName() + ","); if (getGeofenceId() != null) sb.append("GeofenceId: " + getGeofenceId() + ","); - if (getGeofenceProperties() != null) - sb.append("GeofenceProperties: " + getGeofenceProperties() + ","); if (getGeometry() != null) - sb.append("Geometry: " + getGeometry()); + sb.append("Geometry: " + getGeometry() + ","); + if (getGeofenceProperties() != null) + sb.append("GeofenceProperties: " + getGeofenceProperties()); sb.append("}"); return sb.toString(); } @@ -445,9 +471,9 @@ public int hashCode() { hashCode = prime * hashCode + ((getCollectionName() == null) ? 0 : getCollectionName().hashCode()); hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); + hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); hashCode = prime * hashCode + ((getGeofenceProperties() == null) ? 0 : getGeofenceProperties().hashCode()); - hashCode = prime * hashCode + ((getGeometry() == null) ? 0 : getGeometry().hashCode()); return hashCode; } @@ -472,15 +498,15 @@ public boolean equals(Object obj) { if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; + if (other.getGeometry() == null ^ this.getGeometry() == null) + return false; + if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) + return false; if (other.getGeofenceProperties() == null ^ this.getGeofenceProperties() == null) return false; if (other.getGeofenceProperties() != null && other.getGeofenceProperties().equals(this.getGeofenceProperties()) == false) return false; - if (other.getGeometry() == null ^ this.getGeometry() == null) - return false; - if (other.getGeometry() != null && other.getGeometry().equals(this.getGeometry()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceResult.java index b63aa963ef..10e2fc3840 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,15 +18,6 @@ import java.io.Serializable; public class PutGeofenceResult implements Serializable { - /** - *

    - * The timestamp for when the geofence was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ - *

    - */ - private java.util.Date createTime; - /** *

    * The geofence identifier entered in the request. @@ -34,130 +25,139 @@ public class PutGeofenceResult implements Serializable { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    + * Pattern: [-._\p{L}\p{N}]+
    */ private String geofenceId; /** *

    - * The timestamp for when the geofence was last updated in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    */ - private java.util.Date updateTime; + private java.util.Date createTime; /** *

    - * The timestamp for when the geofence was created in ISO * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    + */ + private java.util.Date updateTime; + + /** + *

    + * The geofence identifier entered in the request. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * * @return

    - * The timestamp for when the geofence was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The geofence identifier entered in the request. *

    */ - public java.util.Date getCreateTime() { - return createTime; + public String getGeofenceId() { + return geofenceId; } /** *

    - * The timestamp for when the geofence was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The geofence identifier entered in the request. *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param createTime

    - * The timestamp for when the geofence was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * @param geofenceId

    + * The geofence identifier entered in the request. *

    */ - public void setCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public void setGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; } /** *

    - * The timestamp for when the geofence was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The geofence identifier entered in the request. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\p{L}\p{N}]+
    * - * @param createTime

    - * The timestamp for when the geofence was created in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * @param geofenceId

    + * The geofence identifier entered in the request. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public PutGeofenceResult withCreateTime(java.util.Date createTime) { - this.createTime = createTime; + public PutGeofenceResult withGeofenceId(String geofenceId) { + this.geofenceId = geofenceId; return this; } /** *

    - * The geofence identifier entered in the request. + * The timestamp for when the geofence was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * * @return

    - * The geofence identifier entered in the request. + * The timestamp for when the geofence was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    */ - public String getGeofenceId() { - return geofenceId; + public java.util.Date getCreateTime() { + return createTime; } /** *

    - * The geofence identifier entered in the request. + * The timestamp for when the geofence was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param geofenceId

    - * The geofence identifier entered in the request. + * @param createTime

    + * The timestamp for when the geofence was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    */ - public void setGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; + public void setCreateTime(java.util.Date createTime) { + this.createTime = createTime; } /** *

    - * The geofence identifier entered in the request. + * The timestamp for when the geofence was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    *

    * Returns a reference to this object so that method calls can be chained * together. - *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\p{L}\p{N}]+$
    * - * @param geofenceId

    - * The geofence identifier entered in the request. + * @param createTime

    + * The timestamp for when the geofence was created in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public PutGeofenceResult withGeofenceId(String geofenceId) { - this.geofenceId = geofenceId; + public PutGeofenceResult withCreateTime(java.util.Date createTime) { + this.createTime = createTime; return this; } @@ -231,10 +231,10 @@ public PutGeofenceResult withUpdateTime(java.util.Date updateTime) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCreateTime() != null) - sb.append("CreateTime: " + getCreateTime() + ","); if (getGeofenceId() != null) sb.append("GeofenceId: " + getGeofenceId() + ","); + if (getCreateTime() != null) + sb.append("CreateTime: " + getCreateTime() + ","); if (getUpdateTime() != null) sb.append("UpdateTime: " + getUpdateTime()); sb.append("}"); @@ -246,8 +246,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getGeofenceId() == null) ? 0 : getGeofenceId().hashCode()); + hashCode = prime * hashCode + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); hashCode = prime * hashCode + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); return hashCode; } @@ -263,16 +263,16 @@ public boolean equals(Object obj) { return false; PutGeofenceResult other = (PutGeofenceResult) obj; - if (other.getCreateTime() == null ^ this.getCreateTime() == null) - return false; - if (other.getCreateTime() != null - && other.getCreateTime().equals(this.getCreateTime()) == false) - return false; if (other.getGeofenceId() == null ^ this.getGeofenceId() == null) return false; if (other.getGeofenceId() != null && other.getGeofenceId().equals(this.getGeofenceId()) == false) return false; + if (other.getCreateTime() == null ^ this.getCreateTime() == null) + return false; + if (other.getCreateTime() != null + && other.getCreateTime().equals(this.getCreateTime()) == false) + return false; if (other.getUpdateTime() == null ^ this.getUpdateTime() == null) return false; if (other.getUpdateTime() != null diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ResourceNotFoundException.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ResourceNotFoundException.java index ca57e83d23..8874636b46 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ResourceNotFoundException.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ResourceNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntry.java index acd78b8ffb..9676aaf12d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntryError.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntryError.java index 8b163ce88e..149624a2f7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntryError.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixEntryError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixErrorCode.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixErrorCode.java index 67dc9ae305..238195c1a8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixErrorCode.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/RouteMatrixErrorCode.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForPositionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForPositionResult.java index 4fe3f3d53a..49e1a42062 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForPositionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForPositionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,6 +24,13 @@ *

    */ public class SearchForPositionResult implements Serializable { + /** + *

    + * Details about the search result, such as its address and position. + *

    + */ + private Place place; + /** *

    * The distance in meters of a great-circle arc between the query position @@ -41,13 +48,6 @@ public class SearchForPositionResult implements Serializable { */ private Double distance; - /** - *

    - * Details about the search result, such as its address and position. - *

    - */ - private Place place; - /** *

    * The unique identifier of the place. You can use this with the @@ -63,6 +63,54 @@ public class SearchForPositionResult implements Serializable { */ private String placeId; + /** + *

    + * Details about the search result, such as its address and position. + *

    + * + * @return

    + * Details about the search result, such as its address and + * position. + *

    + */ + public Place getPlace() { + return place; + } + + /** + *

    + * Details about the search result, such as its address and position. + *

    + * + * @param place

    + * Details about the search result, such as its address and + * position. + *

    + */ + public void setPlace(Place place) { + this.place = place; + } + + /** + *

    + * Details about the search result, such as its address and position. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param place

    + * Details about the search result, such as its address and + * position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchForPositionResult withPlace(Place place) { + this.place = place; + return this; + } + /** *

    * The distance in meters of a great-circle arc between the query position @@ -162,54 +210,6 @@ public SearchForPositionResult withDistance(Double distance) { return this; } - /** - *

    - * Details about the search result, such as its address and position. - *

    - * - * @return

    - * Details about the search result, such as its address and - * position. - *

    - */ - public Place getPlace() { - return place; - } - - /** - *

    - * Details about the search result, such as its address and position. - *

    - * - * @param place

    - * Details about the search result, such as its address and - * position. - *

    - */ - public void setPlace(Place place) { - this.place = place; - } - - /** - *

    - * Details about the search result, such as its address and position. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param place

    - * Details about the search result, such as its address and - * position. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchForPositionResult withPlace(Place place) { - this.place = place; - return this; - } - /** *

    * The unique identifier of the place. You can use this with the @@ -314,10 +314,10 @@ public SearchForPositionResult withPlaceId(String placeId) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDistance() != null) - sb.append("Distance: " + getDistance() + ","); if (getPlace() != null) sb.append("Place: " + getPlace() + ","); + if (getDistance() != null) + sb.append("Distance: " + getDistance() + ","); if (getPlaceId() != null) sb.append("PlaceId: " + getPlaceId()); sb.append("}"); @@ -329,8 +329,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode + ((getPlace() == null) ? 0 : getPlace().hashCode()); + hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode + ((getPlaceId() == null) ? 0 : getPlaceId().hashCode()); return hashCode; } @@ -346,14 +346,14 @@ public boolean equals(Object obj) { return false; SearchForPositionResult other = (SearchForPositionResult) obj; - if (other.getDistance() == null ^ this.getDistance() == null) - return false; - if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) - return false; if (other.getPlace() == null ^ this.getPlace() == null) return false; if (other.getPlace() != null && other.getPlace().equals(this.getPlace()) == false) return false; + if (other.getDistance() == null ^ this.getDistance() == null) + return false; + if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) + return false; if (other.getPlaceId() == null ^ this.getPlaceId() == null) return false; if (other.getPlaceId() != null && other.getPlaceId().equals(this.getPlaceId()) == false) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForSuggestionsResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForSuggestionsResult.java index 9aa4074df0..6cbd51a5ae 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForSuggestionsResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForSuggestionsResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,17 +26,11 @@ public class SearchForSuggestionsResult implements Serializable { /** *

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The text of the place suggestion, typically formatted as an address + * string. *

    */ - private java.util.List categories; + private String text; /** *

    @@ -59,22 +53,6 @@ public class SearchForSuggestionsResult implements Serializable { */ private String placeId; - /** - *

    - * Categories from the data provider that describe the Place that are not - * mapped to any Amazon Location categories. - *

    - */ - private java.util.List supplementalCategories; - - /** - *

    - * The text of the place suggestion, typically formatted as an address - * string. - *

    - */ - private String text; - /** *

    * The Amazon Location categories that describe the Place. @@ -86,122 +64,65 @@ public class SearchForSuggestionsResult implements Serializable { * >Categories and filtering, in the Amazon Location Service * Developer Guide. *

    - * - * @return

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list of - * Amazon Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

    */ - public java.util.List getCategories() { - return categories; - } + private java.util.List categories; /** *

    - * The Amazon Location categories that describe the Place. + * Categories from the data provider that describe the Place that are not + * mapped to any Amazon Location categories. *

    + */ + private java.util.List supplementalCategories; + + /** *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The text of the place suggestion, typically formatted as an address + * string. *

    * - * @param categories

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

    + * @return

    + * The text of the place suggestion, typically formatted as an + * address string. + *

    */ - public void setCategories(java.util.Collection categories) { - if (categories == null) { - this.categories = null; - return; - } - - this.categories = new java.util.ArrayList(categories); + public String getText() { + return text; } /** *

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The text of the place suggestion, typically formatted as an address + * string. *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. * - * @param categories

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. + * @param text

    + * The text of the place suggestion, typically formatted as an + * address string. *

    - * @return A reference to this updated object so that method calls can be - * chained together. */ - public SearchForSuggestionsResult withCategories(String... categories) { - if (getCategories() == null) { - this.categories = new java.util.ArrayList(categories.length); - } - for (String value : categories) { - this.categories.add(value); - } - return this; + public void setText(String text) { + this.text = text; } /** *

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * The text of the place suggestion, typically formatted as an address + * string. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * - * @param categories

    - * The Amazon Location categories that describe the Place. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. + * @param text

    + * The text of the place suggestion, typically formatted as an + * address string. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchForSuggestionsResult withCategories(java.util.Collection categories) { - setCategories(categories); + public SearchForSuggestionsResult withText(String text) { + this.text = text; return this; } @@ -337,6 +258,136 @@ public SearchForSuggestionsResult withPlaceId(String placeId) { return this; } + /** + *

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

    + * + * @return

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list of + * Amazon Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

    + */ + public java.util.List getCategories() { + return categories; + } + + /** + *

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

    + * + * @param categories

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. + *

    + */ + public void setCategories(java.util.Collection categories) { + if (categories == null) { + this.categories = null; + return; + } + + this.categories = new java.util.ArrayList(categories); + } + + /** + *

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param categories

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchForSuggestionsResult withCategories(String... categories) { + if (getCategories() == null) { + this.categories = new java.util.ArrayList(categories.length); + } + for (String value : categories) { + this.categories.add(value); + } + return this; + } + + /** + *

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param categories

    + * The Amazon Location categories that describe the Place. + *

    + *

    + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchForSuggestionsResult withCategories(java.util.Collection categories) { + setCategories(categories); + return this; + } + /** *

    * Categories from the data provider that describe the Place that are not @@ -421,57 +472,6 @@ public SearchForSuggestionsResult withSupplementalCategories( return this; } - /** - *

    - * The text of the place suggestion, typically formatted as an address - * string. - *

    - * - * @return

    - * The text of the place suggestion, typically formatted as an - * address string. - *

    - */ - public String getText() { - return text; - } - - /** - *

    - * The text of the place suggestion, typically formatted as an address - * string. - *

    - * - * @param text

    - * The text of the place suggestion, typically formatted as an - * address string. - *

    - */ - public void setText(String text) { - this.text = text; - } - - /** - *

    - * The text of the place suggestion, typically formatted as an address - * string. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param text

    - * The text of the place suggestion, typically formatted as an - * address string. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchForSuggestionsResult withText(String text) { - this.text = text; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -483,14 +483,14 @@ public SearchForSuggestionsResult withText(String text) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getCategories() != null) - sb.append("Categories: " + getCategories() + ","); + if (getText() != null) + sb.append("Text: " + getText() + ","); if (getPlaceId() != null) sb.append("PlaceId: " + getPlaceId() + ","); + if (getCategories() != null) + sb.append("Categories: " + getCategories() + ","); if (getSupplementalCategories() != null) - sb.append("SupplementalCategories: " + getSupplementalCategories() + ","); - if (getText() != null) - sb.append("Text: " + getText()); + sb.append("SupplementalCategories: " + getSupplementalCategories()); sb.append("}"); return sb.toString(); } @@ -500,13 +500,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getCategories() == null) ? 0 : getCategories().hashCode()); + hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); hashCode = prime * hashCode + ((getPlaceId() == null) ? 0 : getPlaceId().hashCode()); + hashCode = prime * hashCode + ((getCategories() == null) ? 0 : getCategories().hashCode()); hashCode = prime * hashCode + ((getSupplementalCategories() == null) ? 0 : getSupplementalCategories() .hashCode()); - hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); return hashCode; } @@ -521,24 +521,24 @@ public boolean equals(Object obj) { return false; SearchForSuggestionsResult other = (SearchForSuggestionsResult) obj; - if (other.getCategories() == null ^ this.getCategories() == null) + if (other.getText() == null ^ this.getText() == null) return false; - if (other.getCategories() != null - && other.getCategories().equals(this.getCategories()) == false) + if (other.getText() != null && other.getText().equals(this.getText()) == false) return false; if (other.getPlaceId() == null ^ this.getPlaceId() == null) return false; if (other.getPlaceId() != null && other.getPlaceId().equals(this.getPlaceId()) == false) return false; + if (other.getCategories() == null ^ this.getCategories() == null) + return false; + if (other.getCategories() != null + && other.getCategories().equals(this.getCategories()) == false) + return false; if (other.getSupplementalCategories() == null ^ this.getSupplementalCategories() == null) return false; if (other.getSupplementalCategories() != null && other.getSupplementalCategories().equals(this.getSupplementalCategories()) == false) return false; - if (other.getText() == null ^ this.getText() == null) - return false; - if (other.getText() != null && other.getText().equals(this.getText()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForTextResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForTextResult.java index 6afe2d39c7..22b13de125 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForTextResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchForTextResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,6 +24,13 @@ *

    */ public class SearchForTextResult implements Serializable { + /** + *

    + * Details about the search result, such as its address and position. + *

    + */ + private Place place; + /** *

    * The distance in meters of a great-circle arc between the bias position @@ -44,10 +51,19 @@ public class SearchForTextResult implements Serializable { /** *

    - * Details about the search result, such as its address and position. + * The relative confidence in the match for a result among the results + * returned. For example, if more fields for an address match (including + * house number, street, city, country/region, and postal code), the + * relevance score is closer to 1. *

    + *

    + * Returned only when the partner selected is Esri or Grab. + *

    + *

    + * Constraints:
    + * Range: 0.0 - 1.0
    */ - private Place place; + private Double relevance; /** *

    @@ -66,19 +82,51 @@ public class SearchForTextResult implements Serializable { /** *

    - * The relative confidence in the match for a result among the results - * returned. For example, if more fields for an address match (including - * house number, street, city, country/region, and postal code), the - * relevance score is closer to 1. + * Details about the search result, such as its address and position. + *

    + * + * @return

    + * Details about the search result, such as its address and + * position. + *

    + */ + public Place getPlace() { + return place; + } + + /** + *

    + * Details about the search result, such as its address and position. *

    + * + * @param place

    + * Details about the search result, such as its address and + * position. + *

    + */ + public void setPlace(Place place) { + this.place = place; + } + + /** *

    - * Returned only when the partner selected is Esri or Grab. + * Details about the search result, such as its address and position. *

    *

    - * Constraints:
    - * Range: 0.0 - 1.0
    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param place

    + * Details about the search result, such as its address and + * position. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. */ - private Double relevance; + public SearchForTextResult withPlace(Place place) { + this.place = place; + return this; + } /** *

    @@ -189,49 +237,91 @@ public SearchForTextResult withDistance(Double distance) { /** *

    - * Details about the search result, such as its address and position. + * The relative confidence in the match for a result among the results + * returned. For example, if more fields for an address match (including + * house number, street, city, country/region, and postal code), the + * relevance score is closer to 1. + *

    + *

    + * Returned only when the partner selected is Esri or Grab. *

    + *

    + * Constraints:
    + * Range: 0.0 - 1.0
    * * @return

    - * Details about the search result, such as its address and - * position. + * The relative confidence in the match for a result among the + * results returned. For example, if more fields for an address + * match (including house number, street, city, country/region, and + * postal code), the relevance score is closer to 1. + *

    + *

    + * Returned only when the partner selected is Esri or Grab. *

    */ - public Place getPlace() { - return place; + public Double getRelevance() { + return relevance; } /** *

    - * Details about the search result, such as its address and position. + * The relative confidence in the match for a result among the results + * returned. For example, if more fields for an address match (including + * house number, street, city, country/region, and postal code), the + * relevance score is closer to 1. + *

    + *

    + * Returned only when the partner selected is Esri or Grab. *

    + *

    + * Constraints:
    + * Range: 0.0 - 1.0
    * - * @param place

    - * Details about the search result, such as its address and - * position. + * @param relevance

    + * The relative confidence in the match for a result among the + * results returned. For example, if more fields for an address + * match (including house number, street, city, country/region, + * and postal code), the relevance score is closer to 1. + *

    + *

    + * Returned only when the partner selected is Esri or Grab. *

    */ - public void setPlace(Place place) { - this.place = place; + public void setRelevance(Double relevance) { + this.relevance = relevance; } /** *

    - * Details about the search result, such as its address and position. + * The relative confidence in the match for a result among the results + * returned. For example, if more fields for an address match (including + * house number, street, city, country/region, and postal code), the + * relevance score is closer to 1. + *

    + *

    + * Returned only when the partner selected is Esri or Grab. *

    *

    * Returns a reference to this object so that method calls can be chained * together. + *

    + * Constraints:
    + * Range: 0.0 - 1.0
    * - * @param place

    - * Details about the search result, such as its address and - * position. + * @param relevance

    + * The relative confidence in the match for a result among the + * results returned. For example, if more fields for an address + * match (including house number, street, city, country/region, + * and postal code), the relevance score is closer to 1. + *

    + *

    + * Returned only when the partner selected is Esri or Grab. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchForTextResult withPlace(Place place) { - this.place = place; + public SearchForTextResult withRelevance(Double relevance) { + this.relevance = relevance; return this; } @@ -328,96 +418,6 @@ public SearchForTextResult withPlaceId(String placeId) { return this; } - /** - *

    - * The relative confidence in the match for a result among the results - * returned. For example, if more fields for an address match (including - * house number, street, city, country/region, and postal code), the - * relevance score is closer to 1. - *

    - *

    - * Returned only when the partner selected is Esri or Grab. - *

    - *

    - * Constraints:
    - * Range: 0.0 - 1.0
    - * - * @return

    - * The relative confidence in the match for a result among the - * results returned. For example, if more fields for an address - * match (including house number, street, city, country/region, and - * postal code), the relevance score is closer to 1. - *

    - *

    - * Returned only when the partner selected is Esri or Grab. - *

    - */ - public Double getRelevance() { - return relevance; - } - - /** - *

    - * The relative confidence in the match for a result among the results - * returned. For example, if more fields for an address match (including - * house number, street, city, country/region, and postal code), the - * relevance score is closer to 1. - *

    - *

    - * Returned only when the partner selected is Esri or Grab. - *

    - *

    - * Constraints:
    - * Range: 0.0 - 1.0
    - * - * @param relevance

    - * The relative confidence in the match for a result among the - * results returned. For example, if more fields for an address - * match (including house number, street, city, country/region, - * and postal code), the relevance score is closer to 1. - *

    - *

    - * Returned only when the partner selected is Esri or Grab. - *

    - */ - public void setRelevance(Double relevance) { - this.relevance = relevance; - } - - /** - *

    - * The relative confidence in the match for a result among the results - * returned. For example, if more fields for an address match (including - * house number, street, city, country/region, and postal code), the - * relevance score is closer to 1. - *

    - *

    - * Returned only when the partner selected is Esri or Grab. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Range: 0.0 - 1.0
    - * - * @param relevance

    - * The relative confidence in the match for a result among the - * results returned. For example, if more fields for an address - * match (including house number, street, city, country/region, - * and postal code), the relevance score is closer to 1. - *

    - *

    - * Returned only when the partner selected is Esri or Grab. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchForTextResult withRelevance(Double relevance) { - this.relevance = relevance; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -429,14 +429,14 @@ public SearchForTextResult withRelevance(Double relevance) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDistance() != null) - sb.append("Distance: " + getDistance() + ","); if (getPlace() != null) sb.append("Place: " + getPlace() + ","); - if (getPlaceId() != null) - sb.append("PlaceId: " + getPlaceId() + ","); + if (getDistance() != null) + sb.append("Distance: " + getDistance() + ","); if (getRelevance() != null) - sb.append("Relevance: " + getRelevance()); + sb.append("Relevance: " + getRelevance() + ","); + if (getPlaceId() != null) + sb.append("PlaceId: " + getPlaceId()); sb.append("}"); return sb.toString(); } @@ -446,10 +446,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode + ((getPlace() == null) ? 0 : getPlace().hashCode()); - hashCode = prime * hashCode + ((getPlaceId() == null) ? 0 : getPlaceId().hashCode()); + hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode + ((getRelevance() == null) ? 0 : getRelevance().hashCode()); + hashCode = prime * hashCode + ((getPlaceId() == null) ? 0 : getPlaceId().hashCode()); return hashCode; } @@ -464,23 +464,23 @@ public boolean equals(Object obj) { return false; SearchForTextResult other = (SearchForTextResult) obj; - if (other.getDistance() == null ^ this.getDistance() == null) - return false; - if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) - return false; if (other.getPlace() == null ^ this.getPlace() == null) return false; if (other.getPlace() != null && other.getPlace().equals(this.getPlace()) == false) return false; - if (other.getPlaceId() == null ^ this.getPlaceId() == null) + if (other.getDistance() == null ^ this.getDistance() == null) return false; - if (other.getPlaceId() != null && other.getPlaceId().equals(this.getPlaceId()) == false) + if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) return false; if (other.getRelevance() == null ^ this.getRelevance() == null) return false; if (other.getRelevance() != null && other.getRelevance().equals(this.getRelevance()) == false) return false; + if (other.getPlaceId() == null ^ this.getPlaceId() == null) + return false; + if (other.getPlaceId() != null && other.getPlaceId().equals(this.getPlaceId()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionRequest.java index e55c5a9464..9cb4e8aa01 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,21 +34,39 @@ public class SearchPlaceIndexForPositionRequest extends AmazonWebServiceRequest *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    */ private String indexName; /** *

    - * The optional API key to authorize the request. + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first number + * represents the X coordinate, or longitude; the second number represents + * the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a position with + * longitude -123.1174 and latitude 49.2847. + *

    + */ + private java.util.List position; + + /** + *

    + * An optional parameter. The maximum number of results returned per + * request. + *

    + *

    + * Default value: 50 *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Range: 1 - 50
    */ - private String key; + private Integer maxResults; /** *

    @@ -85,33 +103,15 @@ public class SearchPlaceIndexForPositionRequest extends AmazonWebServiceRequest /** *

    - * An optional parameter. The maximum number of results returned per - * request. - *

    - *

    - * Default value: 50 + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Range: 1 - 50
    - */ - private Integer maxResults; - - /** - *

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first number - * represents the X coordinate, or longitude; the second number represents - * the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a position with - * longitude -123.1174 and latitude 49.2847. - *

    + * Length: 0 - 1000
    */ - private java.util.List position; + private String key; /** *

    @@ -120,7 +120,7 @@ public class SearchPlaceIndexForPositionRequest extends AmazonWebServiceRequest *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @return

    * The name of the place index resource you want to use for the @@ -138,7 +138,7 @@ public String getIndexName() { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource you want to use for the @@ -159,7 +159,7 @@ public void setIndexName(String indexName) { *

    * Constraints:
    * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    + * Pattern: [-._\w]+
    * * @param indexName

    * The name of the place index resource you want to use for the @@ -175,67 +175,229 @@ public SearchPlaceIndexForPositionRequest withIndexName(String indexName) { /** *

    - * The optional API key to authorize the request. + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first number + * represents the X coordinate, or longitude; the second number represents + * the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a position with + * longitude -123.1174 and latitude 49.2847. + *

    + * + * @return

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first number + * represents the X coordinate, or longitude; the second number + * represents the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a + * position with longitude -123.1174 and latitude + * 49.2847. + *

    + */ + public java.util.List getPosition() { + return position; + } + + /** + *

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first number + * represents the X coordinate, or longitude; the second number represents + * the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a position with + * longitude -123.1174 and latitude 49.2847. + *

    + * + * @param position

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first + * number represents the X coordinate, or longitude; the second + * number represents the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a + * position with longitude -123.1174 and latitude + * 49.2847. + *

    + */ + public void setPosition(java.util.Collection position) { + if (position == null) { + this.position = null; + return; + } + + this.position = new java.util.ArrayList(position); + } + + /** + *

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first number + * represents the X coordinate, or longitude; the second number represents + * the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a position with + * longitude -123.1174 and latitude 49.2847. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first + * number represents the X coordinate, or longitude; the second + * number represents the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a + * position with longitude -123.1174 and latitude + * 49.2847. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForPositionRequest withPosition(Double... position) { + if (getPosition() == null) { + this.position = new java.util.ArrayList(position.length); + } + for (Double value : position) { + this.position.add(value); + } + return this; + } + + /** + *

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first number + * represents the X coordinate, or longitude; the second number represents + * the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a position with + * longitude -123.1174 and latitude 49.2847. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * Specifies the longitude and latitude of the position to query. + *

    + *

    + * This parameter must contain a pair of numbers. The first + * number represents the X coordinate, or longitude; the second + * number represents the Y coordinate, or latitude. + *

    + *

    + * For example, [-123.1174, 49.2847] represents a + * position with longitude -123.1174 and latitude + * 49.2847. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForPositionRequest withPosition(java.util.Collection position) { + setPosition(position); + return this; + } + + /** + *

    + * An optional parameter. The maximum number of results returned per + * request. + *

    + *

    + * Default value: 50 *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Range: 1 - 50
    * * @return

    - * The optional API key to authorize the request. + * An optional parameter. The maximum number of results returned per + * request. + *

    + *

    + * Default value: 50 *

    */ - public String getKey() { - return key; + public Integer getMaxResults() { + return maxResults; } /** *

    - * The optional API key to authorize the request. + * An optional parameter. The maximum number of results returned per + * request. + *

    + *

    + * Default value: 50 *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Range: 1 - 50
    * - * @param key

    - * The optional API key to authorize the request. + * @param maxResults

    + * An optional parameter. The maximum number of results returned + * per request. + *

    + *

    + * Default value: 50 *

    */ - public void setKey(String key) { - this.key = key; + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

    - * The optional API key to authorize the request. + * An optional parameter. The maximum number of results returned per + * request. + *

    + *

    + * Default value: 50 *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Length: 0 - 1000
    + * Range: 1 - 50
    * - * @param key

    - * The optional API key to authorize the request. + * @param maxResults

    + * An optional parameter. The maximum number of results returned + * per request. + *

    + *

    + * Default value: 50 *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForPositionRequest withKey(String key) { - this.key = key; + public SearchPlaceIndexForPositionRequest withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } @@ -433,229 +595,67 @@ public SearchPlaceIndexForPositionRequest withLanguage(String language) { /** *

    - * An optional parameter. The maximum number of results returned per - * request. - *

    - *

    - * Default value: 50 + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Range: 1 - 50
    + * Length: 0 - 1000
    * * @return

    - * An optional parameter. The maximum number of results returned per - * request. - *

    - *

    - * Default value: 50 + * The optional API key to authorize the request. *

    */ - public Integer getMaxResults() { - return maxResults; + public String getKey() { + return key; } /** *

    - * An optional parameter. The maximum number of results returned per - * request. - *

    - *

    - * Default value: 50 + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Range: 1 - 50
    + * Length: 0 - 1000
    * - * @param maxResults

    - * An optional parameter. The maximum number of results returned - * per request. - *

    - *

    - * Default value: 50 + * @param key

    + * The optional API key to authorize the request. *

    */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setKey(String key) { + this.key = key; } /** *

    - * An optional parameter. The maximum number of results returned per - * request. - *

    - *

    - * Default value: 50 + * The optional API key to authorize the request. *

    *

    * Returns a reference to this object so that method calls can be chained * together. *

    * Constraints:
    - * Range: 1 - 50
    - * - * @param maxResults

    - * An optional parameter. The maximum number of results returned - * per request. - *

    - *

    - * Default value: 50 - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForPositionRequest withMaxResults(Integer maxResults) { - this.maxResults = maxResults; - return this; - } - - /** - *

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first number - * represents the X coordinate, or longitude; the second number represents - * the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a position with - * longitude -123.1174 and latitude 49.2847. - *

    - * - * @return

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first number - * represents the X coordinate, or longitude; the second number - * represents the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a - * position with longitude -123.1174 and latitude - * 49.2847. - *

    - */ - public java.util.List getPosition() { - return position; - } - - /** - *

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first number - * represents the X coordinate, or longitude; the second number represents - * the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a position with - * longitude -123.1174 and latitude 49.2847. - *

    - * - * @param position

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first - * number represents the X coordinate, or longitude; the second - * number represents the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a - * position with longitude -123.1174 and latitude - * 49.2847. - *

    - */ - public void setPosition(java.util.Collection position) { - if (position == null) { - this.position = null; - return; - } - - this.position = new java.util.ArrayList(position); - } - - /** - *

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first number - * represents the X coordinate, or longitude; the second number represents - * the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a position with - * longitude -123.1174 and latitude 49.2847. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param position

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first - * number represents the X coordinate, or longitude; the second - * number represents the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a - * position with longitude -123.1174 and latitude - * 49.2847. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForPositionRequest withPosition(Double... position) { - if (getPosition() == null) { - this.position = new java.util.ArrayList(position.length); - } - for (Double value : position) { - this.position.add(value); - } - return this; - } - - /** - *

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first number - * represents the X coordinate, or longitude; the second number represents - * the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a position with - * longitude -123.1174 and latitude 49.2847. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. + * Length: 0 - 1000
    * - * @param position

    - * Specifies the longitude and latitude of the position to query. - *

    - *

    - * This parameter must contain a pair of numbers. The first - * number represents the X coordinate, or longitude; the second - * number represents the Y coordinate, or latitude. - *

    - *

    - * For example, [-123.1174, 49.2847] represents a - * position with longitude -123.1174 and latitude - * 49.2847. + * @param key

    + * The optional API key to authorize the request. *

    * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForPositionRequest withPosition(java.util.Collection position) { - setPosition(position); + public SearchPlaceIndexForPositionRequest withKey(String key) { + this.key = key; return this; } @@ -672,14 +672,14 @@ public String toString() { sb.append("{"); if (getIndexName() != null) sb.append("IndexName: " + getIndexName() + ","); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); - if (getLanguage() != null) - sb.append("Language: " + getLanguage() + ","); + if (getPosition() != null) + sb.append("Position: " + getPosition() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); - if (getPosition() != null) - sb.append("Position: " + getPosition()); + if (getLanguage() != null) + sb.append("Language: " + getLanguage() + ","); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -690,10 +690,10 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); - hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getPosition() == null) ? 0 : getPosition().hashCode()); + hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); + hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -713,22 +713,22 @@ public boolean equals(Object obj) { if (other.getIndexName() != null && other.getIndexName().equals(this.getIndexName()) == false) return false; - if (other.getKey() == null ^ this.getKey() == null) - return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) - return false; - if (other.getLanguage() == null ^ this.getLanguage() == null) + if (other.getPosition() == null ^ this.getPosition() == null) return false; - if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) + if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) return false; if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false) return false; - if (other.getPosition() == null ^ this.getPosition() == null) + if (other.getLanguage() == null ^ this.getLanguage() == null) return false; - if (other.getPosition() != null && other.getPosition().equals(this.getPosition()) == false) + if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) + return false; + if (other.getKey() == null ^ this.getKey() == null) + return false; + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionResult.java index f2efad994d..1431e59ad3 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,15 @@ import java.io.Serializable; public class SearchPlaceIndexForPositionResult implements Serializable { + /** + *

    + * Contains a summary of the request. Echoes the input values for + * Position, Language, MaxResults, + * and the DataSource of the place index. + *

    + */ + private SearchPlaceIndexForPositionSummary summary; + /** *

    * Returns a list of Places closest to the specified position. Each result @@ -32,8 +41,59 @@ public class SearchPlaceIndexForPositionResult implements Serializable { * Position, Language, MaxResults, * and the DataSource of the place index. *

    + * + * @return

    + * Contains a summary of the request. Echoes the input values for + * Position, Language, + * MaxResults, and the DataSource of the + * place index. + *

    */ - private SearchPlaceIndexForPositionSummary summary; + public SearchPlaceIndexForPositionSummary getSummary() { + return summary; + } + + /** + *

    + * Contains a summary of the request. Echoes the input values for + * Position, Language, MaxResults, + * and the DataSource of the place index. + *

    + * + * @param summary

    + * Contains a summary of the request. Echoes the input values for + * Position, Language, + * MaxResults, and the DataSource of + * the place index. + *

    + */ + public void setSummary(SearchPlaceIndexForPositionSummary summary) { + this.summary = summary; + } + + /** + *

    + * Contains a summary of the request. Echoes the input values for + * Position, Language, MaxResults, + * and the DataSource of the place index. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param summary

    + * Contains a summary of the request. Echoes the input values for + * Position, Language, + * MaxResults, and the DataSource of + * the place index. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForPositionResult withSummary(SearchPlaceIndexForPositionSummary summary) { + this.summary = summary; + return this; + } /** *

    @@ -121,66 +181,6 @@ public SearchPlaceIndexForPositionResult withResults( return this; } - /** - *

    - * Contains a summary of the request. Echoes the input values for - * Position, Language, MaxResults, - * and the DataSource of the place index. - *

    - * - * @return

    - * Contains a summary of the request. Echoes the input values for - * Position, Language, - * MaxResults, and the DataSource of the - * place index. - *

    - */ - public SearchPlaceIndexForPositionSummary getSummary() { - return summary; - } - - /** - *

    - * Contains a summary of the request. Echoes the input values for - * Position, Language, MaxResults, - * and the DataSource of the place index. - *

    - * - * @param summary

    - * Contains a summary of the request. Echoes the input values for - * Position, Language, - * MaxResults, and the DataSource of - * the place index. - *

    - */ - public void setSummary(SearchPlaceIndexForPositionSummary summary) { - this.summary = summary; - } - - /** - *

    - * Contains a summary of the request. Echoes the input values for - * Position, Language, MaxResults, - * and the DataSource of the place index. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param summary

    - * Contains a summary of the request. Echoes the input values for - * Position, Language, - * MaxResults, and the DataSource of - * the place index. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForPositionResult withSummary(SearchPlaceIndexForPositionSummary summary) { - this.summary = summary; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -192,10 +192,10 @@ public SearchPlaceIndexForPositionResult withSummary(SearchPlaceIndexForPosition public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getResults() != null) - sb.append("Results: " + getResults() + ","); if (getSummary() != null) - sb.append("Summary: " + getSummary()); + sb.append("Summary: " + getSummary() + ","); + if (getResults() != null) + sb.append("Results: " + getResults()); sb.append("}"); return sb.toString(); } @@ -205,8 +205,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getResults() == null) ? 0 : getResults().hashCode()); hashCode = prime * hashCode + ((getSummary() == null) ? 0 : getSummary().hashCode()); + hashCode = prime * hashCode + ((getResults() == null) ? 0 : getResults().hashCode()); return hashCode; } @@ -221,14 +221,14 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForPositionResult other = (SearchPlaceIndexForPositionResult) obj; - if (other.getResults() == null ^ this.getResults() == null) - return false; - if (other.getResults() != null && other.getResults().equals(this.getResults()) == false) - return false; if (other.getSummary() == null ^ this.getSummary() == null) return false; if (other.getSummary() != null && other.getSummary().equals(this.getSummary()) == false) return false; + if (other.getResults() == null ^ this.getResults() == null) + return false; + if (other.getResults() != null && other.getResults().equals(this.getResults()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionSummary.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionSummary.java index 4f2e266e58..00681203ad 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionSummary.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForPositionSummary.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,6 +24,27 @@ *

    */ public class SearchPlaceIndexForPositionSummary implements Serializable { + /** + *

    + * The position specified in the request. + *

    + */ + private java.util.List position; + + /** + *

    + * Contains the optional result count limit that is specified in the + * request. + *

    + *

    + * Default value: 50 + *

    + *

    + * Constraints:
    + * Range: 1 - 50
    + */ + private Integer maxResults; + /** *

    * The geospatial data provider attached to the place index resource @@ -67,6 +88,80 @@ public class SearchPlaceIndexForPositionSummary implements Serializable { */ private String language; + /** + *

    + * The position specified in the request. + *

    + * + * @return

    + * The position specified in the request. + *

    + */ + public java.util.List getPosition() { + return position; + } + + /** + *

    + * The position specified in the request. + *

    + * + * @param position

    + * The position specified in the request. + *

    + */ + public void setPosition(java.util.Collection position) { + if (position == null) { + this.position = null; + return; + } + + this.position = new java.util.ArrayList(position); + } + + /** + *

    + * The position specified in the request. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The position specified in the request. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForPositionSummary withPosition(Double... position) { + if (getPosition() == null) { + this.position = new java.util.ArrayList(position.length); + } + for (Double value : position) { + this.position.add(value); + } + return this; + } + + /** + *

    + * The position specified in the request. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param position

    + * The position specified in the request. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForPositionSummary withPosition(java.util.Collection position) { + setPosition(position); + return this; + } + /** *

    * Contains the optional result count limit that is specified in the @@ -78,15 +173,72 @@ public class SearchPlaceIndexForPositionSummary implements Serializable { *

    * Constraints:
    * Range: 1 - 50
    + * + * @return

    + * Contains the optional result count limit that is specified in the + * request. + *

    + *

    + * Default value: 50 + *

    */ - private Integer maxResults; + public Integer getMaxResults() { + return maxResults; + } /** *

    - * The position specified in the request. + * Contains the optional result count limit that is specified in the + * request. *

    + *

    + * Default value: 50 + *

    + *

    + * Constraints:
    + * Range: 1 - 50
    + * + * @param maxResults

    + * Contains the optional result count limit that is specified in + * the request. + *

    + *

    + * Default value: 50 + *

    */ - private java.util.List position; + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; + } + + /** + *

    + * Contains the optional result count limit that is specified in the + * request. + *

    + *

    + * Default value: 50 + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Range: 1 - 50
    + * + * @param maxResults

    + * Contains the optional result count limit that is specified in + * the request. + *

    + *

    + * Default value: 50 + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForPositionSummary withMaxResults(Integer maxResults) { + this.maxResults = maxResults; + return this; + } /** *

    @@ -345,158 +497,6 @@ public SearchPlaceIndexForPositionSummary withLanguage(String language) { return this; } - /** - *

    - * Contains the optional result count limit that is specified in the - * request. - *

    - *

    - * Default value: 50 - *

    - *

    - * Constraints:
    - * Range: 1 - 50
    - * - * @return

    - * Contains the optional result count limit that is specified in the - * request. - *

    - *

    - * Default value: 50 - *

    - */ - public Integer getMaxResults() { - return maxResults; - } - - /** - *

    - * Contains the optional result count limit that is specified in the - * request. - *

    - *

    - * Default value: 50 - *

    - *

    - * Constraints:
    - * Range: 1 - 50
    - * - * @param maxResults

    - * Contains the optional result count limit that is specified in - * the request. - *

    - *

    - * Default value: 50 - *

    - */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; - } - - /** - *

    - * Contains the optional result count limit that is specified in the - * request. - *

    - *

    - * Default value: 50 - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - *

    - * Constraints:
    - * Range: 1 - 50
    - * - * @param maxResults

    - * Contains the optional result count limit that is specified in - * the request. - *

    - *

    - * Default value: 50 - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForPositionSummary withMaxResults(Integer maxResults) { - this.maxResults = maxResults; - return this; - } - - /** - *

    - * The position specified in the request. - *

    - * - * @return

    - * The position specified in the request. - *

    - */ - public java.util.List getPosition() { - return position; - } - - /** - *

    - * The position specified in the request. - *

    - * - * @param position

    - * The position specified in the request. - *

    - */ - public void setPosition(java.util.Collection position) { - if (position == null) { - this.position = null; - return; - } - - this.position = new java.util.ArrayList(position); - } - - /** - *

    - * The position specified in the request. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param position

    - * The position specified in the request. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForPositionSummary withPosition(Double... position) { - if (getPosition() == null) { - this.position = new java.util.ArrayList(position.length); - } - for (Double value : position) { - this.position.add(value); - } - return this; - } - - /** - *

    - * The position specified in the request. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param position

    - * The position specified in the request. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForPositionSummary withPosition(java.util.Collection position) { - setPosition(position); - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -508,14 +508,14 @@ public SearchPlaceIndexForPositionSummary withPosition(java.util.Collection + * The name of the place index resource you want to use for the search. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + */ + private String indexName; + + /** + *

    + * The free-form partial text to use to generate place suggestions. For + * example, eiffel tow. + *

    + *

    + * Constraints:
    + * Length: 1 - 200
    + */ + private String text; + /** *

    * An optional parameter that indicates a preference for place suggestions @@ -93,22 +115,6 @@ public class SearchPlaceIndexForSuggestionsRequest extends AmazonWebServiceReque */ private java.util.List filterBBox; - /** - *

    - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

    - */ - private java.util.List filterCategories; - /** *

    * An optional parameter that limits the search results by returning only @@ -128,26 +134,17 @@ public class SearchPlaceIndexForSuggestionsRequest extends AmazonWebServiceReque /** *

    - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. *

    *

    - * Constraints:
    - * Length: 1 - 100
    - * Pattern: ^[-._\w]+$
    - */ - private String indexName; - - /** - *

    - * The optional API key to authorize the request. + * The default: 5 *

    *

    * Constraints:
    - * Length: 0 - 1000
    + * Range: 1 - 15
    */ - private String key; + private Integer maxResults; /** *

    @@ -183,17 +180,91 @@ public class SearchPlaceIndexForSuggestionsRequest extends AmazonWebServiceReque /** *

    - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

    *

    - * The default: 5 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

    + */ + private java.util.List filterCategories; + + /** + *

    + * The optional API key to authorize the request. *

    *

    * Constraints:
    - * Range: 1 - 15
    + * Length: 0 - 1000
    */ - private Integer maxResults; + private String key; + + /** + *

    + * The name of the place index resource you want to use for the search. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @return

    + * The name of the place index resource you want to use for the + * search. + *

    + */ + public String getIndexName() { + return indexName; + } + + /** + *

    + * The name of the place index resource you want to use for the search. + *

    + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param indexName

    + * The name of the place index resource you want to use for the + * search. + *

    + */ + public void setIndexName(String indexName) { + this.indexName = indexName; + } + + /** + *

    + * The name of the place index resource you want to use for the search. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 100
    + * Pattern: [-._\w]+
    + * + * @param indexName

    + * The name of the place index resource you want to use for the + * search. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForSuggestionsRequest withIndexName(String indexName) { + this.indexName = indexName; + return this; + } /** *

    @@ -203,8 +274,57 @@ public class SearchPlaceIndexForSuggestionsRequest extends AmazonWebServiceReque *

    * Constraints:
    * Length: 1 - 200
    + * + * @return

    + * The free-form partial text to use to generate place suggestions. + * For example, eiffel tow. + *

    */ - private String text; + public String getText() { + return text; + } + + /** + *

    + * The free-form partial text to use to generate place suggestions. For + * example, eiffel tow. + *

    + *

    + * Constraints:
    + * Length: 1 - 200
    + * + * @param text

    + * The free-form partial text to use to generate place + * suggestions. For example, eiffel tow. + *

    + */ + public void setText(String text) { + this.text = text; + } + + /** + *

    + * The free-form partial text to use to generate place suggestions. For + * example, eiffel tow. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + *

    + * Constraints:
    + * Length: 1 - 200
    + * + * @param text

    + * The free-form partial text to use to generate place + * suggestions. For example, eiffel tow. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForSuggestionsRequest withText(String text) { + this.text = text; + return this; + } /** *

    @@ -680,211 +800,60 @@ public SearchPlaceIndexForSuggestionsRequest withFilterBBox( /** *

    - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. + * An optional parameter that limits the search results by returning only + * suggestions within the provided list of countries. *

    + *
      + *
    • *

      - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * Use the ISO + * 3166 3-digit country code. For example, Australia uses three + * upper-case characters: AUS. *

      + *
      • + *
    * * @return

    - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. + * An optional parameter that limits the search results by returning + * only suggestions within the provided list of countries. *

    + *
      + *
    • *

      - * For more information about using categories, including a list of - * Amazon Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * Use the ISO + * 3166 3-digit country code. For example, Australia uses three + * upper-case characters: AUS. *

      + *
      • + *
    */ - public java.util.List getFilterCategories() { - return filterCategories; + public java.util.List getFilterCountries() { + return filterCountries; } /** *

    - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. + * An optional parameter that limits the search results by returning only + * suggestions within the provided list of countries. *

    + *
      + *
    • *

      - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * Use the ISO + * 3166 3-digit country code. For example, Australia uses three + * upper-case characters: AUS. *

      + *
      • + *
    * - * @param filterCategories

    - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. + * @param filterCountries

    + * An optional parameter that limits the search results by + * returning only suggestions within the provided list of + * countries. *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

    - */ - public void setFilterCategories(java.util.Collection filterCategories) { - if (filterCategories == null) { - this.filterCategories = null; - return; - } - - this.filterCategories = new java.util.ArrayList(filterCategories); - } - - /** - *

    - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filterCategories

    - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForSuggestionsRequest withFilterCategories(String... filterCategories) { - if (getFilterCategories() == null) { - this.filterCategories = new java.util.ArrayList(filterCategories.length); - } - for (String value : filterCategories) { - this.filterCategories.add(value); - } - return this; - } - - /** - *

    - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. - *

    - *

    - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

    - *

    - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filterCategories

    - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. - *

    - *

    - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

    - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForSuggestionsRequest withFilterCategories( - java.util.Collection filterCategories) { - setFilterCategories(filterCategories); - return this; - } - - /** - *

    - * An optional parameter that limits the search results by returning only - * suggestions within the provided list of countries. - *

    - *
      - *
    • - *

      - * Use the ISO - * 3166 3-digit country code. For example, Australia uses three - * upper-case characters: AUS. - *

      - *
      • - *
    - * - * @return

    - * An optional parameter that limits the search results by returning - * only suggestions within the provided list of countries. - *

    - *
      - *
    • - *

      - * Use the ISO - * 3166 3-digit country code. For example, Australia uses three - * upper-case characters: AUS. - *

      - *
      • - *
    - */ - public java.util.List getFilterCountries() { - return filterCountries; - } - - /** - *

    - * An optional parameter that limits the search results by returning only - * suggestions within the provided list of countries. - *

    - *
      - *
    • - *

      - * Use the ISO - * 3166 3-digit country code. For example, Australia uses three - * upper-case characters: AUS. - *

      - *
      • - *
    - * - * @param filterCountries

    - * An optional parameter that limits the search results by - * returning only suggestions within the provided list of - * countries. - *

    - *
      - *
    • + *
        + *
      • *

        * Use the ISO @@ -993,127 +962,79 @@ public SearchPlaceIndexForSuggestionsRequest withFilterCountries( /** *

        - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. + *

        + *

        + * The default: 5 *

        *

        * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Range: 1 - 15
        * * @return

        - * The name of the place index resource you want to use for the - * search. + * An optional parameter. The maximum number of results returned per + * request. + *

        + *

        + * The default: 5 *

        */ - public String getIndexName() { - return indexName; + public Integer getMaxResults() { + return maxResults; } /** *

        - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. *

        *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param indexName

        - * The name of the place index resource you want to use for the - * search. - *

        - */ - public void setIndexName(String indexName) { - this.indexName = indexName; - } - - /** - *

        - * The name of the place index resource you want to use for the search. + * The default: 5 *

        *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Range: 1 - 15
        * - * @param indexName

        - * The name of the place index resource you want to use for the - * search. + * @param maxResults

        + * An optional parameter. The maximum number of results returned + * per request. + *

        + *

        + * The default: 5 *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForSuggestionsRequest withIndexName(String indexName) { - this.indexName = indexName; - return this; - } - - /** - *

        - * The optional API key to authorize the request. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @return

        - * The optional API key to authorize the request. - *

        */ - public String getKey() { - return key; + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

        - * The optional API key to authorize the request. + * An optional parameter. The maximum number of results returned per + * request. *

        *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param key

        - * The optional API key to authorize the request. - *

        - */ - public void setKey(String key) { - this.key = key; - } - - /** - *

        - * The optional API key to authorize the request. + * The default: 5 *

        *

        * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Length: 0 - 1000
        + * Range: 1 - 15
        * - * @param key

        - * The optional API key to authorize the request. + * @param maxResults

        + * An optional parameter. The maximum number of results returned + * per request. + *

        + *

        + * The default: 5 *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsRequest withKey(String key) { - this.key = key; + public SearchPlaceIndexForSuggestionsRequest withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } @@ -1310,139 +1231,218 @@ public SearchPlaceIndexForSuggestionsRequest withLanguage(String language) { /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 5 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        - *

        - * Constraints:
        - * Range: 1 - 15
        * * @return

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. *

        *

        - * The default: 5 + * For more information about using categories, including a list of + * Amazon Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        */ - public Integer getMaxResults() { - return maxResults; + public java.util.List getFilterCategories() { + return filterCategories; } /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 5 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        - *

        - * Constraints:
        - * Range: 1 - 15
        * - * @param maxResults

        - * An optional parameter. The maximum number of results returned - * per request. + * @param filterCategories

        + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. *

        *

        - * The default: 5 + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

        */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setFilterCategories(java.util.Collection filterCategories) { + if (filterCategories == null) { + this.filterCategories = null; + return; + } + + this.filterCategories = new java.util.ArrayList(filterCategories); } /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 5 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        *

        * Returns a reference to this object so that method calls can be chained * together. + * + * @param filterCategories

        + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. + *

        + *

        + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForSuggestionsRequest withFilterCategories(String... filterCategories) { + if (getFilterCategories() == null) { + this.filterCategories = new java.util.ArrayList(filterCategories.length); + } + for (String value : filterCategories) { + this.filterCategories.add(value); + } + return this; + } + + /** *

        - * Constraints:
        - * Range: 1 - 15
        + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. + *

        + *

        + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. * - * @param maxResults

        - * An optional parameter. The maximum number of results returned - * per request. + * @param filterCategories

        + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. *

        *

        - * The default: 5 + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsRequest withMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public SearchPlaceIndexForSuggestionsRequest withFilterCategories( + java.util.Collection filterCategories) { + setFilterCategories(filterCategories); return this; } /** *

        - * The free-form partial text to use to generate place suggestions. For - * example, eiffel tow. + * The optional API key to authorize the request. *

        *

        * Constraints:
        - * Length: 1 - 200
        + * Length: 0 - 1000
        * * @return

        - * The free-form partial text to use to generate place suggestions. - * For example, eiffel tow. + * The optional API key to authorize the request. *

        */ - public String getText() { - return text; + public String getKey() { + return key; } /** *

        - * The free-form partial text to use to generate place suggestions. For - * example, eiffel tow. + * The optional API key to authorize the request. *

        *

        * Constraints:
        - * Length: 1 - 200
        + * Length: 0 - 1000
        * - * @param text

        - * The free-form partial text to use to generate place - * suggestions. For example, eiffel tow. + * @param key

        + * The optional API key to authorize the request. *

        */ - public void setText(String text) { - this.text = text; + public void setKey(String key) { + this.key = key; } /** *

        - * The free-form partial text to use to generate place suggestions. For - * example, eiffel tow. + * The optional API key to authorize the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Length: 1 - 200
        + * Length: 0 - 1000
        * - * @param text

        - * The free-form partial text to use to generate place - * suggestions. For example, eiffel tow. + * @param key

        + * The optional API key to authorize the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsRequest withText(String text) { - this.text = text; + public SearchPlaceIndexForSuggestionsRequest withKey(String key) { + this.key = key; return this; } @@ -1457,24 +1457,24 @@ public SearchPlaceIndexForSuggestionsRequest withText(String text) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getIndexName() != null) + sb.append("IndexName: " + getIndexName() + ","); + if (getText() != null) + sb.append("Text: " + getText() + ","); if (getBiasPosition() != null) sb.append("BiasPosition: " + getBiasPosition() + ","); if (getFilterBBox() != null) sb.append("FilterBBox: " + getFilterBBox() + ","); - if (getFilterCategories() != null) - sb.append("FilterCategories: " + getFilterCategories() + ","); if (getFilterCountries() != null) sb.append("FilterCountries: " + getFilterCountries() + ","); - if (getIndexName() != null) - sb.append("IndexName: " + getIndexName() + ","); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); - if (getLanguage() != null) - sb.append("Language: " + getLanguage() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); - if (getText() != null) - sb.append("Text: " + getText()); + if (getLanguage() != null) + sb.append("Language: " + getLanguage() + ","); + if (getFilterCategories() != null) + sb.append("FilterCategories: " + getFilterCategories() + ","); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -1484,18 +1484,18 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); + hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); hashCode = prime * hashCode + ((getBiasPosition() == null) ? 0 : getBiasPosition().hashCode()); hashCode = prime * hashCode + ((getFilterBBox() == null) ? 0 : getFilterBBox().hashCode()); - hashCode = prime * hashCode - + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); hashCode = prime * hashCode + ((getFilterCountries() == null) ? 0 : getFilterCountries().hashCode()); - hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); - hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); + hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); + hashCode = prime * hashCode + + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -1510,6 +1510,15 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForSuggestionsRequest other = (SearchPlaceIndexForSuggestionsRequest) obj; + if (other.getIndexName() == null ^ this.getIndexName() == null) + return false; + if (other.getIndexName() != null + && other.getIndexName().equals(this.getIndexName()) == false) + return false; + if (other.getText() == null ^ this.getText() == null) + return false; + if (other.getText() != null && other.getText().equals(this.getText()) == false) + return false; if (other.getBiasPosition() == null ^ this.getBiasPosition() == null) return false; if (other.getBiasPosition() != null @@ -1520,37 +1529,28 @@ public boolean equals(Object obj) { if (other.getFilterBBox() != null && other.getFilterBBox().equals(this.getFilterBBox()) == false) return false; - if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) - return false; - if (other.getFilterCategories() != null - && other.getFilterCategories().equals(this.getFilterCategories()) == false) - return false; if (other.getFilterCountries() == null ^ this.getFilterCountries() == null) return false; if (other.getFilterCountries() != null && other.getFilterCountries().equals(this.getFilterCountries()) == false) return false; - if (other.getIndexName() == null ^ this.getIndexName() == null) - return false; - if (other.getIndexName() != null - && other.getIndexName().equals(this.getIndexName()) == false) - return false; - if (other.getKey() == null ^ this.getKey() == null) + if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) + if (other.getMaxResults() != null + && other.getMaxResults().equals(this.getMaxResults()) == false) return false; if (other.getLanguage() == null ^ this.getLanguage() == null) return false; if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) return false; - if (other.getMaxResults() == null ^ this.getMaxResults() == null) + if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) return false; - if (other.getMaxResults() != null - && other.getMaxResults().equals(this.getMaxResults()) == false) + if (other.getFilterCategories() != null + && other.getFilterCategories().equals(this.getFilterCategories()) == false) return false; - if (other.getText() == null ^ this.getText() == null) + if (other.getKey() == null ^ this.getKey() == null) return false; - if (other.getText() != null && other.getText().equals(this.getText()) == false) + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsResult.java index 0901dc79a7..9859a372e4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class SearchPlaceIndexForSuggestionsResult implements Serializable { + /** + *

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index. + *

        + */ + private SearchPlaceIndexForSuggestionsSummary summary; + /** *

        * A list of place suggestions that best match the search text. @@ -33,8 +44,67 @@ public class SearchPlaceIndexForSuggestionsResult implements Serializable { * MaxResults, and Text. Also includes the * DataSource of the place index. *

        + * + * @return

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index. + *

        */ - private SearchPlaceIndexForSuggestionsSummary summary; + public SearchPlaceIndexForSuggestionsSummary getSummary() { + return summary; + } + + /** + *

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index. + *

        + * + * @param summary

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes + * the DataSource of the place index. + *

        + */ + public void setSummary(SearchPlaceIndexForSuggestionsSummary summary) { + this.summary = summary; + } + + /** + *

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param summary

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes + * the DataSource of the place index. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForSuggestionsResult withSummary( + SearchPlaceIndexForSuggestionsSummary summary) { + this.summary = summary; + return this; + } /** *

        @@ -111,76 +181,6 @@ public SearchPlaceIndexForSuggestionsResult withResults( return this; } - /** - *

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index. - *

        - * - * @return

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index. - *

        - */ - public SearchPlaceIndexForSuggestionsSummary getSummary() { - return summary; - } - - /** - *

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index. - *

        - * - * @param summary

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes - * the DataSource of the place index. - *

        - */ - public void setSummary(SearchPlaceIndexForSuggestionsSummary summary) { - this.summary = summary; - } - - /** - *

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param summary

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes - * the DataSource of the place index. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForSuggestionsResult withSummary( - SearchPlaceIndexForSuggestionsSummary summary) { - this.summary = summary; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -192,10 +192,10 @@ public SearchPlaceIndexForSuggestionsResult withSummary( public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getResults() != null) - sb.append("Results: " + getResults() + ","); if (getSummary() != null) - sb.append("Summary: " + getSummary()); + sb.append("Summary: " + getSummary() + ","); + if (getResults() != null) + sb.append("Results: " + getResults()); sb.append("}"); return sb.toString(); } @@ -205,8 +205,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getResults() == null) ? 0 : getResults().hashCode()); hashCode = prime * hashCode + ((getSummary() == null) ? 0 : getSummary().hashCode()); + hashCode = prime * hashCode + ((getResults() == null) ? 0 : getResults().hashCode()); return hashCode; } @@ -221,14 +221,14 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForSuggestionsResult other = (SearchPlaceIndexForSuggestionsResult) obj; - if (other.getResults() == null ^ this.getResults() == null) - return false; - if (other.getResults() != null && other.getResults().equals(this.getResults()) == false) - return false; if (other.getSummary() == null ^ this.getSummary() == null) return false; if (other.getSummary() != null && other.getSummary().equals(this.getSummary()) == false) return false; + if (other.getResults() == null ^ this.getResults() == null) + return false; + if (other.getResults() != null && other.getResults().equals(this.getResults()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsSummary.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsSummary.java index c1dd6469b0..f933659b35 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsSummary.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForSuggestionsSummary.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,6 +24,13 @@ *

        */ public class SearchPlaceIndexForSuggestionsSummary implements Serializable { + /** + *

        + * The free-form partial text input specified in the request. + *

        + */ + private String text; + /** *

        * Contains the coordinates for the optional bias position specified in the @@ -41,6 +48,28 @@ public class SearchPlaceIndexForSuggestionsSummary implements Serializable { */ private java.util.List biasPosition; + /** + *

        + * Contains the coordinates for the optional bounding box specified in the + * request. + *

        + */ + private java.util.List filterBBox; + + /** + *

        + * Contains the optional country filter specified in the request. + *

        + */ + private java.util.List filterCountries; + + /** + *

        + * Contains the optional result count limit specified in the request. + *

        + */ + private Integer maxResults; + /** *

        * The geospatial data provider attached to the place index resource @@ -73,11 +102,16 @@ public class SearchPlaceIndexForSuggestionsSummary implements Serializable { /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * The preferred language used to return results. Matches the language in + * the request. The value is a valid BCP 47 language tag, for + * example, en for English. *

        + *

        + * Constraints:
        + * Length: 2 - 35
        */ - private java.util.List filterBBox; + private String language; /** *

        @@ -88,37 +122,48 @@ public class SearchPlaceIndexForSuggestionsSummary implements Serializable { /** *

        - * Contains the optional country filter specified in the request. - *

        - */ - private java.util.List filterCountries; - - /** - *

        - * The preferred language used to return results. Matches the language in - * the request. The value is a valid BCP 47 language tag, for - * example, en for English. + * The free-form partial text input specified in the request. *

        - *

        - * Constraints:
        - * Length: 2 - 35
        + * + * @return

        + * The free-form partial text input specified in the request. + *

        */ - private String language; + public String getText() { + return text; + } /** *

        - * Contains the optional result count limit specified in the request. + * The free-form partial text input specified in the request. *

        + * + * @param text

        + * The free-form partial text input specified in the request. + *

        */ - private Integer maxResults; + public void setText(String text) { + this.text = text; + } /** *

        * The free-form partial text input specified in the request. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param text

        + * The free-form partial text input specified in the request. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private String text; + public SearchPlaceIndexForSuggestionsSummary withText(String text) { + this.text = text; + return this; + } /** *

        @@ -281,419 +326,392 @@ public SearchPlaceIndexForSuggestionsSummary withBiasPosition( /** *

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified in the + * request. *

        * * @return

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified + * in the request. *

        */ - public String getDataSource() { - return dataSource; + public java.util.List getFilterBBox() { + return filterBBox; } /** *

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified in the + * request. *

        * - * @param dataSource

        - * The geospatial data provider attached to the place index - * resource specified in the request. Values can be one of the - * following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * @param filterBBox

        + * Contains the coordinates for the optional bounding box + * specified in the request. *

        */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; + public void setFilterBBox(java.util.Collection filterBBox) { + if (filterBBox == null) { + this.filterBBox = null; + return; + } + + this.filterBBox = new java.util.ArrayList(filterBBox); } /** *

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab + * Contains the coordinates for the optional bounding box specified in the + * request. *

          - *
          • - *
        • *

          - * Here - *

          - *
          • - *
        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param filterBBox

        + * Contains the coordinates for the optional bounding box + * specified in the request. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForSuggestionsSummary withFilterBBox(Double... filterBBox) { + if (getFilterBBox() == null) { + this.filterBBox = new java.util.ArrayList(filterBBox.length); + } + for (Double value : filterBBox) { + this.filterBBox.add(value); + } + return this; + } + + /** *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified in the + * request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param dataSource

        - * The geospatial data provider attached to the place index - * resource specified in the request. Values can be one of the - * following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * @param filterBBox

        + * Contains the coordinates for the optional bounding box + * specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withDataSource(String dataSource) { - this.dataSource = dataSource; + public SearchPlaceIndexForSuggestionsSummary withFilterBBox( + java.util.Collection filterBBox) { + setFilterBBox(filterBBox); return this; } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        * * @return

        - * Contains the coordinates for the optional bounding box specified - * in the request. + * Contains the optional country filter specified in the request. *

        */ - public java.util.List getFilterBBox() { - return filterBBox; + public java.util.List getFilterCountries() { + return filterCountries; } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        * - * @param filterBBox

        - * Contains the coordinates for the optional bounding box - * specified in the request. + * @param filterCountries

        + * Contains the optional country filter specified in the request. *

        */ - public void setFilterBBox(java.util.Collection filterBBox) { - if (filterBBox == null) { - this.filterBBox = null; + public void setFilterCountries(java.util.Collection filterCountries) { + if (filterCountries == null) { + this.filterCountries = null; return; } - this.filterBBox = new java.util.ArrayList(filterBBox); + this.filterCountries = new java.util.ArrayList(filterCountries); } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterBBox

        - * Contains the coordinates for the optional bounding box - * specified in the request. + * @param filterCountries

        + * Contains the optional country filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withFilterBBox(Double... filterBBox) { - if (getFilterBBox() == null) { - this.filterBBox = new java.util.ArrayList(filterBBox.length); + public SearchPlaceIndexForSuggestionsSummary withFilterCountries(String... filterCountries) { + if (getFilterCountries() == null) { + this.filterCountries = new java.util.ArrayList(filterCountries.length); } - for (Double value : filterBBox) { - this.filterBBox.add(value); + for (String value : filterCountries) { + this.filterCountries.add(value); } return this; } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterBBox

        - * Contains the coordinates for the optional bounding box - * specified in the request. + * @param filterCountries

        + * Contains the optional country filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withFilterBBox( - java.util.Collection filterBBox) { - setFilterBBox(filterBBox); + public SearchPlaceIndexForSuggestionsSummary withFilterCountries( + java.util.Collection filterCountries) { + setFilterCountries(filterCountries); return this; } /** *

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the request. *

        * * @return

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the + * request. *

        */ - public java.util.List getFilterCategories() { - return filterCategories; + public Integer getMaxResults() { + return maxResults; } /** *

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the request. *

        * - * @param filterCategories

        - * The optional category filter specified in the request. + * @param maxResults

        + * Contains the optional result count limit specified in the + * request. *

        */ - public void setFilterCategories(java.util.Collection filterCategories) { - if (filterCategories == null) { - this.filterCategories = null; - return; - } - - this.filterCategories = new java.util.ArrayList(filterCategories); + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterCategories

        - * The optional category filter specified in the request. + * @param maxResults

        + * Contains the optional result count limit specified in the + * request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withFilterCategories(String... filterCategories) { - if (getFilterCategories() == null) { - this.filterCategories = new java.util.ArrayList(filterCategories.length); - } - for (String value : filterCategories) { - this.filterCategories.add(value); - } + public SearchPlaceIndexForSuggestionsSummary withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } /** *

        - * The optional category filter specified in the request. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: *

        + *
          + *
        • *

          - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filterCategories

          - * The optional category filter specified in the request. - *

          - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForSuggestionsSummary withFilterCategories( - java.util.Collection filterCategories) { - setFilterCategories(filterCategories); - return this; - } - - /** + * Esri + *

          + *
          • + *
        • *

          - * Contains the optional country filter specified in the request. + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        * * @return

        - * Contains the optional country filter specified in the request. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        */ - public java.util.List getFilterCountries() { - return filterCountries; + public String getDataSource() { + return dataSource; } /** *

        - * Contains the optional country filter specified in the request. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: *

        - * - * @param filterCountries

        - * Contains the optional country filter specified in the request. - *

        - */ - public void setFilterCountries(java.util.Collection filterCountries) { - if (filterCountries == null) { - this.filterCountries = null; - return; - } - - this.filterCountries = new java.util.ArrayList(filterCountries); - } - - /** + *
          + *
        • *

          - * Contains the optional country filter specified in the request. + * Esri *

          + *
          • + *
        • *

          - * Returns a reference to this object so that method calls can be chained - * together. + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. + *

        * - * @param filterCountries

        - * Contains the optional country filter specified in the request. + * @param dataSource

        + * The geospatial data provider attached to the place index + * resource specified in the request. Values can be one of the + * following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        - * @return A reference to this updated object so that method calls can be - * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withFilterCountries(String... filterCountries) { - if (getFilterCountries() == null) { - this.filterCountries = new java.util.ArrayList(filterCountries.length); - } - for (String value : filterCountries) { - this.filterCountries.add(value); - } - return this; + public void setDataSource(String dataSource) { + this.dataSource = dataSource; } /** *

        - * Contains the optional country filter specified in the request. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterCountries

        - * Contains the optional country filter specified in the request. + * @param dataSource

        + * The geospatial data provider attached to the place index + * resource specified in the request. Values can be one of the + * following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withFilterCountries( - java.util.Collection filterCountries) { - setFilterCountries(filterCountries); + public SearchPlaceIndexForSuggestionsSummary withDataSource(String dataSource) { + this.dataSource = dataSource; return this; } @@ -771,94 +789,76 @@ public SearchPlaceIndexForSuggestionsSummary withLanguage(String language) { /** *

        - * Contains the optional result count limit specified in the request. + * The optional category filter specified in the request. *

        * * @return

        - * Contains the optional result count limit specified in the - * request. + * The optional category filter specified in the request. *

        */ - public Integer getMaxResults() { - return maxResults; + public java.util.List getFilterCategories() { + return filterCategories; } /** *

        - * Contains the optional result count limit specified in the request. + * The optional category filter specified in the request. *

        * - * @param maxResults

        - * Contains the optional result count limit specified in the - * request. + * @param filterCategories

        + * The optional category filter specified in the request. *

        */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setFilterCategories(java.util.Collection filterCategories) { + if (filterCategories == null) { + this.filterCategories = null; + return; + } + + this.filterCategories = new java.util.ArrayList(filterCategories); } /** *

        - * Contains the optional result count limit specified in the request. + * The optional category filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param maxResults

        - * Contains the optional result count limit specified in the - * request. + * @param filterCategories

        + * The optional category filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public SearchPlaceIndexForSuggestionsSummary withFilterCategories(String... filterCategories) { + if (getFilterCategories() == null) { + this.filterCategories = new java.util.ArrayList(filterCategories.length); + } + for (String value : filterCategories) { + this.filterCategories.add(value); + } return this; } /** *

        - * The free-form partial text input specified in the request. - *

        - * - * @return

        - * The free-form partial text input specified in the request. - *

        - */ - public String getText() { - return text; - } - - /** - *

        - * The free-form partial text input specified in the request. - *

        - * - * @param text

        - * The free-form partial text input specified in the request. - *

        - */ - public void setText(String text) { - this.text = text; - } - - /** - *

        - * The free-form partial text input specified in the request. + * The optional category filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param text

        - * The free-form partial text input specified in the request. + * @param filterCategories

        + * The optional category filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForSuggestionsSummary withText(String text) { - this.text = text; + public SearchPlaceIndexForSuggestionsSummary withFilterCategories( + java.util.Collection filterCategories) { + setFilterCategories(filterCategories); return this; } @@ -873,22 +873,22 @@ public SearchPlaceIndexForSuggestionsSummary withText(String text) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getText() != null) + sb.append("Text: " + getText() + ","); if (getBiasPosition() != null) sb.append("BiasPosition: " + getBiasPosition() + ","); - if (getDataSource() != null) - sb.append("DataSource: " + getDataSource() + ","); if (getFilterBBox() != null) sb.append("FilterBBox: " + getFilterBBox() + ","); - if (getFilterCategories() != null) - sb.append("FilterCategories: " + getFilterCategories() + ","); if (getFilterCountries() != null) sb.append("FilterCountries: " + getFilterCountries() + ","); - if (getLanguage() != null) - sb.append("Language: " + getLanguage() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); - if (getText() != null) - sb.append("Text: " + getText()); + if (getDataSource() != null) + sb.append("DataSource: " + getDataSource() + ","); + if (getLanguage() != null) + sb.append("Language: " + getLanguage() + ","); + if (getFilterCategories() != null) + sb.append("FilterCategories: " + getFilterCategories()); sb.append("}"); return sb.toString(); } @@ -898,17 +898,17 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); hashCode = prime * hashCode + ((getBiasPosition() == null) ? 0 : getBiasPosition().hashCode()); - hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); hashCode = prime * hashCode + ((getFilterBBox() == null) ? 0 : getFilterBBox().hashCode()); - hashCode = prime * hashCode - + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); hashCode = prime * hashCode + ((getFilterCountries() == null) ? 0 : getFilterCountries().hashCode()); - hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); - hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); + hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); + hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); + hashCode = prime * hashCode + + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); return hashCode; } @@ -923,43 +923,43 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForSuggestionsSummary other = (SearchPlaceIndexForSuggestionsSummary) obj; + if (other.getText() == null ^ this.getText() == null) + return false; + if (other.getText() != null && other.getText().equals(this.getText()) == false) + return false; if (other.getBiasPosition() == null ^ this.getBiasPosition() == null) return false; if (other.getBiasPosition() != null && other.getBiasPosition().equals(this.getBiasPosition()) == false) return false; - if (other.getDataSource() == null ^ this.getDataSource() == null) - return false; - if (other.getDataSource() != null - && other.getDataSource().equals(this.getDataSource()) == false) - return false; if (other.getFilterBBox() == null ^ this.getFilterBBox() == null) return false; if (other.getFilterBBox() != null && other.getFilterBBox().equals(this.getFilterBBox()) == false) return false; - if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) - return false; - if (other.getFilterCategories() != null - && other.getFilterCategories().equals(this.getFilterCategories()) == false) - return false; if (other.getFilterCountries() == null ^ this.getFilterCountries() == null) return false; if (other.getFilterCountries() != null && other.getFilterCountries().equals(this.getFilterCountries()) == false) return false; - if (other.getLanguage() == null ^ this.getLanguage() == null) - return false; - if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) - return false; if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false) return false; - if (other.getText() == null ^ this.getText() == null) + if (other.getDataSource() == null ^ this.getDataSource() == null) return false; - if (other.getText() != null && other.getText().equals(this.getText()) == false) + if (other.getDataSource() != null + && other.getDataSource().equals(this.getDataSource()) == false) + return false; + if (other.getLanguage() == null ^ this.getLanguage() == null) + return false; + if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) + return false; + if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) + return false; + if (other.getFilterCategories() != null + && other.getFilterCategories().equals(this.getFilterCategories()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextRequest.java index c7c9553176..f975b520ac 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -41,6 +41,28 @@ *

        */ public class SearchPlaceIndexForTextRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

        + * The name of the place index resource you want to use for the search. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + */ + private String indexName; + + /** + *

        + * The address, name, city, or region to be used in the search in free-form + * text format. For example, 123 Any Street. + *

        + *

        + * Constraints:
        + * Length: 1 - 200
        + */ + private String text; + /** *

        * An optional parameter that indicates a preference for places that are @@ -93,22 +115,6 @@ public class SearchPlaceIndexForTextRequest extends AmazonWebServiceRequest impl */ private java.util.List filterBBox; - /** - *

        - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. - *

        - *

        - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

        - */ - private java.util.List filterCategories; - /** *

        * An optional parameter that limits the search results by returning only @@ -129,26 +135,17 @@ public class SearchPlaceIndexForTextRequest extends AmazonWebServiceRequest impl /** *

        - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. *

        *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - */ - private String indexName; - - /** - *

        - * The optional API key to authorize the request. + * The default: 50 *

        *

        * Constraints:
        - * Length: 0 - 1000
        + * Range: 1 - 50
        */ - private String key; + private Integer maxResults; /** *

        @@ -185,17 +182,91 @@ public class SearchPlaceIndexForTextRequest extends AmazonWebServiceRequest impl /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

        + */ + private java.util.List filterCategories; + + /** + *

        + * The optional API key to authorize the request. *

        *

        * Constraints:
        - * Range: 1 - 50
        + * Length: 0 - 1000
        */ - private Integer maxResults; + private String key; + + /** + *

        + * The name of the place index resource you want to use for the search. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name of the place index resource you want to use for the + * search. + *

        + */ + public String getIndexName() { + return indexName; + } + + /** + *

        + * The name of the place index resource you want to use for the search. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param indexName

        + * The name of the place index resource you want to use for the + * search. + *

        + */ + public void setIndexName(String indexName) { + this.indexName = indexName; + } + + /** + *

        + * The name of the place index resource you want to use for the search. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param indexName

        + * The name of the place index resource you want to use for the + * search. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForTextRequest withIndexName(String indexName) { + this.indexName = indexName; + return this; + } /** *

        @@ -205,8 +276,59 @@ public class SearchPlaceIndexForTextRequest extends AmazonWebServiceRequest impl *

        * Constraints:
        * Length: 1 - 200
        + * + * @return

        + * The address, name, city, or region to be used in the search in + * free-form text format. For example, 123 Any Street. + *

        */ - private String text; + public String getText() { + return text; + } + + /** + *

        + * The address, name, city, or region to be used in the search in free-form + * text format. For example, 123 Any Street. + *

        + *

        + * Constraints:
        + * Length: 1 - 200
        + * + * @param text

        + * The address, name, city, or region to be used in the search in + * free-form text format. For example, + * 123 Any Street. + *

        + */ + public void setText(String text) { + this.text = text; + } + + /** + *

        + * The address, name, city, or region to be used in the search in free-form + * text format. For example, 123 Any Street. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 200
        + * + * @param text

        + * The address, name, city, or region to be used in the search in + * free-form text format. For example, + * 123 Any Street. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForTextRequest withText(String text) { + this.text = text; + return this; + } /** *

        @@ -683,205 +805,54 @@ public SearchPlaceIndexForTextRequest withFilterBBox(java.util.Collection - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. + * An optional parameter that limits the search results by returning only + * places that are in a specified list of countries. *

        + *
          + *
        • *

          - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * Valid values include ISO 3166 + * 3-digit country codes. For example, Australia uses three upper-case + * characters: AUS. *

          + *
          • + *
        * * @return

        - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. + * An optional parameter that limits the search results by returning + * only places that are in a specified list of countries. *

        + *
          + *
        • *

          - * For more information about using categories, including a list of - * Amazon Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * Valid values include ISO + * 3166 3-digit country codes. For example, Australia uses three + * upper-case characters: AUS. *

          + *
          • + *
        */ - public java.util.List getFilterCategories() { - return filterCategories; + public java.util.List getFilterCountries() { + return filterCountries; } /** *

        - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. + * An optional parameter that limits the search results by returning only + * places that are in a specified list of countries. *

        + *
          + *
        • *

          - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. + * Valid values include ISO 3166 + * 3-digit country codes. For example, Australia uses three upper-case + * characters: AUS. *

          - * - * @param filterCategories

          - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. - *

          - *

          - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

          - */ - public void setFilterCategories(java.util.Collection filterCategories) { - if (filterCategories == null) { - this.filterCategories = null; - return; - } - - this.filterCategories = new java.util.ArrayList(filterCategories); - } - - /** - *

          - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. - *

          - *

          - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

          - *

          - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filterCategories

          - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. - *

          - *

          - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

          - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForTextRequest withFilterCategories(String... filterCategories) { - if (getFilterCategories() == null) { - this.filterCategories = new java.util.ArrayList(filterCategories.length); - } - for (String value : filterCategories) { - this.filterCategories.add(value); - } - return this; - } - - /** - *

          - * A list of one or more Amazon Location categories to filter the returned - * places. If you include more than one category, the results will include - * results that match any of the categories listed. - *

          - *

          - * For more information about using categories, including a list of Amazon - * Location categories, see Categories and filtering, in the Amazon Location Service - * Developer Guide. - *

          - *

          - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filterCategories

          - * A list of one or more Amazon Location categories to filter the - * returned places. If you include more than one category, the - * results will include results that match any of the - * categories listed. - *

          - *

          - * For more information about using categories, including a list - * of Amazon Location categories, see Categories and filtering, in the Amazon Location - * Service Developer Guide. - *

          - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForTextRequest withFilterCategories( - java.util.Collection filterCategories) { - setFilterCategories(filterCategories); - return this; - } - - /** - *

          - * An optional parameter that limits the search results by returning only - * places that are in a specified list of countries. - *

          - *
            - *
          • - *

            - * Valid values include ISO 3166 - * 3-digit country codes. For example, Australia uses three upper-case - * characters: AUS. - *

            - *
            • - *
          - * - * @return

          - * An optional parameter that limits the search results by returning - * only places that are in a specified list of countries. - *

          - *
            - *
          • - *

            - * Valid values include ISO - * 3166 3-digit country codes. For example, Australia uses three - * upper-case characters: AUS. - *

            - *
            • - *
          - */ - public java.util.List getFilterCountries() { - return filterCountries; - } - - /** - *

          - * An optional parameter that limits the search results by returning only - * places that are in a specified list of countries. - *

          - *
            - *
          • - *

            - * Valid values include ISO 3166 - * 3-digit country codes. For example, Australia uses three upper-case - * characters: AUS. - *

            - *
            • - *
          + *
          • + *
        * * @param filterCountries

        * An optional parameter that limits the search results by @@ -1000,160 +971,112 @@ public SearchPlaceIndexForTextRequest withFilterCountries( /** *

        - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. + *

        + *

        + * The default: 50 *

        *

        * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Range: 1 - 50
        * * @return

        - * The name of the place index resource you want to use for the - * search. + * An optional parameter. The maximum number of results returned per + * request. + *

        + *

        + * The default: 50 *

        */ - public String getIndexName() { - return indexName; + public Integer getMaxResults() { + return maxResults; } /** *

        - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. + *

        + *

        + * The default: 50 *

        *

        * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Range: 1 - 50
        * - * @param indexName

        - * The name of the place index resource you want to use for the - * search. + * @param maxResults

        + * An optional parameter. The maximum number of results returned + * per request. + *

        + *

        + * The default: 50 *

        */ - public void setIndexName(String indexName) { - this.indexName = indexName; + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

        - * The name of the place index resource you want to use for the search. + * An optional parameter. The maximum number of results returned per + * request. + *

        + *

        + * The default: 50 *

        *

        * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Range: 1 - 50
        * - * @param indexName

        - * The name of the place index resource you want to use for the - * search. + * @param maxResults

        + * An optional parameter. The maximum number of results returned + * per request. + *

        + *

        + * The default: 50 *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextRequest withIndexName(String indexName) { - this.indexName = indexName; + public SearchPlaceIndexForTextRequest withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } /** *

        - * The optional API key to authorize the request. + * The preferred language used to return results. The value must be a valid + * BCP 47 language tag, + * for example, en for English. *

        *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @return

        - * The optional API key to authorize the request. - *

        - */ - public String getKey() { - return key; - } - - /** + * This setting affects the languages used in the results, but not the + * results themselves. If no language is specified, or not supported for a + * particular result, the partner automatically chooses a language for the + * result. + *

        *

        - * The optional API key to authorize the request. + * For an example, we'll use the Greek language. You search for + * Athens, Greece, with the language parameter set + * to en. The result found will most likely be returned as + * Athens. + *

        + *

        + * If you set the language parameter to el, for + * Greek, then the result found will more likely be returned as + * Αθήνα. + *

        + *

        + * If the data provider does not have a value for Greek, the result will be + * in a language that the provider does support. *

        *

        * Constraints:
        - * Length: 0 - 1000
        - * - * @param key

        - * The optional API key to authorize the request. - *

        - */ - public void setKey(String key) { - this.key = key; - } - - /** - *

        - * The optional API key to authorize the request. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param key

        - * The optional API key to authorize the request. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForTextRequest withKey(String key) { - this.key = key; - return this; - } - - /** - *

        - * The preferred language used to return results. The value must be a valid - * BCP 47 language tag, - * for example, en for English. - *

        - *

        - * This setting affects the languages used in the results, but not the - * results themselves. If no language is specified, or not supported for a - * particular result, the partner automatically chooses a language for the - * result. - *

        - *

        - * For an example, we'll use the Greek language. You search for - * Athens, Greece, with the language parameter set - * to en. The result found will most likely be returned as - * Athens. - *

        - *

        - * If you set the language parameter to el, for - * Greek, then the result found will more likely be returned as - * Αθήνα. - *

        - *

        - * If the data provider does not have a value for Greek, the result will be - * in a language that the provider does support. - *

        - *

        - * Constraints:
        - * Length: 2 - 35
        + * Length: 2 - 35
        * * @return

        * The preferred language used to return results. The value must be @@ -1318,141 +1241,218 @@ public SearchPlaceIndexForTextRequest withLanguage(String language) { /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        - *

        - * Constraints:
        - * Range: 1 - 50
        * * @return

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list of + * Amazon Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        */ - public Integer getMaxResults() { - return maxResults; + public java.util.List getFilterCategories() { + return filterCategories; } /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        - *

        - * Constraints:
        - * Range: 1 - 50
        * - * @param maxResults

        - * An optional parameter. The maximum number of results returned - * per request. + * @param filterCategories

        + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

        */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setFilterCategories(java.util.Collection filterCategories) { + if (filterCategories == null) { + this.filterCategories = null; + return; + } + + this.filterCategories = new java.util.ArrayList(filterCategories); } /** *

        - * An optional parameter. The maximum number of results returned per - * request. + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. *

        *

        * Returns a reference to this object so that method calls can be chained * together. + * + * @param filterCategories

        + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. + *

        + *

        + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForTextRequest withFilterCategories(String... filterCategories) { + if (getFilterCategories() == null) { + this.filterCategories = new java.util.ArrayList(filterCategories.length); + } + for (String value : filterCategories) { + this.filterCategories.add(value); + } + return this; + } + + /** *

        - * Constraints:
        - * Range: 1 - 50
        + * A list of one or more Amazon Location categories to filter the returned + * places. If you include more than one category, the results will include + * results that match any of the categories listed. + *

        + *

        + * For more information about using categories, including a list of Amazon + * Location categories, see Categories and filtering, in the Amazon Location Service + * Developer Guide. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. * - * @param maxResults

        - * An optional parameter. The maximum number of results returned - * per request. + * @param filterCategories

        + * A list of one or more Amazon Location categories to filter the + * returned places. If you include more than one category, the + * results will include results that match any of the + * categories listed. *

        *

        - * The default: 50 + * For more information about using categories, including a list + * of Amazon Location categories, see Categories and filtering, in the Amazon Location + * Service Developer Guide. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextRequest withMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public SearchPlaceIndexForTextRequest withFilterCategories( + java.util.Collection filterCategories) { + setFilterCategories(filterCategories); return this; } /** *

        - * The address, name, city, or region to be used in the search in free-form - * text format. For example, 123 Any Street. + * The optional API key to authorize the request. *

        *

        * Constraints:
        - * Length: 1 - 200
        + * Length: 0 - 1000
        * * @return

        - * The address, name, city, or region to be used in the search in - * free-form text format. For example, 123 Any Street. + * The optional API key to authorize the request. *

        */ - public String getText() { - return text; + public String getKey() { + return key; } /** *

        - * The address, name, city, or region to be used in the search in free-form - * text format. For example, 123 Any Street. + * The optional API key to authorize the request. *

        *

        * Constraints:
        - * Length: 1 - 200
        + * Length: 0 - 1000
        * - * @param text

        - * The address, name, city, or region to be used in the search in - * free-form text format. For example, - * 123 Any Street. + * @param key

        + * The optional API key to authorize the request. *

        */ - public void setText(String text) { - this.text = text; + public void setKey(String key) { + this.key = key; } /** *

        - * The address, name, city, or region to be used in the search in free-form - * text format. For example, 123 Any Street. + * The optional API key to authorize the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Length: 1 - 200
        + * Length: 0 - 1000
        * - * @param text

        - * The address, name, city, or region to be used in the search in - * free-form text format. For example, - * 123 Any Street. + * @param key

        + * The optional API key to authorize the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextRequest withText(String text) { - this.text = text; + public SearchPlaceIndexForTextRequest withKey(String key) { + this.key = key; return this; } @@ -1467,24 +1467,24 @@ public SearchPlaceIndexForTextRequest withText(String text) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getIndexName() != null) + sb.append("IndexName: " + getIndexName() + ","); + if (getText() != null) + sb.append("Text: " + getText() + ","); if (getBiasPosition() != null) sb.append("BiasPosition: " + getBiasPosition() + ","); if (getFilterBBox() != null) sb.append("FilterBBox: " + getFilterBBox() + ","); - if (getFilterCategories() != null) - sb.append("FilterCategories: " + getFilterCategories() + ","); if (getFilterCountries() != null) sb.append("FilterCountries: " + getFilterCountries() + ","); - if (getIndexName() != null) - sb.append("IndexName: " + getIndexName() + ","); - if (getKey() != null) - sb.append("Key: " + getKey() + ","); - if (getLanguage() != null) - sb.append("Language: " + getLanguage() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); - if (getText() != null) - sb.append("Text: " + getText()); + if (getLanguage() != null) + sb.append("Language: " + getLanguage() + ","); + if (getFilterCategories() != null) + sb.append("FilterCategories: " + getFilterCategories() + ","); + if (getKey() != null) + sb.append("Key: " + getKey()); sb.append("}"); return sb.toString(); } @@ -1494,18 +1494,18 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); + hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); hashCode = prime * hashCode + ((getBiasPosition() == null) ? 0 : getBiasPosition().hashCode()); hashCode = prime * hashCode + ((getFilterBBox() == null) ? 0 : getFilterBBox().hashCode()); - hashCode = prime * hashCode - + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); hashCode = prime * hashCode + ((getFilterCountries() == null) ? 0 : getFilterCountries().hashCode()); - hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); - hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); - hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); + hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); + hashCode = prime * hashCode + + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); + hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode()); return hashCode; } @@ -1520,6 +1520,15 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForTextRequest other = (SearchPlaceIndexForTextRequest) obj; + if (other.getIndexName() == null ^ this.getIndexName() == null) + return false; + if (other.getIndexName() != null + && other.getIndexName().equals(this.getIndexName()) == false) + return false; + if (other.getText() == null ^ this.getText() == null) + return false; + if (other.getText() != null && other.getText().equals(this.getText()) == false) + return false; if (other.getBiasPosition() == null ^ this.getBiasPosition() == null) return false; if (other.getBiasPosition() != null @@ -1530,37 +1539,28 @@ public boolean equals(Object obj) { if (other.getFilterBBox() != null && other.getFilterBBox().equals(this.getFilterBBox()) == false) return false; - if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) - return false; - if (other.getFilterCategories() != null - && other.getFilterCategories().equals(this.getFilterCategories()) == false) - return false; if (other.getFilterCountries() == null ^ this.getFilterCountries() == null) return false; if (other.getFilterCountries() != null && other.getFilterCountries().equals(this.getFilterCountries()) == false) return false; - if (other.getIndexName() == null ^ this.getIndexName() == null) - return false; - if (other.getIndexName() != null - && other.getIndexName().equals(this.getIndexName()) == false) - return false; - if (other.getKey() == null ^ this.getKey() == null) + if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; - if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) + if (other.getMaxResults() != null + && other.getMaxResults().equals(this.getMaxResults()) == false) return false; if (other.getLanguage() == null ^ this.getLanguage() == null) return false; if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) return false; - if (other.getMaxResults() == null ^ this.getMaxResults() == null) + if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) return false; - if (other.getMaxResults() != null - && other.getMaxResults().equals(this.getMaxResults()) == false) + if (other.getFilterCategories() != null + && other.getFilterCategories().equals(this.getFilterCategories()) == false) return false; - if (other.getText() == null ^ this.getText() == null) + if (other.getKey() == null ^ this.getKey() == null) return false; - if (other.getText() != null && other.getText().equals(this.getText()) == false) + if (other.getKey() != null && other.getKey().equals(this.getKey()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextResult.java index 281d63a39e..4333b78797 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,18 @@ import java.io.Serializable; public class SearchPlaceIndexForTextResult implements Serializable { + /** + *

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index and the bounding box, + * ResultBBox, which surrounds the search results. + *

        + */ + private SearchPlaceIndexForTextSummary summary; + /** *

        * A list of Places matching the input text. Each result contains additional @@ -39,8 +51,73 @@ public class SearchPlaceIndexForTextResult implements Serializable { * DataSource of the place index and the bounding box, * ResultBBox, which surrounds the search results. *

        + * + * @return

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index and the bounding box, + * ResultBBox, which surrounds the search results. + *

        */ - private SearchPlaceIndexForTextSummary summary; + public SearchPlaceIndexForTextSummary getSummary() { + return summary; + } + + /** + *

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index and the bounding box, + * ResultBBox, which surrounds the search results. + *

        + * + * @param summary

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes + * the DataSource of the place index and the + * bounding box, ResultBBox, which surrounds the + * search results. + *

        + */ + public void setSummary(SearchPlaceIndexForTextSummary summary) { + this.summary = summary; + } + + /** + *

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes the + * DataSource of the place index and the bounding box, + * ResultBBox, which surrounds the search results. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param summary

        + * Contains a summary of the request. Echoes the input values for + * BiasPosition, FilterBBox, + * FilterCountries, Language, + * MaxResults, and Text. Also includes + * the DataSource of the place index and the + * bounding box, ResultBBox, which surrounds the + * search results. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public SearchPlaceIndexForTextResult withSummary(SearchPlaceIndexForTextSummary summary) { + this.summary = summary; + return this; + } /** *

        @@ -160,83 +237,6 @@ public SearchPlaceIndexForTextResult withResults( return this; } - /** - *

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index and the bounding box, - * ResultBBox, which surrounds the search results. - *

        - * - * @return

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index and the bounding box, - * ResultBBox, which surrounds the search results. - *

        - */ - public SearchPlaceIndexForTextSummary getSummary() { - return summary; - } - - /** - *

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index and the bounding box, - * ResultBBox, which surrounds the search results. - *

        - * - * @param summary

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes - * the DataSource of the place index and the - * bounding box, ResultBBox, which surrounds the - * search results. - *

        - */ - public void setSummary(SearchPlaceIndexForTextSummary summary) { - this.summary = summary; - } - - /** - *

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes the - * DataSource of the place index and the bounding box, - * ResultBBox, which surrounds the search results. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param summary

        - * Contains a summary of the request. Echoes the input values for - * BiasPosition, FilterBBox, - * FilterCountries, Language, - * MaxResults, and Text. Also includes - * the DataSource of the place index and the - * bounding box, ResultBBox, which surrounds the - * search results. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForTextResult withSummary(SearchPlaceIndexForTextSummary summary) { - this.summary = summary; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -248,10 +248,10 @@ public SearchPlaceIndexForTextResult withSummary(SearchPlaceIndexForTextSummary public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getResults() != null) - sb.append("Results: " + getResults() + ","); if (getSummary() != null) - sb.append("Summary: " + getSummary()); + sb.append("Summary: " + getSummary() + ","); + if (getResults() != null) + sb.append("Results: " + getResults()); sb.append("}"); return sb.toString(); } @@ -261,8 +261,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getResults() == null) ? 0 : getResults().hashCode()); hashCode = prime * hashCode + ((getSummary() == null) ? 0 : getSummary().hashCode()); + hashCode = prime * hashCode + ((getResults() == null) ? 0 : getResults().hashCode()); return hashCode; } @@ -277,14 +277,14 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForTextResult other = (SearchPlaceIndexForTextResult) obj; - if (other.getResults() == null ^ this.getResults() == null) - return false; - if (other.getResults() != null && other.getResults().equals(this.getResults()) == false) - return false; if (other.getSummary() == null ^ this.getSummary() == null) return false; if (other.getSummary() != null && other.getSummary().equals(this.getSummary()) == false) return false; + if (other.getResults() == null ^ this.getResults() == null) + return false; + if (other.getResults() != null && other.getResults().equals(this.getResults()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextSummary.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextSummary.java index 0a3e0f6f4a..478a6bc1e4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextSummary.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SearchPlaceIndexForTextSummary.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -23,6 +23,13 @@ *

        */ public class SearchPlaceIndexForTextSummary implements Serializable { + /** + *

        + * The search text specified in the request. + *

        + */ + private String text; + /** *

        * Contains the coordinates for the optional bias position specified in the @@ -40,6 +47,45 @@ public class SearchPlaceIndexForTextSummary implements Serializable { */ private java.util.List biasPosition; + /** + *

        + * Contains the coordinates for the optional bounding box specified in the + * request. + *

        + */ + private java.util.List filterBBox; + + /** + *

        + * Contains the optional country filter specified in the request. + *

        + */ + private java.util.List filterCountries; + + /** + *

        + * Contains the optional result count limit specified in the request. + *

        + *

        + * Constraints:
        + * Range: 1 - 50
        + */ + private Integer maxResults; + + /** + *

        + * The bounding box that fully contains all search results. + *

        + * + *

        + * If you specified the optional FilterBBox parameter in the + * request, ResultBBox is contained within + * FilterBBox. + *

        + *         + */ + private java.util.List resultBBox; + /** *

        * The geospatial data provider attached to the place index resource @@ -70,28 +116,6 @@ public class SearchPlaceIndexForTextSummary implements Serializable { */ private String dataSource; - /** - *

        - * Contains the coordinates for the optional bounding box specified in the - * request. - *

        - */ - private java.util.List filterBBox; - - /** - *

        - * The optional category filter specified in the request. - *

        - */ - private java.util.List filterCategories; - - /** - *

        - * Contains the optional country filter specified in the request. - *

        - */ - private java.util.List filterCountries; - /** *

        * The preferred language used to return results. Matches the language in @@ -107,34 +131,55 @@ public class SearchPlaceIndexForTextSummary implements Serializable { /** *

        - * Contains the optional result count limit specified in the request. + * The optional category filter specified in the request. *

        - *

        - * Constraints:
        - * Range: 1 - 50
        */ - private Integer maxResults; + private java.util.List filterCategories; /** *

        - * The bounding box that fully contains all search results. + * The search text specified in the request. *

        - * + * + * @return

        + * The search text specified in the request. + *

        + */ + public String getText() { + return text; + } + + /** *

        - * If you specified the optional FilterBBox parameter in the - * request, ResultBBox is contained within - * FilterBBox. + * The search text specified in the request. *

        - *         + * + * @param text

        + * The search text specified in the request. + *

        */ - private java.util.List resultBBox; + public void setText(String text) { + this.text = text; + } /** *

        * The search text specified in the request. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param text

        + * The search text specified in the request. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private String text; + public SearchPlaceIndexForTextSummary withText(String text) { + this.text = text; + return this; + } /** *

        @@ -296,722 +341,677 @@ public SearchPlaceIndexForTextSummary withBiasPosition(java.util.Collection - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified in the + * request. *

        * * @return

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified + * in the request. *

        */ - public String getDataSource() { - return dataSource; + public java.util.List getFilterBBox() { + return filterBBox; } /** *

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab + * Contains the coordinates for the optional bounding box specified in the + * request. *

          - *
          • - *
        • + * + * @param filterBBox

          + * Contains the coordinates for the optional bounding box + * specified in the request. + *

          + */ + public void setFilterBBox(java.util.Collection filterBBox) { + if (filterBBox == null) { + this.filterBBox = null; + return; + } + + this.filterBBox = new java.util.ArrayList(filterBBox); + } + + /** *

          - * Here + * Contains the coordinates for the optional bounding box specified in the + * request. *

          - *
          • - *
        *

        - * For more information about data providers, see Amazon Location Service data providers. - *

        + * Returns a reference to this object so that method calls can be chained + * together. * - * @param dataSource

        - * The geospatial data provider attached to the place index - * resource specified in the request. Values can be one of the - * following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * @param filterBBox

        + * Contains the coordinates for the optional bounding box + * specified in the request. *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - public void setDataSource(String dataSource) { - this.dataSource = dataSource; + public SearchPlaceIndexForTextSummary withFilterBBox(Double... filterBBox) { + if (getFilterBBox() == null) { + this.filterBBox = new java.util.ArrayList(filterBBox.length); + } + for (Double value : filterBBox) { + this.filterBBox.add(value); + } + return this; } /** *

        - * The geospatial data provider attached to the place index resource - * specified in the request. Values can be one of the following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * Contains the coordinates for the optional bounding box specified in the + * request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param dataSource

        - * The geospatial data provider attached to the place index - * resource specified in the request. Values can be one of the - * following: - *

        - *
          - *
        • - *

          - * Esri - *

          - *
          • - *
        • - *

          - * Grab - *

          - *
          • - *
        • - *

          - * Here - *

          - *
          • - *
        - *

        - * For more information about data providers, see Amazon Location Service data providers. + * @param filterBBox

        + * Contains the coordinates for the optional bounding box + * specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withDataSource(String dataSource) { - this.dataSource = dataSource; + public SearchPlaceIndexForTextSummary withFilterBBox(java.util.Collection filterBBox) { + setFilterBBox(filterBBox); return this; } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        * * @return

        - * Contains the coordinates for the optional bounding box specified - * in the request. + * Contains the optional country filter specified in the request. *

        */ - public java.util.List getFilterBBox() { - return filterBBox; + public java.util.List getFilterCountries() { + return filterCountries; } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        * - * @param filterBBox

        - * Contains the coordinates for the optional bounding box - * specified in the request. + * @param filterCountries

        + * Contains the optional country filter specified in the request. *

        */ - public void setFilterBBox(java.util.Collection filterBBox) { - if (filterBBox == null) { - this.filterBBox = null; + public void setFilterCountries(java.util.Collection filterCountries) { + if (filterCountries == null) { + this.filterCountries = null; return; } - this.filterBBox = new java.util.ArrayList(filterBBox); + this.filterCountries = new java.util.ArrayList(filterCountries); } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterBBox

        - * Contains the coordinates for the optional bounding box - * specified in the request. + * @param filterCountries

        + * Contains the optional country filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withFilterBBox(Double... filterBBox) { - if (getFilterBBox() == null) { - this.filterBBox = new java.util.ArrayList(filterBBox.length); + public SearchPlaceIndexForTextSummary withFilterCountries(String... filterCountries) { + if (getFilterCountries() == null) { + this.filterCountries = new java.util.ArrayList(filterCountries.length); } - for (Double value : filterBBox) { - this.filterBBox.add(value); + for (String value : filterCountries) { + this.filterCountries.add(value); } return this; } /** *

        - * Contains the coordinates for the optional bounding box specified in the - * request. + * Contains the optional country filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterBBox

        - * Contains the coordinates for the optional bounding box - * specified in the request. + * @param filterCountries

        + * Contains the optional country filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withFilterBBox(java.util.Collection filterBBox) { - setFilterBBox(filterBBox); + public SearchPlaceIndexForTextSummary withFilterCountries( + java.util.Collection filterCountries) { + setFilterCountries(filterCountries); return this; } /** *

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the request. *

        + *

        + * Constraints:
        + * Range: 1 - 50
        * * @return

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the + * request. *

        */ - public java.util.List getFilterCategories() { - return filterCategories; + public Integer getMaxResults() { + return maxResults; } /** *

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the request. *

        + *

        + * Constraints:
        + * Range: 1 - 50
        * - * @param filterCategories

        - * The optional category filter specified in the request. + * @param maxResults

        + * Contains the optional result count limit specified in the + * request. *

        */ - public void setFilterCategories(java.util.Collection filterCategories) { - if (filterCategories == null) { - this.filterCategories = null; - return; - } - - this.filterCategories = new java.util.ArrayList(filterCategories); + public void setMaxResults(Integer maxResults) { + this.maxResults = maxResults; } /** *

        - * The optional category filter specified in the request. + * Contains the optional result count limit specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. + *

        + * Constraints:
        + * Range: 1 - 50
        * - * @param filterCategories

        - * The optional category filter specified in the request. + * @param maxResults

        + * Contains the optional result count limit specified in the + * request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withFilterCategories(String... filterCategories) { - if (getFilterCategories() == null) { - this.filterCategories = new java.util.ArrayList(filterCategories.length); - } - for (String value : filterCategories) { - this.filterCategories.add(value); - } + public SearchPlaceIndexForTextSummary withMaxResults(Integer maxResults) { + this.maxResults = maxResults; return this; } /** *

        - * The optional category filter specified in the request. + * The bounding box that fully contains all search results. *

        + * *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param filterCategories

        - * The optional category filter specified in the request. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForTextSummary withFilterCategories( - java.util.Collection filterCategories) { - setFilterCategories(filterCategories); - return this; - } - - /** - *

        - * Contains the optional country filter specified in the request. + * If you specified the optional FilterBBox parameter in the + * request, ResultBBox is contained within + * FilterBBox. *

        + *         * * @return

        - * Contains the optional country filter specified in the request. + * The bounding box that fully contains all search results. + *

        + * + *

        + * If you specified the optional FilterBBox parameter + * in the request, ResultBBox is contained within + * FilterBBox. *

        + *         */ - public java.util.List getFilterCountries() { - return filterCountries; + public java.util.List getResultBBox() { + return resultBBox; } /** *

        - * Contains the optional country filter specified in the request. + * The bounding box that fully contains all search results. + *

        + * + *

        + * If you specified the optional FilterBBox parameter in the + * request, ResultBBox is contained within + * FilterBBox. *

        + *         * - * @param filterCountries

        - * Contains the optional country filter specified in the request. + * @param resultBBox

        + * The bounding box that fully contains all search results. *

        + * + *

        + * If you specified the optional FilterBBox + * parameter in the request, ResultBBox is contained + * within FilterBBox. + *

        + *         */ - public void setFilterCountries(java.util.Collection filterCountries) { - if (filterCountries == null) { - this.filterCountries = null; + public void setResultBBox(java.util.Collection resultBBox) { + if (resultBBox == null) { + this.resultBBox = null; return; } - this.filterCountries = new java.util.ArrayList(filterCountries); + this.resultBBox = new java.util.ArrayList(resultBBox); } /** *

        - * Contains the optional country filter specified in the request. + * The bounding box that fully contains all search results. *

        + * + *

        + * If you specified the optional FilterBBox parameter in the + * request, ResultBBox is contained within + * FilterBBox. + *

        + *         *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterCountries

        - * Contains the optional country filter specified in the request. + * @param resultBBox

        + * The bounding box that fully contains all search results. *

        + * + *

        + * If you specified the optional FilterBBox + * parameter in the request, ResultBBox is contained + * within FilterBBox. + *

        + *         * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withFilterCountries(String... filterCountries) { - if (getFilterCountries() == null) { - this.filterCountries = new java.util.ArrayList(filterCountries.length); + public SearchPlaceIndexForTextSummary withResultBBox(Double... resultBBox) { + if (getResultBBox() == null) { + this.resultBBox = new java.util.ArrayList(resultBBox.length); } - for (String value : filterCountries) { - this.filterCountries.add(value); + for (Double value : resultBBox) { + this.resultBBox.add(value); } return this; } /** *

        - * Contains the optional country filter specified in the request. + * The bounding box that fully contains all search results. *

        + * + *

        + * If you specified the optional FilterBBox parameter in the + * request, ResultBBox is contained within + * FilterBBox. + *

        + *         *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param filterCountries

        - * Contains the optional country filter specified in the request. + * @param resultBBox

        + * The bounding box that fully contains all search results. *

        + * + *

        + * If you specified the optional FilterBBox + * parameter in the request, ResultBBox is contained + * within FilterBBox. + *

        + *         * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withFilterCountries( - java.util.Collection filterCountries) { - setFilterCountries(filterCountries); + public SearchPlaceIndexForTextSummary withResultBBox(java.util.Collection resultBBox) { + setResultBBox(resultBBox); return this; } /** *

        - * The preferred language used to return results. Matches the language in - * the request. The value is a valid BCP 47 language tag, for - * example, en for English. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: *

        + *
          + *
        • *

          - * Constraints:
          - * Length: 2 - 35
          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. + *

        * * @return

        - * The preferred language used to return results. Matches the - * language in the request. The value is a valid BCP 47 language - * tag, for example, en for English. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        */ - public String getLanguage() { - return language; + public String getDataSource() { + return dataSource; } /** *

        - * The preferred language used to return results. Matches the language in - * the request. The value is a valid BCP 47 language tag, for - * example, en for English. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: *

        + *
          + *
        • *

          - * Constraints:
          - * Length: 2 - 35
          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. + *

        * - * @param language

        - * The preferred language used to return results. Matches the - * language in the request. The value is a valid BCP 47 language - * tag, for example, en for English. + * @param dataSource

        + * The geospatial data provider attached to the place index + * resource specified in the request. Values can be one of the + * following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        */ - public void setLanguage(String language) { - this.language = language; + public void setDataSource(String dataSource) { + this.dataSource = dataSource; } /** *

        - * The preferred language used to return results. Matches the language in - * the request. The value is a valid BCP 47 language tag, for - * example, en for English. + * The geospatial data provider attached to the place index resource + * specified in the request. Values can be one of the following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        *

        * Returns a reference to this object so that method calls can be chained * together. - *

        - * Constraints:
        - * Length: 2 - 35
        * - * @param language

        - * The preferred language used to return results. Matches the - * language in the request. The value is a valid BCP 47 language - * tag, for example, en for English. + * @param dataSource

        + * The geospatial data provider attached to the place index + * resource specified in the request. Values can be one of the + * following: + *

        + *
          + *
        • + *

          + * Esri + *

          + *
          • + *
        • + *

          + * Grab + *

          + *
          • + *
        • + *

          + * Here + *

          + *
          • + *
        + *

        + * For more information about data providers, see Amazon Location Service data providers. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withLanguage(String language) { - this.language = language; + public SearchPlaceIndexForTextSummary withDataSource(String dataSource) { + this.dataSource = dataSource; return this; } /** *

        - * Contains the optional result count limit specified in the request. + * The preferred language used to return results. Matches the language in + * the request. The value is a valid BCP 47 language tag, for + * example, en for English. *

        *

        * Constraints:
        - * Range: 1 - 50
        + * Length: 2 - 35
        * * @return

        - * Contains the optional result count limit specified in the - * request. + * The preferred language used to return results. Matches the + * language in the request. The value is a valid BCP 47 language + * tag, for example, en for English. *

        */ - public Integer getMaxResults() { - return maxResults; + public String getLanguage() { + return language; } /** *

        - * Contains the optional result count limit specified in the request. + * The preferred language used to return results. Matches the language in + * the request. The value is a valid BCP 47 language tag, for + * example, en for English. *

        *

        * Constraints:
        - * Range: 1 - 50
        + * Length: 2 - 35
        * - * @param maxResults

        - * Contains the optional result count limit specified in the - * request. + * @param language

        + * The preferred language used to return results. Matches the + * language in the request. The value is a valid BCP 47 language + * tag, for example, en for English. *

        */ - public void setMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public void setLanguage(String language) { + this.language = language; } /** *

        - * Contains the optional result count limit specified in the request. + * The preferred language used to return results. Matches the language in + * the request. The value is a valid BCP 47 language tag, for + * example, en for English. *

        *

        * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Range: 1 - 50
        + * Length: 2 - 35
        * - * @param maxResults

        - * Contains the optional result count limit specified in the - * request. + * @param language

        + * The preferred language used to return results. Matches the + * language in the request. The value is a valid BCP 47 language + * tag, for example, en for English. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withMaxResults(Integer maxResults) { - this.maxResults = maxResults; + public SearchPlaceIndexForTextSummary withLanguage(String language) { + this.language = language; return this; } /** *

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox parameter in the - * request, ResultBBox is contained within - * FilterBBox. + * The optional category filter specified in the request. *

        - *         * * @return

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox parameter - * in the request, ResultBBox is contained within - * FilterBBox. + * The optional category filter specified in the request. *

        - *         */ - public java.util.List getResultBBox() { - return resultBBox; + public java.util.List getFilterCategories() { + return filterCategories; } /** *

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox parameter in the - * request, ResultBBox is contained within - * FilterBBox. + * The optional category filter specified in the request. *

        - *         * - * @param resultBBox

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox - * parameter in the request, ResultBBox is contained - * within FilterBBox. + * @param filterCategories

        + * The optional category filter specified in the request. *

        - *         */ - public void setResultBBox(java.util.Collection resultBBox) { - if (resultBBox == null) { - this.resultBBox = null; + public void setFilterCategories(java.util.Collection filterCategories) { + if (filterCategories == null) { + this.filterCategories = null; return; } - this.resultBBox = new java.util.ArrayList(resultBBox); + this.filterCategories = new java.util.ArrayList(filterCategories); } /** *

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox parameter in the - * request, ResultBBox is contained within - * FilterBBox. + * The optional category filter specified in the request. *

        - *         *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param resultBBox

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox - * parameter in the request, ResultBBox is contained - * within FilterBBox. + * @param filterCategories

        + * The optional category filter specified in the request. *

        - *         * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withResultBBox(Double... resultBBox) { - if (getResultBBox() == null) { - this.resultBBox = new java.util.ArrayList(resultBBox.length); + public SearchPlaceIndexForTextSummary withFilterCategories(String... filterCategories) { + if (getFilterCategories() == null) { + this.filterCategories = new java.util.ArrayList(filterCategories.length); } - for (Double value : resultBBox) { - this.resultBBox.add(value); + for (String value : filterCategories) { + this.filterCategories.add(value); } return this; } /** *

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox parameter in the - * request, ResultBBox is contained within - * FilterBBox. - *

        - *         - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param resultBBox

        - * The bounding box that fully contains all search results. - *

        - * - *

        - * If you specified the optional FilterBBox - * parameter in the request, ResultBBox is contained - * within FilterBBox. - *

        - *         - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public SearchPlaceIndexForTextSummary withResultBBox(java.util.Collection resultBBox) { - setResultBBox(resultBBox); - return this; - } - - /** - *

        - * The search text specified in the request. - *

        - * - * @return

        - * The search text specified in the request. - *

        - */ - public String getText() { - return text; - } - - /** - *

        - * The search text specified in the request. - *

        - * - * @param text

        - * The search text specified in the request. - *

        - */ - public void setText(String text) { - this.text = text; - } - - /** - *

        - * The search text specified in the request. + * The optional category filter specified in the request. *

        *

        * Returns a reference to this object so that method calls can be chained * together. * - * @param text

        - * The search text specified in the request. + * @param filterCategories

        + * The optional category filter specified in the request. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public SearchPlaceIndexForTextSummary withText(String text) { - this.text = text; + public SearchPlaceIndexForTextSummary withFilterCategories( + java.util.Collection filterCategories) { + setFilterCategories(filterCategories); return this; } @@ -1026,24 +1026,24 @@ public SearchPlaceIndexForTextSummary withText(String text) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getText() != null) + sb.append("Text: " + getText() + ","); if (getBiasPosition() != null) sb.append("BiasPosition: " + getBiasPosition() + ","); - if (getDataSource() != null) - sb.append("DataSource: " + getDataSource() + ","); if (getFilterBBox() != null) sb.append("FilterBBox: " + getFilterBBox() + ","); - if (getFilterCategories() != null) - sb.append("FilterCategories: " + getFilterCategories() + ","); if (getFilterCountries() != null) sb.append("FilterCountries: " + getFilterCountries() + ","); - if (getLanguage() != null) - sb.append("Language: " + getLanguage() + ","); if (getMaxResults() != null) sb.append("MaxResults: " + getMaxResults() + ","); if (getResultBBox() != null) sb.append("ResultBBox: " + getResultBBox() + ","); - if (getText() != null) - sb.append("Text: " + getText()); + if (getDataSource() != null) + sb.append("DataSource: " + getDataSource() + ","); + if (getLanguage() != null) + sb.append("Language: " + getLanguage() + ","); + if (getFilterCategories() != null) + sb.append("FilterCategories: " + getFilterCategories()); sb.append("}"); return sb.toString(); } @@ -1053,18 +1053,18 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); hashCode = prime * hashCode + ((getBiasPosition() == null) ? 0 : getBiasPosition().hashCode()); - hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); hashCode = prime * hashCode + ((getFilterBBox() == null) ? 0 : getFilterBBox().hashCode()); - hashCode = prime * hashCode - + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); hashCode = prime * hashCode + ((getFilterCountries() == null) ? 0 : getFilterCountries().hashCode()); - hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode()); hashCode = prime * hashCode + ((getResultBBox() == null) ? 0 : getResultBBox().hashCode()); - hashCode = prime * hashCode + ((getText() == null) ? 0 : getText().hashCode()); + hashCode = prime * hashCode + ((getDataSource() == null) ? 0 : getDataSource().hashCode()); + hashCode = prime * hashCode + ((getLanguage() == null) ? 0 : getLanguage().hashCode()); + hashCode = prime * hashCode + + ((getFilterCategories() == null) ? 0 : getFilterCategories().hashCode()); return hashCode; } @@ -1079,35 +1079,25 @@ public boolean equals(Object obj) { return false; SearchPlaceIndexForTextSummary other = (SearchPlaceIndexForTextSummary) obj; + if (other.getText() == null ^ this.getText() == null) + return false; + if (other.getText() != null && other.getText().equals(this.getText()) == false) + return false; if (other.getBiasPosition() == null ^ this.getBiasPosition() == null) return false; if (other.getBiasPosition() != null && other.getBiasPosition().equals(this.getBiasPosition()) == false) return false; - if (other.getDataSource() == null ^ this.getDataSource() == null) - return false; - if (other.getDataSource() != null - && other.getDataSource().equals(this.getDataSource()) == false) - return false; if (other.getFilterBBox() == null ^ this.getFilterBBox() == null) return false; if (other.getFilterBBox() != null && other.getFilterBBox().equals(this.getFilterBBox()) == false) return false; - if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) - return false; - if (other.getFilterCategories() != null - && other.getFilterCategories().equals(this.getFilterCategories()) == false) - return false; if (other.getFilterCountries() == null ^ this.getFilterCountries() == null) return false; if (other.getFilterCountries() != null && other.getFilterCountries().equals(this.getFilterCountries()) == false) return false; - if (other.getLanguage() == null ^ this.getLanguage() == null) - return false; - if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) - return false; if (other.getMaxResults() == null ^ this.getMaxResults() == null) return false; if (other.getMaxResults() != null @@ -1118,9 +1108,19 @@ public boolean equals(Object obj) { if (other.getResultBBox() != null && other.getResultBBox().equals(this.getResultBBox()) == false) return false; - if (other.getText() == null ^ this.getText() == null) + if (other.getDataSource() == null ^ this.getDataSource() == null) return false; - if (other.getText() != null && other.getText().equals(this.getText()) == false) + if (other.getDataSource() != null + && other.getDataSource().equals(this.getDataSource()) == false) + return false; + if (other.getLanguage() == null ^ this.getLanguage() == null) + return false; + if (other.getLanguage() != null && other.getLanguage().equals(this.getLanguage()) == false) + return false; + if (other.getFilterCategories() == null ^ this.getFilterCategories() == null) + return false; + if (other.getFilterCategories() != null + && other.getFilterCategories().equals(this.getFilterCategories()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ServiceQuotaExceededException.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ServiceQuotaExceededException.java index 1077700b38..1b8b85bb44 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ServiceQuotaExceededException.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ServiceQuotaExceededException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SpeedUnit.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SpeedUnit.java new file mode 100644 index 0000000000..38d371997e --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/SpeedUnit.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.util.HashMap; +import java.util.Map; + +/** + * Speed Unit + */ +public enum SpeedUnit { + + KilometersPerHour("KilometersPerHour"), + MilesPerHour("MilesPerHour"); + + private String value; + + private SpeedUnit(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + + private static final Map enumMap; + static { + enumMap = new HashMap(); + enumMap.put("KilometersPerHour", KilometersPerHour); + enumMap.put("MilesPerHour", MilesPerHour); + } + + /** + * Use this in place of valueOf. + * + * @param value real value + * @return SpeedUnit corresponding to the value + */ + public static SpeedUnit fromValue(String value) { + if (value == null || value.isEmpty()) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } else if (enumMap.containsKey(value)) { + return enumMap.get(value); + } else { + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Status.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Status.java index f3339e8463..db61cbaab8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Status.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Status.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Step.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Step.java index 203bc0cfec..8d5b516c97 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Step.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Step.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -24,6 +24,22 @@ *

        */ public class Step implements Serializable { + /** + *

        + * The starting position of a step. If the position is the first step in the + * leg, this position is the same as the start position of the leg. + *

        + */ + private java.util.List startPosition; + + /** + *

        + * The end position of a step. If the position the last step in the leg, + * this position is the same as the end position of the leg. + *

        + */ + private java.util.List endPosition; + /** *

        * The travel distance between the step's StartPosition and @@ -48,14 +64,6 @@ public class Step implements Serializable { */ private Double durationSeconds; - /** - *

        - * The end position of a step. If the position the last step in the leg, - * this position is the same as the end position of the leg. - *

        - */ - private java.util.List endPosition; - /** *

        * Represents the start position, or index, in a sequence of steps within @@ -77,8 +85,171 @@ public class Step implements Serializable { * The starting position of a step. If the position is the first step in the * leg, this position is the same as the start position of the leg. *

        + * + * @return

        + * The starting position of a step. If the position is the first + * step in the leg, this position is the same as the start position + * of the leg. + *

        */ - private java.util.List startPosition; + public java.util.List getStartPosition() { + return startPosition; + } + + /** + *

        + * The starting position of a step. If the position is the first step in the + * leg, this position is the same as the start position of the leg. + *

        + * + * @param startPosition

        + * The starting position of a step. If the position is the first + * step in the leg, this position is the same as the start + * position of the leg. + *

        + */ + public void setStartPosition(java.util.Collection startPosition) { + if (startPosition == null) { + this.startPosition = null; + return; + } + + this.startPosition = new java.util.ArrayList(startPosition); + } + + /** + *

        + * The starting position of a step. If the position is the first step in the + * leg, this position is the same as the start position of the leg. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param startPosition

        + * The starting position of a step. If the position is the first + * step in the leg, this position is the same as the start + * position of the leg. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Step withStartPosition(Double... startPosition) { + if (getStartPosition() == null) { + this.startPosition = new java.util.ArrayList(startPosition.length); + } + for (Double value : startPosition) { + this.startPosition.add(value); + } + return this; + } + + /** + *

        + * The starting position of a step. If the position is the first step in the + * leg, this position is the same as the start position of the leg. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param startPosition

        + * The starting position of a step. If the position is the first + * step in the leg, this position is the same as the start + * position of the leg. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Step withStartPosition(java.util.Collection startPosition) { + setStartPosition(startPosition); + return this; + } + + /** + *

        + * The end position of a step. If the position the last step in the leg, + * this position is the same as the end position of the leg. + *

        + * + * @return

        + * The end position of a step. If the position the last step in the + * leg, this position is the same as the end position of the leg. + *

        + */ + public java.util.List getEndPosition() { + return endPosition; + } + + /** + *

        + * The end position of a step. If the position the last step in the leg, + * this position is the same as the end position of the leg. + *

        + * + * @param endPosition

        + * The end position of a step. If the position the last step in + * the leg, this position is the same as the end position of the + * leg. + *

        + */ + public void setEndPosition(java.util.Collection endPosition) { + if (endPosition == null) { + this.endPosition = null; + return; + } + + this.endPosition = new java.util.ArrayList(endPosition); + } + + /** + *

        + * The end position of a step. If the position the last step in the leg, + * this position is the same as the end position of the leg. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param endPosition

        + * The end position of a step. If the position the last step in + * the leg, this position is the same as the end position of the + * leg. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Step withEndPosition(Double... endPosition) { + if (getEndPosition() == null) { + this.endPosition = new java.util.ArrayList(endPosition.length); + } + for (Double value : endPosition) { + this.endPosition.add(value); + } + return this; + } + + /** + *

        + * The end position of a step. If the position the last step in the leg, + * this position is the same as the end position of the leg. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param endPosition

        + * The end position of a step. If the position the last step in + * the leg, this position is the same as the end position of the + * leg. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Step withEndPosition(java.util.Collection endPosition) { + setEndPosition(endPosition); + return this; + } /** *

        @@ -212,91 +383,6 @@ public Step withDurationSeconds(Double durationSeconds) { return this; } - /** - *

        - * The end position of a step. If the position the last step in the leg, - * this position is the same as the end position of the leg. - *

        - * - * @return

        - * The end position of a step. If the position the last step in the - * leg, this position is the same as the end position of the leg. - *

        - */ - public java.util.List getEndPosition() { - return endPosition; - } - - /** - *

        - * The end position of a step. If the position the last step in the leg, - * this position is the same as the end position of the leg. - *

        - * - * @param endPosition

        - * The end position of a step. If the position the last step in - * the leg, this position is the same as the end position of the - * leg. - *

        - */ - public void setEndPosition(java.util.Collection endPosition) { - if (endPosition == null) { - this.endPosition = null; - return; - } - - this.endPosition = new java.util.ArrayList(endPosition); - } - - /** - *

        - * The end position of a step. If the position the last step in the leg, - * this position is the same as the end position of the leg. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param endPosition

        - * The end position of a step. If the position the last step in - * the leg, this position is the same as the end position of the - * leg. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Step withEndPosition(Double... endPosition) { - if (getEndPosition() == null) { - this.endPosition = new java.util.ArrayList(endPosition.length); - } - for (Double value : endPosition) { - this.endPosition.add(value); - } - return this; - } - - /** - *

        - * The end position of a step. If the position the last step in the leg, - * this position is the same as the end position of the leg. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param endPosition

        - * The end position of a step. If the position the last step in - * the leg, this position is the same as the end position of the - * leg. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Step withEndPosition(java.util.Collection endPosition) { - setEndPosition(endPosition); - return this; - } - /** *

        * Represents the start position, or index, in a sequence of steps within @@ -387,92 +473,6 @@ public Step withGeometryOffset(Integer geometryOffset) { return this; } - /** - *

        - * The starting position of a step. If the position is the first step in the - * leg, this position is the same as the start position of the leg. - *

        - * - * @return

        - * The starting position of a step. If the position is the first - * step in the leg, this position is the same as the start position - * of the leg. - *

        - */ - public java.util.List getStartPosition() { - return startPosition; - } - - /** - *

        - * The starting position of a step. If the position is the first step in the - * leg, this position is the same as the start position of the leg. - *

        - * - * @param startPosition

        - * The starting position of a step. If the position is the first - * step in the leg, this position is the same as the start - * position of the leg. - *

        - */ - public void setStartPosition(java.util.Collection startPosition) { - if (startPosition == null) { - this.startPosition = null; - return; - } - - this.startPosition = new java.util.ArrayList(startPosition); - } - - /** - *

        - * The starting position of a step. If the position is the first step in the - * leg, this position is the same as the start position of the leg. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param startPosition

        - * The starting position of a step. If the position is the first - * step in the leg, this position is the same as the start - * position of the leg. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Step withStartPosition(Double... startPosition) { - if (getStartPosition() == null) { - this.startPosition = new java.util.ArrayList(startPosition.length); - } - for (Double value : startPosition) { - this.startPosition.add(value); - } - return this; - } - - /** - *

        - * The starting position of a step. If the position is the first step in the - * leg, this position is the same as the start position of the leg. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param startPosition

        - * The starting position of a step. If the position is the first - * step in the leg, this position is the same as the start - * position of the leg. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public Step withStartPosition(java.util.Collection startPosition) { - setStartPosition(startPosition); - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -484,16 +484,16 @@ public Step withStartPosition(java.util.Collection startPosition) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getStartPosition() != null) + sb.append("StartPosition: " + getStartPosition() + ","); + if (getEndPosition() != null) + sb.append("EndPosition: " + getEndPosition() + ","); if (getDistance() != null) sb.append("Distance: " + getDistance() + ","); if (getDurationSeconds() != null) sb.append("DurationSeconds: " + getDurationSeconds() + ","); - if (getEndPosition() != null) - sb.append("EndPosition: " + getEndPosition() + ","); if (getGeometryOffset() != null) - sb.append("GeometryOffset: " + getGeometryOffset() + ","); - if (getStartPosition() != null) - sb.append("StartPosition: " + getStartPosition()); + sb.append("GeometryOffset: " + getGeometryOffset()); sb.append("}"); return sb.toString(); } @@ -503,15 +503,15 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode - + ((getDurationSeconds() == null) ? 0 : getDurationSeconds().hashCode()); + + ((getStartPosition() == null) ? 0 : getStartPosition().hashCode()); hashCode = prime * hashCode + ((getEndPosition() == null) ? 0 : getEndPosition().hashCode()); + hashCode = prime * hashCode + ((getDistance() == null) ? 0 : getDistance().hashCode()); hashCode = prime * hashCode - + ((getGeometryOffset() == null) ? 0 : getGeometryOffset().hashCode()); + + ((getDurationSeconds() == null) ? 0 : getDurationSeconds().hashCode()); hashCode = prime * hashCode - + ((getStartPosition() == null) ? 0 : getStartPosition().hashCode()); + + ((getGeometryOffset() == null) ? 0 : getGeometryOffset().hashCode()); return hashCode; } @@ -526,6 +526,16 @@ public boolean equals(Object obj) { return false; Step other = (Step) obj; + if (other.getStartPosition() == null ^ this.getStartPosition() == null) + return false; + if (other.getStartPosition() != null + && other.getStartPosition().equals(this.getStartPosition()) == false) + return false; + if (other.getEndPosition() == null ^ this.getEndPosition() == null) + return false; + if (other.getEndPosition() != null + && other.getEndPosition().equals(this.getEndPosition()) == false) + return false; if (other.getDistance() == null ^ this.getDistance() == null) return false; if (other.getDistance() != null && other.getDistance().equals(this.getDistance()) == false) @@ -535,21 +545,11 @@ public boolean equals(Object obj) { if (other.getDurationSeconds() != null && other.getDurationSeconds().equals(this.getDurationSeconds()) == false) return false; - if (other.getEndPosition() == null ^ this.getEndPosition() == null) - return false; - if (other.getEndPosition() != null - && other.getEndPosition().equals(this.getEndPosition()) == false) - return false; if (other.getGeometryOffset() == null ^ this.getGeometryOffset() == null) return false; if (other.getGeometryOffset() != null && other.getGeometryOffset().equals(this.getGeometryOffset()) == false) return false; - if (other.getStartPosition() == null ^ this.getStartPosition() == null) - return false; - if (other.getStartPosition() != null - && other.getStartPosition().equals(this.getStartPosition()) == false) - return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceRequest.java index b3f029e2f5..0a20af9461 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -59,8 +59,8 @@ public class TagResourceRequest extends AmazonWebServiceRequest implements Seria * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        */ private String resourceArn; @@ -128,8 +128,8 @@ public class TagResourceRequest extends AmazonWebServiceRequest implements Seria * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @return

        * The Amazon Resource Name (ARN) of the resource whose tags you @@ -165,8 +165,8 @@ public String getResourceArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param resourceArn

        * The Amazon Resource Name (ARN) of the resource whose tags you @@ -205,8 +205,8 @@ public void setResourceArn(String resourceArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param resourceArn

        * The Amazon Resource Name (ARN) of the resource whose tags you diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceResult.java index 3b7bfd5170..11613e06f2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TagResourceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ThrottlingException.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ThrottlingException.java index 07baca4a2b..713102bc41 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ThrottlingException.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ThrottlingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TimeZone.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TimeZone.java index 2dab2f4f9e..73ce33ddd7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TimeZone.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TimeZone.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TrackingFilterGeometry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TrackingFilterGeometry.java new file mode 100644 index 0000000000..b1b1da4ae8 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TrackingFilterGeometry.java @@ -0,0 +1,161 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

        + * The geomerty used to filter device positions. + *

        + */ +public class TrackingFilterGeometry implements Serializable { + /** + *

        + * The set of arrays which define the polygon. A polygon can have between 4 + * and 1000 vertices. + *

        + */ + private java.util.List>> polygon; + + /** + *

        + * The set of arrays which define the polygon. A polygon can have between 4 + * and 1000 vertices. + *

        + * + * @return

        + * The set of arrays which define the polygon. A polygon can have + * between 4 and 1000 vertices. + *

        + */ + public java.util.List>> getPolygon() { + return polygon; + } + + /** + *

        + * The set of arrays which define the polygon. A polygon can have between 4 + * and 1000 vertices. + *

        + * + * @param polygon

        + * The set of arrays which define the polygon. A polygon can have + * between 4 and 1000 vertices. + *

        + */ + public void setPolygon(java.util.Collection>> polygon) { + if (polygon == null) { + this.polygon = null; + return; + } + + this.polygon = new java.util.ArrayList>>(polygon); + } + + /** + *

        + * The set of arrays which define the polygon. A polygon can have between 4 + * and 1000 vertices. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param polygon

        + * The set of arrays which define the polygon. A polygon can have + * between 4 and 1000 vertices. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public TrackingFilterGeometry withPolygon(java.util.List>... polygon) { + if (getPolygon() == null) { + this.polygon = new java.util.ArrayList>>( + polygon.length); + } + for (java.util.List> value : polygon) { + this.polygon.add(value); + } + return this; + } + + /** + *

        + * The set of arrays which define the polygon. A polygon can have between 4 + * and 1000 vertices. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param polygon

        + * The set of arrays which define the polygon. A polygon can have + * between 4 and 1000 vertices. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public TrackingFilterGeometry withPolygon( + java.util.Collection>> polygon) { + setPolygon(polygon); + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getPolygon() != null) + sb.append("Polygon: " + getPolygon()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getPolygon() == null) ? 0 : getPolygon().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof TrackingFilterGeometry == false) + return false; + TrackingFilterGeometry other = (TrackingFilterGeometry) obj; + + if (other.getPolygon() == null ^ this.getPolygon() == null) + return false; + if (other.getPolygon() != null && other.getPolygon().equals(this.getPolygon()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TravelMode.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TravelMode.java index 862e5e4f6e..4e95e0b15d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TravelMode.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TravelMode.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java index 3d9f1bcaaa..c0737250af 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,6 +26,29 @@ *

        */ public class TruckDimensions implements Serializable { + /** + *

        + * The length of the truck. + *

        + *
          + *
        • + *

          + * For example, 15.5. + *

          + *
          • + *
        + * + *

        + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

        + *         + *

        + * Constraints:
        + * Range: 0.0 -
        + */ + private Double length; + /** *

        * The height of the truck. @@ -51,26 +74,26 @@ public class TruckDimensions implements Serializable { /** *

        - * The length of the truck. + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be between 0 - * and 300 meters. + * and 50 meters. *

        *         *

        * Constraints:
        * Range: 0.0 -
        */ - private Double length; + private Double width; /** *

        @@ -87,26 +110,135 @@ public class TruckDimensions implements Serializable { /** *

        - * The width of the truck. + * The length of the truck. *

        *
          *
        • *

          - * For example, 4.5. + * For example, 15.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be between 0 - * and 50 meters. + * and 300 meters. *

        *         *

        * Constraints:
        * Range: 0.0 -
        + * + * @return

        + * The length of the truck. + *

        + *
          + *
        • + *

          + * For example, 15.5. + *

          + *
          • + *
        + * + *

        + * For routes calculated with a HERE resource, this value must be + * between 0 and 300 meters. + *

        + *         */ - private Double width; + public Double getLength() { + return length; + } + + /** + *

        + * The length of the truck. + *

        + *
          + *
        • + *

          + * For example, 15.5. + *

          + *
          • + *
        + * + *

        + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

        + *         + *

        + * Constraints:
        + * Range: 0.0 -
        + * + * @param length

        + * The length of the truck. + *

        + *
          + *
        • + *

          + * For example, 15.5. + *

          + *
          • + *
        + * + *

        + * For routes calculated with a HERE resource, this value must be + * between 0 and 300 meters. + *

        + *         + */ + public void setLength(Double length) { + this.length = length; + } + + /** + *

        + * The length of the truck. + *

        + *
          + *
        • + *

          + * For example, 15.5. + *

          + *
          • + *
        + * + *

        + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

        + *         + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Range: 0.0 -
        + * + * @param length

        + * The length of the truck. + *

        + *
          + *
        • + *

          + * For example, 15.5. + *

          + *
          • + *
        + * + *

        + * For routes calculated with a HERE resource, this value must be + * between 0 and 300 meters. + *

        + *         + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public TruckDimensions withLength(Double length) { + this.length = length; + return this; + } /** *

        @@ -242,19 +374,19 @@ public TruckDimensions withHeight(Double height) { /** *

        - * The length of the truck. + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be between 0 - * and 300 meters. + * and 50 meters. *

        *         *

        @@ -262,83 +394,83 @@ public TruckDimensions withHeight(Double height) { * Range: 0.0 -
        * * @return

        - * The length of the truck. + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be - * between 0 and 300 meters. + * between 0 and 50 meters. *

        *         */ - public Double getLength() { - return length; + public Double getWidth() { + return width; } /** *

        - * The length of the truck. + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be between 0 - * and 300 meters. + * and 50 meters. *

        *         *

        * Constraints:
        * Range: 0.0 -
        * - * @param length

        - * The length of the truck. + * @param width

        + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be - * between 0 and 300 meters. + * between 0 and 50 meters. *

        *         */ - public void setLength(Double length) { - this.length = length; + public void setWidth(Double width) { + this.width = width; } /** *

        - * The length of the truck. + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be between 0 - * and 300 meters. + * and 50 meters. *

        *         *

        @@ -348,27 +480,27 @@ public void setLength(Double length) { * Constraints:
        * Range: 0.0 -
        * - * @param length

        - * The length of the truck. + * @param width

        + * The width of the truck. *

        *
          *
        • *

          - * For example, 15.5. + * For example, 4.5. *

          *
          • *
        * *

        * For routes calculated with a HERE resource, this value must be - * between 0 and 300 meters. + * between 0 and 50 meters. *

        *         * @return A reference to this updated object so that method calls can be * chained together. */ - public TruckDimensions withLength(Double length) { - this.length = length; + public TruckDimensions withWidth(Double width) { + this.width = width; return this; } @@ -499,138 +631,6 @@ public TruckDimensions withUnit(DimensionUnit unit) { return this; } - /** - *

        - * The width of the truck. - *

        - *
          - *
        • - *

          - * For example, 4.5. - *

          - *
          • - *
        - * - *

        - * For routes calculated with a HERE resource, this value must be between 0 - * and 50 meters. - *

        - *         - *

        - * Constraints:
        - * Range: 0.0 -
        - * - * @return

        - * The width of the truck. - *

        - *
          - *
        • - *

          - * For example, 4.5. - *

          - *
          • - *
        - * - *

        - * For routes calculated with a HERE resource, this value must be - * between 0 and 50 meters. - *

        - *         - */ - public Double getWidth() { - return width; - } - - /** - *

        - * The width of the truck. - *

        - *
          - *
        • - *

          - * For example, 4.5. - *

          - *
          • - *
        - * - *

        - * For routes calculated with a HERE resource, this value must be between 0 - * and 50 meters. - *

        - *         - *

        - * Constraints:
        - * Range: 0.0 -
        - * - * @param width

        - * The width of the truck. - *

        - *
          - *
        • - *

          - * For example, 4.5. - *

          - *
          • - *
        - * - *

        - * For routes calculated with a HERE resource, this value must be - * between 0 and 50 meters. - *

        - *         - */ - public void setWidth(Double width) { - this.width = width; - } - - /** - *

        - * The width of the truck. - *

        - *
          - *
        • - *

          - * For example, 4.5. - *

          - *
          • - *
        - * - *

        - * For routes calculated with a HERE resource, this value must be between 0 - * and 50 meters. - *

        - *         - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Range: 0.0 -
        - * - * @param width

        - * The width of the truck. - *

        - *
          - *
        • - *

          - * For example, 4.5. - *

          - *
          • - *
        - * - *

        - * For routes calculated with a HERE resource, this value must be - * between 0 and 50 meters. - *

        - *         - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public TruckDimensions withWidth(Double width) { - this.width = width; - return this; - } - /** * Returns a string representation of this object; useful for testing and * debugging. @@ -642,14 +642,14 @@ public TruckDimensions withWidth(Double width) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getHeight() != null) - sb.append("Height: " + getHeight() + ","); if (getLength() != null) sb.append("Length: " + getLength() + ","); - if (getUnit() != null) - sb.append("Unit: " + getUnit() + ","); + if (getHeight() != null) + sb.append("Height: " + getHeight() + ","); if (getWidth() != null) - sb.append("Width: " + getWidth()); + sb.append("Width: " + getWidth() + ","); + if (getUnit() != null) + sb.append("Unit: " + getUnit()); sb.append("}"); return sb.toString(); } @@ -659,10 +659,10 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getHeight() == null) ? 0 : getHeight().hashCode()); hashCode = prime * hashCode + ((getLength() == null) ? 0 : getLength().hashCode()); - hashCode = prime * hashCode + ((getUnit() == null) ? 0 : getUnit().hashCode()); + hashCode = prime * hashCode + ((getHeight() == null) ? 0 : getHeight().hashCode()); hashCode = prime * hashCode + ((getWidth() == null) ? 0 : getWidth().hashCode()); + hashCode = prime * hashCode + ((getUnit() == null) ? 0 : getUnit().hashCode()); return hashCode; } @@ -677,22 +677,22 @@ public boolean equals(Object obj) { return false; TruckDimensions other = (TruckDimensions) obj; - if (other.getHeight() == null ^ this.getHeight() == null) - return false; - if (other.getHeight() != null && other.getHeight().equals(this.getHeight()) == false) - return false; if (other.getLength() == null ^ this.getLength() == null) return false; if (other.getLength() != null && other.getLength().equals(this.getLength()) == false) return false; - if (other.getUnit() == null ^ this.getUnit() == null) + if (other.getHeight() == null ^ this.getHeight() == null) return false; - if (other.getUnit() != null && other.getUnit().equals(this.getUnit()) == false) + if (other.getHeight() != null && other.getHeight().equals(this.getHeight()) == false) return false; if (other.getWidth() == null ^ this.getWidth() == null) return false; if (other.getWidth() != null && other.getWidth().equals(this.getWidth()) == false) return false; + if (other.getUnit() == null ^ this.getUnit() == null) + return false; + if (other.getUnit() != null && other.getUnit().equals(this.getUnit()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckWeight.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckWeight.java index 099a10b28e..9d93d60434 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckWeight.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckWeight.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceRequest.java index 6f19ba5b24..2d06a87ba6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -42,8 +42,8 @@ public class UntagResourceRequest extends AmazonWebServiceRequest implements Ser * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        */ private String resourceArn; @@ -71,8 +71,8 @@ public class UntagResourceRequest extends AmazonWebServiceRequest implements Ser * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @return

        * The Amazon Resource Name (ARN) of the resource from which you @@ -108,8 +108,8 @@ public String getResourceArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param resourceArn

        * The Amazon Resource Name (ARN) of the resource from which you @@ -148,8 +148,8 @@ public void setResourceArn(String resourceArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param resourceArn

        * The Amazon Resource Name (ARN) of the resource from which you diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceResult.java index 5a0c7f75a4..3c010dbf4c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UntagResourceResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionRequest.java index 4bbd5ed8c1..d24adb247e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,20 +33,10 @@ public class UpdateGeofenceCollectionRequest extends AmazonWebServiceRequest imp *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        */ private String collectionName; - /** - *

        - * Updates the description for the geofence collection. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - */ - private String description; - /** *

        * No longer used. If included, the only allowed value is @@ -66,6 +56,16 @@ public class UpdateGeofenceCollectionRequest extends AmazonWebServiceRequest imp */ private String pricingPlanDataSource; + /** + *

        + * Updates the description for the geofence collection. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + */ + private String description; + /** *

        * The name of the geofence collection to update. @@ -73,7 +73,7 @@ public class UpdateGeofenceCollectionRequest extends AmazonWebServiceRequest imp *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @return

        * The name of the geofence collection to update. @@ -90,7 +90,7 @@ public String getCollectionName() { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param collectionName

        * The name of the geofence collection to update. @@ -110,7 +110,7 @@ public void setCollectionName(String collectionName) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param collectionName

        * The name of the geofence collection to update. @@ -123,60 +123,6 @@ public UpdateGeofenceCollectionRequest withCollectionName(String collectionName) return this; } - /** - *

        - * Updates the description for the geofence collection. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @return

        - * Updates the description for the geofence collection. - *

        - */ - public String getDescription() { - return description; - } - - /** - *

        - * Updates the description for the geofence collection. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the geofence collection. - *

        - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

        - * Updates the description for the geofence collection. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the geofence collection. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateGeofenceCollectionRequest withDescription(String description) { - this.description = description; - return this; - } - /** *

        * No longer used. If included, the only allowed value is @@ -334,6 +280,60 @@ public UpdateGeofenceCollectionRequest withPricingPlanDataSource(String pricingP return this; } + /** + *

        + * Updates the description for the geofence collection. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @return

        + * Updates the description for the geofence collection. + *

        + */ + public String getDescription() { + return description; + } + + /** + *

        + * Updates the description for the geofence collection. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the geofence collection. + *

        + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

        + * Updates the description for the geofence collection. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the geofence collection. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateGeofenceCollectionRequest withDescription(String description) { + this.description = description; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -347,12 +347,12 @@ public String toString() { sb.append("{"); if (getCollectionName() != null) sb.append("CollectionName: " + getCollectionName() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); if (getPricingPlanDataSource() != null) - sb.append("PricingPlanDataSource: " + getPricingPlanDataSource()); + sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription()); sb.append("}"); return sb.toString(); } @@ -364,13 +364,13 @@ public int hashCode() { hashCode = prime * hashCode + ((getCollectionName() == null) ? 0 : getCollectionName().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); return hashCode; } @@ -390,11 +390,6 @@ public boolean equals(Object obj) { if (other.getCollectionName() != null && other.getCollectionName().equals(this.getCollectionName()) == false) return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null @@ -405,6 +400,11 @@ public boolean equals(Object obj) { if (other.getPricingPlanDataSource() != null && other.getPricingPlanDataSource().equals(this.getPricingPlanDataSource()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionResult.java index 293f162a92..a09935559b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateGeofenceCollectionResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class UpdateGeofenceCollectionResult implements Serializable { + /** + *

        + * The name of the updated geofence collection. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + */ + private String collectionName; + /** *

        * The Amazon Resource Name (ARN) of the updated geofence collection. Used @@ -35,11 +46,20 @@ public class UpdateGeofenceCollectionResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        */ private String collectionArn; + /** + *

        + * The time when the geofence collection was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + *

        + */ + private java.util.Date updateTime; + /** *

        * The name of the updated geofence collection. @@ -47,18 +67,55 @@ public class UpdateGeofenceCollectionResult implements Serializable { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name of the updated geofence collection. + *

        */ - private String collectionName; + public String getCollectionName() { + return collectionName; + } /** *

        - * The time when the geofence collection was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ + * The name of the updated geofence collection. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param collectionName

        + * The name of the updated geofence collection. + *

        + */ + public void setCollectionName(String collectionName) { + this.collectionName = collectionName; + } + + /** + *

        + * The name of the updated geofence collection. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param collectionName

        + * The name of the updated geofence collection. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public UpdateGeofenceCollectionResult withCollectionName(String collectionName) { + this.collectionName = collectionName; + return this; + } /** *

        @@ -77,8 +134,8 @@ public class UpdateGeofenceCollectionResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @return

        * The Amazon Resource Name (ARN) of the updated geofence @@ -115,8 +172,8 @@ public String getCollectionArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param collectionArn

        * The Amazon Resource Name (ARN) of the updated geofence @@ -156,8 +213,8 @@ public void setCollectionArn(String collectionArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param collectionArn

        * The Amazon Resource Name (ARN) of the updated geofence @@ -180,63 +237,6 @@ public UpdateGeofenceCollectionResult withCollectionArn(String collectionArn) { return this; } - /** - *

        - * The name of the updated geofence collection. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @return

        - * The name of the updated geofence collection. - *

        - */ - public String getCollectionName() { - return collectionName; - } - - /** - *

        - * The name of the updated geofence collection. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param collectionName

        - * The name of the updated geofence collection. - *

        - */ - public void setCollectionName(String collectionName) { - this.collectionName = collectionName; - } - - /** - *

        - * The name of the updated geofence collection. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param collectionName

        - * The name of the updated geofence collection. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateGeofenceCollectionResult withCollectionName(String collectionName) { - this.collectionName = collectionName; - return this; - } - /** *

        * The time when the geofence collection was last updated in */ public class UpdateKeyRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

        + * The name of the API key resource to update. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + */ + private String keyName; + /** *

        * Updates the description for the API key resource. @@ -44,6 +55,14 @@ public class UpdateKeyRequest extends AmazonWebServiceRequest implements Seriali */ private java.util.Date expireTime; + /** + *

        + * Whether the API key should expire. Set to true to set the + * API key to have no expiration time. + *

        + */ + private Boolean noExpiry; + /** *

        * The boolean flag to be included for updating ExpireTime or @@ -62,6 +81,13 @@ public class UpdateKeyRequest extends AmazonWebServiceRequest implements Seriali */ private Boolean forceUpdate; + /** + *

        + * Updates the API key restrictions for the API key resource. + *

        + */ + private ApiKeyRestrictions restrictions; + /** *

        * The name of the API key resource to update. @@ -69,24 +95,55 @@ public class UpdateKeyRequest extends AmazonWebServiceRequest implements Seriali *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name of the API key resource to update. + *

        */ - private String keyName; + public String getKeyName() { + return keyName; + } /** *

        - * Whether the API key should expire. Set to true to set the - * API key to have no expiration time. + * The name of the API key resource to update. *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param keyName

        + * The name of the API key resource to update. + *

        */ - private Boolean noExpiry; + public void setKeyName(String keyName) { + this.keyName = keyName; + } /** *

        - * Updates the API key restrictions for the API key resource. + * The name of the API key resource to update. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param keyName

        + * The name of the API key resource to update. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private ApiKeyRestrictions restrictions; + public UpdateKeyRequest withKeyName(String keyName) { + this.keyName = keyName; + return this; + } /** *

        @@ -202,6 +259,72 @@ public UpdateKeyRequest withExpireTime(java.util.Date expireTime) { return this; } + /** + *

        + * Whether the API key should expire. Set to true to set the + * API key to have no expiration time. + *

        + * + * @return

        + * Whether the API key should expire. Set to true to + * set the API key to have no expiration time. + *

        + */ + public Boolean isNoExpiry() { + return noExpiry; + } + + /** + *

        + * Whether the API key should expire. Set to true to set the + * API key to have no expiration time. + *

        + * + * @return

        + * Whether the API key should expire. Set to true to + * set the API key to have no expiration time. + *

        + */ + public Boolean getNoExpiry() { + return noExpiry; + } + + /** + *

        + * Whether the API key should expire. Set to true to set the + * API key to have no expiration time. + *

        + * + * @param noExpiry

        + * Whether the API key should expire. Set to true to + * set the API key to have no expiration time. + *

        + */ + public void setNoExpiry(Boolean noExpiry) { + this.noExpiry = noExpiry; + } + + /** + *

        + * Whether the API key should expire. Set to true to set the + * API key to have no expiration time. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param noExpiry

        + * Whether the API key should expire. Set to true to + * set the API key to have no expiration time. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateKeyRequest withNoExpiry(Boolean noExpiry) { + this.noExpiry = noExpiry; + return this; + } + /** *

        * The boolean flag to be included for updating ExpireTime or @@ -348,129 +471,6 @@ public UpdateKeyRequest withForceUpdate(Boolean forceUpdate) { return this; } - /** - *

        - * The name of the API key resource to update. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @return

        - * The name of the API key resource to update. - *

        - */ - public String getKeyName() { - return keyName; - } - - /** - *

        - * The name of the API key resource to update. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param keyName

        - * The name of the API key resource to update. - *

        - */ - public void setKeyName(String keyName) { - this.keyName = keyName; - } - - /** - *

        - * The name of the API key resource to update. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param keyName

        - * The name of the API key resource to update. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateKeyRequest withKeyName(String keyName) { - this.keyName = keyName; - return this; - } - - /** - *

        - * Whether the API key should expire. Set to true to set the - * API key to have no expiration time. - *

        - * - * @return

        - * Whether the API key should expire. Set to true to - * set the API key to have no expiration time. - *

        - */ - public Boolean isNoExpiry() { - return noExpiry; - } - - /** - *

        - * Whether the API key should expire. Set to true to set the - * API key to have no expiration time. - *

        - * - * @return

        - * Whether the API key should expire. Set to true to - * set the API key to have no expiration time. - *

        - */ - public Boolean getNoExpiry() { - return noExpiry; - } - - /** - *

        - * Whether the API key should expire. Set to true to set the - * API key to have no expiration time. - *

        - * - * @param noExpiry

        - * Whether the API key should expire. Set to true to - * set the API key to have no expiration time. - *

        - */ - public void setNoExpiry(Boolean noExpiry) { - this.noExpiry = noExpiry; - } - - /** - *

        - * Whether the API key should expire. Set to true to set the - * API key to have no expiration time. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param noExpiry

        - * Whether the API key should expire. Set to true to - * set the API key to have no expiration time. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateKeyRequest withNoExpiry(Boolean noExpiry) { - this.noExpiry = noExpiry; - return this; - } - /** *

        * Updates the API key restrictions for the API key resource. @@ -527,16 +527,16 @@ public UpdateKeyRequest withRestrictions(ApiKeyRestrictions restrictions) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getKeyName() != null) + sb.append("KeyName: " + getKeyName() + ","); if (getDescription() != null) sb.append("Description: " + getDescription() + ","); if (getExpireTime() != null) sb.append("ExpireTime: " + getExpireTime() + ","); - if (getForceUpdate() != null) - sb.append("ForceUpdate: " + getForceUpdate() + ","); - if (getKeyName() != null) - sb.append("KeyName: " + getKeyName() + ","); if (getNoExpiry() != null) sb.append("NoExpiry: " + getNoExpiry() + ","); + if (getForceUpdate() != null) + sb.append("ForceUpdate: " + getForceUpdate() + ","); if (getRestrictions() != null) sb.append("Restrictions: " + getRestrictions()); sb.append("}"); @@ -548,13 +548,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getExpireTime() == null) ? 0 : getExpireTime().hashCode()); + hashCode = prime * hashCode + ((getNoExpiry() == null) ? 0 : getNoExpiry().hashCode()); hashCode = prime * hashCode + ((getForceUpdate() == null) ? 0 : getForceUpdate().hashCode()); - hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode()); - hashCode = prime * hashCode + ((getNoExpiry() == null) ? 0 : getNoExpiry().hashCode()); hashCode = prime * hashCode + ((getRestrictions() == null) ? 0 : getRestrictions().hashCode()); return hashCode; @@ -571,6 +571,10 @@ public boolean equals(Object obj) { return false; UpdateKeyRequest other = (UpdateKeyRequest) obj; + if (other.getKeyName() == null ^ this.getKeyName() == null) + return false; + if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) + return false; if (other.getDescription() == null ^ this.getDescription() == null) return false; if (other.getDescription() != null @@ -581,19 +585,15 @@ public boolean equals(Object obj) { if (other.getExpireTime() != null && other.getExpireTime().equals(this.getExpireTime()) == false) return false; + if (other.getNoExpiry() == null ^ this.getNoExpiry() == null) + return false; + if (other.getNoExpiry() != null && other.getNoExpiry().equals(this.getNoExpiry()) == false) + return false; if (other.getForceUpdate() == null ^ this.getForceUpdate() == null) return false; if (other.getForceUpdate() != null && other.getForceUpdate().equals(this.getForceUpdate()) == false) return false; - if (other.getKeyName() == null ^ this.getKeyName() == null) - return false; - if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) - return false; - if (other.getNoExpiry() == null ^ this.getNoExpiry() == null) - return false; - if (other.getNoExpiry() != null && other.getNoExpiry().equals(this.getNoExpiry()) == false) - return false; if (other.getRestrictions() == null ^ this.getRestrictions() == null) return false; if (other.getRestrictions() != null diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateKeyResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateKeyResult.java index 16c558da52..9efda1950a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateKeyResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateKeyResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,8 +34,8 @@ public class UpdateKeyResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        */ private String keyArn; @@ -46,7 +46,7 @@ public class UpdateKeyResult implements Serializable { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        */ private String keyName; @@ -75,8 +75,8 @@ public class UpdateKeyResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @return

        * The Amazon Resource Name (ARN) for the API key resource. Used @@ -112,8 +112,8 @@ public String getKeyArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param keyArn

        * The Amazon Resource Name (ARN) for the API key resource. Used @@ -152,8 +152,8 @@ public void setKeyArn(String keyArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
        * * @param keyArn

        * The Amazon Resource Name (ARN) for the API key resource. Used @@ -183,7 +183,7 @@ public UpdateKeyResult withKeyArn(String keyArn) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @return

        * The name of the API key resource. @@ -200,7 +200,7 @@ public String getKeyName() { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param keyName

        * The name of the API key resource. @@ -220,7 +220,7 @@ public void setKeyName(String keyName) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param keyName

        * The name of the API key resource. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapRequest.java index 54cdb97d53..af502e4061 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -25,24 +25,6 @@ *

        */ public class UpdateMapRequest extends AmazonWebServiceRequest implements Serializable { - /** - *

        - * Updates the parts of the map configuration that can be updated, including - * the political view. - *

        - */ - private MapConfigurationUpdate configurationUpdate; - - /** - *

        - * Updates the description for the map resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - */ - private String description; - /** *

        * The name of the map resource to update. @@ -50,7 +32,7 @@ public class UpdateMapRequest extends AmazonWebServiceRequest implements Seriali *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        */ private String mapName; @@ -66,57 +48,6 @@ public class UpdateMapRequest extends AmazonWebServiceRequest implements Seriali */ private String pricingPlan; - /** - *

        - * Updates the parts of the map configuration that can be updated, including - * the political view. - *

        - * - * @return

        - * Updates the parts of the map configuration that can be updated, - * including the political view. - *

        - */ - public MapConfigurationUpdate getConfigurationUpdate() { - return configurationUpdate; - } - - /** - *

        - * Updates the parts of the map configuration that can be updated, including - * the political view. - *

        - * - * @param configurationUpdate

        - * Updates the parts of the map configuration that can be - * updated, including the political view. - *

        - */ - public void setConfigurationUpdate(MapConfigurationUpdate configurationUpdate) { - this.configurationUpdate = configurationUpdate; - } - - /** - *

        - * Updates the parts of the map configuration that can be updated, including - * the political view. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param configurationUpdate

        - * Updates the parts of the map configuration that can be - * updated, including the political view. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateMapRequest withConfigurationUpdate(MapConfigurationUpdate configurationUpdate) { - this.configurationUpdate = configurationUpdate; - return this; - } - /** *

        * Updates the description for the map resource. @@ -124,52 +55,16 @@ public UpdateMapRequest withConfigurationUpdate(MapConfigurationUpdate configura *

        * Constraints:
        * Length: 0 - 1000
        - * - * @return

        - * Updates the description for the map resource. - *

        */ - public String getDescription() { - return description; - } - - /** - *

        - * Updates the description for the map resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the map resource. - *

        - */ - public void setDescription(String description) { - this.description = description; - } + private String description; /** *

        - * Updates the description for the map resource. + * Updates the parts of the map configuration that can be updated, including + * the political view. *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the map resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. */ - public UpdateMapRequest withDescription(String description) { - this.description = description; - return this; - } + private MapConfigurationUpdate configurationUpdate; /** *

        @@ -178,7 +73,7 @@ public UpdateMapRequest withDescription(String description) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @return

        * The name of the map resource to update. @@ -195,7 +90,7 @@ public String getMapName() { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param mapName

        * The name of the map resource to update. @@ -215,7 +110,7 @@ public void setMapName(String mapName) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param mapName

        * The name of the map resource to update. @@ -340,6 +235,111 @@ public UpdateMapRequest withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

        + * Updates the description for the map resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @return

        + * Updates the description for the map resource. + *

        + */ + public String getDescription() { + return description; + } + + /** + *

        + * Updates the description for the map resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the map resource. + *

        + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

        + * Updates the description for the map resource. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the map resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateMapRequest withDescription(String description) { + this.description = description; + return this; + } + + /** + *

        + * Updates the parts of the map configuration that can be updated, including + * the political view. + *

        + * + * @return

        + * Updates the parts of the map configuration that can be updated, + * including the political view. + *

        + */ + public MapConfigurationUpdate getConfigurationUpdate() { + return configurationUpdate; + } + + /** + *

        + * Updates the parts of the map configuration that can be updated, including + * the political view. + *

        + * + * @param configurationUpdate

        + * Updates the parts of the map configuration that can be + * updated, including the political view. + *

        + */ + public void setConfigurationUpdate(MapConfigurationUpdate configurationUpdate) { + this.configurationUpdate = configurationUpdate; + } + + /** + *

        + * Updates the parts of the map configuration that can be updated, including + * the political view. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param configurationUpdate

        + * Updates the parts of the map configuration that can be + * updated, including the political view. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateMapRequest withConfigurationUpdate(MapConfigurationUpdate configurationUpdate) { + this.configurationUpdate = configurationUpdate; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -351,14 +351,14 @@ public UpdateMapRequest withPricingPlan(PricingPlan pricingPlan) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getConfigurationUpdate() != null) - sb.append("ConfigurationUpdate: " + getConfigurationUpdate() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getMapName() != null) sb.append("MapName: " + getMapName() + ","); if (getPricingPlan() != null) - sb.append("PricingPlan: " + getPricingPlan()); + sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); + if (getConfigurationUpdate() != null) + sb.append("ConfigurationUpdate: " + getConfigurationUpdate()); sb.append("}"); return sb.toString(); } @@ -368,13 +368,13 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); hashCode = prime * hashCode - + ((getConfigurationUpdate() == null) ? 0 : getConfigurationUpdate().hashCode()); + + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getMapName() == null) ? 0 : getMapName().hashCode()); hashCode = prime * hashCode - + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + + ((getConfigurationUpdate() == null) ? 0 : getConfigurationUpdate().hashCode()); return hashCode; } @@ -389,16 +389,6 @@ public boolean equals(Object obj) { return false; UpdateMapRequest other = (UpdateMapRequest) obj; - if (other.getConfigurationUpdate() == null ^ this.getConfigurationUpdate() == null) - return false; - if (other.getConfigurationUpdate() != null - && other.getConfigurationUpdate().equals(this.getConfigurationUpdate()) == false) - return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; if (other.getMapName() == null ^ this.getMapName() == null) return false; if (other.getMapName() != null && other.getMapName().equals(this.getMapName()) == false) @@ -408,6 +398,16 @@ public boolean equals(Object obj) { if (other.getPricingPlan() != null && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; + if (other.getConfigurationUpdate() == null ^ this.getConfigurationUpdate() == null) + return false; + if (other.getConfigurationUpdate() != null + && other.getConfigurationUpdate().equals(this.getConfigurationUpdate()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapResult.java index 89f75337bf..1b5d860ba5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateMapResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class UpdateMapResult implements Serializable { + /** + *

        + * The name of the updated map resource. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + */ + private String mapName; + /** *

        * The Amazon Resource Name (ARN) of the updated map resource. Used to @@ -34,11 +45,20 @@ public class UpdateMapResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        */ private String mapArn; + /** + *

        + * The timestamp for when the map resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

        + */ + private java.util.Date updateTime; + /** *

        * The name of the updated map resource. @@ -46,18 +66,55 @@ public class UpdateMapResult implements Serializable { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name of the updated map resource. + *

        */ - private String mapName; + public String getMapName() { + return mapName; + } /** *

        - * The timestamp for when the map resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the updated map resource. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param mapName

        + * The name of the updated map resource. + *

        + */ + public void setMapName(String mapName) { + this.mapName = mapName; + } + + /** + *

        + * The name of the updated map resource. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param mapName

        + * The name of the updated map resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public UpdateMapResult withMapName(String mapName) { + this.mapName = mapName; + return this; + } /** *

        @@ -75,8 +132,8 @@ public class UpdateMapResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @return

        * The Amazon Resource Name (ARN) of the updated map resource. Used @@ -111,8 +168,8 @@ public String getMapArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @param mapArn

        * The Amazon Resource Name (ARN) of the updated map resource. @@ -150,8 +207,8 @@ public void setMapArn(String mapArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @param mapArn

        * The Amazon Resource Name (ARN) of the updated map resource. @@ -173,63 +230,6 @@ public UpdateMapResult withMapArn(String mapArn) { return this; } - /** - *

        - * The name of the updated map resource. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @return

        - * The name of the updated map resource. - *

        - */ - public String getMapName() { - return mapName; - } - - /** - *

        - * The name of the updated map resource. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param mapName

        - * The name of the updated map resource. - *

        - */ - public void setMapName(String mapName) { - this.mapName = mapName; - } - - /** - *

        - * The name of the updated map resource. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param mapName

        - * The name of the updated map resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateMapResult withMapName(String mapName) { - this.mapName = mapName; - return this; - } - /** *

        * The timestamp for when the map resource was last updated in */ public class UpdatePlaceIndexRequest extends AmazonWebServiceRequest implements Serializable { - /** - *

        - * Updates the data storage option for the place index resource. - *

        - */ - private DataSourceConfiguration dataSourceConfiguration; - - /** - *

        - * Updates the description for the place index resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - */ - private String description; - /** *

        * The name of the place index resource to update. @@ -49,7 +32,7 @@ public class UpdatePlaceIndexRequest extends AmazonWebServiceRequest implements *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        */ private String indexName; @@ -65,68 +48,6 @@ public class UpdatePlaceIndexRequest extends AmazonWebServiceRequest implements */ private String pricingPlan; - /** - *

        - * Updates the data storage option for the place index resource. - *

        - * - * @return

        - * Updates the data storage option for the place index resource. - *

        - */ - public DataSourceConfiguration getDataSourceConfiguration() { - return dataSourceConfiguration; - } - - /** - *

        - * Updates the data storage option for the place index resource. - *

        - * - * @param dataSourceConfiguration

        - * Updates the data storage option for the place index resource. - *

        - */ - public void setDataSourceConfiguration(DataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; - } - - /** - *

        - * Updates the data storage option for the place index resource. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param dataSourceConfiguration

        - * Updates the data storage option for the place index resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdatePlaceIndexRequest withDataSourceConfiguration( - DataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; - return this; - } - - /** - *

        - * Updates the description for the place index resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @return

        - * Updates the description for the place index resource. - *

        - */ - public String getDescription() { - return description; - } - /** *

        * Updates the description for the place index resource. @@ -134,36 +55,15 @@ public String getDescription() { *

        * Constraints:
        * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the place index resource. - *

        */ - public void setDescription(String description) { - this.description = description; - } + private String description; /** *

        - * Updates the description for the place index resource. + * Updates the data storage option for the place index resource. *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the place index resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. */ - public UpdatePlaceIndexRequest withDescription(String description) { - this.description = description; - return this; - } + private DataSourceConfiguration dataSourceConfiguration; /** *

        @@ -172,7 +72,7 @@ public UpdatePlaceIndexRequest withDescription(String description) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @return

        * The name of the place index resource to update. @@ -189,7 +89,7 @@ public String getIndexName() { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param indexName

        * The name of the place index resource to update. @@ -209,7 +109,7 @@ public void setIndexName(String indexName) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param indexName

        * The name of the place index resource to update. @@ -334,6 +234,106 @@ public UpdatePlaceIndexRequest withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

        + * Updates the description for the place index resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @return

        + * Updates the description for the place index resource. + *

        + */ + public String getDescription() { + return description; + } + + /** + *

        + * Updates the description for the place index resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the place index resource. + *

        + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

        + * Updates the description for the place index resource. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the place index resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdatePlaceIndexRequest withDescription(String description) { + this.description = description; + return this; + } + + /** + *

        + * Updates the data storage option for the place index resource. + *

        + * + * @return

        + * Updates the data storage option for the place index resource. + *

        + */ + public DataSourceConfiguration getDataSourceConfiguration() { + return dataSourceConfiguration; + } + + /** + *

        + * Updates the data storage option for the place index resource. + *

        + * + * @param dataSourceConfiguration

        + * Updates the data storage option for the place index resource. + *

        + */ + public void setDataSourceConfiguration(DataSourceConfiguration dataSourceConfiguration) { + this.dataSourceConfiguration = dataSourceConfiguration; + } + + /** + *

        + * Updates the data storage option for the place index resource. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param dataSourceConfiguration

        + * Updates the data storage option for the place index resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdatePlaceIndexRequest withDataSourceConfiguration( + DataSourceConfiguration dataSourceConfiguration) { + this.dataSourceConfiguration = dataSourceConfiguration; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -345,14 +345,14 @@ public UpdatePlaceIndexRequest withPricingPlan(PricingPlan pricingPlan) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDataSourceConfiguration() != null) - sb.append("DataSourceConfiguration: " + getDataSourceConfiguration() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getIndexName() != null) sb.append("IndexName: " + getIndexName() + ","); if (getPricingPlan() != null) - sb.append("PricingPlan: " + getPricingPlan()); + sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); + if (getDataSourceConfiguration() != null) + sb.append("DataSourceConfiguration: " + getDataSourceConfiguration()); sb.append("}"); return sb.toString(); } @@ -362,15 +362,15 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); + hashCode = prime * hashCode + + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getDataSourceConfiguration() == null) ? 0 : getDataSourceConfiguration() .hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode + ((getIndexName() == null) ? 0 : getIndexName().hashCode()); - hashCode = prime * hashCode - + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); return hashCode; } @@ -385,16 +385,6 @@ public boolean equals(Object obj) { return false; UpdatePlaceIndexRequest other = (UpdatePlaceIndexRequest) obj; - if (other.getDataSourceConfiguration() == null ^ this.getDataSourceConfiguration() == null) - return false; - if (other.getDataSourceConfiguration() != null - && other.getDataSourceConfiguration().equals(this.getDataSourceConfiguration()) == false) - return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; if (other.getIndexName() == null ^ this.getIndexName() == null) return false; if (other.getIndexName() != null @@ -405,6 +395,16 @@ public boolean equals(Object obj) { if (other.getPricingPlan() != null && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; + if (other.getDataSourceConfiguration() == null ^ this.getDataSourceConfiguration() == null) + return false; + if (other.getDataSourceConfiguration() != null + && other.getDataSourceConfiguration().equals(this.getDataSourceConfiguration()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdatePlaceIndexResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdatePlaceIndexResult.java index db748baabe..24792d1f82 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdatePlaceIndexResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdatePlaceIndexResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class UpdatePlaceIndexResult implements Serializable { + /** + *

        + * The name of the updated place index resource. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + */ + private String indexName; + /** *

        * The Amazon Resource Name (ARN) of the upated place index resource. Used @@ -35,11 +46,20 @@ public class UpdatePlaceIndexResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        */ private String indexArn; + /** + *

        + * The timestamp for when the place index resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

        + */ + private java.util.Date updateTime; + /** *

        * The name of the updated place index resource. @@ -47,18 +67,55 @@ public class UpdatePlaceIndexResult implements Serializable { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name of the updated place index resource. + *

        */ - private String indexName; + public String getIndexName() { + return indexName; + } /** *

        - * The timestamp for when the place index resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the updated place index resource. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param indexName

        + * The name of the updated place index resource. + *

        + */ + public void setIndexName(String indexName) { + this.indexName = indexName; + } + + /** + *

        + * The name of the updated place index resource. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param indexName

        + * The name of the updated place index resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public UpdatePlaceIndexResult withIndexName(String indexName) { + this.indexName = indexName; + return this; + } /** *

        @@ -77,8 +134,8 @@ public class UpdatePlaceIndexResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @return

        * The Amazon Resource Name (ARN) of the upated place index @@ -114,8 +171,8 @@ public String getIndexArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @param indexArn

        * The Amazon Resource Name (ARN) of the upated place index @@ -155,8 +212,8 @@ public void setIndexArn(String indexArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @param indexArn

        * The Amazon Resource Name (ARN) of the upated place index @@ -179,63 +236,6 @@ public UpdatePlaceIndexResult withIndexArn(String indexArn) { return this; } - /** - *

        - * The name of the updated place index resource. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @return

        - * The name of the updated place index resource. - *

        - */ - public String getIndexName() { - return indexName; - } - - /** - *

        - * The name of the updated place index resource. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param indexName

        - * The name of the updated place index resource. - *

        - */ - public void setIndexName(String indexName) { - this.indexName = indexName; - } - - /** - *

        - * The name of the updated place index resource. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param indexName

        - * The name of the updated place index resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdatePlaceIndexResult withIndexName(String indexName) { - this.indexName = indexName; - return this; - } - /** *

        * The timestamp for when the place index resource was last updated in * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        */ private String calculatorName; /** *

        - * Updates the description for the route calculator resource. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        *

        * Constraints:
        - * Length: 0 - 1000
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement */ - private String description; + private String pricingPlan; /** *

        - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Updates the description for the route calculator resource. *

        *

        * Constraints:
        - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * Length: 0 - 1000
        */ - private String pricingPlan; + private String description; /** *

        @@ -65,7 +65,7 @@ public class UpdateRouteCalculatorRequest extends AmazonWebServiceRequest implem *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @return

        * The name of the route calculator resource to update. @@ -82,7 +82,7 @@ public String getCalculatorName() { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param calculatorName

        * The name of the route calculator resource to update. @@ -102,7 +102,7 @@ public void setCalculatorName(String calculatorName) { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        * * @param calculatorName

        * The name of the route calculator resource to update. @@ -115,60 +115,6 @@ public UpdateRouteCalculatorRequest withCalculatorName(String calculatorName) { return this; } - /** - *

        - * Updates the description for the route calculator resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @return

        - * Updates the description for the route calculator resource. - *

        - */ - public String getDescription() { - return description; - } - - /** - *

        - * Updates the description for the route calculator resource. - *

        - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the route calculator resource. - *

        - */ - public void setDescription(String description) { - this.description = description; - } - - /** - *

        - * Updates the description for the route calculator resource. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 0 - 1000
        - * - * @param description

        - * Updates the description for the route calculator resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateRouteCalculatorRequest withDescription(String description) { - this.description = description; - return this; - } - /** *

        * No longer used. If included, the only allowed value is @@ -281,6 +227,60 @@ public UpdateRouteCalculatorRequest withPricingPlan(PricingPlan pricingPlan) { return this; } + /** + *

        + * Updates the description for the route calculator resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @return

        + * Updates the description for the route calculator resource. + *

        + */ + public String getDescription() { + return description; + } + + /** + *

        + * Updates the description for the route calculator resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the route calculator resource. + *

        + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

        + * Updates the description for the route calculator resource. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the route calculator resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateRouteCalculatorRequest withDescription(String description) { + this.description = description; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -294,10 +294,10 @@ public String toString() { sb.append("{"); if (getCalculatorName() != null) sb.append("CalculatorName: " + getCalculatorName() + ","); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); if (getPricingPlan() != null) - sb.append("PricingPlan: " + getPricingPlan()); + sb.append("PricingPlan: " + getPricingPlan() + ","); + if (getDescription() != null) + sb.append("Description: " + getDescription()); sb.append("}"); return sb.toString(); } @@ -309,10 +309,10 @@ public int hashCode() { hashCode = prime * hashCode + ((getCalculatorName() == null) ? 0 : getCalculatorName().hashCode()); - hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); + hashCode = prime * hashCode + + ((getDescription() == null) ? 0 : getDescription().hashCode()); return hashCode; } @@ -332,16 +332,16 @@ public boolean equals(Object obj) { if (other.getCalculatorName() != null && other.getCalculatorName().equals(this.getCalculatorName()) == false) return false; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; if (other.getPricingPlan() != null && other.getPricingPlan().equals(this.getPricingPlan()) == false) return false; + if (other.getDescription() == null ^ this.getDescription() == null) + return false; + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateRouteCalculatorResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateRouteCalculatorResult.java index e281ece0b2..d093c5278a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateRouteCalculatorResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateRouteCalculatorResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class UpdateRouteCalculatorResult implements Serializable { + /** + *

        + * The name of the updated route calculator resource. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + */ + private String calculatorName; + /** *

        * The Amazon Resource Name (ARN) of the updated route calculator resource. @@ -35,11 +46,20 @@ public class UpdateRouteCalculatorResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        */ private String calculatorArn; + /** + *

        + * The timestamp for when the route calculator was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

        + */ + private java.util.Date updateTime; + /** *

        * The name of the updated route calculator resource. @@ -47,18 +67,55 @@ public class UpdateRouteCalculatorResult implements Serializable { *

        * Constraints:
        * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * Pattern: [-._\w]+
        + * + * @return

        + * The name of the updated route calculator resource. + *

        */ - private String calculatorName; + public String getCalculatorName() { + return calculatorName; + } /** *

        - * The timestamp for when the route calculator was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the updated route calculator resource. + *

        + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param calculatorName

        + * The name of the updated route calculator resource. + *

        + */ + public void setCalculatorName(String calculatorName) { + this.calculatorName = calculatorName; + } + + /** + *

        + * The name of the updated route calculator resource. *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        + * + * @param calculatorName

        + * The name of the updated route calculator resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. */ - private java.util.Date updateTime; + public UpdateRouteCalculatorResult withCalculatorName(String calculatorName) { + this.calculatorName = calculatorName; + return this; + } /** *

        @@ -77,8 +134,8 @@ public class UpdateRouteCalculatorResult implements Serializable { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @return

        * The Amazon Resource Name (ARN) of the updated route calculator @@ -114,8 +171,8 @@ public String getCalculatorArn() { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @param calculatorArn

        * The Amazon Resource Name (ARN) of the updated route calculator @@ -154,8 +211,8 @@ public void setCalculatorArn(String calculatorArn) { * Constraints:
        * Length: 0 - 1600
        * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0 - * -9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))$
        + * arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0- + * 9]+)*))(:[0-9]+):((\*)|([-a-z]+[/][*-._\w]+))
        * * @param calculatorArn

        * The Amazon Resource Name (ARN) of the updated route calculator @@ -177,63 +234,6 @@ public UpdateRouteCalculatorResult withCalculatorArn(String calculatorArn) { return this; } - /** - *

        - * The name of the updated route calculator resource. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @return

        - * The name of the updated route calculator resource. - *

        - */ - public String getCalculatorName() { - return calculatorName; - } - - /** - *

        - * The name of the updated route calculator resource. - *

        - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param calculatorName

        - * The name of the updated route calculator resource. - *

        - */ - public void setCalculatorName(String calculatorName) { - this.calculatorName = calculatorName; - } - - /** - *

        - * The name of the updated route calculator resource. - *

        - *

        - * Returns a reference to this object so that method calls can be chained - * together. - *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        - * - * @param calculatorName

        - * The name of the updated route calculator resource. - *

        - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateRouteCalculatorResult withCalculatorName(String calculatorName) { - this.calculatorName = calculatorName; - return this; - } - /** *

        * The timestamp for when the route calculator was last updated in - * Updates the description for the tracker resource. + * The name of the tracker resource to update. *

        *

        * Constraints:
        - * Length: 0 - 1000
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        */ - private String description; + private String trackerName; /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + */ + private String pricingPlan; + + /** + *

        + * This parameter is no longer used. *

        - *         */ - private Boolean eventBridgeEnabled; + private String pricingPlanDataSource; + + /** + *

        + * Updates the description for the tracker resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + */ + private String description; /** *

        @@ -98,216 +113,305 @@ public class UpdateTrackerRequest extends AmazonWebServiceRequest implements Ser /** *

        - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

        + * *

        - * Constraints:
        - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - */ - private String pricingPlan; - - /** - *

        - * This parameter is no longer used. + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. *

        + *         */ - private String pricingPlanDataSource; + private Boolean eventBridgeEnabled; /** *

        - * The name of the tracker resource to update. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

        *

        - * Constraints:
        - * Length: 1 - 100
        - * Pattern: ^[-._\w]+$
        + * This parameter is only used if you are using a KMS customer managed key. + *

        */ - private String trackerName; + private Boolean kmsKeyEnableGeospatialQueries; /** *

        - * Updates the description for the tracker resource. + * The name of the tracker resource to update. *

        *

        * Constraints:
        - * Length: 0 - 1000
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        * * @return

        - * Updates the description for the tracker resource. + * The name of the tracker resource to update. *

        */ - public String getDescription() { - return description; + public String getTrackerName() { + return trackerName; } /** *

        - * Updates the description for the tracker resource. + * The name of the tracker resource to update. *

        *

        * Constraints:
        - * Length: 0 - 1000
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        * - * @param description

        - * Updates the description for the tracker resource. + * @param trackerName

        + * The name of the tracker resource to update. *

        */ - public void setDescription(String description) { - this.description = description; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; } /** *

        - * Updates the description for the tracker resource. + * The name of the tracker resource to update. *

        *

        * Returns a reference to this object so that method calls can be chained * together. *

        * Constraints:
        - * Length: 0 - 1000
        + * Length: 1 - 100
        + * Pattern: [-._\w]+
        * - * @param description

        - * Updates the description for the tracker resource. + * @param trackerName

        + * The name of the tracker resource to update. *

        * @return A reference to this updated object so that method calls can be * chained together. */ - public UpdateTrackerRequest withDescription(String description) { - this.description = description; + public UpdateTrackerRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; return this; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

        - *         + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * * @return

        - * Whether to enable position UPDATE events from this - * tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those - * events are always sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         + * @see PricingPlan */ - public Boolean isEventBridgeEnabled() { - return eventBridgeEnabled; + public String getPricingPlan() { + return pricingPlan; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

        - *         + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @return

        - * Whether to enable position UPDATE events from this - * tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those - * events are always sent to EventBridge. - *

        - *         + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. + *

        + * @see PricingPlan */ - public Boolean getEventBridgeEnabled() { - return eventBridgeEnabled; + public void setPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. - *

        - *         + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param eventBridgeEnabled

        - * Whether to enable position UPDATE events from - * this tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER - * and EXIT events for geofences with this tracker. - * Those events are always sent to EventBridge. + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         + * @return A reference to this updated object so that method calls can be + * chained together. + * @see PricingPlan */ - public void setEventBridgeEnabled(Boolean eventBridgeEnabled) { - this.eventBridgeEnabled = eventBridgeEnabled; + public UpdateTrackerRequest withPricingPlan(String pricingPlan) { + this.pricingPlan = pricingPlan; + return this; } /** *

        - * Whether to enable position UPDATE events from this tracker - * to be sent to EventBridge. + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - * *

        - * You do not need enable this feature to get ENTER and - * EXIT events for geofences with this tracker. Those events - * are always sent to EventBridge. + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement + * + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. + *

        + * @see PricingPlan + */ + public void setPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); + } + + /** + *

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         *

        * Returns a reference to this object so that method calls can be chained * together. + *

        + * Constraints:
        + * Allowed Values: RequestBasedUsage, MobileAssetTracking, + * MobileAssetManagement * - * @param eventBridgeEnabled

        - * Whether to enable position UPDATE events from - * this tracker to be sent to EventBridge. - *

        - * - *

        - * You do not need enable this feature to get ENTER - * and EXIT events for geofences with this tracker. - * Those events are always sent to EventBridge. + * @param pricingPlan

        + * No longer used. If included, the only allowed value is + * RequestBasedUsage. *

        - *         * @return A reference to this updated object so that method calls can be * chained together. + * @see PricingPlan */ - public UpdateTrackerRequest withEventBridgeEnabled(Boolean eventBridgeEnabled) { - this.eventBridgeEnabled = eventBridgeEnabled; + public UpdateTrackerRequest withPricingPlan(PricingPlan pricingPlan) { + this.pricingPlan = pricingPlan.toString(); return this; } /** *

        - * Updates the position filtering for the tracker resource. + * This parameter is no longer used. *

        + * + * @return

        + * This parameter is no longer used. + *

        + */ + public String getPricingPlanDataSource() { + return pricingPlanDataSource; + } + + /** *

        - * Valid values: + * This parameter is no longer used. + *

        + * + * @param pricingPlanDataSource

        + * This parameter is no longer used. + *

        + */ + public void setPricingPlanDataSource(String pricingPlanDataSource) { + this.pricingPlanDataSource = pricingPlanDataSource; + } + + /** + *

        + * This parameter is no longer used. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param pricingPlanDataSource

        + * This parameter is no longer used. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateTrackerRequest withPricingPlanDataSource(String pricingPlanDataSource) { + this.pricingPlanDataSource = pricingPlanDataSource; + return this; + } + + /** + *

        + * Updates the description for the tracker resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @return

        + * Updates the description for the tracker resource. + *

        + */ + public String getDescription() { + return description; + } + + /** + *

        + * Updates the description for the tracker resource. + *

        + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the tracker resource. + *

        + */ + public void setDescription(String description) { + this.description = description; + } + + /** + *

        + * Updates the description for the tracker resource. + *

        + *

        + * Returns a reference to this object so that method calls can be chained + * together. + *

        + * Constraints:
        + * Length: 0 - 1000
        + * + * @param description

        + * Updates the description for the tracker resource. + *

        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateTrackerRequest withDescription(String description) { + this.description = description; + return this; + } + + /** + *

        + * Updates the position filtering for the tracker resource. + *

        + *

        + * Valid values: *

        *
          *
        • @@ -780,215 +884,230 @@ public UpdateTrackerRequest withPositionFiltering(PositionFiltering positionFilt /** *

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

          + * *

          - * Constraints:
          - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. + *

          + *           * * @return

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this + * tracker to be sent to EventBridge. *

          - * @see PricingPlan + * + *

          + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those + * events are always sent to EventBridge. + *

          + *           */ - public String getPricingPlan() { - return pricingPlan; + public Boolean isEventBridgeEnabled() { + return eventBridgeEnabled; } /** *

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

          + * *

          - * Constraints:
          - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. + *

          + *           * - * @param pricingPlan

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

          - * @see PricingPlan + * @return

          + * Whether to enable position UPDATE events from this + * tracker to be sent to EventBridge. + *

          + * + *

          + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those + * events are always sent to EventBridge. + *

          + *           */ - public void setPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; + public Boolean getEventBridgeEnabled() { + return eventBridgeEnabled; } /** *

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

          + * *

          - * Returns a reference to this object so that method calls can be chained - * together. - *

          - * Constraints:
          - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. + *

          + *           * - * @param pricingPlan

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * @param eventBridgeEnabled

          + * Whether to enable position UPDATE events from + * this tracker to be sent to EventBridge. *

          - * @return A reference to this updated object so that method calls can be - * chained together. - * @see PricingPlan + * + *

          + * You do not need enable this feature to get ENTER + * and EXIT events for geofences with this tracker. + * Those events are always sent to EventBridge. + *

          + *           */ - public UpdateTrackerRequest withPricingPlan(String pricingPlan) { - this.pricingPlan = pricingPlan; - return this; + public void setEventBridgeEnabled(Boolean eventBridgeEnabled) { + this.eventBridgeEnabled = eventBridgeEnabled; } /** *

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * Whether to enable position UPDATE events from this tracker + * to be sent to EventBridge. *

          + * *

          - * Constraints:
          - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement - * - * @param pricingPlan

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. - *

          - * @see PricingPlan - */ - public void setPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); - } - - /** - *

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * You do not need enable this feature to get ENTER and + * EXIT events for geofences with this tracker. Those events + * are always sent to EventBridge. *

          + *           *

          * Returns a reference to this object so that method calls can be chained * together. - *

          - * Constraints:
          - * Allowed Values: RequestBasedUsage, MobileAssetTracking, - * MobileAssetManagement * - * @param pricingPlan

          - * No longer used. If included, the only allowed value is - * RequestBasedUsage. + * @param eventBridgeEnabled

          + * Whether to enable position UPDATE events from + * this tracker to be sent to EventBridge. + *

          + * + *

          + * You do not need enable this feature to get ENTER + * and EXIT events for geofences with this tracker. + * Those events are always sent to EventBridge. *

          + *           * @return A reference to this updated object so that method calls can be * chained together. - * @see PricingPlan */ - public UpdateTrackerRequest withPricingPlan(PricingPlan pricingPlan) { - this.pricingPlan = pricingPlan.toString(); + public UpdateTrackerRequest withEventBridgeEnabled(Boolean eventBridgeEnabled) { + this.eventBridgeEnabled = eventBridgeEnabled; return this; } /** *

          - * This parameter is no longer used. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

          - * - * @return

          - * This parameter is no longer used. - *

          - */ - public String getPricingPlanDataSource() { - return pricingPlanDataSource; - } - - /** *

          - * This parameter is no longer used. + * This parameter is only used if you are using a KMS customer managed key. *

          * - * @param pricingPlanDataSource

          - * This parameter is no longer used. - *

          + * @return

          + * Enables GeospatialQueries for a tracker that uses a + * Amazon Web Services KMS customer managed key. + *

          + *

          + * This parameter is only used if you are using a KMS customer + * managed key. + *

          */ - public void setPricingPlanDataSource(String pricingPlanDataSource) { - this.pricingPlanDataSource = pricingPlanDataSource; + public Boolean isKmsKeyEnableGeospatialQueries() { + return kmsKeyEnableGeospatialQueries; } /** *

          - * This parameter is no longer used. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

          *

          - * Returns a reference to this object so that method calls can be chained - * together. - * - * @param pricingPlanDataSource

          - * This parameter is no longer used. - *

          - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateTrackerRequest withPricingPlanDataSource(String pricingPlanDataSource) { - this.pricingPlanDataSource = pricingPlanDataSource; - return this; - } - - /** - *

          - * The name of the tracker resource to update. + * This parameter is only used if you are using a KMS customer managed key. *

          - *

          - * Constraints:
          - * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          * * @return

          - * The name of the tracker resource to update. + * Enables GeospatialQueries for a tracker that uses a + * Amazon Web Services KMS customer managed key. + *

          + *

          + * This parameter is only used if you are using a KMS customer + * managed key. *

          */ - public String getTrackerName() { - return trackerName; + public Boolean getKmsKeyEnableGeospatialQueries() { + return kmsKeyEnableGeospatialQueries; } /** *

          - * The name of the tracker resource to update. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. *

          *

          - * Constraints:
          - * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          + * This parameter is only used if you are using a KMS customer managed key. + *

          * - * @param trackerName

          - * The name of the tracker resource to update. + * @param kmsKeyEnableGeospatialQueries

          + * Enables GeospatialQueries for a tracker that uses + * a Amazon Web Services KMS customer managed key. + *

          + *

          + * This parameter is only used if you are using a KMS customer + * managed key. *

          */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; + public void setKmsKeyEnableGeospatialQueries(Boolean kmsKeyEnableGeospatialQueries) { + this.kmsKeyEnableGeospatialQueries = kmsKeyEnableGeospatialQueries; } /** *

          - * The name of the tracker resource to update. + * Enables GeospatialQueries for a tracker that uses a Amazon Web Services KMS customer managed key. + *

          + *

          + * This parameter is only used if you are using a KMS customer managed key. *

          *

          * Returns a reference to this object so that method calls can be chained * together. - *

          - * Constraints:
          - * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          * - * @param trackerName

          - * The name of the tracker resource to update. + * @param kmsKeyEnableGeospatialQueries

          + * Enables GeospatialQueries for a tracker that uses + * a Amazon Web Services KMS customer managed key. + *

          + *

          + * This parameter is only used if you are using a KMS customer + * managed key. *

          * @return A reference to this updated object so that method calls can be * chained together. */ - public UpdateTrackerRequest withTrackerName(String trackerName) { - this.trackerName = trackerName; + public UpdateTrackerRequest withKmsKeyEnableGeospatialQueries( + Boolean kmsKeyEnableGeospatialQueries) { + this.kmsKeyEnableGeospatialQueries = kmsKeyEnableGeospatialQueries; return this; } @@ -1003,18 +1122,20 @@ public UpdateTrackerRequest withTrackerName(String trackerName) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getDescription() != null) - sb.append("Description: " + getDescription() + ","); - if (getEventBridgeEnabled() != null) - sb.append("EventBridgeEnabled: " + getEventBridgeEnabled() + ","); - if (getPositionFiltering() != null) - sb.append("PositionFiltering: " + getPositionFiltering() + ","); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); if (getPricingPlan() != null) sb.append("PricingPlan: " + getPricingPlan() + ","); if (getPricingPlanDataSource() != null) sb.append("PricingPlanDataSource: " + getPricingPlanDataSource() + ","); - if (getTrackerName() != null) - sb.append("TrackerName: " + getTrackerName()); + if (getDescription() != null) + sb.append("Description: " + getDescription() + ","); + if (getPositionFiltering() != null) + sb.append("PositionFiltering: " + getPositionFiltering() + ","); + if (getEventBridgeEnabled() != null) + sb.append("EventBridgeEnabled: " + getEventBridgeEnabled() + ","); + if (getKmsKeyEnableGeospatialQueries() != null) + sb.append("KmsKeyEnableGeospatialQueries: " + getKmsKeyEnableGeospatialQueries()); sb.append("}"); return sb.toString(); } @@ -1025,18 +1146,22 @@ public int hashCode() { int hashCode = 1; hashCode = prime * hashCode - + ((getDescription() == null) ? 0 : getDescription().hashCode()); - hashCode = prime * hashCode - + ((getEventBridgeEnabled() == null) ? 0 : getEventBridgeEnabled().hashCode()); - hashCode = prime * hashCode - + ((getPositionFiltering() == null) ? 0 : getPositionFiltering().hashCode()); + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); hashCode = prime * hashCode + ((getPricingPlan() == null) ? 0 : getPricingPlan().hashCode()); hashCode = prime * hashCode + ((getPricingPlanDataSource() == null) ? 0 : getPricingPlanDataSource().hashCode()); hashCode = prime * hashCode - + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + + ((getDescription() == null) ? 0 : getDescription().hashCode()); + hashCode = prime * hashCode + + ((getPositionFiltering() == null) ? 0 : getPositionFiltering().hashCode()); + hashCode = prime * hashCode + + ((getEventBridgeEnabled() == null) ? 0 : getEventBridgeEnabled().hashCode()); + hashCode = prime + * hashCode + + ((getKmsKeyEnableGeospatialQueries() == null) ? 0 + : getKmsKeyEnableGeospatialQueries().hashCode()); return hashCode; } @@ -1051,20 +1176,10 @@ public boolean equals(Object obj) { return false; UpdateTrackerRequest other = (UpdateTrackerRequest) obj; - if (other.getDescription() == null ^ this.getDescription() == null) - return false; - if (other.getDescription() != null - && other.getDescription().equals(this.getDescription()) == false) - return false; - if (other.getEventBridgeEnabled() == null ^ this.getEventBridgeEnabled() == null) - return false; - if (other.getEventBridgeEnabled() != null - && other.getEventBridgeEnabled().equals(this.getEventBridgeEnabled()) == false) - return false; - if (other.getPositionFiltering() == null ^ this.getPositionFiltering() == null) + if (other.getTrackerName() == null ^ this.getTrackerName() == null) return false; - if (other.getPositionFiltering() != null - && other.getPositionFiltering().equals(this.getPositionFiltering()) == false) + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) return false; if (other.getPricingPlan() == null ^ this.getPricingPlan() == null) return false; @@ -1076,10 +1191,27 @@ public boolean equals(Object obj) { if (other.getPricingPlanDataSource() != null && other.getPricingPlanDataSource().equals(this.getPricingPlanDataSource()) == false) return false; - if (other.getTrackerName() == null ^ this.getTrackerName() == null) + if (other.getDescription() == null ^ this.getDescription() == null) return false; - if (other.getTrackerName() != null - && other.getTrackerName().equals(this.getTrackerName()) == false) + if (other.getDescription() != null + && other.getDescription().equals(this.getDescription()) == false) + return false; + if (other.getPositionFiltering() == null ^ this.getPositionFiltering() == null) + return false; + if (other.getPositionFiltering() != null + && other.getPositionFiltering().equals(this.getPositionFiltering()) == false) + return false; + if (other.getEventBridgeEnabled() == null ^ this.getEventBridgeEnabled() == null) + return false; + if (other.getEventBridgeEnabled() != null + && other.getEventBridgeEnabled().equals(this.getEventBridgeEnabled()) == false) + return false; + if (other.getKmsKeyEnableGeospatialQueries() == null + ^ this.getKmsKeyEnableGeospatialQueries() == null) + return false; + if (other.getKmsKeyEnableGeospatialQueries() != null + && other.getKmsKeyEnableGeospatialQueries().equals( + this.getKmsKeyEnableGeospatialQueries()) == false) return false; return true; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateTrackerResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateTrackerResult.java index a03408e75e..a950f3f2fa 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateTrackerResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/UpdateTrackerResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -18,6 +18,17 @@ import java.io.Serializable; public class UpdateTrackerResult implements Serializable { + /** + *

          + * The name of the updated tracker resource. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + */ + private String trackerName; + /** *

          * The Amazon Resource Name (ARN) of the updated tracker resource. Used to @@ -35,11 +46,20 @@ public class UpdateTrackerResult implements Serializable { * Constraints:
          * Length: 0 - 1600
          * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
          + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
          */ private String trackerArn; + /** + *

          + * The timestamp for when the tracker resource was last updated in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + private java.util.Date updateTime; + /** *

          * The name of the updated tracker resource. @@ -47,18 +67,55 @@ public class UpdateTrackerResult implements Serializable { *

          * Constraints:
          * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          + * Pattern: [-._\w]+
          + * + * @return

          + * The name of the updated tracker resource. + *

          */ - private String trackerName; + public String getTrackerName() { + return trackerName; + } /** *

          - * The timestamp for when the tracker resource was last updated in ISO - * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + * The name of the updated tracker resource. *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + * + * @param trackerName

          + * The name of the updated tracker resource. + *

          */ - private java.util.Date updateTime; + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

          + * The name of the updated tracker resource. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + * + * @param trackerName

          + * The name of the updated tracker resource. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public UpdateTrackerResult withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } /** *

          @@ -77,8 +134,8 @@ public class UpdateTrackerResult implements Serializable { * Constraints:
          * Length: 0 - 1600
          * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
          + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
          * * @return

          * The Amazon Resource Name (ARN) of the updated tracker resource. @@ -114,8 +171,8 @@ public String getTrackerArn() { * Constraints:
          * Length: 0 - 1600
          * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
          + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
          * * @param trackerArn

          * The Amazon Resource Name (ARN) of the updated tracker @@ -154,8 +211,8 @@ public void setTrackerArn(String trackerArn) { * Constraints:
          * Length: 0 - 1600
          * Pattern: - * ^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0- - * 9]+)*)?){2}:([^/].*)?$
          + * arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9 + * ]+)*)?){2}:([^/].*)?
          * * @param trackerArn

          * The Amazon Resource Name (ARN) of the updated tracker @@ -177,63 +234,6 @@ public UpdateTrackerResult withTrackerArn(String trackerArn) { return this; } - /** - *

          - * The name of the updated tracker resource. - *

          - *

          - * Constraints:
          - * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          - * - * @return

          - * The name of the updated tracker resource. - *

          - */ - public String getTrackerName() { - return trackerName; - } - - /** - *

          - * The name of the updated tracker resource. - *

          - *

          - * Constraints:
          - * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          - * - * @param trackerName

          - * The name of the updated tracker resource. - *

          - */ - public void setTrackerName(String trackerName) { - this.trackerName = trackerName; - } - - /** - *

          - * The name of the updated tracker resource. - *

          - *

          - * Returns a reference to this object so that method calls can be chained - * together. - *

          - * Constraints:
          - * Length: 1 - 100
          - * Pattern: ^[-._\w]+$
          - * - * @param trackerName

          - * The name of the updated tracker resource. - *

          - * @return A reference to this updated object so that method calls can be - * chained together. - */ - public UpdateTrackerResult withTrackerName(String trackerName) { - this.trackerName = trackerName; - return this; - } - /** *

          * The timestamp for when the tracker resource was last updated in - * The field where the invalid entry was detected. - *

          - */ - private java.util.List fieldList; - /** *

          * A message with the reason for the validation exception error. @@ -43,40 +36,20 @@ public class ValidationException extends AmazonServiceException { */ private String reason; - /** - * Constructs a new ValidationException with the specified error message. - * - * @param message Describes the error encountered. - */ - public ValidationException(String message) { - super(message); - } - /** *

          * The field where the invalid entry was detected. *

          - * - * @return

          - * The field where the invalid entry was detected. - *

          */ - public java.util.List getFieldList() { - return fieldList; - } + private java.util.List fieldList; /** - *

          - * The field where the invalid entry was detected. - *

          + * Constructs a new ValidationException with the specified error message. * - * @param fieldList

          - * The field where the invalid entry was detected. - *

          + * @param message Describes the error encountered. */ - public void setFieldList(java.util.Collection fieldList) { - this.fieldList = fieldList == null ? null - : new java.util.ArrayList(fieldList); + public ValidationException(String message) { + super(message); } /** @@ -114,4 +87,31 @@ public String getReason() { public void setReason(String reason) { this.reason = reason; } + + /** + *

          + * The field where the invalid entry was detected. + *

          + * + * @return

          + * The field where the invalid entry was detected. + *

          + */ + public java.util.List getFieldList() { + return fieldList; + } + + /** + *

          + * The field where the invalid entry was detected. + *

          + * + * @param fieldList

          + * The field where the invalid entry was detected. + *

          + */ + public void setFieldList(java.util.Collection fieldList) { + this.fieldList = fieldList == null ? null + : new java.util.ArrayList(fieldList); + } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ValidationExceptionField.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ValidationExceptionField.java index 765bcd7737..b67fad5dff 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ValidationExceptionField.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ValidationExceptionField.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,105 +26,105 @@ public class ValidationExceptionField implements Serializable { /** *

          - * A message with the reason for the validation exception error. + * The field name where the invalid entry was detected. *

          */ - private String message; + private String name; /** *

          - * The field name where the invalid entry was detected. + * A message with the reason for the validation exception error. *

          */ - private String name; + private String message; /** *

          - * A message with the reason for the validation exception error. + * The field name where the invalid entry was detected. *

          * * @return

          - * A message with the reason for the validation exception error. + * The field name where the invalid entry was detected. *

          */ - public String getMessage() { - return message; + public String getName() { + return name; } /** *

          - * A message with the reason for the validation exception error. + * The field name where the invalid entry was detected. *

          * - * @param message

          - * A message with the reason for the validation exception error. + * @param name

          + * The field name where the invalid entry was detected. *

          */ - public void setMessage(String message) { - this.message = message; + public void setName(String name) { + this.name = name; } /** *

          - * A message with the reason for the validation exception error. + * The field name where the invalid entry was detected. *

          *

          * Returns a reference to this object so that method calls can be chained * together. * - * @param message

          - * A message with the reason for the validation exception error. + * @param name

          + * The field name where the invalid entry was detected. *

          * @return A reference to this updated object so that method calls can be * chained together. */ - public ValidationExceptionField withMessage(String message) { - this.message = message; + public ValidationExceptionField withName(String name) { + this.name = name; return this; } /** *

          - * The field name where the invalid entry was detected. + * A message with the reason for the validation exception error. *

          * * @return

          - * The field name where the invalid entry was detected. + * A message with the reason for the validation exception error. *

          */ - public String getName() { - return name; + public String getMessage() { + return message; } /** *

          - * The field name where the invalid entry was detected. + * A message with the reason for the validation exception error. *

          * - * @param name

          - * The field name where the invalid entry was detected. + * @param message

          + * A message with the reason for the validation exception error. *

          */ - public void setName(String name) { - this.name = name; + public void setMessage(String message) { + this.message = message; } /** *

          - * The field name where the invalid entry was detected. + * A message with the reason for the validation exception error. *

          *

          * Returns a reference to this object so that method calls can be chained * together. * - * @param name

          - * The field name where the invalid entry was detected. + * @param message

          + * A message with the reason for the validation exception error. *

          * @return A reference to this updated object so that method calls can be * chained together. */ - public ValidationExceptionField withName(String name) { - this.name = name; + public ValidationExceptionField withMessage(String message) { + this.message = message; return this; } @@ -139,10 +139,10 @@ public ValidationExceptionField withName(String name) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); - if (getMessage() != null) - sb.append("Message: " + getMessage() + ","); if (getName() != null) - sb.append("Name: " + getName()); + sb.append("Name: " + getName() + ","); + if (getMessage() != null) + sb.append("Message: " + getMessage()); sb.append("}"); return sb.toString(); } @@ -152,8 +152,8 @@ public int hashCode() { final int prime = 31; int hashCode = 1; - hashCode = prime * hashCode + ((getMessage() == null) ? 0 : getMessage().hashCode()); hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode()); + hashCode = prime * hashCode + ((getMessage() == null) ? 0 : getMessage().hashCode()); return hashCode; } @@ -168,14 +168,14 @@ public boolean equals(Object obj) { return false; ValidationExceptionField other = (ValidationExceptionField) obj; - if (other.getMessage() == null ^ this.getMessage() == null) - return false; - if (other.getMessage() != null && other.getMessage().equals(this.getMessage()) == false) - return false; if (other.getName() == null ^ this.getName() == null) return false; if (other.getName() != null && other.getName().equals(this.getName()) == false) return false; + if (other.getMessage() == null ^ this.getMessage() == null) + return false; + if (other.getMessage() != null && other.getMessage().equals(this.getMessage()) == false) + return false; return true; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VehicleWeightUnit.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VehicleWeightUnit.java index 88e533efd2..dae98c26de 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VehicleWeightUnit.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VehicleWeightUnit.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionRequest.java new file mode 100644 index 0000000000..2606619cbe --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionRequest.java @@ -0,0 +1,367 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +import com.amazonaws.AmazonWebServiceRequest; + +/** + *

          + * Verifies the integrity of the device's position by determining if it was + * reported behind a proxy, and by comparing it to an inferred position + * estimated based on the device's state. + *

          + */ +public class VerifyDevicePositionRequest extends AmazonWebServiceRequest implements Serializable { + /** + *

          + * The name of the tracker resource to be associated with verification + * request. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + */ + private String trackerName; + + /** + *

          + * The device's state, including position, IP address, cell signals and + * Wi-Fi access points. + *

          + */ + private DeviceState deviceState; + + /** + *

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + */ + private String distanceUnit; + + /** + *

          + * The name of the tracker resource to be associated with verification + * request. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + * + * @return

          + * The name of the tracker resource to be associated with + * verification request. + *

          + */ + public String getTrackerName() { + return trackerName; + } + + /** + *

          + * The name of the tracker resource to be associated with verification + * request. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + * + * @param trackerName

          + * The name of the tracker resource to be associated with + * verification request. + *

          + */ + public void setTrackerName(String trackerName) { + this.trackerName = trackerName; + } + + /** + *

          + * The name of the tracker resource to be associated with verification + * request. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\w]+
          + * + * @param trackerName

          + * The name of the tracker resource to be associated with + * verification request. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public VerifyDevicePositionRequest withTrackerName(String trackerName) { + this.trackerName = trackerName; + return this; + } + + /** + *

          + * The device's state, including position, IP address, cell signals and + * Wi-Fi access points. + *

          + * + * @return

          + * The device's state, including position, IP address, cell signals + * and Wi-Fi access points. + *

          + */ + public DeviceState getDeviceState() { + return deviceState; + } + + /** + *

          + * The device's state, including position, IP address, cell signals and + * Wi-Fi access points. + *

          + * + * @param deviceState

          + * The device's state, including position, IP address, cell + * signals and Wi-Fi access points. + *

          + */ + public void setDeviceState(DeviceState deviceState) { + this.deviceState = deviceState; + } + + /** + *

          + * The device's state, including position, IP address, cell signals and + * Wi-Fi access points. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param deviceState

          + * The device's state, including position, IP address, cell + * signals and Wi-Fi access points. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public VerifyDevicePositionRequest withDeviceState(DeviceState deviceState) { + this.deviceState = deviceState; + return this; + } + + /** + *

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @return

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** + *

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** + *

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public VerifyDevicePositionRequest withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification request. + *

          + *

          + * Default Value: Kilometers + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public VerifyDevicePositionRequest withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getTrackerName() != null) + sb.append("TrackerName: " + getTrackerName() + ","); + if (getDeviceState() != null) + sb.append("DeviceState: " + getDeviceState() + ","); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + + ((getTrackerName() == null) ? 0 : getTrackerName().hashCode()); + hashCode = prime * hashCode + + ((getDeviceState() == null) ? 0 : getDeviceState().hashCode()); + hashCode = prime * hashCode + + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof VerifyDevicePositionRequest == false) + return false; + VerifyDevicePositionRequest other = (VerifyDevicePositionRequest) obj; + + if (other.getTrackerName() == null ^ this.getTrackerName() == null) + return false; + if (other.getTrackerName() != null + && other.getTrackerName().equals(this.getTrackerName()) == false) + return false; + if (other.getDeviceState() == null ^ this.getDeviceState() == null) + return false; + if (other.getDeviceState() != null + && other.getDeviceState().equals(this.getDeviceState()) == false) + return false; + if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) + return false; + if (other.getDistanceUnit() != null + && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionResult.java new file mode 100644 index 0000000000..ada227e1b4 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/VerifyDevicePositionResult.java @@ -0,0 +1,470 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +public class VerifyDevicePositionResult implements Serializable { + /** + *

          + * The inferred state of the device, given the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

          + */ + private InferredState inferredState; + + /** + *

          + * The device identifier. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\p{L}\p{N}]+
          + */ + private String deviceId; + + /** + *

          + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + private java.util.Date sampleTime; + + /** + *

          + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + private java.util.Date receivedTime; + + /** + *

          + * The distance unit for the verification response. + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + */ + private String distanceUnit; + + /** + *

          + * The inferred state of the device, given the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

          + * + * @return

          + * The inferred state of the device, given the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

          + */ + public InferredState getInferredState() { + return inferredState; + } + + /** + *

          + * The inferred state of the device, given the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

          + * + * @param inferredState

          + * The inferred state of the device, given the provided position, + * IP address, cellular signals, and Wi-Fi- access points. + *

          + */ + public void setInferredState(InferredState inferredState) { + this.inferredState = inferredState; + } + + /** + *

          + * The inferred state of the device, given the provided position, IP + * address, cellular signals, and Wi-Fi- access points. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param inferredState

          + * The inferred state of the device, given the provided position, + * IP address, cellular signals, and Wi-Fi- access points. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public VerifyDevicePositionResult withInferredState(InferredState inferredState) { + this.inferredState = inferredState; + return this; + } + + /** + *

          + * The device identifier. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\p{L}\p{N}]+
          + * + * @return

          + * The device identifier. + *

          + */ + public String getDeviceId() { + return deviceId; + } + + /** + *

          + * The device identifier. + *

          + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\p{L}\p{N}]+
          + * + * @param deviceId

          + * The device identifier. + *

          + */ + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; + } + + /** + *

          + * The device identifier. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Length: 1 - 100
          + * Pattern: [-._\p{L}\p{N}]+
          + * + * @param deviceId

          + * The device identifier. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public VerifyDevicePositionResult withDeviceId(String deviceId) { + this.deviceId = deviceId; + return this; + } + + /** + *

          + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + * + * @return

          + * The timestamp at which the device's position was determined. Uses + * + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + public java.util.Date getSampleTime() { + return sampleTime; + } + + /** + *

          + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + * + * @param sampleTime

          + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + public void setSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; + } + + /** + *

          + * The timestamp at which the device's position was determined. Uses ISO 8601 + * format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param sampleTime

          + * The timestamp at which the device's position was determined. + * Uses ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public VerifyDevicePositionResult withSampleTime(java.util.Date sampleTime) { + this.sampleTime = sampleTime; + return this; + } + + /** + *

          + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + * + * @return

          + * The timestamp for when the tracker resource received the device + * position in + * ISO 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + public java.util.Date getReceivedTime() { + return receivedTime; + } + + /** + *

          + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + * + * @param receivedTime

          + * The timestamp for when the tracker resource received the + * device position in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + */ + public void setReceivedTime(java.util.Date receivedTime) { + this.receivedTime = receivedTime; + } + + /** + *

          + * The timestamp for when the tracker resource received the device position + * in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param receivedTime

          + * The timestamp for when the tracker resource received the + * device position in ISO + * 8601 format: YYYY-MM-DDThh:mm:ss.sssZ. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public VerifyDevicePositionResult withReceivedTime(java.util.Date receivedTime) { + this.receivedTime = receivedTime; + return this; + } + + /** + *

          + * The distance unit for the verification response. + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @return

          + * The distance unit for the verification response. + *

          + * @see DistanceUnit + */ + public String getDistanceUnit() { + return distanceUnit; + } + + /** + *

          + * The distance unit for the verification response. + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification response. + *

          + * @see DistanceUnit + */ + public void setDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + } + + /** + *

          + * The distance unit for the verification response. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification response. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public VerifyDevicePositionResult withDistanceUnit(String distanceUnit) { + this.distanceUnit = distanceUnit; + return this; + } + + /** + *

          + * The distance unit for the verification response. + *

          + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification response. + *

          + * @see DistanceUnit + */ + public void setDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + } + + /** + *

          + * The distance unit for the verification response. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Allowed Values: Kilometers, Miles + * + * @param distanceUnit

          + * The distance unit for the verification response. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + * @see DistanceUnit + */ + public VerifyDevicePositionResult withDistanceUnit(DistanceUnit distanceUnit) { + this.distanceUnit = distanceUnit.toString(); + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getInferredState() != null) + sb.append("InferredState: " + getInferredState() + ","); + if (getDeviceId() != null) + sb.append("DeviceId: " + getDeviceId() + ","); + if (getSampleTime() != null) + sb.append("SampleTime: " + getSampleTime() + ","); + if (getReceivedTime() != null) + sb.append("ReceivedTime: " + getReceivedTime() + ","); + if (getDistanceUnit() != null) + sb.append("DistanceUnit: " + getDistanceUnit()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + + ((getInferredState() == null) ? 0 : getInferredState().hashCode()); + hashCode = prime * hashCode + ((getDeviceId() == null) ? 0 : getDeviceId().hashCode()); + hashCode = prime * hashCode + ((getSampleTime() == null) ? 0 : getSampleTime().hashCode()); + hashCode = prime * hashCode + + ((getReceivedTime() == null) ? 0 : getReceivedTime().hashCode()); + hashCode = prime * hashCode + + ((getDistanceUnit() == null) ? 0 : getDistanceUnit().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof VerifyDevicePositionResult == false) + return false; + VerifyDevicePositionResult other = (VerifyDevicePositionResult) obj; + + if (other.getInferredState() == null ^ this.getInferredState() == null) + return false; + if (other.getInferredState() != null + && other.getInferredState().equals(this.getInferredState()) == false) + return false; + if (other.getDeviceId() == null ^ this.getDeviceId() == null) + return false; + if (other.getDeviceId() != null && other.getDeviceId().equals(this.getDeviceId()) == false) + return false; + if (other.getSampleTime() == null ^ this.getSampleTime() == null) + return false; + if (other.getSampleTime() != null + && other.getSampleTime().equals(this.getSampleTime()) == false) + return false; + if (other.getReceivedTime() == null ^ this.getReceivedTime() == null) + return false; + if (other.getReceivedTime() != null + && other.getReceivedTime().equals(this.getReceivedTime()) == false) + return false; + if (other.getDistanceUnit() == null ^ this.getDistanceUnit() == null) + return false; + if (other.getDistanceUnit() != null + && other.getDistanceUnit().equals(this.getDistanceUnit()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/WiFiAccessPoint.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/WiFiAccessPoint.java new file mode 100644 index 0000000000..4e8d19d168 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/WiFiAccessPoint.java @@ -0,0 +1,209 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

          + * Wi-Fi access point. + *

          + */ +public class WiFiAccessPoint implements Serializable { + /** + *

          + * Medium access control address (Mac). + *

          + *

          + * Constraints:
          + * Length: 12 - 17
          + * Pattern: ([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})
          + */ + private String macAddress; + + /** + *

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + *

          + * Constraints:
          + * Range: -128 - 0
          + */ + private Integer rss; + + /** + *

          + * Medium access control address (Mac). + *

          + *

          + * Constraints:
          + * Length: 12 - 17
          + * Pattern: ([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})
          + * + * @return

          + * Medium access control address (Mac). + *

          + */ + public String getMacAddress() { + return macAddress; + } + + /** + *

          + * Medium access control address (Mac). + *

          + *

          + * Constraints:
          + * Length: 12 - 17
          + * Pattern: ([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})
          + * + * @param macAddress

          + * Medium access control address (Mac). + *

          + */ + public void setMacAddress(String macAddress) { + this.macAddress = macAddress; + } + + /** + *

          + * Medium access control address (Mac). + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Length: 12 - 17
          + * Pattern: ([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})
          + * + * @param macAddress

          + * Medium access control address (Mac). + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public WiFiAccessPoint withMacAddress(String macAddress) { + this.macAddress = macAddress; + return this; + } + + /** + *

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + *

          + * Constraints:
          + * Range: -128 - 0
          + * + * @return

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + */ + public Integer getRss() { + return rss; + } + + /** + *

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + *

          + * Constraints:
          + * Range: -128 - 0
          + * + * @param rss

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + */ + public void setRss(Integer rss) { + this.rss = rss; + } + + /** + *

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + *

          + * Returns a reference to this object so that method calls can be chained + * together. + *

          + * Constraints:
          + * Range: -128 - 0
          + * + * @param rss

          + * Received signal strength (dBm) of the WLAN measurement data. + *

          + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public WiFiAccessPoint withRss(Integer rss) { + this.rss = rss; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getMacAddress() != null) + sb.append("MacAddress: " + getMacAddress() + ","); + if (getRss() != null) + sb.append("Rss: " + getRss()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getMacAddress() == null) ? 0 : getMacAddress().hashCode()); + hashCode = prime * hashCode + ((getRss() == null) ? 0 : getRss().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof WiFiAccessPoint == false) + return false; + WiFiAccessPoint other = (WiFiAccessPoint) obj; + + if (other.getMacAddress() == null ^ this.getMacAddress() == null) + return false; + if (other.getMacAddress() != null + && other.getMacAddress().equals(this.getMacAddress()) == false) + return false; + if (other.getRss() == null ^ this.getRss() == null) + return false; + if (other.getRss() != null && other.getRss().equals(this.getRss()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AccessDeniedExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AccessDeniedExceptionUnmarshaller.java index d10615acb4..323717fe80 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AccessDeniedExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AccessDeniedExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonMarshaller.java index c3c4affa99..6d575717b1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonUnmarshaller.java index 19d02bee8d..1b6e677e26 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyFilterJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonMarshaller.java index a8ef872a54..d0e0c53d8d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -38,17 +38,6 @@ public void marshall(ApiKeyRestrictions apiKeyRestrictions, AwsJsonWriter jsonWr } jsonWriter.endArray(); } - if (apiKeyRestrictions.getAllowReferers() != null) { - java.util.List allowReferers = apiKeyRestrictions.getAllowReferers(); - jsonWriter.name("AllowReferers"); - jsonWriter.beginArray(); - for (String allowReferersItem : allowReferers) { - if (allowReferersItem != null) { - jsonWriter.value(allowReferersItem); - } - } - jsonWriter.endArray(); - } if (apiKeyRestrictions.getAllowResources() != null) { java.util.List allowResources = apiKeyRestrictions.getAllowResources(); jsonWriter.name("AllowResources"); @@ -60,6 +49,17 @@ public void marshall(ApiKeyRestrictions apiKeyRestrictions, AwsJsonWriter jsonWr } jsonWriter.endArray(); } + if (apiKeyRestrictions.getAllowReferers() != null) { + java.util.List allowReferers = apiKeyRestrictions.getAllowReferers(); + jsonWriter.name("AllowReferers"); + jsonWriter.beginArray(); + for (String allowReferersItem : allowReferers) { + if (allowReferersItem != null) { + jsonWriter.value(allowReferersItem); + } + } + jsonWriter.endArray(); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonUnmarshaller.java index 26d6772761..3bdcdd390a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ApiKeyRestrictionsJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -41,13 +41,13 @@ public ApiKeyRestrictions unmarshall(JsonUnmarshallerContext context) throws Exc StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("AllowReferers")) { - apiKeyRestrictions.setAllowReferers(new ListUnmarshaller( + } else if (name.equals("AllowResources")) { + apiKeyRestrictions.setAllowResources(new ListUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("AllowResources")) { - apiKeyRestrictions.setAllowResources(new ListUnmarshaller( + } else if (name.equals("AllowReferers")) { + apiKeyRestrictions.setAllowReferers(new ListUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerRequestMarshaller.java index b766453b86..b02c847b59 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -82,9 +82,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerResultJsonUnmarshaller.java index 47bee5837c..ebc2149d16 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/AssociateTrackerConsumerResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonMarshaller.java index 2a865394db..3a58f6c3b8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonUnmarshaller.java index f06746afe9..21c55550fc 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryRequestMarshaller.java index 64bc911bcd..a4d4ad72c5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("tracking."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryResultJsonUnmarshaller.java index 19017b619c..1bd92c234d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteDevicePositionHistoryResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonMarshaller.java index c55f61737f..6f4eebca67 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class BatchDeleteGeofenceErrorJsonMarshaller { public void marshall(BatchDeleteGeofenceError batchDeleteGeofenceError, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (batchDeleteGeofenceError.getError() != null) { - BatchItemError error = batchDeleteGeofenceError.getError(); - jsonWriter.name("Error"); - BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); - } if (batchDeleteGeofenceError.getGeofenceId() != null) { String geofenceId = batchDeleteGeofenceError.getGeofenceId(); jsonWriter.name("GeofenceId"); jsonWriter.value(geofenceId); } + if (batchDeleteGeofenceError.getError() != null) { + BatchItemError error = batchDeleteGeofenceError.getError(); + jsonWriter.name("Error"); + BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonUnmarshaller.java index ca1cc10a0e..3616708bfe 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,12 +36,12 @@ public BatchDeleteGeofenceError unmarshall(JsonUnmarshallerContext context) thro reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Error")) { - batchDeleteGeofenceError.setError(BatchItemErrorJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("GeofenceId")) { + if (name.equals("GeofenceId")) { batchDeleteGeofenceError.setGeofenceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Error")) { + batchDeleteGeofenceError.setError(BatchItemErrorJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceRequestMarshaller.java index 10f7c54c90..56f02deb95 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("geofencing."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceResultJsonUnmarshaller.java index e86dfe188c..d610c602a5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchDeleteGeofenceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonMarshaller.java index 606d84922a..6d3def9eec 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,16 +32,16 @@ public void marshall(BatchEvaluateGeofencesError batchEvaluateGeofencesError, jsonWriter.name("DeviceId"); jsonWriter.value(deviceId); } - if (batchEvaluateGeofencesError.getError() != null) { - BatchItemError error = batchEvaluateGeofencesError.getError(); - jsonWriter.name("Error"); - BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); - } if (batchEvaluateGeofencesError.getSampleTime() != null) { java.util.Date sampleTime = batchEvaluateGeofencesError.getSampleTime(); jsonWriter.name("SampleTime"); jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); } + if (batchEvaluateGeofencesError.getError() != null) { + BatchItemError error = batchEvaluateGeofencesError.getError(); + jsonWriter.name("Error"); + BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonUnmarshaller.java index f2b25935b0..16494e03e1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -39,13 +39,13 @@ public BatchEvaluateGeofencesError unmarshall(JsonUnmarshallerContext context) t if (name.equals("DeviceId")) { batchEvaluateGeofencesError.setDeviceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Error")) { - batchEvaluateGeofencesError.setError(BatchItemErrorJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("SampleTime")) { batchEvaluateGeofencesError.setSampleTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("Error")) { + batchEvaluateGeofencesError.setError(BatchItemErrorJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesRequestMarshaller.java index 965002a9f0..b49009c7c1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("geofencing."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesResultJsonUnmarshaller.java index 1c11d6ca15..27a1bd6c1c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchEvaluateGeofencesResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonMarshaller.java index 8d538a44a1..0378c0257b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonUnmarshaller.java index 5f062d6684..8672acec9d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionRequestMarshaller.java index ff215655ff..331b367b75 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("tracking."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionResultJsonUnmarshaller.java index f7163508f9..134d5cc81e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchGetDevicePositionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,16 +34,16 @@ public BatchGetDevicePositionResult unmarshall(JsonUnmarshallerContext context) reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("DevicePositions")) { + if (name.equals("Errors")) { batchGetDevicePositionResult - .setDevicePositions(new ListUnmarshaller( - DevicePositionJsonUnmarshaller.getInstance() + .setErrors(new ListUnmarshaller( + BatchGetDevicePositionErrorJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Errors")) { + } else if (name.equals("DevicePositions")) { batchGetDevicePositionResult - .setErrors(new ListUnmarshaller( - BatchGetDevicePositionErrorJsonUnmarshaller.getInstance() + .setDevicePositions(new ListUnmarshaller( + DevicePositionJsonUnmarshaller.getInstance() ) .unmarshall(context)); } else { diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonMarshaller.java index 4c60a168bc..de121c34a8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonUnmarshaller.java index 693a28fd95..565495a8e0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchItemErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonMarshaller.java index 51fc0c101e..2fb30a5fb6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class BatchPutGeofenceErrorJsonMarshaller { public void marshall(BatchPutGeofenceError batchPutGeofenceError, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (batchPutGeofenceError.getError() != null) { - BatchItemError error = batchPutGeofenceError.getError(); - jsonWriter.name("Error"); - BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); - } if (batchPutGeofenceError.getGeofenceId() != null) { String geofenceId = batchPutGeofenceError.getGeofenceId(); jsonWriter.name("GeofenceId"); jsonWriter.value(geofenceId); } + if (batchPutGeofenceError.getError() != null) { + BatchItemError error = batchPutGeofenceError.getError(); + jsonWriter.name("Error"); + BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonUnmarshaller.java index f1a6d1bbfb..38fce54fc5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,12 +36,12 @@ public BatchPutGeofenceError unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Error")) { - batchPutGeofenceError.setError(BatchItemErrorJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("GeofenceId")) { + if (name.equals("GeofenceId")) { batchPutGeofenceError.setGeofenceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Error")) { + batchPutGeofenceError.setError(BatchItemErrorJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonMarshaller.java index 0ef960a3e6..f79374c192 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,6 +32,11 @@ public void marshall(BatchPutGeofenceRequestEntry batchPutGeofenceRequestEntry, jsonWriter.name("GeofenceId"); jsonWriter.value(geofenceId); } + if (batchPutGeofenceRequestEntry.getGeometry() != null) { + GeofenceGeometry geometry = batchPutGeofenceRequestEntry.getGeometry(); + jsonWriter.name("Geometry"); + GeofenceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); + } if (batchPutGeofenceRequestEntry.getGeofenceProperties() != null) { java.util.Map geofenceProperties = batchPutGeofenceRequestEntry .getGeofenceProperties(); @@ -47,11 +52,6 @@ public void marshall(BatchPutGeofenceRequestEntry batchPutGeofenceRequestEntry, } jsonWriter.endObject(); } - if (batchPutGeofenceRequestEntry.getGeometry() != null) { - GeofenceGeometry geometry = batchPutGeofenceRequestEntry.getGeometry(); - jsonWriter.name("Geometry"); - GeofenceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonUnmarshaller.java index 54c1ba916f..6ee80c6831 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -40,15 +40,15 @@ public BatchPutGeofenceRequestEntry unmarshall(JsonUnmarshallerContext context) if (name.equals("GeofenceId")) { batchPutGeofenceRequestEntry.setGeofenceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Geometry")) { + batchPutGeofenceRequestEntry.setGeometry(GeofenceGeometryJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else if (name.equals("GeofenceProperties")) { batchPutGeofenceRequestEntry.setGeofenceProperties(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Geometry")) { - batchPutGeofenceRequestEntry.setGeometry(GeofenceGeometryJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestMarshaller.java index 1648e01957..010999d7d0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public Request marshall(BatchPutGeofenceRequest batchPu "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("geofencing."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceResultJsonUnmarshaller.java index 72ff59acef..3a7521f088 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,16 +33,16 @@ public BatchPutGeofenceResult unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Errors")) { - batchPutGeofenceResult.setErrors(new ListUnmarshaller( - BatchPutGeofenceErrorJsonUnmarshaller.getInstance() - ) - .unmarshall(context)); - } else if (name.equals("Successes")) { + if (name.equals("Successes")) { batchPutGeofenceResult.setSuccesses(new ListUnmarshaller( BatchPutGeofenceSuccessJsonUnmarshaller.getInstance() ) .unmarshall(context)); + } else if (name.equals("Errors")) { + batchPutGeofenceResult.setErrors(new ListUnmarshaller( + BatchPutGeofenceErrorJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonMarshaller.java index 89e651f801..b8e6a8a640 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class BatchPutGeofenceSuccessJsonMarshaller { public void marshall(BatchPutGeofenceSuccess batchPutGeofenceSuccess, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (batchPutGeofenceSuccess.getCreateTime() != null) { - java.util.Date createTime = batchPutGeofenceSuccess.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); - } if (batchPutGeofenceSuccess.getGeofenceId() != null) { String geofenceId = batchPutGeofenceSuccess.getGeofenceId(); jsonWriter.name("GeofenceId"); jsonWriter.value(geofenceId); } + if (batchPutGeofenceSuccess.getCreateTime() != null) { + java.util.Date createTime = batchPutGeofenceSuccess.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + } if (batchPutGeofenceSuccess.getUpdateTime() != null) { java.util.Date updateTime = batchPutGeofenceSuccess.getUpdateTime(); jsonWriter.name("UpdateTime"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonUnmarshaller.java index db8132d5b5..09cc1e2dfd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchPutGeofenceSuccessJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,13 +36,13 @@ public BatchPutGeofenceSuccess unmarshall(JsonUnmarshallerContext context) throw reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { + if (name.equals("GeofenceId")) { + batchPutGeofenceSuccess.setGeofenceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("CreateTime")) { batchPutGeofenceSuccess.setCreateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); - } else if (name.equals("GeofenceId")) { - batchPutGeofenceSuccess.setGeofenceId(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("UpdateTime")) { batchPutGeofenceSuccess.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonMarshaller.java index 3e84f54bbe..9e2c01c9e2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,16 +32,16 @@ public void marshall(BatchUpdateDevicePositionError batchUpdateDevicePositionErr jsonWriter.name("DeviceId"); jsonWriter.value(deviceId); } - if (batchUpdateDevicePositionError.getError() != null) { - BatchItemError error = batchUpdateDevicePositionError.getError(); - jsonWriter.name("Error"); - BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); - } if (batchUpdateDevicePositionError.getSampleTime() != null) { java.util.Date sampleTime = batchUpdateDevicePositionError.getSampleTime(); jsonWriter.name("SampleTime"); jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); } + if (batchUpdateDevicePositionError.getError() != null) { + BatchItemError error = batchUpdateDevicePositionError.getError(); + jsonWriter.name("Error"); + BatchItemErrorJsonMarshaller.getInstance().marshall(error, jsonWriter); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonUnmarshaller.java index e6824bb930..3be9407a48 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -40,14 +40,14 @@ public BatchUpdateDevicePositionError unmarshall(JsonUnmarshallerContext context if (name.equals("DeviceId")) { batchUpdateDevicePositionError.setDeviceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Error")) { - batchUpdateDevicePositionError.setError(BatchItemErrorJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else if (name.equals("SampleTime")) { batchUpdateDevicePositionError.setSampleTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("Error")) { + batchUpdateDevicePositionError.setError(BatchItemErrorJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionRequestMarshaller.java index 82b0851db6..91c05726e5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("tracking."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionResultJsonUnmarshaller.java index bd6062dccd..1f865a866b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/BatchUpdateDevicePositionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonMarshaller.java index 85eefa44ae..e1f37a40b4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonUnmarshaller.java index 0537809288..e854085105 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteCarModeOptionsJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixRequestMarshaller.java index 2be89fe0a7..4a743bc53f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -69,18 +69,6 @@ public Request marshall( AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (calculateRouteMatrixRequest.getCarModeOptions() != null) { - CalculateRouteCarModeOptions carModeOptions = calculateRouteMatrixRequest - .getCarModeOptions(); - jsonWriter.name("CarModeOptions"); - CalculateRouteCarModeOptionsJsonMarshaller.getInstance().marshall(carModeOptions, - jsonWriter); - } - if (calculateRouteMatrixRequest.getDepartNow() != null) { - Boolean departNow = calculateRouteMatrixRequest.getDepartNow(); - jsonWriter.name("DepartNow"); - jsonWriter.value(departNow); - } if (calculateRouteMatrixRequest.getDeparturePositions() != null) { java.util.List> departurePositions = calculateRouteMatrixRequest .getDeparturePositions(); @@ -99,11 +87,6 @@ public Request marshall( } jsonWriter.endArray(); } - if (calculateRouteMatrixRequest.getDepartureTime() != null) { - java.util.Date departureTime = calculateRouteMatrixRequest.getDepartureTime(); - jsonWriter.name("DepartureTime"); - jsonWriter.value(DateUtils.formatISO8601Date(departureTime)); - } if (calculateRouteMatrixRequest.getDestinationPositions() != null) { java.util.List> destinationPositions = calculateRouteMatrixRequest .getDestinationPositions(); @@ -122,15 +105,32 @@ public Request marshall( } jsonWriter.endArray(); } + if (calculateRouteMatrixRequest.getTravelMode() != null) { + String travelMode = calculateRouteMatrixRequest.getTravelMode(); + jsonWriter.name("TravelMode"); + jsonWriter.value(travelMode); + } + if (calculateRouteMatrixRequest.getDepartureTime() != null) { + java.util.Date departureTime = calculateRouteMatrixRequest.getDepartureTime(); + jsonWriter.name("DepartureTime"); + jsonWriter.value(DateUtils.formatISO8601Date(departureTime)); + } + if (calculateRouteMatrixRequest.getDepartNow() != null) { + Boolean departNow = calculateRouteMatrixRequest.getDepartNow(); + jsonWriter.name("DepartNow"); + jsonWriter.value(departNow); + } if (calculateRouteMatrixRequest.getDistanceUnit() != null) { String distanceUnit = calculateRouteMatrixRequest.getDistanceUnit(); jsonWriter.name("DistanceUnit"); jsonWriter.value(distanceUnit); } - if (calculateRouteMatrixRequest.getTravelMode() != null) { - String travelMode = calculateRouteMatrixRequest.getTravelMode(); - jsonWriter.name("TravelMode"); - jsonWriter.value(travelMode); + if (calculateRouteMatrixRequest.getCarModeOptions() != null) { + CalculateRouteCarModeOptions carModeOptions = calculateRouteMatrixRequest + .getCarModeOptions(); + jsonWriter.name("CarModeOptions"); + CalculateRouteCarModeOptionsJsonMarshaller.getInstance().marshall(carModeOptions, + jsonWriter); } if (calculateRouteMatrixRequest.getTruckModeOptions() != null) { CalculateRouteTruckModeOptions truckModeOptions = calculateRouteMatrixRequest @@ -151,7 +151,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("routes."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixResultJsonUnmarshaller.java index acd75ee6ee..7bbf4c3278 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonMarshaller.java index 597c477f31..091027ac2c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,20 +32,20 @@ public void marshall(CalculateRouteMatrixSummary calculateRouteMatrixSummary, jsonWriter.name("DataSource"); jsonWriter.value(dataSource); } - if (calculateRouteMatrixSummary.getDistanceUnit() != null) { - String distanceUnit = calculateRouteMatrixSummary.getDistanceUnit(); - jsonWriter.name("DistanceUnit"); - jsonWriter.value(distanceUnit); + if (calculateRouteMatrixSummary.getRouteCount() != null) { + Integer routeCount = calculateRouteMatrixSummary.getRouteCount(); + jsonWriter.name("RouteCount"); + jsonWriter.value(routeCount); } if (calculateRouteMatrixSummary.getErrorCount() != null) { Integer errorCount = calculateRouteMatrixSummary.getErrorCount(); jsonWriter.name("ErrorCount"); jsonWriter.value(errorCount); } - if (calculateRouteMatrixSummary.getRouteCount() != null) { - Integer routeCount = calculateRouteMatrixSummary.getRouteCount(); - jsonWriter.name("RouteCount"); - jsonWriter.value(routeCount); + if (calculateRouteMatrixSummary.getDistanceUnit() != null) { + String distanceUnit = calculateRouteMatrixSummary.getDistanceUnit(); + jsonWriter.name("DistanceUnit"); + jsonWriter.value(distanceUnit); } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonUnmarshaller.java index 691b338923..126ba55f7f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteMatrixSummaryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -39,14 +39,14 @@ public CalculateRouteMatrixSummary unmarshall(JsonUnmarshallerContext context) t if (name.equals("DataSource")) { calculateRouteMatrixSummary.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("DistanceUnit")) { - calculateRouteMatrixSummary.setDistanceUnit(StringJsonUnmarshaller.getInstance() + } else if (name.equals("RouteCount")) { + calculateRouteMatrixSummary.setRouteCount(IntegerJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("ErrorCount")) { calculateRouteMatrixSummary.setErrorCount(IntegerJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("RouteCount")) { - calculateRouteMatrixSummary.setRouteCount(IntegerJsonUnmarshaller.getInstance() + } else if (name.equals("DistanceUnit")) { + calculateRouteMatrixSummary.setDistanceUnit(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else { reader.skipValue(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteRequestMarshaller.java index 746911c305..66ea3443ed 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -67,18 +67,6 @@ public Request marshall(CalculateRouteRequest calculateRo AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (calculateRouteRequest.getCarModeOptions() != null) { - CalculateRouteCarModeOptions carModeOptions = calculateRouteRequest - .getCarModeOptions(); - jsonWriter.name("CarModeOptions"); - CalculateRouteCarModeOptionsJsonMarshaller.getInstance().marshall(carModeOptions, - jsonWriter); - } - if (calculateRouteRequest.getDepartNow() != null) { - Boolean departNow = calculateRouteRequest.getDepartNow(); - jsonWriter.name("DepartNow"); - jsonWriter.value(departNow); - } if (calculateRouteRequest.getDeparturePosition() != null) { java.util.List departurePosition = calculateRouteRequest .getDeparturePosition(); @@ -91,11 +79,6 @@ public Request marshall(CalculateRouteRequest calculateRo } jsonWriter.endArray(); } - if (calculateRouteRequest.getDepartureTime() != null) { - java.util.Date departureTime = calculateRouteRequest.getDepartureTime(); - jsonWriter.name("DepartureTime"); - jsonWriter.value(DateUtils.formatISO8601Date(departureTime)); - } if (calculateRouteRequest.getDestinationPosition() != null) { java.util.List destinationPosition = calculateRouteRequest .getDestinationPosition(); @@ -108,6 +91,39 @@ public Request marshall(CalculateRouteRequest calculateRo } jsonWriter.endArray(); } + if (calculateRouteRequest.getWaypointPositions() != null) { + java.util.List> waypointPositions = calculateRouteRequest + .getWaypointPositions(); + jsonWriter.name("WaypointPositions"); + jsonWriter.beginArray(); + for (java.util.List waypointPositionsItem : waypointPositions) { + if (waypointPositionsItem != null) { + jsonWriter.beginArray(); + for (Double waypointPositionsItemItem : waypointPositionsItem) { + if (waypointPositionsItemItem != null) { + jsonWriter.value(waypointPositionsItemItem); + } + } + jsonWriter.endArray(); + } + } + jsonWriter.endArray(); + } + if (calculateRouteRequest.getTravelMode() != null) { + String travelMode = calculateRouteRequest.getTravelMode(); + jsonWriter.name("TravelMode"); + jsonWriter.value(travelMode); + } + if (calculateRouteRequest.getDepartureTime() != null) { + java.util.Date departureTime = calculateRouteRequest.getDepartureTime(); + jsonWriter.name("DepartureTime"); + jsonWriter.value(DateUtils.formatISO8601Date(departureTime)); + } + if (calculateRouteRequest.getDepartNow() != null) { + Boolean departNow = calculateRouteRequest.getDepartNow(); + jsonWriter.name("DepartNow"); + jsonWriter.value(departNow); + } if (calculateRouteRequest.getDistanceUnit() != null) { String distanceUnit = calculateRouteRequest.getDistanceUnit(); jsonWriter.name("DistanceUnit"); @@ -118,10 +134,12 @@ public Request marshall(CalculateRouteRequest calculateRo jsonWriter.name("IncludeLegGeometry"); jsonWriter.value(includeLegGeometry); } - if (calculateRouteRequest.getTravelMode() != null) { - String travelMode = calculateRouteRequest.getTravelMode(); - jsonWriter.name("TravelMode"); - jsonWriter.value(travelMode); + if (calculateRouteRequest.getCarModeOptions() != null) { + CalculateRouteCarModeOptions carModeOptions = calculateRouteRequest + .getCarModeOptions(); + jsonWriter.name("CarModeOptions"); + CalculateRouteCarModeOptionsJsonMarshaller.getInstance().marshall(carModeOptions, + jsonWriter); } if (calculateRouteRequest.getTruckModeOptions() != null) { CalculateRouteTruckModeOptions truckModeOptions = calculateRouteRequest @@ -130,23 +148,15 @@ public Request marshall(CalculateRouteRequest calculateRo CalculateRouteTruckModeOptionsJsonMarshaller.getInstance().marshall( truckModeOptions, jsonWriter); } - if (calculateRouteRequest.getWaypointPositions() != null) { - java.util.List> waypointPositions = calculateRouteRequest - .getWaypointPositions(); - jsonWriter.name("WaypointPositions"); - jsonWriter.beginArray(); - for (java.util.List waypointPositionsItem : waypointPositions) { - if (waypointPositionsItem != null) { - jsonWriter.beginArray(); - for (Double waypointPositionsItemItem : waypointPositionsItem) { - if (waypointPositionsItemItem != null) { - jsonWriter.value(waypointPositionsItemItem); - } - } - jsonWriter.endArray(); - } - } - jsonWriter.endArray(); + if (calculateRouteRequest.getArrivalTime() != null) { + java.util.Date arrivalTime = calculateRouteRequest.getArrivalTime(); + jsonWriter.name("ArrivalTime"); + jsonWriter.value(DateUtils.formatISO8601Date(arrivalTime)); + } + if (calculateRouteRequest.getOptimizeFor() != null) { + String optimizeFor = calculateRouteRequest.getOptimizeFor(); + jsonWriter.name("OptimizeFor"); + jsonWriter.value(optimizeFor); } jsonWriter.endObject(); @@ -160,7 +170,7 @@ public Request marshall(CalculateRouteRequest calculateRo "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("routes."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteResultJsonUnmarshaller.java index b88b949acf..79dbb07c78 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonMarshaller.java index 9b5b0c6044..8b95492a19 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,6 +27,17 @@ class CalculateRouteSummaryJsonMarshaller { public void marshall(CalculateRouteSummary calculateRouteSummary, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (calculateRouteSummary.getRouteBBox() != null) { + java.util.List routeBBox = calculateRouteSummary.getRouteBBox(); + jsonWriter.name("RouteBBox"); + jsonWriter.beginArray(); + for (Double routeBBoxItem : routeBBox) { + if (routeBBoxItem != null) { + jsonWriter.value(routeBBoxItem); + } + } + jsonWriter.endArray(); + } if (calculateRouteSummary.getDataSource() != null) { String dataSource = calculateRouteSummary.getDataSource(); jsonWriter.name("DataSource"); @@ -37,26 +48,15 @@ public void marshall(CalculateRouteSummary calculateRouteSummary, AwsJsonWriter jsonWriter.name("Distance"); jsonWriter.value(distance); } - if (calculateRouteSummary.getDistanceUnit() != null) { - String distanceUnit = calculateRouteSummary.getDistanceUnit(); - jsonWriter.name("DistanceUnit"); - jsonWriter.value(distanceUnit); - } if (calculateRouteSummary.getDurationSeconds() != null) { Double durationSeconds = calculateRouteSummary.getDurationSeconds(); jsonWriter.name("DurationSeconds"); jsonWriter.value(durationSeconds); } - if (calculateRouteSummary.getRouteBBox() != null) { - java.util.List routeBBox = calculateRouteSummary.getRouteBBox(); - jsonWriter.name("RouteBBox"); - jsonWriter.beginArray(); - for (Double routeBBoxItem : routeBBox) { - if (routeBBoxItem != null) { - jsonWriter.value(routeBBoxItem); - } - } - jsonWriter.endArray(); + if (calculateRouteSummary.getDistanceUnit() != null) { + String distanceUnit = calculateRouteSummary.getDistanceUnit(); + jsonWriter.name("DistanceUnit"); + jsonWriter.value(distanceUnit); } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonUnmarshaller.java index 786c1d61b6..c0ebc00169 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteSummaryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,23 +36,23 @@ public CalculateRouteSummary unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("DataSource")) { + if (name.equals("RouteBBox")) { + calculateRouteSummary.setRouteBBox(new ListUnmarshaller( + DoubleJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("DataSource")) { calculateRouteSummary.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Distance")) { calculateRouteSummary.setDistance(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("DistanceUnit")) { - calculateRouteSummary.setDistanceUnit(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("DurationSeconds")) { calculateRouteSummary.setDurationSeconds(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("RouteBBox")) { - calculateRouteSummary.setRouteBBox(new ListUnmarshaller( - DoubleJsonUnmarshaller.getInstance() - ) - .unmarshall(context)); + } else if (name.equals("DistanceUnit")) { + calculateRouteSummary.setDistanceUnit(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonMarshaller.java index 64fa3f08af..93807a3b69 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonUnmarshaller.java index b51a64be32..74bd2e7ee5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CalculateRouteTruckModeOptionsJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonMarshaller.java new file mode 100644 index 0000000000..be48455beb --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonMarshaller.java @@ -0,0 +1,51 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO CellSignals + */ +class CellSignalsJsonMarshaller { + + public void marshall(CellSignals cellSignals, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (cellSignals.getLteCellDetails() != null) { + java.util.List lteCellDetails = cellSignals.getLteCellDetails(); + jsonWriter.name("LteCellDetails"); + jsonWriter.beginArray(); + for (LteCellDetails lteCellDetailsItem : lteCellDetails) { + if (lteCellDetailsItem != null) { + LteCellDetailsJsonMarshaller.getInstance().marshall(lteCellDetailsItem, + jsonWriter); + } + } + jsonWriter.endArray(); + } + jsonWriter.endObject(); + } + + private static CellSignalsJsonMarshaller instance; + + public static CellSignalsJsonMarshaller getInstance() { + if (instance == null) + instance = new CellSignalsJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonUnmarshaller.java new file mode 100644 index 0000000000..0a9ebc830f --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CellSignalsJsonUnmarshaller.java @@ -0,0 +1,58 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO CellSignals + */ +class CellSignalsJsonUnmarshaller implements Unmarshaller { + + public CellSignals unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + CellSignals cellSignals = new CellSignals(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("LteCellDetails")) { + cellSignals.setLteCellDetails(new ListUnmarshaller( + LteCellDetailsJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return cellSignals; + } + + private static CellSignalsJsonUnmarshaller instance; + + public static CellSignalsJsonUnmarshaller getInstance() { + if (instance == null) + instance = new CellSignalsJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java index 047a64dd10..77c653c57a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java index 0950f0121e..5b45f4394a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ConflictExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ConflictExceptionUnmarshaller.java index 598cd0b9dc..23f0fc0f54 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ConflictExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ConflictExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionRequestMarshaller.java index 8ae3da2b4b..6b353e4ab2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -66,16 +66,6 @@ public Request marshall( jsonWriter.name("CollectionName"); jsonWriter.value(collectionName); } - if (createGeofenceCollectionRequest.getDescription() != null) { - String description = createGeofenceCollectionRequest.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); - } - if (createGeofenceCollectionRequest.getKmsKeyId() != null) { - String kmsKeyId = createGeofenceCollectionRequest.getKmsKeyId(); - jsonWriter.name("KmsKeyId"); - jsonWriter.value(kmsKeyId); - } if (createGeofenceCollectionRequest.getPricingPlan() != null) { String pricingPlan = createGeofenceCollectionRequest.getPricingPlan(); jsonWriter.name("PricingPlan"); @@ -87,6 +77,11 @@ public Request marshall( jsonWriter.name("PricingPlanDataSource"); jsonWriter.value(pricingPlanDataSource); } + if (createGeofenceCollectionRequest.getDescription() != null) { + String description = createGeofenceCollectionRequest.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); + } if (createGeofenceCollectionRequest.getTags() != null) { java.util.Map tags = createGeofenceCollectionRequest.getTags(); jsonWriter.name("Tags"); @@ -100,6 +95,11 @@ public Request marshall( } jsonWriter.endObject(); } + if (createGeofenceCollectionRequest.getKmsKeyId() != null) { + String kmsKeyId = createGeofenceCollectionRequest.getKmsKeyId(); + jsonWriter.name("KmsKeyId"); + jsonWriter.value(kmsKeyId); + } jsonWriter.endObject(); jsonWriter.close(); @@ -112,9 +112,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("geofencing."); + request.setHostPrefix("cp.geofencing."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionResultJsonUnmarshaller.java index dce614ecc3..40bfb3b75a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateGeofenceCollectionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,12 +34,12 @@ public CreateGeofenceCollectionResult unmarshall(JsonUnmarshallerContext context reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CollectionArn")) { - createGeofenceCollectionResult.setCollectionArn(StringJsonUnmarshaller + if (name.equals("CollectionName")) { + createGeofenceCollectionResult.setCollectionName(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("CollectionName")) { - createGeofenceCollectionResult.setCollectionName(StringJsonUnmarshaller + } else if (name.equals("CollectionArn")) { + createGeofenceCollectionResult.setCollectionArn(StringJsonUnmarshaller .getInstance() .unmarshall(context)); } else if (name.equals("CreateTime")) { diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyRequestMarshaller.java index 8ecc384667..2506cfed01 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -59,6 +59,16 @@ public Request marshall(CreateKeyRequest createKeyRequest) { AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); + if (createKeyRequest.getKeyName() != null) { + String keyName = createKeyRequest.getKeyName(); + jsonWriter.name("KeyName"); + jsonWriter.value(keyName); + } + if (createKeyRequest.getRestrictions() != null) { + ApiKeyRestrictions restrictions = createKeyRequest.getRestrictions(); + jsonWriter.name("Restrictions"); + ApiKeyRestrictionsJsonMarshaller.getInstance().marshall(restrictions, jsonWriter); + } if (createKeyRequest.getDescription() != null) { String description = createKeyRequest.getDescription(); jsonWriter.name("Description"); @@ -69,21 +79,11 @@ public Request marshall(CreateKeyRequest createKeyRequest) { jsonWriter.name("ExpireTime"); jsonWriter.value(DateUtils.formatISO8601Date(expireTime)); } - if (createKeyRequest.getKeyName() != null) { - String keyName = createKeyRequest.getKeyName(); - jsonWriter.name("KeyName"); - jsonWriter.value(keyName); - } if (createKeyRequest.getNoExpiry() != null) { Boolean noExpiry = createKeyRequest.getNoExpiry(); jsonWriter.name("NoExpiry"); jsonWriter.value(noExpiry); } - if (createKeyRequest.getRestrictions() != null) { - ApiKeyRestrictions restrictions = createKeyRequest.getRestrictions(); - jsonWriter.name("Restrictions"); - ApiKeyRestrictionsJsonMarshaller.getInstance().marshall(restrictions, jsonWriter); - } if (createKeyRequest.getTags() != null) { java.util.Map tags = createKeyRequest.getTags(); jsonWriter.name("Tags"); @@ -109,9 +109,9 @@ public Request marshall(CreateKeyRequest createKeyRequest) { "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyResultJsonUnmarshaller.java index b67508fc36..46ec59cafa 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateKeyResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,11 +33,7 @@ public CreateKeyResult unmarshall(JsonUnmarshallerContext context) throws Except reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - createKeyResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("Key")) { + if (name.equals("Key")) { createKeyResult.setKey(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("KeyArn")) { @@ -46,6 +42,10 @@ public CreateKeyResult unmarshall(JsonUnmarshallerContext context) throws Except } else if (name.equals("KeyName")) { createKeyResult.setKeyName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + createKeyResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapRequestMarshaller.java index 8b440164b3..8745fbae2e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -59,26 +59,26 @@ public Request marshall(CreateMapRequest createMapRequest) { AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (createMapRequest.getConfiguration() != null) { - MapConfiguration configuration = createMapRequest.getConfiguration(); - jsonWriter.name("Configuration"); - MapConfigurationJsonMarshaller.getInstance().marshall(configuration, jsonWriter); - } - if (createMapRequest.getDescription() != null) { - String description = createMapRequest.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); - } if (createMapRequest.getMapName() != null) { String mapName = createMapRequest.getMapName(); jsonWriter.name("MapName"); jsonWriter.value(mapName); } + if (createMapRequest.getConfiguration() != null) { + MapConfiguration configuration = createMapRequest.getConfiguration(); + jsonWriter.name("Configuration"); + MapConfigurationJsonMarshaller.getInstance().marshall(configuration, jsonWriter); + } if (createMapRequest.getPricingPlan() != null) { String pricingPlan = createMapRequest.getPricingPlan(); jsonWriter.name("PricingPlan"); jsonWriter.value(pricingPlan); } + if (createMapRequest.getDescription() != null) { + String description = createMapRequest.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); + } if (createMapRequest.getTags() != null) { java.util.Map tags = createMapRequest.getTags(); jsonWriter.name("Tags"); @@ -104,9 +104,9 @@ public Request marshall(CreateMapRequest createMapRequest) { "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("maps."); + request.setHostPrefix("cp.maps."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapResultJsonUnmarshaller.java index c59374d65d..e635ade38b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateMapResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,15 +33,15 @@ public CreateMapResult unmarshall(JsonUnmarshallerContext context) throws Except reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - createMapResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + if (name.equals("MapName")) { + createMapResult.setMapName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("MapArn")) { createMapResult.setMapArn(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("MapName")) { - createMapResult.setMapName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("CreateTime")) { + createMapResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) .unmarshall(context)); } else { reader.skipValue(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexRequestMarshaller.java index 480c77d857..fc71fe6168 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,32 +60,32 @@ public Request marshall(CreatePlaceIndexRequest createP AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); + if (createPlaceIndexRequest.getIndexName() != null) { + String indexName = createPlaceIndexRequest.getIndexName(); + jsonWriter.name("IndexName"); + jsonWriter.value(indexName); + } if (createPlaceIndexRequest.getDataSource() != null) { String dataSource = createPlaceIndexRequest.getDataSource(); jsonWriter.name("DataSource"); jsonWriter.value(dataSource); } - if (createPlaceIndexRequest.getDataSourceConfiguration() != null) { - DataSourceConfiguration dataSourceConfiguration = createPlaceIndexRequest - .getDataSourceConfiguration(); - jsonWriter.name("DataSourceConfiguration"); - DataSourceConfigurationJsonMarshaller.getInstance().marshall( - dataSourceConfiguration, jsonWriter); + if (createPlaceIndexRequest.getPricingPlan() != null) { + String pricingPlan = createPlaceIndexRequest.getPricingPlan(); + jsonWriter.name("PricingPlan"); + jsonWriter.value(pricingPlan); } if (createPlaceIndexRequest.getDescription() != null) { String description = createPlaceIndexRequest.getDescription(); jsonWriter.name("Description"); jsonWriter.value(description); } - if (createPlaceIndexRequest.getIndexName() != null) { - String indexName = createPlaceIndexRequest.getIndexName(); - jsonWriter.name("IndexName"); - jsonWriter.value(indexName); - } - if (createPlaceIndexRequest.getPricingPlan() != null) { - String pricingPlan = createPlaceIndexRequest.getPricingPlan(); - jsonWriter.name("PricingPlan"); - jsonWriter.value(pricingPlan); + if (createPlaceIndexRequest.getDataSourceConfiguration() != null) { + DataSourceConfiguration dataSourceConfiguration = createPlaceIndexRequest + .getDataSourceConfiguration(); + jsonWriter.name("DataSourceConfiguration"); + DataSourceConfigurationJsonMarshaller.getInstance().marshall( + dataSourceConfiguration, jsonWriter); } if (createPlaceIndexRequest.getTags() != null) { java.util.Map tags = createPlaceIndexRequest.getTags(); @@ -112,9 +112,9 @@ public Request marshall(CreatePlaceIndexRequest createP "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("places."); + request.setHostPrefix("cp.places."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexResultJsonUnmarshaller.java index 910648297b..3f953a2a75 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreatePlaceIndexResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,15 +33,15 @@ public CreatePlaceIndexResult unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - createPlaceIndexResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + if (name.equals("IndexName")) { + createPlaceIndexResult.setIndexName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("IndexArn")) { createPlaceIndexResult.setIndexArn(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("IndexName")) { - createPlaceIndexResult.setIndexName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("CreateTime")) { + createPlaceIndexResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) .unmarshall(context)); } else { reader.skipValue(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorRequestMarshaller.java index 18be9d44eb..6b21cb9df9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -71,16 +71,16 @@ public Request marshall( jsonWriter.name("DataSource"); jsonWriter.value(dataSource); } - if (createRouteCalculatorRequest.getDescription() != null) { - String description = createRouteCalculatorRequest.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); - } if (createRouteCalculatorRequest.getPricingPlan() != null) { String pricingPlan = createRouteCalculatorRequest.getPricingPlan(); jsonWriter.name("PricingPlan"); jsonWriter.value(pricingPlan); } + if (createRouteCalculatorRequest.getDescription() != null) { + String description = createRouteCalculatorRequest.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); + } if (createRouteCalculatorRequest.getTags() != null) { java.util.Map tags = createRouteCalculatorRequest.getTags(); jsonWriter.name("Tags"); @@ -106,9 +106,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("routes."); + request.setHostPrefix("cp.routes."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorResultJsonUnmarshaller.java index f6a7aab11e..67cdac6479 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateRouteCalculatorResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,12 +33,12 @@ public CreateRouteCalculatorResult unmarshall(JsonUnmarshallerContext context) t reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CalculatorArn")) { - createRouteCalculatorResult.setCalculatorArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("CalculatorName")) { + if (name.equals("CalculatorName")) { createRouteCalculatorResult.setCalculatorName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CalculatorArn")) { + createRouteCalculatorResult.setCalculatorArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("CreateTime")) { createRouteCalculatorResult.setCreateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerRequestMarshaller.java index 20bb6fb7c0..e8e261f76d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,36 +60,31 @@ public Request marshall(CreateTrackerRequest createTracker AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (createTrackerRequest.getDescription() != null) { - String description = createTrackerRequest.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); + if (createTrackerRequest.getTrackerName() != null) { + String trackerName = createTrackerRequest.getTrackerName(); + jsonWriter.name("TrackerName"); + jsonWriter.value(trackerName); } - if (createTrackerRequest.getEventBridgeEnabled() != null) { - Boolean eventBridgeEnabled = createTrackerRequest.getEventBridgeEnabled(); - jsonWriter.name("EventBridgeEnabled"); - jsonWriter.value(eventBridgeEnabled); + if (createTrackerRequest.getPricingPlan() != null) { + String pricingPlan = createTrackerRequest.getPricingPlan(); + jsonWriter.name("PricingPlan"); + jsonWriter.value(pricingPlan); } if (createTrackerRequest.getKmsKeyId() != null) { String kmsKeyId = createTrackerRequest.getKmsKeyId(); jsonWriter.name("KmsKeyId"); jsonWriter.value(kmsKeyId); } - if (createTrackerRequest.getPositionFiltering() != null) { - String positionFiltering = createTrackerRequest.getPositionFiltering(); - jsonWriter.name("PositionFiltering"); - jsonWriter.value(positionFiltering); - } - if (createTrackerRequest.getPricingPlan() != null) { - String pricingPlan = createTrackerRequest.getPricingPlan(); - jsonWriter.name("PricingPlan"); - jsonWriter.value(pricingPlan); - } if (createTrackerRequest.getPricingPlanDataSource() != null) { String pricingPlanDataSource = createTrackerRequest.getPricingPlanDataSource(); jsonWriter.name("PricingPlanDataSource"); jsonWriter.value(pricingPlanDataSource); } + if (createTrackerRequest.getDescription() != null) { + String description = createTrackerRequest.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); + } if (createTrackerRequest.getTags() != null) { java.util.Map tags = createTrackerRequest.getTags(); jsonWriter.name("Tags"); @@ -103,10 +98,21 @@ public Request marshall(CreateTrackerRequest createTracker } jsonWriter.endObject(); } - if (createTrackerRequest.getTrackerName() != null) { - String trackerName = createTrackerRequest.getTrackerName(); - jsonWriter.name("TrackerName"); - jsonWriter.value(trackerName); + if (createTrackerRequest.getPositionFiltering() != null) { + String positionFiltering = createTrackerRequest.getPositionFiltering(); + jsonWriter.name("PositionFiltering"); + jsonWriter.value(positionFiltering); + } + if (createTrackerRequest.getEventBridgeEnabled() != null) { + Boolean eventBridgeEnabled = createTrackerRequest.getEventBridgeEnabled(); + jsonWriter.name("EventBridgeEnabled"); + jsonWriter.value(eventBridgeEnabled); + } + if (createTrackerRequest.getKmsKeyEnableGeospatialQueries() != null) { + Boolean kmsKeyEnableGeospatialQueries = createTrackerRequest + .getKmsKeyEnableGeospatialQueries(); + jsonWriter.name("KmsKeyEnableGeospatialQueries"); + jsonWriter.value(kmsKeyEnableGeospatialQueries); } jsonWriter.endObject(); @@ -120,9 +126,9 @@ public Request marshall(CreateTrackerRequest createTracker "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerResultJsonUnmarshaller.java index f184baa394..95be674b98 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CreateTrackerResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,15 +33,15 @@ public CreateTrackerResult unmarshall(JsonUnmarshallerContext context) throws Ex reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - createTrackerResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + if (name.equals("TrackerName")) { + createTrackerResult.setTrackerName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("TrackerArn")) { createTrackerResult.setTrackerArn(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("TrackerName")) { - createTrackerResult.setTrackerName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("CreateTime")) { + createTrackerResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) .unmarshall(context)); } else { reader.skipValue(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonMarshaller.java index 4f37cf69f3..50828d4872 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonUnmarshaller.java index 2eee040b8d..c286a92d35 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DataSourceConfigurationJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionRequestMarshaller.java index d3b17f0159..378e70154b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,9 +61,9 @@ public Request marshall( .fromString(deleteGeofenceCollectionRequest.getCollectionName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("geofencing."); + request.setHostPrefix("cp.geofencing."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionResultJsonUnmarshaller.java index 6117005542..80eeee7f01 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteGeofenceCollectionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyRequestMarshaller.java index 75d5b8b064..d2d8c036b8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -57,11 +57,15 @@ public Request marshall(DeleteKeyRequest deleteKeyRequest) { "{KeyName}", (deleteKeyRequest.getKeyName() == null) ? "" : StringUtils .fromString(deleteKeyRequest.getKeyName())); + if (deleteKeyRequest.getForceDelete() != null) { + request.addParameter("forceDelete", + StringUtils.fromBoolean(deleteKeyRequest.getForceDelete())); + } request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyResultJsonUnmarshaller.java index bc55149d39..2b09de0d4f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteKeyResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapRequestMarshaller.java index f9a816c6f5..344ef70725 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -59,9 +59,9 @@ public Request marshall(DeleteMapRequest deleteMapRequest) { .fromString(deleteMapRequest.getMapName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("maps."); + request.setHostPrefix("cp.maps."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapResultJsonUnmarshaller.java index 97c8143ccb..d0acefd1fe 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteMapResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexRequestMarshaller.java index 3aacb9ca1a..c99c3e89d9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,9 +60,9 @@ public Request marshall(DeletePlaceIndexRequest deleteP .fromString(deletePlaceIndexRequest.getIndexName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("places."); + request.setHostPrefix("cp.places."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexResultJsonUnmarshaller.java index a8ae1ab21f..42e7964dce 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeletePlaceIndexResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorRequestMarshaller.java index 9ce03cb79e..a1e70742d5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,9 +61,9 @@ public Request marshall( .fromString(deleteRouteCalculatorRequest.getCalculatorName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("routes."); + request.setHostPrefix("cp.routes."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorResultJsonUnmarshaller.java index 4254068cd7..5105269adb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteRouteCalculatorResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerRequestMarshaller.java index 237727324d..2f6bfae796 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,9 +60,9 @@ public Request marshall(DeleteTrackerRequest deleteTracker .fromString(deleteTrackerRequest.getTrackerName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerResultJsonUnmarshaller.java index 12ca1f8040..f6bf452532 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeleteTrackerResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionRequestMarshaller.java index f88ac4942f..aa326bf51c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,9 +61,9 @@ public Request marshall( .fromString(describeGeofenceCollectionRequest.getCollectionName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("geofencing."); + request.setHostPrefix("cp.geofencing."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionResultJsonUnmarshaller.java index 54da296838..e3920ead5b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeGeofenceCollectionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,25 +34,18 @@ public DescribeGeofenceCollectionResult unmarshall(JsonUnmarshallerContext conte reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CollectionArn")) { - describeGeofenceCollectionResult.setCollectionArn(StringJsonUnmarshaller - .getInstance() - .unmarshall(context)); - } else if (name.equals("CollectionName")) { + if (name.equals("CollectionName")) { describeGeofenceCollectionResult.setCollectionName(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("CreateTime")) { - describeGeofenceCollectionResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + } else if (name.equals("CollectionArn")) { + describeGeofenceCollectionResult.setCollectionArn(StringJsonUnmarshaller + .getInstance() .unmarshall(context)); } else if (name.equals("Description")) { describeGeofenceCollectionResult.setDescription(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("KmsKeyId")) { - describeGeofenceCollectionResult.setKmsKeyId(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("PricingPlan")) { describeGeofenceCollectionResult.setPricingPlan(StringJsonUnmarshaller .getInstance() @@ -61,15 +54,26 @@ public DescribeGeofenceCollectionResult unmarshall(JsonUnmarshallerContext conte describeGeofenceCollectionResult.setPricingPlanDataSource(StringJsonUnmarshaller .getInstance() .unmarshall(context)); + } else if (name.equals("KmsKeyId")) { + describeGeofenceCollectionResult.setKmsKeyId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("Tags")) { describeGeofenceCollectionResult.setTags(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); + } else if (name.equals("CreateTime")) { + describeGeofenceCollectionResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { describeGeofenceCollectionResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("GeofenceCount")) { + describeGeofenceCollectionResult.setGeofenceCount(IntegerJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyRequestMarshaller.java index 1a879580a5..ca5598a2a6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,9 +60,9 @@ public Request marshall(DescribeKeyRequest describeKeyReques .fromString(describeKeyRequest.getKeyName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyResultJsonUnmarshaller.java index 89f8aebe70..fd0ca739e0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeKeyResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,18 +33,7 @@ public DescribeKeyResult unmarshall(JsonUnmarshallerContext context) throws Exce reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - describeKeyResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("Description")) { - describeKeyResult.setDescription(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("ExpireTime")) { - describeKeyResult.setExpireTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("Key")) { + if (name.equals("Key")) { describeKeyResult.setKey(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("KeyArn")) { @@ -56,15 +45,26 @@ public DescribeKeyResult unmarshall(JsonUnmarshallerContext context) throws Exce } else if (name.equals("Restrictions")) { describeKeyResult.setRestrictions(ApiKeyRestrictionsJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + describeKeyResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("ExpireTime")) { + describeKeyResult.setExpireTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("UpdateTime")) { + describeKeyResult.setUpdateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("Description")) { + describeKeyResult.setDescription(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("Tags")) { describeKeyResult.setTags(new MapUnmarshaller(StringJsonUnmarshaller .getInstance() ) .unmarshall(context)); - } else if (name.equals("UpdateTime")) { - describeKeyResult.setUpdateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapRequestMarshaller.java index 239ab39159..fb5838bc32 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,9 +60,9 @@ public Request marshall(DescribeMapRequest describeMapReques .fromString(describeMapRequest.getMapName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("maps."); + request.setHostPrefix("cp.maps."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapResultJsonUnmarshaller.java index 8e6fb50afb..fb17abc2e5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeMapResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,33 +33,33 @@ public DescribeMapResult unmarshall(JsonUnmarshallerContext context) throws Exce reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Configuration")) { - describeMapResult.setConfiguration(MapConfigurationJsonUnmarshaller.getInstance() + if (name.equals("MapName")) { + describeMapResult.setMapName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("CreateTime")) { - describeMapResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + } else if (name.equals("MapArn")) { + describeMapResult.setMapArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("PricingPlan")) { + describeMapResult.setPricingPlan(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("DataSource")) { describeMapResult.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Configuration")) { + describeMapResult.setConfiguration(MapConfigurationJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("Description")) { describeMapResult.setDescription(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("MapArn")) { - describeMapResult.setMapArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("MapName")) { - describeMapResult.setMapName(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("PricingPlan")) { - describeMapResult.setPricingPlan(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("Tags")) { describeMapResult.setTags(new MapUnmarshaller(StringJsonUnmarshaller .getInstance() ) .unmarshall(context)); + } else if (name.equals("CreateTime")) { + describeMapResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { describeMapResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexRequestMarshaller.java index 61e697e658..3b19f38fd6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,9 +61,9 @@ public Request marshall( .fromString(describePlaceIndexRequest.getIndexName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("places."); + request.setHostPrefix("cp.places."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexResultJsonUnmarshaller.java index c4e0a1566f..9220461acd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribePlaceIndexResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,10 +33,26 @@ public DescribePlaceIndexResult unmarshall(JsonUnmarshallerContext context) thro reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { + if (name.equals("IndexName")) { + describePlaceIndexResult.setIndexName(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("IndexArn")) { + describePlaceIndexResult.setIndexArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("PricingPlan")) { + describePlaceIndexResult.setPricingPlan(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Description")) { + describePlaceIndexResult.setDescription(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("CreateTime")) { describePlaceIndexResult.setCreateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("UpdateTime")) { + describePlaceIndexResult.setUpdateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("DataSource")) { describePlaceIndexResult.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); @@ -45,27 +61,11 @@ public DescribePlaceIndexResult unmarshall(JsonUnmarshallerContext context) thro .setDataSourceConfiguration(DataSourceConfigurationJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("Description")) { - describePlaceIndexResult.setDescription(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("IndexArn")) { - describePlaceIndexResult.setIndexArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("IndexName")) { - describePlaceIndexResult.setIndexName(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("PricingPlan")) { - describePlaceIndexResult.setPricingPlan(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("Tags")) { describePlaceIndexResult.setTags(new MapUnmarshaller(StringJsonUnmarshaller .getInstance() ) .unmarshall(context)); - } else if (name.equals("UpdateTime")) { - describePlaceIndexResult.setUpdateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorRequestMarshaller.java index 28a7ba9dde..c25e4b1eb7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,9 +61,9 @@ public Request marshall( .fromString(describeRouteCalculatorRequest.getCalculatorName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("routes."); + request.setHostPrefix("cp.routes."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorResultJsonUnmarshaller.java index bde12d71b9..d482c99073 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeRouteCalculatorResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,35 +34,35 @@ public DescribeRouteCalculatorResult unmarshall(JsonUnmarshallerContext context) reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CalculatorArn")) { - describeRouteCalculatorResult.setCalculatorArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("CalculatorName")) { + if (name.equals("CalculatorName")) { describeRouteCalculatorResult.setCalculatorName(StringJsonUnmarshaller .getInstance() .unmarshall(context)); + } else if (name.equals("CalculatorArn")) { + describeRouteCalculatorResult.setCalculatorArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("PricingPlan")) { + describeRouteCalculatorResult.setPricingPlan(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Description")) { + describeRouteCalculatorResult.setDescription(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("CreateTime")) { describeRouteCalculatorResult.setCreateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("UpdateTime")) { + describeRouteCalculatorResult.setUpdateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("DataSource")) { describeRouteCalculatorResult.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Description")) { - describeRouteCalculatorResult.setDescription(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("PricingPlan")) { - describeRouteCalculatorResult.setPricingPlan(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("Tags")) { describeRouteCalculatorResult.setTags(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("UpdateTime")) { - describeRouteCalculatorResult.setUpdateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerRequestMarshaller.java index 627397860a..d8d618b147 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -60,9 +60,9 @@ public Request marshall(DescribeTrackerRequest describeT .fromString(describeTrackerRequest.getTrackerName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerResultJsonUnmarshaller.java index 2e5b81b843..1ca3a09924 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DescribeTrackerResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,22 +33,15 @@ public DescribeTrackerResult unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - describeTrackerResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + if (name.equals("TrackerName")) { + describeTrackerResult.setTrackerName(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("TrackerArn")) { + describeTrackerResult.setTrackerArn(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Description")) { describeTrackerResult.setDescription(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("EventBridgeEnabled")) { - describeTrackerResult.setEventBridgeEnabled(BooleanJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("KmsKeyId")) { - describeTrackerResult.setKmsKeyId(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("PositionFiltering")) { - describeTrackerResult.setPositionFiltering(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("PricingPlan")) { describeTrackerResult.setPricingPlan(StringJsonUnmarshaller.getInstance() .unmarshall(context)); @@ -60,16 +53,27 @@ public DescribeTrackerResult unmarshall(JsonUnmarshallerContext context) throws .getInstance() ) .unmarshall(context)); - } else if (name.equals("TrackerArn")) { - describeTrackerResult.setTrackerArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("TrackerName")) { - describeTrackerResult.setTrackerName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("CreateTime")) { + describeTrackerResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) .unmarshall(context)); } else if (name.equals("UpdateTime")) { describeTrackerResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("KmsKeyId")) { + describeTrackerResult.setKmsKeyId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("PositionFiltering")) { + describeTrackerResult.setPositionFiltering(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("EventBridgeEnabled")) { + describeTrackerResult.setEventBridgeEnabled(BooleanJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("KmsKeyEnableGeospatialQueries")) { + describeTrackerResult.setKmsKeyEnableGeospatialQueries(BooleanJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonMarshaller.java index 61d0966764..c792b7612d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,16 +26,21 @@ class DevicePositionJsonMarshaller { public void marshall(DevicePosition devicePosition, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (devicePosition.getAccuracy() != null) { - PositionalAccuracy accuracy = devicePosition.getAccuracy(); - jsonWriter.name("Accuracy"); - PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); - } if (devicePosition.getDeviceId() != null) { String deviceId = devicePosition.getDeviceId(); jsonWriter.name("DeviceId"); jsonWriter.value(deviceId); } + if (devicePosition.getSampleTime() != null) { + java.util.Date sampleTime = devicePosition.getSampleTime(); + jsonWriter.name("SampleTime"); + jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); + } + if (devicePosition.getReceivedTime() != null) { + java.util.Date receivedTime = devicePosition.getReceivedTime(); + jsonWriter.name("ReceivedTime"); + jsonWriter.value(DateUtils.formatISO8601Date(receivedTime)); + } if (devicePosition.getPosition() != null) { java.util.List position = devicePosition.getPosition(); jsonWriter.name("Position"); @@ -47,6 +52,11 @@ public void marshall(DevicePosition devicePosition, AwsJsonWriter jsonWriter) th } jsonWriter.endArray(); } + if (devicePosition.getAccuracy() != null) { + PositionalAccuracy accuracy = devicePosition.getAccuracy(); + jsonWriter.name("Accuracy"); + PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); + } if (devicePosition.getPositionProperties() != null) { java.util.Map positionProperties = devicePosition .getPositionProperties(); @@ -62,16 +72,6 @@ public void marshall(DevicePosition devicePosition, AwsJsonWriter jsonWriter) th } jsonWriter.endObject(); } - if (devicePosition.getReceivedTime() != null) { - java.util.Date receivedTime = devicePosition.getReceivedTime(); - jsonWriter.name("ReceivedTime"); - jsonWriter.value(DateUtils.formatISO8601Date(receivedTime)); - } - if (devicePosition.getSampleTime() != null) { - java.util.Date sampleTime = devicePosition.getSampleTime(); - jsonWriter.name("SampleTime"); - jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonUnmarshaller.java index bf40f557b4..f0872bba14 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,30 +36,30 @@ public DevicePosition unmarshall(JsonUnmarshallerContext context) throws Excepti reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Accuracy")) { - devicePosition.setAccuracy(PositionalAccuracyJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("DeviceId")) { + if (name.equals("DeviceId")) { devicePosition.setDeviceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("SampleTime")) { + devicePosition.setSampleTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("ReceivedTime")) { + devicePosition.setReceivedTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("Position")) { devicePosition.setPosition(new ListUnmarshaller(DoubleJsonUnmarshaller .getInstance() ) .unmarshall(context)); + } else if (name.equals("Accuracy")) { + devicePosition.setAccuracy(PositionalAccuracyJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("PositionProperties")) { devicePosition.setPositionProperties(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("ReceivedTime")) { - devicePosition.setReceivedTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("SampleTime")) { - devicePosition.setSampleTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonMarshaller.java index 3b28226457..5773219078 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class DevicePositionUpdateJsonMarshaller { public void marshall(DevicePositionUpdate devicePositionUpdate, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (devicePositionUpdate.getAccuracy() != null) { - PositionalAccuracy accuracy = devicePositionUpdate.getAccuracy(); - jsonWriter.name("Accuracy"); - PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); - } if (devicePositionUpdate.getDeviceId() != null) { String deviceId = devicePositionUpdate.getDeviceId(); jsonWriter.name("DeviceId"); jsonWriter.value(deviceId); } + if (devicePositionUpdate.getSampleTime() != null) { + java.util.Date sampleTime = devicePositionUpdate.getSampleTime(); + jsonWriter.name("SampleTime"); + jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); + } if (devicePositionUpdate.getPosition() != null) { java.util.List position = devicePositionUpdate.getPosition(); jsonWriter.name("Position"); @@ -48,6 +48,11 @@ public void marshall(DevicePositionUpdate devicePositionUpdate, AwsJsonWriter js } jsonWriter.endArray(); } + if (devicePositionUpdate.getAccuracy() != null) { + PositionalAccuracy accuracy = devicePositionUpdate.getAccuracy(); + jsonWriter.name("Accuracy"); + PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); + } if (devicePositionUpdate.getPositionProperties() != null) { java.util.Map positionProperties = devicePositionUpdate .getPositionProperties(); @@ -63,11 +68,6 @@ public void marshall(DevicePositionUpdate devicePositionUpdate, AwsJsonWriter js } jsonWriter.endObject(); } - if (devicePositionUpdate.getSampleTime() != null) { - java.util.Date sampleTime = devicePositionUpdate.getSampleTime(); - jsonWriter.name("SampleTime"); - jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonUnmarshaller.java index ccba5aae27..bb7003c58a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DevicePositionUpdateJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,26 +36,26 @@ public DevicePositionUpdate unmarshall(JsonUnmarshallerContext context) throws E reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Accuracy")) { - devicePositionUpdate.setAccuracy(PositionalAccuracyJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("DeviceId")) { + if (name.equals("DeviceId")) { devicePositionUpdate.setDeviceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("SampleTime")) { + devicePositionUpdate.setSampleTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("Position")) { devicePositionUpdate.setPosition(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); + } else if (name.equals("Accuracy")) { + devicePositionUpdate.setAccuracy(PositionalAccuracyJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("PositionProperties")) { devicePositionUpdate.setPositionProperties(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("SampleTime")) { - devicePositionUpdate.setSampleTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonMarshaller.java new file mode 100644 index 0000000000..3e10b9fc96 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonMarshaller.java @@ -0,0 +1,87 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO DeviceState + */ +class DeviceStateJsonMarshaller { + + public void marshall(DeviceState deviceState, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (deviceState.getDeviceId() != null) { + String deviceId = deviceState.getDeviceId(); + jsonWriter.name("DeviceId"); + jsonWriter.value(deviceId); + } + if (deviceState.getSampleTime() != null) { + java.util.Date sampleTime = deviceState.getSampleTime(); + jsonWriter.name("SampleTime"); + jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); + } + if (deviceState.getPosition() != null) { + java.util.List position = deviceState.getPosition(); + jsonWriter.name("Position"); + jsonWriter.beginArray(); + for (Double positionItem : position) { + if (positionItem != null) { + jsonWriter.value(positionItem); + } + } + jsonWriter.endArray(); + } + if (deviceState.getAccuracy() != null) { + PositionalAccuracy accuracy = deviceState.getAccuracy(); + jsonWriter.name("Accuracy"); + PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); + } + if (deviceState.getIpv4Address() != null) { + String ipv4Address = deviceState.getIpv4Address(); + jsonWriter.name("Ipv4Address"); + jsonWriter.value(ipv4Address); + } + if (deviceState.getWiFiAccessPoints() != null) { + java.util.List wiFiAccessPoints = deviceState.getWiFiAccessPoints(); + jsonWriter.name("WiFiAccessPoints"); + jsonWriter.beginArray(); + for (WiFiAccessPoint wiFiAccessPointsItem : wiFiAccessPoints) { + if (wiFiAccessPointsItem != null) { + WiFiAccessPointJsonMarshaller.getInstance().marshall(wiFiAccessPointsItem, + jsonWriter); + } + } + jsonWriter.endArray(); + } + if (deviceState.getCellSignals() != null) { + CellSignals cellSignals = deviceState.getCellSignals(); + jsonWriter.name("CellSignals"); + CellSignalsJsonMarshaller.getInstance().marshall(cellSignals, jsonWriter); + } + jsonWriter.endObject(); + } + + private static DeviceStateJsonMarshaller instance; + + public static DeviceStateJsonMarshaller getInstance() { + if (instance == null) + instance = new DeviceStateJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonUnmarshaller.java new file mode 100644 index 0000000000..ed9d67b249 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DeviceStateJsonUnmarshaller.java @@ -0,0 +1,79 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO DeviceState + */ +class DeviceStateJsonUnmarshaller implements Unmarshaller { + + public DeviceState unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + DeviceState deviceState = new DeviceState(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("DeviceId")) { + deviceState.setDeviceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("SampleTime")) { + deviceState.setSampleTime(DateJsonUnmarshaller + .getInstance(TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("Position")) { + deviceState.setPosition(new ListUnmarshaller(DoubleJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); + } else if (name.equals("Accuracy")) { + deviceState.setAccuracy(PositionalAccuracyJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Ipv4Address")) { + deviceState.setIpv4Address(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("WiFiAccessPoints")) { + deviceState.setWiFiAccessPoints(new ListUnmarshaller( + WiFiAccessPointJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("CellSignals")) { + deviceState.setCellSignals(CellSignalsJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return deviceState; + } + + private static DeviceStateJsonUnmarshaller instance; + + public static DeviceStateJsonUnmarshaller getInstance() { + if (instance == null) + instance = new DeviceStateJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerRequestMarshaller.java index 0d622f4bf5..36d7720d3d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -55,19 +55,19 @@ public Request marshall( request.setHttpMethod(HttpMethodName.DELETE); String uriResourcePath = "/tracking/v0/trackers/{TrackerName}/consumers/{ConsumerArn}"; - uriResourcePath = uriResourcePath.replace( - "{ConsumerArn}", - (disassociateTrackerConsumerRequest.getConsumerArn() == null) ? "" : StringUtils - .fromString(disassociateTrackerConsumerRequest.getConsumerArn())); uriResourcePath = uriResourcePath.replace( "{TrackerName}", (disassociateTrackerConsumerRequest.getTrackerName() == null) ? "" : StringUtils .fromString(disassociateTrackerConsumerRequest.getTrackerName())); + uriResourcePath = uriResourcePath.replace( + "{ConsumerArn}", + (disassociateTrackerConsumerRequest.getConsumerArn() == null) ? "" : StringUtils + .fromString(disassociateTrackerConsumerRequest.getConsumerArn())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerResultJsonUnmarshaller.java index bfe4c5a075..4beff2864f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/DisassociateTrackerConsumerResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonMarshaller.java new file mode 100644 index 0000000000..856b72bcc0 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonMarshaller.java @@ -0,0 +1,56 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO ForecastGeofenceEventsDeviceState + */ +class ForecastGeofenceEventsDeviceStateJsonMarshaller { + + public void marshall(ForecastGeofenceEventsDeviceState forecastGeofenceEventsDeviceState, + AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (forecastGeofenceEventsDeviceState.getPosition() != null) { + java.util.List position = forecastGeofenceEventsDeviceState.getPosition(); + jsonWriter.name("Position"); + jsonWriter.beginArray(); + for (Double positionItem : position) { + if (positionItem != null) { + jsonWriter.value(positionItem); + } + } + jsonWriter.endArray(); + } + if (forecastGeofenceEventsDeviceState.getSpeed() != null) { + Double speed = forecastGeofenceEventsDeviceState.getSpeed(); + jsonWriter.name("Speed"); + jsonWriter.value(speed); + } + jsonWriter.endObject(); + } + + private static ForecastGeofenceEventsDeviceStateJsonMarshaller instance; + + public static ForecastGeofenceEventsDeviceStateJsonMarshaller getInstance() { + if (instance == null) + instance = new ForecastGeofenceEventsDeviceStateJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonUnmarshaller.java new file mode 100644 index 0000000000..5dd4360bb1 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsDeviceStateJsonUnmarshaller.java @@ -0,0 +1,63 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO ForecastGeofenceEventsDeviceState + */ +class ForecastGeofenceEventsDeviceStateJsonUnmarshaller implements + Unmarshaller { + + public ForecastGeofenceEventsDeviceState unmarshall(JsonUnmarshallerContext context) + throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + ForecastGeofenceEventsDeviceState forecastGeofenceEventsDeviceState = new ForecastGeofenceEventsDeviceState(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("Position")) { + forecastGeofenceEventsDeviceState.setPosition(new ListUnmarshaller( + DoubleJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("Speed")) { + forecastGeofenceEventsDeviceState.setSpeed(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return forecastGeofenceEventsDeviceState; + } + + private static ForecastGeofenceEventsDeviceStateJsonUnmarshaller instance; + + public static ForecastGeofenceEventsDeviceStateJsonUnmarshaller getInstance() { + if (instance == null) + instance = new ForecastGeofenceEventsDeviceStateJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsRequestMarshaller.java new file mode 100644 index 0000000000..b578ee47a6 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsRequestMarshaller.java @@ -0,0 +1,118 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import static com.amazonaws.util.StringUtils.UTF8; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; + +import android.text.TextUtils; + +import com.amazonaws.AmazonClientException; +import com.amazonaws.Request; +import com.amazonaws.DefaultRequest; +import com.amazonaws.http.HttpMethodName; +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.Marshaller; +import com.amazonaws.util.BinaryUtils; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.StringUtils; +import com.amazonaws.util.StringInputStream; +import com.amazonaws.util.json.AwsJsonWriter; +import com.amazonaws.util.json.JsonUtils; + +/** + * JSON request marshaller for ForecastGeofenceEventsRequest + */ +public class ForecastGeofenceEventsRequestMarshaller implements + Marshaller, ForecastGeofenceEventsRequest> { + + public Request marshall( + ForecastGeofenceEventsRequest forecastGeofenceEventsRequest) { + if (forecastGeofenceEventsRequest == null) { + throw new AmazonClientException( + "Invalid argument passed to marshall(ForecastGeofenceEventsRequest)"); + } + + Request request = new DefaultRequest( + forecastGeofenceEventsRequest, "AmazonLocation"); + request.setHttpMethod(HttpMethodName.POST); + + String uriResourcePath = "/geofencing/v0/collections/{CollectionName}/forecast-geofence-events"; + uriResourcePath = uriResourcePath.replace( + "{CollectionName}", + (forecastGeofenceEventsRequest.getCollectionName() == null) ? "" : StringUtils + .fromString(forecastGeofenceEventsRequest.getCollectionName())); + request.setResourcePath(uriResourcePath); + try { + StringWriter stringWriter = new StringWriter(); + AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); + jsonWriter.beginObject(); + + if (forecastGeofenceEventsRequest.getDeviceState() != null) { + ForecastGeofenceEventsDeviceState deviceState = forecastGeofenceEventsRequest + .getDeviceState(); + jsonWriter.name("DeviceState"); + ForecastGeofenceEventsDeviceStateJsonMarshaller.getInstance().marshall(deviceState, + jsonWriter); + } + if (forecastGeofenceEventsRequest.getTimeHorizonMinutes() != null) { + Double timeHorizonMinutes = forecastGeofenceEventsRequest.getTimeHorizonMinutes(); + jsonWriter.name("TimeHorizonMinutes"); + jsonWriter.value(timeHorizonMinutes); + } + if (forecastGeofenceEventsRequest.getDistanceUnit() != null) { + String distanceUnit = forecastGeofenceEventsRequest.getDistanceUnit(); + jsonWriter.name("DistanceUnit"); + jsonWriter.value(distanceUnit); + } + if (forecastGeofenceEventsRequest.getSpeedUnit() != null) { + String speedUnit = forecastGeofenceEventsRequest.getSpeedUnit(); + jsonWriter.name("SpeedUnit"); + jsonWriter.value(speedUnit); + } + if (forecastGeofenceEventsRequest.getNextToken() != null) { + String nextToken = forecastGeofenceEventsRequest.getNextToken(); + jsonWriter.name("NextToken"); + jsonWriter.value(nextToken); + } + if (forecastGeofenceEventsRequest.getMaxResults() != null) { + Integer maxResults = forecastGeofenceEventsRequest.getMaxResults(); + jsonWriter.name("MaxResults"); + jsonWriter.value(maxResults); + } + + jsonWriter.endObject(); + jsonWriter.close(); + String snippet = stringWriter.toString(); + byte[] content = snippet.getBytes(UTF8); + request.setContent(new StringInputStream(snippet)); + request.addHeader("Content-Length", Integer.toString(content.length)); + } catch (Throwable t) { + throw new AmazonClientException( + "Unable to marshall request to JSON: " + t.getMessage(), t); + } + if (!request.getHeaders().containsKey("Content-Type")) { + request.addHeader("Content-Type", "application/x-amz-json-1.0"); + } + request.setHostPrefix("geofencing."); + + return request; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsResultJsonUnmarshaller.java new file mode 100644 index 0000000000..ab17db9e8c --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastGeofenceEventsResultJsonUnmarshaller.java @@ -0,0 +1,68 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for response ForecastGeofenceEventsResult + */ +public class ForecastGeofenceEventsResultJsonUnmarshaller implements + Unmarshaller { + + public ForecastGeofenceEventsResult unmarshall(JsonUnmarshallerContext context) + throws Exception { + ForecastGeofenceEventsResult forecastGeofenceEventsResult = new ForecastGeofenceEventsResult(); + + AwsJsonReader reader = context.getReader(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("ForecastedEvents")) { + forecastGeofenceEventsResult + .setForecastedEvents(new ListUnmarshaller( + ForecastedEventJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("NextToken")) { + forecastGeofenceEventsResult.setNextToken(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("DistanceUnit")) { + forecastGeofenceEventsResult.setDistanceUnit(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("SpeedUnit")) { + forecastGeofenceEventsResult.setSpeedUnit(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + + return forecastGeofenceEventsResult; + } + + private static ForecastGeofenceEventsResultJsonUnmarshaller instance; + + public static ForecastGeofenceEventsResultJsonUnmarshaller getInstance() { + if (instance == null) + instance = new ForecastGeofenceEventsResultJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonMarshaller.java new file mode 100644 index 0000000000..ccc3bcbe3a --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonMarshaller.java @@ -0,0 +1,85 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO ForecastedEvent + */ +class ForecastedEventJsonMarshaller { + + public void marshall(ForecastedEvent forecastedEvent, AwsJsonWriter jsonWriter) + throws Exception { + jsonWriter.beginObject(); + if (forecastedEvent.getEventId() != null) { + String eventId = forecastedEvent.getEventId(); + jsonWriter.name("EventId"); + jsonWriter.value(eventId); + } + if (forecastedEvent.getGeofenceId() != null) { + String geofenceId = forecastedEvent.getGeofenceId(); + jsonWriter.name("GeofenceId"); + jsonWriter.value(geofenceId); + } + if (forecastedEvent.getIsDeviceInGeofence() != null) { + Boolean isDeviceInGeofence = forecastedEvent.getIsDeviceInGeofence(); + jsonWriter.name("IsDeviceInGeofence"); + jsonWriter.value(isDeviceInGeofence); + } + if (forecastedEvent.getNearestDistance() != null) { + Double nearestDistance = forecastedEvent.getNearestDistance(); + jsonWriter.name("NearestDistance"); + jsonWriter.value(nearestDistance); + } + if (forecastedEvent.getEventType() != null) { + String eventType = forecastedEvent.getEventType(); + jsonWriter.name("EventType"); + jsonWriter.value(eventType); + } + if (forecastedEvent.getForecastedBreachTime() != null) { + java.util.Date forecastedBreachTime = forecastedEvent.getForecastedBreachTime(); + jsonWriter.name("ForecastedBreachTime"); + jsonWriter.value(DateUtils.formatISO8601Date(forecastedBreachTime)); + } + if (forecastedEvent.getGeofenceProperties() != null) { + java.util.Map geofenceProperties = forecastedEvent + .getGeofenceProperties(); + jsonWriter.name("GeofenceProperties"); + jsonWriter.beginObject(); + for (java.util.Map.Entry geofencePropertiesEntry : geofenceProperties + .entrySet()) { + String geofencePropertiesValue = geofencePropertiesEntry.getValue(); + if (geofencePropertiesValue != null) { + jsonWriter.name(geofencePropertiesEntry.getKey()); + jsonWriter.value(geofencePropertiesValue); + } + } + jsonWriter.endObject(); + } + jsonWriter.endObject(); + } + + private static ForecastedEventJsonMarshaller instance; + + public static ForecastedEventJsonMarshaller getInstance() { + if (instance == null) + instance = new ForecastedEventJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonUnmarshaller.java new file mode 100644 index 0000000000..c1824b07df --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ForecastedEventJsonUnmarshaller.java @@ -0,0 +1,78 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO ForecastedEvent + */ +class ForecastedEventJsonUnmarshaller implements + Unmarshaller { + + public ForecastedEvent unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + ForecastedEvent forecastedEvent = new ForecastedEvent(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("EventId")) { + forecastedEvent.setEventId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("GeofenceId")) { + forecastedEvent.setGeofenceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("IsDeviceInGeofence")) { + forecastedEvent.setIsDeviceInGeofence(BooleanJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("NearestDistance")) { + forecastedEvent.setNearestDistance(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("EventType")) { + forecastedEvent.setEventType(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("ForecastedBreachTime")) { + forecastedEvent.setForecastedBreachTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("GeofenceProperties")) { + forecastedEvent.setGeofenceProperties(new MapUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return forecastedEvent; + } + + private static ForecastedEventJsonUnmarshaller instance; + + public static ForecastedEventJsonUnmarshaller getInstance() { + if (instance == null) + instance = new ForecastedEventJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java index e4efcfb775..01f61025c3 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,11 +27,6 @@ class GeofenceGeometryJsonMarshaller { public void marshall(GeofenceGeometry geofenceGeometry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (geofenceGeometry.getCircle() != null) { - Circle circle = geofenceGeometry.getCircle(); - jsonWriter.name("Circle"); - CircleJsonMarshaller.getInstance().marshall(circle, jsonWriter); - } if (geofenceGeometry.getPolygon() != null) { java.util.List>> polygon = geofenceGeometry .getPolygon(); @@ -56,6 +51,16 @@ public void marshall(GeofenceGeometry geofenceGeometry, AwsJsonWriter jsonWriter } jsonWriter.endArray(); } + if (geofenceGeometry.getCircle() != null) { + Circle circle = geofenceGeometry.getCircle(); + jsonWriter.name("Circle"); + CircleJsonMarshaller.getInstance().marshall(circle, jsonWriter); + } + if (geofenceGeometry.getGeobuf() != null) { + java.nio.ByteBuffer geobuf = geofenceGeometry.getGeobuf(); + jsonWriter.name("Geobuf"); + jsonWriter.value(geobuf); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java index 6b2f3115bb..0f280253a7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,10 +36,7 @@ public GeofenceGeometry unmarshall(JsonUnmarshallerContext context) throws Excep reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Circle")) { - geofenceGeometry.setCircle(CircleJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Polygon")) { + if (name.equals("Polygon")) { geofenceGeometry .setPolygon(new ListUnmarshaller>>( new ListUnmarshaller>( @@ -49,6 +46,12 @@ public GeofenceGeometry unmarshall(JsonUnmarshallerContext context) throws Excep ) ) .unmarshall(context)); + } else if (name.equals("Circle")) { + geofenceGeometry.setCircle(CircleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Geobuf")) { + geofenceGeometry.setGeobuf(ByteBufferJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryRequestMarshaller.java index a3af510195..e4ba3cf21f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -55,31 +55,20 @@ public Request marshall( request.setHttpMethod(HttpMethodName.POST); String uriResourcePath = "/tracking/v0/trackers/{TrackerName}/devices/{DeviceId}/list-positions"; - uriResourcePath = uriResourcePath.replace( - "{DeviceId}", - (getDevicePositionHistoryRequest.getDeviceId() == null) ? "" : StringUtils - .fromString(getDevicePositionHistoryRequest.getDeviceId())); uriResourcePath = uriResourcePath.replace( "{TrackerName}", (getDevicePositionHistoryRequest.getTrackerName() == null) ? "" : StringUtils .fromString(getDevicePositionHistoryRequest.getTrackerName())); + uriResourcePath = uriResourcePath.replace( + "{DeviceId}", + (getDevicePositionHistoryRequest.getDeviceId() == null) ? "" : StringUtils + .fromString(getDevicePositionHistoryRequest.getDeviceId())); request.setResourcePath(uriResourcePath); try { StringWriter stringWriter = new StringWriter(); AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (getDevicePositionHistoryRequest.getEndTimeExclusive() != null) { - java.util.Date endTimeExclusive = getDevicePositionHistoryRequest - .getEndTimeExclusive(); - jsonWriter.name("EndTimeExclusive"); - jsonWriter.value(DateUtils.formatISO8601Date(endTimeExclusive)); - } - if (getDevicePositionHistoryRequest.getMaxResults() != null) { - Integer maxResults = getDevicePositionHistoryRequest.getMaxResults(); - jsonWriter.name("MaxResults"); - jsonWriter.value(maxResults); - } if (getDevicePositionHistoryRequest.getNextToken() != null) { String nextToken = getDevicePositionHistoryRequest.getNextToken(); jsonWriter.name("NextToken"); @@ -91,6 +80,17 @@ public Request marshall( jsonWriter.name("StartTimeInclusive"); jsonWriter.value(DateUtils.formatISO8601Date(startTimeInclusive)); } + if (getDevicePositionHistoryRequest.getEndTimeExclusive() != null) { + java.util.Date endTimeExclusive = getDevicePositionHistoryRequest + .getEndTimeExclusive(); + jsonWriter.name("EndTimeExclusive"); + jsonWriter.value(DateUtils.formatISO8601Date(endTimeExclusive)); + } + if (getDevicePositionHistoryRequest.getMaxResults() != null) { + Integer maxResults = getDevicePositionHistoryRequest.getMaxResults(); + jsonWriter.name("MaxResults"); + jsonWriter.value(maxResults); + } jsonWriter.endObject(); jsonWriter.close(); @@ -103,7 +103,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("tracking."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryResultJsonUnmarshaller.java index 007c8beb82..53520bbde7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionHistoryResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionRequestMarshaller.java index 9cdad1e903..962127c411 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -55,17 +55,17 @@ public Request marshall( request.setHttpMethod(HttpMethodName.GET); String uriResourcePath = "/tracking/v0/trackers/{TrackerName}/devices/{DeviceId}/positions/latest"; - uriResourcePath = uriResourcePath.replace( - "{DeviceId}", - (getDevicePositionRequest.getDeviceId() == null) ? "" : StringUtils - .fromString(getDevicePositionRequest.getDeviceId())); uriResourcePath = uriResourcePath.replace( "{TrackerName}", (getDevicePositionRequest.getTrackerName() == null) ? "" : StringUtils .fromString(getDevicePositionRequest.getTrackerName())); + uriResourcePath = uriResourcePath.replace( + "{DeviceId}", + (getDevicePositionRequest.getDeviceId() == null) ? "" : StringUtils + .fromString(getDevicePositionRequest.getDeviceId())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("tracking."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionResultJsonUnmarshaller.java index e414d749e4..53dda19c98 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetDevicePositionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,31 +33,31 @@ public GetDevicePositionResult unmarshall(JsonUnmarshallerContext context) throw reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Accuracy")) { - getDevicePositionResult.setAccuracy(PositionalAccuracyJsonUnmarshaller - .getInstance() - .unmarshall(context)); - } else if (name.equals("DeviceId")) { + if (name.equals("DeviceId")) { getDevicePositionResult.setDeviceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("SampleTime")) { + getDevicePositionResult.setSampleTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("ReceivedTime")) { + getDevicePositionResult.setReceivedTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("Position")) { getDevicePositionResult.setPosition(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); + } else if (name.equals("Accuracy")) { + getDevicePositionResult.setAccuracy(PositionalAccuracyJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else if (name.equals("PositionProperties")) { getDevicePositionResult.setPositionProperties(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("ReceivedTime")) { - getDevicePositionResult.setReceivedTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("SampleTime")) { - getDevicePositionResult.setSampleTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceRequestMarshaller.java index 8aca134b8b..aed498f58c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -64,7 +64,7 @@ public Request marshall(GetGeofenceRequest getGeofenceReques .fromString(getGeofenceRequest.getGeofenceId())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("geofencing."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceResultJsonUnmarshaller.java index 716c9a8159..32e3811f57 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetGeofenceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,28 +33,28 @@ public GetGeofenceResult unmarshall(JsonUnmarshallerContext context) throws Exce reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - getGeofenceResult.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("GeofenceId")) { + if (name.equals("GeofenceId")) { getGeofenceResult.setGeofenceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("GeofenceProperties")) { - getGeofenceResult.setGeofenceProperties(new MapUnmarshaller( - StringJsonUnmarshaller.getInstance() - ) - .unmarshall(context)); } else if (name.equals("Geometry")) { getGeofenceResult.setGeometry(GeofenceGeometryJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Status")) { getGeofenceResult.setStatus(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + getGeofenceResult.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { getGeofenceResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("GeofenceProperties")) { + getGeofenceResult.setGeofenceProperties(new MapUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsRequestMarshaller.java index 33ef089562..6b9a798a3d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -54,6 +54,10 @@ public Request marshall(GetMapGlyphsRequest getMapGlyphsReq request.setHttpMethod(HttpMethodName.GET); String uriResourcePath = "/maps/v0/maps/{MapName}/glyphs/{FontStack}/{FontUnicodeRange}"; + uriResourcePath = uriResourcePath.replace( + "{MapName}", + (getMapGlyphsRequest.getMapName() == null) ? "" : StringUtils + .fromString(getMapGlyphsRequest.getMapName())); uriResourcePath = uriResourcePath.replace( "{FontStack}", (getMapGlyphsRequest.getFontStack() == null) ? "" : StringUtils @@ -65,13 +69,9 @@ public Request marshall(GetMapGlyphsRequest getMapGlyphsReq if (getMapGlyphsRequest.getKey() != null) { request.addParameter("key", StringUtils.fromString(getMapGlyphsRequest.getKey())); } - uriResourcePath = uriResourcePath.replace( - "{MapName}", - (getMapGlyphsRequest.getMapName() == null) ? "" : StringUtils - .fromString(getMapGlyphsRequest.getMapName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("maps."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsResultJsonUnmarshaller.java index 92cefa9dd2..84513d240a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapGlyphsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ public GetMapGlyphsResult unmarshall(JsonUnmarshallerContext context) throws Exc getMapGlyphsResult.setBlob(java.nio.ByteBuffer.wrap(com.amazonaws.util.IOUtils .toByteArray(is))); } - if (context.getHeader("Cache-Control") != null) - getMapGlyphsResult.setCacheControl(context.getHeader("Cache-Control")); if (context.getHeader("Content-Type") != null) getMapGlyphsResult.setContentType(context.getHeader("Content-Type")); + if (context.getHeader("Cache-Control") != null) + getMapGlyphsResult.setCacheControl(context.getHeader("Cache-Control")); return getMapGlyphsResult; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesRequestMarshaller.java index 81c4b3ee7a..107957aaa2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -54,6 +54,10 @@ public Request marshall(GetMapSpritesRequest getMapSprites request.setHttpMethod(HttpMethodName.GET); String uriResourcePath = "/maps/v0/maps/{MapName}/sprites/{FileName}"; + uriResourcePath = uriResourcePath.replace( + "{MapName}", + (getMapSpritesRequest.getMapName() == null) ? "" : StringUtils + .fromString(getMapSpritesRequest.getMapName())); uriResourcePath = uriResourcePath.replace( "{FileName}", (getMapSpritesRequest.getFileName() == null) ? "" : StringUtils @@ -61,13 +65,9 @@ public Request marshall(GetMapSpritesRequest getMapSprites if (getMapSpritesRequest.getKey() != null) { request.addParameter("key", StringUtils.fromString(getMapSpritesRequest.getKey())); } - uriResourcePath = uriResourcePath.replace( - "{MapName}", - (getMapSpritesRequest.getMapName() == null) ? "" : StringUtils - .fromString(getMapSpritesRequest.getMapName())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("maps."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesResultJsonUnmarshaller.java index ab4d935412..399db94e9a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapSpritesResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ public GetMapSpritesResult unmarshall(JsonUnmarshallerContext context) throws Ex getMapSpritesResult.setBlob(java.nio.ByteBuffer.wrap(com.amazonaws.util.IOUtils .toByteArray(is))); } - if (context.getHeader("Cache-Control") != null) - getMapSpritesResult.setCacheControl(context.getHeader("Cache-Control")); if (context.getHeader("Content-Type") != null) getMapSpritesResult.setContentType(context.getHeader("Content-Type")); + if (context.getHeader("Cache-Control") != null) + getMapSpritesResult.setCacheControl(context.getHeader("Cache-Control")); return getMapSpritesResult; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorRequestMarshaller.java index 54efb1286e..d003d31f6f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -55,17 +55,17 @@ public Request marshall( request.setHttpMethod(HttpMethodName.GET); String uriResourcePath = "/maps/v0/maps/{MapName}/style-descriptor"; - if (getMapStyleDescriptorRequest.getKey() != null) { - request.addParameter("key", - StringUtils.fromString(getMapStyleDescriptorRequest.getKey())); - } uriResourcePath = uriResourcePath.replace( "{MapName}", (getMapStyleDescriptorRequest.getMapName() == null) ? "" : StringUtils .fromString(getMapStyleDescriptorRequest.getMapName())); + if (getMapStyleDescriptorRequest.getKey() != null) { + request.addParameter("key", + StringUtils.fromString(getMapStyleDescriptorRequest.getKey())); + } request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("maps."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorResultJsonUnmarshaller.java index ebf2e66728..375324ea92 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapStyleDescriptorResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ public GetMapStyleDescriptorResult unmarshall(JsonUnmarshallerContext context) t getMapStyleDescriptorResult.setBlob(java.nio.ByteBuffer.wrap(com.amazonaws.util.IOUtils .toByteArray(is))); } - if (context.getHeader("Cache-Control") != null) - getMapStyleDescriptorResult.setCacheControl(context.getHeader("Cache-Control")); if (context.getHeader("Content-Type") != null) getMapStyleDescriptorResult.setContentType(context.getHeader("Content-Type")); + if (context.getHeader("Cache-Control") != null) + getMapStyleDescriptorResult.setCacheControl(context.getHeader("Cache-Control")); return getMapStyleDescriptorResult; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileRequestMarshaller.java index 137799580a..056eaa427b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -54,22 +54,22 @@ public Request marshall(GetMapTileRequest getMapTileRequest) request.setHttpMethod(HttpMethodName.GET); String uriResourcePath = "/maps/v0/maps/{MapName}/tiles/{Z}/{X}/{Y}"; - if (getMapTileRequest.getKey() != null) { - request.addParameter("key", StringUtils.fromString(getMapTileRequest.getKey())); - } uriResourcePath = uriResourcePath.replace( "{MapName}", (getMapTileRequest.getMapName() == null) ? "" : StringUtils .fromString(getMapTileRequest.getMapName())); + uriResourcePath = uriResourcePath.replace("{Z}", (getMapTileRequest.getZ() == null) ? "" + : StringUtils.fromString(getMapTileRequest.getZ())); uriResourcePath = uriResourcePath.replace("{X}", (getMapTileRequest.getX() == null) ? "" : StringUtils.fromString(getMapTileRequest.getX())); uriResourcePath = uriResourcePath.replace("{Y}", (getMapTileRequest.getY() == null) ? "" : StringUtils.fromString(getMapTileRequest.getY())); - uriResourcePath = uriResourcePath.replace("{Z}", (getMapTileRequest.getZ() == null) ? "" - : StringUtils.fromString(getMapTileRequest.getZ())); + if (getMapTileRequest.getKey() != null) { + request.addParameter("key", StringUtils.fromString(getMapTileRequest.getKey())); + } request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("maps."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileResultJsonUnmarshaller.java index a2e3d22c86..ff3397d5fa 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetMapTileResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,10 +34,10 @@ public GetMapTileResult unmarshall(JsonUnmarshallerContext context) throws Excep getMapTileResult.setBlob(java.nio.ByteBuffer.wrap(com.amazonaws.util.IOUtils .toByteArray(is))); } - if (context.getHeader("Cache-Control") != null) - getMapTileResult.setCacheControl(context.getHeader("Cache-Control")); if (context.getHeader("Content-Type") != null) getMapTileResult.setContentType(context.getHeader("Content-Type")); + if (context.getHeader("Cache-Control") != null) + getMapTileResult.setCacheControl(context.getHeader("Cache-Control")); return getMapTileResult; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceRequestMarshaller.java index 025e519493..1016170e38 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -57,19 +57,19 @@ public Request marshall(GetPlaceRequest getPlaceRequest) { "{IndexName}", (getPlaceRequest.getIndexName() == null) ? "" : StringUtils .fromString(getPlaceRequest.getIndexName())); - if (getPlaceRequest.getKey() != null) { - request.addParameter("key", StringUtils.fromString(getPlaceRequest.getKey())); - } - if (getPlaceRequest.getLanguage() != null) { - request.addParameter("language", StringUtils.fromString(getPlaceRequest.getLanguage())); - } uriResourcePath = uriResourcePath.replace( "{PlaceId}", (getPlaceRequest.getPlaceId() == null) ? "" : StringUtils .fromString(getPlaceRequest.getPlaceId())); + if (getPlaceRequest.getLanguage() != null) { + request.addParameter("language", StringUtils.fromString(getPlaceRequest.getLanguage())); + } + if (getPlaceRequest.getKey() != null) { + request.addParameter("key", StringUtils.fromString(getPlaceRequest.getKey())); + } request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("places."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceResultJsonUnmarshaller.java index a49b458e17..230dbe3091 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GetPlaceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonMarshaller.java new file mode 100644 index 0000000000..a947559d18 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonMarshaller.java @@ -0,0 +1,65 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO InferredState + */ +class InferredStateJsonMarshaller { + + public void marshall(InferredState inferredState, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (inferredState.getPosition() != null) { + java.util.List position = inferredState.getPosition(); + jsonWriter.name("Position"); + jsonWriter.beginArray(); + for (Double positionItem : position) { + if (positionItem != null) { + jsonWriter.value(positionItem); + } + } + jsonWriter.endArray(); + } + if (inferredState.getAccuracy() != null) { + PositionalAccuracy accuracy = inferredState.getAccuracy(); + jsonWriter.name("Accuracy"); + PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); + } + if (inferredState.getDeviationDistance() != null) { + Double deviationDistance = inferredState.getDeviationDistance(); + jsonWriter.name("DeviationDistance"); + jsonWriter.value(deviationDistance); + } + if (inferredState.getProxyDetected() != null) { + Boolean proxyDetected = inferredState.getProxyDetected(); + jsonWriter.name("ProxyDetected"); + jsonWriter.value(proxyDetected); + } + jsonWriter.endObject(); + } + + private static InferredStateJsonMarshaller instance; + + public static InferredStateJsonMarshaller getInstance() { + if (instance == null) + instance = new InferredStateJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonUnmarshaller.java new file mode 100644 index 0000000000..3219c71760 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InferredStateJsonUnmarshaller.java @@ -0,0 +1,67 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO InferredState + */ +class InferredStateJsonUnmarshaller implements Unmarshaller { + + public InferredState unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + InferredState inferredState = new InferredState(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("Position")) { + inferredState.setPosition(new ListUnmarshaller(DoubleJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); + } else if (name.equals("Accuracy")) { + inferredState.setAccuracy(PositionalAccuracyJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("DeviationDistance")) { + inferredState.setDeviationDistance(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("ProxyDetected")) { + inferredState.setProxyDetected(BooleanJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return inferredState; + } + + private static InferredStateJsonUnmarshaller instance; + + public static InferredStateJsonUnmarshaller getInstance() { + if (instance == null) + instance = new InferredStateJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InternalServerExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InternalServerExceptionUnmarshaller.java index 141d262ad3..cb76de74d4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InternalServerExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/InternalServerExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonMarshaller.java index 48fbe4c28c..8a306a381c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonUnmarshaller.java index 808b7d466e..a8733393c0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegGeometryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonMarshaller.java index 7b8eabf455..ec60b65e6d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,15 +26,16 @@ class LegJsonMarshaller { public void marshall(Leg leg, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (leg.getDistance() != null) { - Double distance = leg.getDistance(); - jsonWriter.name("Distance"); - jsonWriter.value(distance); - } - if (leg.getDurationSeconds() != null) { - Double durationSeconds = leg.getDurationSeconds(); - jsonWriter.name("DurationSeconds"); - jsonWriter.value(durationSeconds); + if (leg.getStartPosition() != null) { + java.util.List startPosition = leg.getStartPosition(); + jsonWriter.name("StartPosition"); + jsonWriter.beginArray(); + for (Double startPositionItem : startPosition) { + if (startPositionItem != null) { + jsonWriter.value(startPositionItem); + } + } + jsonWriter.endArray(); } if (leg.getEndPosition() != null) { java.util.List endPosition = leg.getEndPosition(); @@ -47,22 +48,21 @@ public void marshall(Leg leg, AwsJsonWriter jsonWriter) throws Exception { } jsonWriter.endArray(); } + if (leg.getDistance() != null) { + Double distance = leg.getDistance(); + jsonWriter.name("Distance"); + jsonWriter.value(distance); + } + if (leg.getDurationSeconds() != null) { + Double durationSeconds = leg.getDurationSeconds(); + jsonWriter.name("DurationSeconds"); + jsonWriter.value(durationSeconds); + } if (leg.getGeometry() != null) { LegGeometry geometry = leg.getGeometry(); jsonWriter.name("Geometry"); LegGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); } - if (leg.getStartPosition() != null) { - java.util.List startPosition = leg.getStartPosition(); - jsonWriter.name("StartPosition"); - jsonWriter.beginArray(); - for (Double startPositionItem : startPosition) { - if (startPositionItem != null) { - jsonWriter.value(startPositionItem); - } - } - jsonWriter.endArray(); - } if (leg.getSteps() != null) { java.util.List steps = leg.getSteps(); jsonWriter.name("Steps"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonUnmarshaller.java index c17ac14cc7..70b23ef758 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LegJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -35,25 +35,25 @@ public Leg unmarshall(JsonUnmarshallerContext context) throws Exception { reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Distance")) { - leg.setDistance(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("DurationSeconds")) { - leg.setDurationSeconds(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); + if (name.equals("StartPosition")) { + leg.setStartPosition(new ListUnmarshaller(DoubleJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); } else if (name.equals("EndPosition")) { leg.setEndPosition(new ListUnmarshaller(DoubleJsonUnmarshaller .getInstance() ) .unmarshall(context)); + } else if (name.equals("Distance")) { + leg.setDistance(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("DurationSeconds")) { + leg.setDurationSeconds(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("Geometry")) { leg.setGeometry(LegGeometryJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("StartPosition")) { - leg.setStartPosition(new ListUnmarshaller(DoubleJsonUnmarshaller - .getInstance() - ) - .unmarshall(context)); } else if (name.equals("Steps")) { leg.setSteps(new ListUnmarshaller(StepJsonUnmarshaller.getInstance() ) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsRequestMarshaller.java index 879d7b3f3f..fa50bd6029 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -75,6 +75,13 @@ public Request marshall( jsonWriter.name("NextToken"); jsonWriter.value(nextToken); } + if (listDevicePositionsRequest.getFilterGeometry() != null) { + TrackingFilterGeometry filterGeometry = listDevicePositionsRequest + .getFilterGeometry(); + jsonWriter.name("FilterGeometry"); + TrackingFilterGeometryJsonMarshaller.getInstance().marshall(filterGeometry, + jsonWriter); + } jsonWriter.endObject(); jsonWriter.close(); @@ -87,7 +94,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("tracking."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonMarshaller.java index 50070a2c8f..26268ed105 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class ListDevicePositionsResponseEntryJsonMarshaller { public void marshall(ListDevicePositionsResponseEntry listDevicePositionsResponseEntry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (listDevicePositionsResponseEntry.getAccuracy() != null) { - PositionalAccuracy accuracy = listDevicePositionsResponseEntry.getAccuracy(); - jsonWriter.name("Accuracy"); - PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); - } if (listDevicePositionsResponseEntry.getDeviceId() != null) { String deviceId = listDevicePositionsResponseEntry.getDeviceId(); jsonWriter.name("DeviceId"); jsonWriter.value(deviceId); } + if (listDevicePositionsResponseEntry.getSampleTime() != null) { + java.util.Date sampleTime = listDevicePositionsResponseEntry.getSampleTime(); + jsonWriter.name("SampleTime"); + jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); + } if (listDevicePositionsResponseEntry.getPosition() != null) { java.util.List position = listDevicePositionsResponseEntry.getPosition(); jsonWriter.name("Position"); @@ -48,6 +48,11 @@ public void marshall(ListDevicePositionsResponseEntry listDevicePositionsRespons } jsonWriter.endArray(); } + if (listDevicePositionsResponseEntry.getAccuracy() != null) { + PositionalAccuracy accuracy = listDevicePositionsResponseEntry.getAccuracy(); + jsonWriter.name("Accuracy"); + PositionalAccuracyJsonMarshaller.getInstance().marshall(accuracy, jsonWriter); + } if (listDevicePositionsResponseEntry.getPositionProperties() != null) { java.util.Map positionProperties = listDevicePositionsResponseEntry .getPositionProperties(); @@ -63,11 +68,6 @@ public void marshall(ListDevicePositionsResponseEntry listDevicePositionsRespons } jsonWriter.endObject(); } - if (listDevicePositionsResponseEntry.getSampleTime() != null) { - java.util.Date sampleTime = listDevicePositionsResponseEntry.getSampleTime(); - jsonWriter.name("SampleTime"); - jsonWriter.value(DateUtils.formatISO8601Date(sampleTime)); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonUnmarshaller.java index a306e2526e..385816876d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,27 +37,27 @@ public ListDevicePositionsResponseEntry unmarshall(JsonUnmarshallerContext conte reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Accuracy")) { - listDevicePositionsResponseEntry.setAccuracy(PositionalAccuracyJsonUnmarshaller - .getInstance() - .unmarshall(context)); - } else if (name.equals("DeviceId")) { + if (name.equals("DeviceId")) { listDevicePositionsResponseEntry.setDeviceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("SampleTime")) { + listDevicePositionsResponseEntry.setSampleTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("Position")) { listDevicePositionsResponseEntry.setPosition(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); + } else if (name.equals("Accuracy")) { + listDevicePositionsResponseEntry.setAccuracy(PositionalAccuracyJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else if (name.equals("PositionProperties")) { listDevicePositionsResponseEntry.setPositionProperties(new MapUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("SampleTime")) { - listDevicePositionsResponseEntry.setSampleTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResultJsonUnmarshaller.java index daa675edcb..6d8e4cbb4b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListDevicePositionsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsRequestMarshaller.java index 30ba4bf733..e647539229 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -83,9 +83,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("geofencing."); + request.setHostPrefix("cp.geofencing."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonMarshaller.java index ac68374e31..3e235ac16d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,11 +32,6 @@ public void marshall(ListGeofenceCollectionsResponseEntry listGeofenceCollection jsonWriter.name("CollectionName"); jsonWriter.value(collectionName); } - if (listGeofenceCollectionsResponseEntry.getCreateTime() != null) { - java.util.Date createTime = listGeofenceCollectionsResponseEntry.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); - } if (listGeofenceCollectionsResponseEntry.getDescription() != null) { String description = listGeofenceCollectionsResponseEntry.getDescription(); jsonWriter.name("Description"); @@ -53,6 +48,11 @@ public void marshall(ListGeofenceCollectionsResponseEntry listGeofenceCollection jsonWriter.name("PricingPlanDataSource"); jsonWriter.value(pricingPlanDataSource); } + if (listGeofenceCollectionsResponseEntry.getCreateTime() != null) { + java.util.Date createTime = listGeofenceCollectionsResponseEntry.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + } if (listGeofenceCollectionsResponseEntry.getUpdateTime() != null) { java.util.Date updateTime = listGeofenceCollectionsResponseEntry.getUpdateTime(); jsonWriter.name("UpdateTime"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonUnmarshaller.java index 1c6b2775d0..f6f268dfa2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -41,10 +41,6 @@ public ListGeofenceCollectionsResponseEntry unmarshall(JsonUnmarshallerContext c listGeofenceCollectionsResponseEntry.setCollectionName(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("CreateTime")) { - listGeofenceCollectionsResponseEntry.setCreateTime(DateJsonUnmarshaller - .getInstance(TimestampFormat.ISO_8601) - .unmarshall(context)); } else if (name.equals("Description")) { listGeofenceCollectionsResponseEntry.setDescription(StringJsonUnmarshaller .getInstance() @@ -57,6 +53,10 @@ public ListGeofenceCollectionsResponseEntry unmarshall(JsonUnmarshallerContext c listGeofenceCollectionsResponseEntry .setPricingPlanDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + listGeofenceCollectionsResponseEntry.setCreateTime(DateJsonUnmarshaller + .getInstance(TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { listGeofenceCollectionsResponseEntry.setUpdateTime(DateJsonUnmarshaller .getInstance(TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResultJsonUnmarshaller.java index 13be639703..24ecf135ec 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceCollectionsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonMarshaller.java index 2f93155f40..83bb74b481 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,15 +27,30 @@ class ListGeofenceResponseEntryJsonMarshaller { public void marshall(ListGeofenceResponseEntry listGeofenceResponseEntry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (listGeofenceResponseEntry.getGeofenceId() != null) { + String geofenceId = listGeofenceResponseEntry.getGeofenceId(); + jsonWriter.name("GeofenceId"); + jsonWriter.value(geofenceId); + } + if (listGeofenceResponseEntry.getGeometry() != null) { + GeofenceGeometry geometry = listGeofenceResponseEntry.getGeometry(); + jsonWriter.name("Geometry"); + GeofenceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); + } + if (listGeofenceResponseEntry.getStatus() != null) { + String status = listGeofenceResponseEntry.getStatus(); + jsonWriter.name("Status"); + jsonWriter.value(status); + } if (listGeofenceResponseEntry.getCreateTime() != null) { java.util.Date createTime = listGeofenceResponseEntry.getCreateTime(); jsonWriter.name("CreateTime"); jsonWriter.value(DateUtils.formatISO8601Date(createTime)); } - if (listGeofenceResponseEntry.getGeofenceId() != null) { - String geofenceId = listGeofenceResponseEntry.getGeofenceId(); - jsonWriter.name("GeofenceId"); - jsonWriter.value(geofenceId); + if (listGeofenceResponseEntry.getUpdateTime() != null) { + java.util.Date updateTime = listGeofenceResponseEntry.getUpdateTime(); + jsonWriter.name("UpdateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(updateTime)); } if (listGeofenceResponseEntry.getGeofenceProperties() != null) { java.util.Map geofenceProperties = listGeofenceResponseEntry @@ -52,21 +67,6 @@ public void marshall(ListGeofenceResponseEntry listGeofenceResponseEntry, } jsonWriter.endObject(); } - if (listGeofenceResponseEntry.getGeometry() != null) { - GeofenceGeometry geometry = listGeofenceResponseEntry.getGeometry(); - jsonWriter.name("Geometry"); - GeofenceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); - } - if (listGeofenceResponseEntry.getStatus() != null) { - String status = listGeofenceResponseEntry.getStatus(); - jsonWriter.name("Status"); - jsonWriter.value(status); - } - if (listGeofenceResponseEntry.getUpdateTime() != null) { - java.util.Date updateTime = listGeofenceResponseEntry.getUpdateTime(); - jsonWriter.name("UpdateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(updateTime)); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonUnmarshaller.java index a5b9533e3d..359b67e920 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofenceResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,18 +36,9 @@ public ListGeofenceResponseEntry unmarshall(JsonUnmarshallerContext context) thr reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - listGeofenceResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("GeofenceId")) { + if (name.equals("GeofenceId")) { listGeofenceResponseEntry.setGeofenceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("GeofenceProperties")) { - listGeofenceResponseEntry.setGeofenceProperties(new MapUnmarshaller( - StringJsonUnmarshaller.getInstance() - ) - .unmarshall(context)); } else if (name.equals("Geometry")) { listGeofenceResponseEntry.setGeometry(GeofenceGeometryJsonUnmarshaller .getInstance() @@ -55,10 +46,19 @@ public ListGeofenceResponseEntry unmarshall(JsonUnmarshallerContext context) thr } else if (name.equals("Status")) { listGeofenceResponseEntry.setStatus(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + listGeofenceResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { listGeofenceResponseEntry.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); + } else if (name.equals("GeofenceProperties")) { + listGeofenceResponseEntry.setGeofenceProperties(new MapUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesRequestMarshaller.java index a42c353775..457674ba1f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -64,16 +64,16 @@ public Request marshall(ListGeofencesRequest listGeofences AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (listGeofencesRequest.getMaxResults() != null) { - Integer maxResults = listGeofencesRequest.getMaxResults(); - jsonWriter.name("MaxResults"); - jsonWriter.value(maxResults); - } if (listGeofencesRequest.getNextToken() != null) { String nextToken = listGeofencesRequest.getNextToken(); jsonWriter.name("NextToken"); jsonWriter.value(nextToken); } + if (listGeofencesRequest.getMaxResults() != null) { + Integer maxResults = listGeofencesRequest.getMaxResults(); + jsonWriter.name("MaxResults"); + jsonWriter.value(maxResults); + } jsonWriter.endObject(); jsonWriter.close(); @@ -86,7 +86,7 @@ public Request marshall(ListGeofencesRequest listGeofences "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("geofencing."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesResultJsonUnmarshaller.java index 03fc29ea38..6152ac18e5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListGeofencesResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysRequestMarshaller.java index 85b508ab38..f0bd87081d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -59,11 +59,6 @@ public Request marshall(ListKeysRequest listKeysRequest) { AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (listKeysRequest.getFilter() != null) { - ApiKeyFilter filter = listKeysRequest.getFilter(); - jsonWriter.name("Filter"); - ApiKeyFilterJsonMarshaller.getInstance().marshall(filter, jsonWriter); - } if (listKeysRequest.getMaxResults() != null) { Integer maxResults = listKeysRequest.getMaxResults(); jsonWriter.name("MaxResults"); @@ -74,6 +69,11 @@ public Request marshall(ListKeysRequest listKeysRequest) { jsonWriter.name("NextToken"); jsonWriter.value(nextToken); } + if (listKeysRequest.getFilter() != null) { + ApiKeyFilter filter = listKeysRequest.getFilter(); + jsonWriter.name("Filter"); + ApiKeyFilterJsonMarshaller.getInstance().marshall(filter, jsonWriter); + } jsonWriter.endObject(); jsonWriter.close(); @@ -86,9 +86,9 @@ public Request marshall(ListKeysRequest listKeysRequest) { "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonMarshaller.java index d275f5d62d..0ea3f11e45 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,31 +27,31 @@ class ListKeysResponseEntryJsonMarshaller { public void marshall(ListKeysResponseEntry listKeysResponseEntry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (listKeysResponseEntry.getCreateTime() != null) { - java.util.Date createTime = listKeysResponseEntry.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); - } - if (listKeysResponseEntry.getDescription() != null) { - String description = listKeysResponseEntry.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); + if (listKeysResponseEntry.getKeyName() != null) { + String keyName = listKeysResponseEntry.getKeyName(); + jsonWriter.name("KeyName"); + jsonWriter.value(keyName); } if (listKeysResponseEntry.getExpireTime() != null) { java.util.Date expireTime = listKeysResponseEntry.getExpireTime(); jsonWriter.name("ExpireTime"); jsonWriter.value(DateUtils.formatISO8601Date(expireTime)); } - if (listKeysResponseEntry.getKeyName() != null) { - String keyName = listKeysResponseEntry.getKeyName(); - jsonWriter.name("KeyName"); - jsonWriter.value(keyName); + if (listKeysResponseEntry.getDescription() != null) { + String description = listKeysResponseEntry.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); } if (listKeysResponseEntry.getRestrictions() != null) { ApiKeyRestrictions restrictions = listKeysResponseEntry.getRestrictions(); jsonWriter.name("Restrictions"); ApiKeyRestrictionsJsonMarshaller.getInstance().marshall(restrictions, jsonWriter); } + if (listKeysResponseEntry.getCreateTime() != null) { + java.util.Date createTime = listKeysResponseEntry.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + } if (listKeysResponseEntry.getUpdateTime() != null) { java.util.Date updateTime = listKeysResponseEntry.getUpdateTime(); jsonWriter.name("UpdateTime"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonUnmarshaller.java index acb153f80d..6bf2fd03d3 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,24 +36,24 @@ public ListKeysResponseEntry unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - listKeysResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("Description")) { - listKeysResponseEntry.setDescription(StringJsonUnmarshaller.getInstance() + if (name.equals("KeyName")) { + listKeysResponseEntry.setKeyName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("ExpireTime")) { listKeysResponseEntry.setExpireTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); - } else if (name.equals("KeyName")) { - listKeysResponseEntry.setKeyName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Description")) { + listKeysResponseEntry.setDescription(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Restrictions")) { listKeysResponseEntry.setRestrictions(ApiKeyRestrictionsJsonUnmarshaller .getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + listKeysResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { listKeysResponseEntry.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResultJsonUnmarshaller.java index b06fc27e7f..3716cd6b57 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListKeysResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsRequestMarshaller.java index 6eee0f0812..3af45ff927 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -81,9 +81,9 @@ public Request marshall(ListMapsRequest listMapsRequest) { "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("maps."); + request.setHostPrefix("cp.maps."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonMarshaller.java index 0aca64c069..1de93fcbe9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,31 +27,31 @@ class ListMapsResponseEntryJsonMarshaller { public void marshall(ListMapsResponseEntry listMapsResponseEntry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (listMapsResponseEntry.getCreateTime() != null) { - java.util.Date createTime = listMapsResponseEntry.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); - } - if (listMapsResponseEntry.getDataSource() != null) { - String dataSource = listMapsResponseEntry.getDataSource(); - jsonWriter.name("DataSource"); - jsonWriter.value(dataSource); + if (listMapsResponseEntry.getMapName() != null) { + String mapName = listMapsResponseEntry.getMapName(); + jsonWriter.name("MapName"); + jsonWriter.value(mapName); } if (listMapsResponseEntry.getDescription() != null) { String description = listMapsResponseEntry.getDescription(); jsonWriter.name("Description"); jsonWriter.value(description); } - if (listMapsResponseEntry.getMapName() != null) { - String mapName = listMapsResponseEntry.getMapName(); - jsonWriter.name("MapName"); - jsonWriter.value(mapName); + if (listMapsResponseEntry.getDataSource() != null) { + String dataSource = listMapsResponseEntry.getDataSource(); + jsonWriter.name("DataSource"); + jsonWriter.value(dataSource); } if (listMapsResponseEntry.getPricingPlan() != null) { String pricingPlan = listMapsResponseEntry.getPricingPlan(); jsonWriter.name("PricingPlan"); jsonWriter.value(pricingPlan); } + if (listMapsResponseEntry.getCreateTime() != null) { + java.util.Date createTime = listMapsResponseEntry.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + } if (listMapsResponseEntry.getUpdateTime() != null) { java.util.Date updateTime = listMapsResponseEntry.getUpdateTime(); jsonWriter.name("UpdateTime"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonUnmarshaller.java index a57e6b030e..e5ff9daf04 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,22 +36,22 @@ public ListMapsResponseEntry unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - listMapsResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("DataSource")) { - listMapsResponseEntry.setDataSource(StringJsonUnmarshaller.getInstance() + if (name.equals("MapName")) { + listMapsResponseEntry.setMapName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Description")) { listMapsResponseEntry.setDescription(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("MapName")) { - listMapsResponseEntry.setMapName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("DataSource")) { + listMapsResponseEntry.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("PricingPlan")) { listMapsResponseEntry.setPricingPlan(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + listMapsResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { listMapsResponseEntry.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResultJsonUnmarshaller.java index a922d3ea39..4402ee8775 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListMapsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesRequestMarshaller.java index 463846ac60..bb12f09cd2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -82,9 +82,9 @@ public Request marshall(ListPlaceIndexesRequest listPla "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("places."); + request.setHostPrefix("cp.places."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonMarshaller.java index 1f888b2d3f..ae091577fa 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,31 +27,31 @@ class ListPlaceIndexesResponseEntryJsonMarshaller { public void marshall(ListPlaceIndexesResponseEntry listPlaceIndexesResponseEntry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (listPlaceIndexesResponseEntry.getCreateTime() != null) { - java.util.Date createTime = listPlaceIndexesResponseEntry.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); - } - if (listPlaceIndexesResponseEntry.getDataSource() != null) { - String dataSource = listPlaceIndexesResponseEntry.getDataSource(); - jsonWriter.name("DataSource"); - jsonWriter.value(dataSource); + if (listPlaceIndexesResponseEntry.getIndexName() != null) { + String indexName = listPlaceIndexesResponseEntry.getIndexName(); + jsonWriter.name("IndexName"); + jsonWriter.value(indexName); } if (listPlaceIndexesResponseEntry.getDescription() != null) { String description = listPlaceIndexesResponseEntry.getDescription(); jsonWriter.name("Description"); jsonWriter.value(description); } - if (listPlaceIndexesResponseEntry.getIndexName() != null) { - String indexName = listPlaceIndexesResponseEntry.getIndexName(); - jsonWriter.name("IndexName"); - jsonWriter.value(indexName); + if (listPlaceIndexesResponseEntry.getDataSource() != null) { + String dataSource = listPlaceIndexesResponseEntry.getDataSource(); + jsonWriter.name("DataSource"); + jsonWriter.value(dataSource); } if (listPlaceIndexesResponseEntry.getPricingPlan() != null) { String pricingPlan = listPlaceIndexesResponseEntry.getPricingPlan(); jsonWriter.name("PricingPlan"); jsonWriter.value(pricingPlan); } + if (listPlaceIndexesResponseEntry.getCreateTime() != null) { + java.util.Date createTime = listPlaceIndexesResponseEntry.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + } if (listPlaceIndexesResponseEntry.getUpdateTime() != null) { java.util.Date updateTime = listPlaceIndexesResponseEntry.getUpdateTime(); jsonWriter.name("UpdateTime"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonUnmarshaller.java index 3c49aeac2b..7d13bc7de6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,22 +37,22 @@ public ListPlaceIndexesResponseEntry unmarshall(JsonUnmarshallerContext context) reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - listPlaceIndexesResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) - .unmarshall(context)); - } else if (name.equals("DataSource")) { - listPlaceIndexesResponseEntry.setDataSource(StringJsonUnmarshaller.getInstance() + if (name.equals("IndexName")) { + listPlaceIndexesResponseEntry.setIndexName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Description")) { listPlaceIndexesResponseEntry.setDescription(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("IndexName")) { - listPlaceIndexesResponseEntry.setIndexName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("DataSource")) { + listPlaceIndexesResponseEntry.setDataSource(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("PricingPlan")) { listPlaceIndexesResponseEntry.setPricingPlan(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + listPlaceIndexesResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { listPlaceIndexesResponseEntry.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResultJsonUnmarshaller.java index 3afbb1e5b9..047e2437b1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListPlaceIndexesResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsRequestMarshaller.java index 867d0ffd1a..60d3491d96 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -83,9 +83,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("routes."); + request.setHostPrefix("cp.routes."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonMarshaller.java index f541b078ec..9a69d4c556 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,26 +32,26 @@ public void marshall(ListRouteCalculatorsResponseEntry listRouteCalculatorsRespo jsonWriter.name("CalculatorName"); jsonWriter.value(calculatorName); } - if (listRouteCalculatorsResponseEntry.getCreateTime() != null) { - java.util.Date createTime = listRouteCalculatorsResponseEntry.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + if (listRouteCalculatorsResponseEntry.getDescription() != null) { + String description = listRouteCalculatorsResponseEntry.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); } if (listRouteCalculatorsResponseEntry.getDataSource() != null) { String dataSource = listRouteCalculatorsResponseEntry.getDataSource(); jsonWriter.name("DataSource"); jsonWriter.value(dataSource); } - if (listRouteCalculatorsResponseEntry.getDescription() != null) { - String description = listRouteCalculatorsResponseEntry.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); - } if (listRouteCalculatorsResponseEntry.getPricingPlan() != null) { String pricingPlan = listRouteCalculatorsResponseEntry.getPricingPlan(); jsonWriter.name("PricingPlan"); jsonWriter.value(pricingPlan); } + if (listRouteCalculatorsResponseEntry.getCreateTime() != null) { + java.util.Date createTime = listRouteCalculatorsResponseEntry.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + } if (listRouteCalculatorsResponseEntry.getUpdateTime() != null) { java.util.Date updateTime = listRouteCalculatorsResponseEntry.getUpdateTime(); jsonWriter.name("UpdateTime"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonUnmarshaller.java index 8317e72a63..f9644de416 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -41,22 +41,22 @@ public ListRouteCalculatorsResponseEntry unmarshall(JsonUnmarshallerContext cont listRouteCalculatorsResponseEntry.setCalculatorName(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("CreateTime")) { - listRouteCalculatorsResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + } else if (name.equals("Description")) { + listRouteCalculatorsResponseEntry.setDescription(StringJsonUnmarshaller + .getInstance() .unmarshall(context)); } else if (name.equals("DataSource")) { listRouteCalculatorsResponseEntry.setDataSource(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("Description")) { - listRouteCalculatorsResponseEntry.setDescription(StringJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else if (name.equals("PricingPlan")) { listRouteCalculatorsResponseEntry.setPricingPlan(StringJsonUnmarshaller .getInstance() .unmarshall(context)); + } else if (name.equals("CreateTime")) { + listRouteCalculatorsResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); } else if (name.equals("UpdateTime")) { listRouteCalculatorsResponseEntry.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResultJsonUnmarshaller.java index 3471697392..7f011b04fc 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListRouteCalculatorsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceRequestMarshaller.java index 2addc725ae..e0a15438a1 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -61,9 +61,9 @@ public Request marshall( .fromString(listTagsForResourceRequest.getResourceArn())); request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceResultJsonUnmarshaller.java index 3de7ff68a8..2f3617bd89 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTagsForResourceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersRequestMarshaller.java index a379966697..4426e1f1ac 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -87,9 +87,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersResultJsonUnmarshaller.java index 56021a27ca..13d2f39363 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackerConsumersResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersRequestMarshaller.java index d6f0e50d27..faff988575 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -82,9 +82,9 @@ public Request marshall(ListTrackersRequest listTrackersReq "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonMarshaller.java index 2189468124..63faf66ce7 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,10 +27,10 @@ class ListTrackersResponseEntryJsonMarshaller { public void marshall(ListTrackersResponseEntry listTrackersResponseEntry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (listTrackersResponseEntry.getCreateTime() != null) { - java.util.Date createTime = listTrackersResponseEntry.getCreateTime(); - jsonWriter.name("CreateTime"); - jsonWriter.value(DateUtils.formatISO8601Date(createTime)); + if (listTrackersResponseEntry.getTrackerName() != null) { + String trackerName = listTrackersResponseEntry.getTrackerName(); + jsonWriter.name("TrackerName"); + jsonWriter.value(trackerName); } if (listTrackersResponseEntry.getDescription() != null) { String description = listTrackersResponseEntry.getDescription(); @@ -47,10 +47,10 @@ public void marshall(ListTrackersResponseEntry listTrackersResponseEntry, jsonWriter.name("PricingPlanDataSource"); jsonWriter.value(pricingPlanDataSource); } - if (listTrackersResponseEntry.getTrackerName() != null) { - String trackerName = listTrackersResponseEntry.getTrackerName(); - jsonWriter.name("TrackerName"); - jsonWriter.value(trackerName); + if (listTrackersResponseEntry.getCreateTime() != null) { + java.util.Date createTime = listTrackersResponseEntry.getCreateTime(); + jsonWriter.name("CreateTime"); + jsonWriter.value(DateUtils.formatISO8601Date(createTime)); } if (listTrackersResponseEntry.getUpdateTime() != null) { java.util.Date updateTime = listTrackersResponseEntry.getUpdateTime(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonUnmarshaller.java index 2a9f866106..ec5633fd74 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResponseEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,9 +36,8 @@ public ListTrackersResponseEntry unmarshall(JsonUnmarshallerContext context) thr reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { - listTrackersResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( - TimestampFormat.ISO_8601) + if (name.equals("TrackerName")) { + listTrackersResponseEntry.setTrackerName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Description")) { listTrackersResponseEntry.setDescription(StringJsonUnmarshaller.getInstance() @@ -50,8 +49,9 @@ public ListTrackersResponseEntry unmarshall(JsonUnmarshallerContext context) thr listTrackersResponseEntry.setPricingPlanDataSource(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("TrackerName")) { - listTrackersResponseEntry.setTrackerName(StringJsonUnmarshaller.getInstance() + } else if (name.equals("CreateTime")) { + listTrackersResponseEntry.setCreateTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) .unmarshall(context)); } else if (name.equals("UpdateTime")) { listTrackersResponseEntry.setUpdateTime(DateJsonUnmarshaller.getInstance( diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResultJsonUnmarshaller.java index 0cf847a197..71f40153a9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ListTrackersResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonMarshaller.java new file mode 100644 index 0000000000..150781e709 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonMarshaller.java @@ -0,0 +1,97 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO LteCellDetails + */ +class LteCellDetailsJsonMarshaller { + + public void marshall(LteCellDetails lteCellDetails, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (lteCellDetails.getCellId() != null) { + Integer cellId = lteCellDetails.getCellId(); + jsonWriter.name("CellId"); + jsonWriter.value(cellId); + } + if (lteCellDetails.getMcc() != null) { + Integer mcc = lteCellDetails.getMcc(); + jsonWriter.name("Mcc"); + jsonWriter.value(mcc); + } + if (lteCellDetails.getMnc() != null) { + Integer mnc = lteCellDetails.getMnc(); + jsonWriter.name("Mnc"); + jsonWriter.value(mnc); + } + if (lteCellDetails.getLocalId() != null) { + LteLocalId localId = lteCellDetails.getLocalId(); + jsonWriter.name("LocalId"); + LteLocalIdJsonMarshaller.getInstance().marshall(localId, jsonWriter); + } + if (lteCellDetails.getNetworkMeasurements() != null) { + java.util.List networkMeasurements = lteCellDetails + .getNetworkMeasurements(); + jsonWriter.name("NetworkMeasurements"); + jsonWriter.beginArray(); + for (LteNetworkMeasurements networkMeasurementsItem : networkMeasurements) { + if (networkMeasurementsItem != null) { + LteNetworkMeasurementsJsonMarshaller.getInstance().marshall( + networkMeasurementsItem, jsonWriter); + } + } + jsonWriter.endArray(); + } + if (lteCellDetails.getTimingAdvance() != null) { + Integer timingAdvance = lteCellDetails.getTimingAdvance(); + jsonWriter.name("TimingAdvance"); + jsonWriter.value(timingAdvance); + } + if (lteCellDetails.getNrCapable() != null) { + Boolean nrCapable = lteCellDetails.getNrCapable(); + jsonWriter.name("NrCapable"); + jsonWriter.value(nrCapable); + } + if (lteCellDetails.getRsrp() != null) { + Integer rsrp = lteCellDetails.getRsrp(); + jsonWriter.name("Rsrp"); + jsonWriter.value(rsrp); + } + if (lteCellDetails.getRsrq() != null) { + Float rsrq = lteCellDetails.getRsrq(); + jsonWriter.name("Rsrq"); + jsonWriter.value(rsrq); + } + if (lteCellDetails.getTac() != null) { + Integer tac = lteCellDetails.getTac(); + jsonWriter.name("Tac"); + jsonWriter.value(tac); + } + jsonWriter.endObject(); + } + + private static LteCellDetailsJsonMarshaller instance; + + public static LteCellDetailsJsonMarshaller getInstance() { + if (instance == null) + instance = new LteCellDetailsJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonUnmarshaller.java new file mode 100644 index 0000000000..83ae2b3a8c --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteCellDetailsJsonUnmarshaller.java @@ -0,0 +1,86 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO LteCellDetails + */ +class LteCellDetailsJsonUnmarshaller implements + Unmarshaller { + + public LteCellDetails unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + LteCellDetails lteCellDetails = new LteCellDetails(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("CellId")) { + lteCellDetails.setCellId(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Mcc")) { + lteCellDetails.setMcc(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Mnc")) { + lteCellDetails.setMnc(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("LocalId")) { + lteCellDetails.setLocalId(LteLocalIdJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("NetworkMeasurements")) { + lteCellDetails.setNetworkMeasurements(new ListUnmarshaller( + LteNetworkMeasurementsJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("TimingAdvance")) { + lteCellDetails.setTimingAdvance(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("NrCapable")) { + lteCellDetails.setNrCapable(BooleanJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Rsrp")) { + lteCellDetails.setRsrp(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Rsrq")) { + lteCellDetails.setRsrq(FloatJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Tac")) { + lteCellDetails.setTac(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return lteCellDetails; + } + + private static LteCellDetailsJsonUnmarshaller instance; + + public static LteCellDetailsJsonUnmarshaller getInstance() { + if (instance == null) + instance = new LteCellDetailsJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonMarshaller.java new file mode 100644 index 0000000000..4820bc3944 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonMarshaller.java @@ -0,0 +1,49 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO LteLocalId + */ +class LteLocalIdJsonMarshaller { + + public void marshall(LteLocalId lteLocalId, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (lteLocalId.getEarfcn() != null) { + Integer earfcn = lteLocalId.getEarfcn(); + jsonWriter.name("Earfcn"); + jsonWriter.value(earfcn); + } + if (lteLocalId.getPci() != null) { + Integer pci = lteLocalId.getPci(); + jsonWriter.name("Pci"); + jsonWriter.value(pci); + } + jsonWriter.endObject(); + } + + private static LteLocalIdJsonMarshaller instance; + + public static LteLocalIdJsonMarshaller getInstance() { + if (instance == null) + instance = new LteLocalIdJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonUnmarshaller.java new file mode 100644 index 0000000000..3d57342833 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteLocalIdJsonUnmarshaller.java @@ -0,0 +1,59 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO LteLocalId + */ +class LteLocalIdJsonUnmarshaller implements Unmarshaller { + + public LteLocalId unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + LteLocalId lteLocalId = new LteLocalId(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("Earfcn")) { + lteLocalId.setEarfcn(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Pci")) { + lteLocalId.setPci(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return lteLocalId; + } + + private static LteLocalIdJsonUnmarshaller instance; + + public static LteLocalIdJsonUnmarshaller getInstance() { + if (instance == null) + instance = new LteLocalIdJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonMarshaller.java new file mode 100644 index 0000000000..a2622de79e --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonMarshaller.java @@ -0,0 +1,65 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO LteNetworkMeasurements + */ +class LteNetworkMeasurementsJsonMarshaller { + + public void marshall(LteNetworkMeasurements lteNetworkMeasurements, AwsJsonWriter jsonWriter) + throws Exception { + jsonWriter.beginObject(); + if (lteNetworkMeasurements.getEarfcn() != null) { + Integer earfcn = lteNetworkMeasurements.getEarfcn(); + jsonWriter.name("Earfcn"); + jsonWriter.value(earfcn); + } + if (lteNetworkMeasurements.getCellId() != null) { + Integer cellId = lteNetworkMeasurements.getCellId(); + jsonWriter.name("CellId"); + jsonWriter.value(cellId); + } + if (lteNetworkMeasurements.getPci() != null) { + Integer pci = lteNetworkMeasurements.getPci(); + jsonWriter.name("Pci"); + jsonWriter.value(pci); + } + if (lteNetworkMeasurements.getRsrp() != null) { + Integer rsrp = lteNetworkMeasurements.getRsrp(); + jsonWriter.name("Rsrp"); + jsonWriter.value(rsrp); + } + if (lteNetworkMeasurements.getRsrq() != null) { + Float rsrq = lteNetworkMeasurements.getRsrq(); + jsonWriter.name("Rsrq"); + jsonWriter.value(rsrq); + } + jsonWriter.endObject(); + } + + private static LteNetworkMeasurementsJsonMarshaller instance; + + public static LteNetworkMeasurementsJsonMarshaller getInstance() { + if (instance == null) + instance = new LteNetworkMeasurementsJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonUnmarshaller.java new file mode 100644 index 0000000000..947fb1acb0 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/LteNetworkMeasurementsJsonUnmarshaller.java @@ -0,0 +1,69 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO LteNetworkMeasurements + */ +class LteNetworkMeasurementsJsonUnmarshaller implements + Unmarshaller { + + public LteNetworkMeasurements unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + LteNetworkMeasurements lteNetworkMeasurements = new LteNetworkMeasurements(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("Earfcn")) { + lteNetworkMeasurements.setEarfcn(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("CellId")) { + lteNetworkMeasurements.setCellId(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Pci")) { + lteNetworkMeasurements.setPci(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Rsrp")) { + lteNetworkMeasurements.setRsrp(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Rsrq")) { + lteNetworkMeasurements.setRsrq(FloatJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return lteNetworkMeasurements; + } + + private static LteNetworkMeasurementsJsonUnmarshaller instance; + + public static LteNetworkMeasurementsJsonUnmarshaller getInstance() { + if (instance == null) + instance = new LteNetworkMeasurementsJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonMarshaller.java index d6d11e1796..199116e265 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,15 +27,26 @@ class MapConfigurationJsonMarshaller { public void marshall(MapConfiguration mapConfiguration, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (mapConfiguration.getStyle() != null) { + String style = mapConfiguration.getStyle(); + jsonWriter.name("Style"); + jsonWriter.value(style); + } if (mapConfiguration.getPoliticalView() != null) { String politicalView = mapConfiguration.getPoliticalView(); jsonWriter.name("PoliticalView"); jsonWriter.value(politicalView); } - if (mapConfiguration.getStyle() != null) { - String style = mapConfiguration.getStyle(); - jsonWriter.name("Style"); - jsonWriter.value(style); + if (mapConfiguration.getCustomLayers() != null) { + java.util.List customLayers = mapConfiguration.getCustomLayers(); + jsonWriter.name("CustomLayers"); + jsonWriter.beginArray(); + for (String customLayersItem : customLayers) { + if (customLayersItem != null) { + jsonWriter.value(customLayersItem); + } + } + jsonWriter.endArray(); } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonUnmarshaller.java index fbeeebdfd6..d4b6e40c4c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,12 +36,17 @@ public MapConfiguration unmarshall(JsonUnmarshallerContext context) throws Excep reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("PoliticalView")) { - mapConfiguration.setPoliticalView(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Style")) { + if (name.equals("Style")) { mapConfiguration.setStyle(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("PoliticalView")) { + mapConfiguration.setPoliticalView(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("CustomLayers")) { + mapConfiguration.setCustomLayers(new ListUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonMarshaller.java index 5bfc74bf98..db1722d91b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -32,6 +32,17 @@ public void marshall(MapConfigurationUpdate mapConfigurationUpdate, AwsJsonWrite jsonWriter.name("PoliticalView"); jsonWriter.value(politicalView); } + if (mapConfigurationUpdate.getCustomLayers() != null) { + java.util.List customLayers = mapConfigurationUpdate.getCustomLayers(); + jsonWriter.name("CustomLayers"); + jsonWriter.beginArray(); + for (String customLayersItem : customLayers) { + if (customLayersItem != null) { + jsonWriter.value(customLayersItem); + } + } + jsonWriter.endArray(); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonUnmarshaller.java index b36865827e..2767c2f0d8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/MapConfigurationUpdateJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -39,6 +39,11 @@ public MapConfigurationUpdate unmarshall(JsonUnmarshallerContext context) throws if (name.equals("PoliticalView")) { mapConfigurationUpdate.setPoliticalView(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CustomLayers")) { + mapConfigurationUpdate.setCustomLayers(new ListUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonMarshaller.java index cd20f0da28..31bdb04e2a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonUnmarshaller.java index 43180ab68a..622afa51f2 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceGeometryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonMarshaller.java index 5ac8a227d1..e6b5774995 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,71 +26,86 @@ class PlaceJsonMarshaller { public void marshall(Place place, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (place.getAddressNumber() != null) { - String addressNumber = place.getAddressNumber(); - jsonWriter.name("AddressNumber"); - jsonWriter.value(addressNumber); - } - if (place.getCategories() != null) { - java.util.List categories = place.getCategories(); - jsonWriter.name("Categories"); - jsonWriter.beginArray(); - for (String categoriesItem : categories) { - if (categoriesItem != null) { - jsonWriter.value(categoriesItem); - } - } - jsonWriter.endArray(); - } - if (place.getCountry() != null) { - String country = place.getCountry(); - jsonWriter.name("Country"); - jsonWriter.value(country); + if (place.getLabel() != null) { + String label = place.getLabel(); + jsonWriter.name("Label"); + jsonWriter.value(label); } if (place.getGeometry() != null) { PlaceGeometry geometry = place.getGeometry(); jsonWriter.name("Geometry"); PlaceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); } - if (place.getInterpolated() != null) { - Boolean interpolated = place.getInterpolated(); - jsonWriter.name("Interpolated"); - jsonWriter.value(interpolated); + if (place.getAddressNumber() != null) { + String addressNumber = place.getAddressNumber(); + jsonWriter.name("AddressNumber"); + jsonWriter.value(addressNumber); } - if (place.getLabel() != null) { - String label = place.getLabel(); - jsonWriter.name("Label"); - jsonWriter.value(label); + if (place.getStreet() != null) { + String street = place.getStreet(); + jsonWriter.name("Street"); + jsonWriter.value(street); + } + if (place.getNeighborhood() != null) { + String neighborhood = place.getNeighborhood(); + jsonWriter.name("Neighborhood"); + jsonWriter.value(neighborhood); } if (place.getMunicipality() != null) { String municipality = place.getMunicipality(); jsonWriter.name("Municipality"); jsonWriter.value(municipality); } - if (place.getNeighborhood() != null) { - String neighborhood = place.getNeighborhood(); - jsonWriter.name("Neighborhood"); - jsonWriter.value(neighborhood); + if (place.getSubRegion() != null) { + String subRegion = place.getSubRegion(); + jsonWriter.name("SubRegion"); + jsonWriter.value(subRegion); + } + if (place.getRegion() != null) { + String region = place.getRegion(); + jsonWriter.name("Region"); + jsonWriter.value(region); + } + if (place.getCountry() != null) { + String country = place.getCountry(); + jsonWriter.name("Country"); + jsonWriter.value(country); } if (place.getPostalCode() != null) { String postalCode = place.getPostalCode(); jsonWriter.name("PostalCode"); jsonWriter.value(postalCode); } - if (place.getRegion() != null) { - String region = place.getRegion(); - jsonWriter.name("Region"); - jsonWriter.value(region); + if (place.getInterpolated() != null) { + Boolean interpolated = place.getInterpolated(); + jsonWriter.name("Interpolated"); + jsonWriter.value(interpolated); } - if (place.getStreet() != null) { - String street = place.getStreet(); - jsonWriter.name("Street"); - jsonWriter.value(street); + if (place.getTimeZone() != null) { + TimeZone timeZone = place.getTimeZone(); + jsonWriter.name("TimeZone"); + TimeZoneJsonMarshaller.getInstance().marshall(timeZone, jsonWriter); } - if (place.getSubRegion() != null) { - String subRegion = place.getSubRegion(); - jsonWriter.name("SubRegion"); - jsonWriter.value(subRegion); + if (place.getUnitType() != null) { + String unitType = place.getUnitType(); + jsonWriter.name("UnitType"); + jsonWriter.value(unitType); + } + if (place.getUnitNumber() != null) { + String unitNumber = place.getUnitNumber(); + jsonWriter.name("UnitNumber"); + jsonWriter.value(unitNumber); + } + if (place.getCategories() != null) { + java.util.List categories = place.getCategories(); + jsonWriter.name("Categories"); + jsonWriter.beginArray(); + for (String categoriesItem : categories) { + if (categoriesItem != null) { + jsonWriter.value(categoriesItem); + } + } + jsonWriter.endArray(); } if (place.getSupplementalCategories() != null) { java.util.List supplementalCategories = place.getSupplementalCategories(); @@ -103,20 +118,10 @@ public void marshall(Place place, AwsJsonWriter jsonWriter) throws Exception { } jsonWriter.endArray(); } - if (place.getTimeZone() != null) { - TimeZone timeZone = place.getTimeZone(); - jsonWriter.name("TimeZone"); - TimeZoneJsonMarshaller.getInstance().marshall(timeZone, jsonWriter); - } - if (place.getUnitNumber() != null) { - String unitNumber = place.getUnitNumber(); - jsonWriter.name("UnitNumber"); - jsonWriter.value(unitNumber); - } - if (place.getUnitType() != null) { - String unitType = place.getUnitType(); - jsonWriter.name("UnitType"); - jsonWriter.value(unitType); + if (place.getSubMunicipality() != null) { + String subMunicipality = place.getSubMunicipality(); + jsonWriter.name("SubMunicipality"); + jsonWriter.value(subMunicipality); } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonUnmarshaller.java index 0c24060853..f768b4a05a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PlaceJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -35,57 +35,60 @@ public Place unmarshall(JsonUnmarshallerContext context) throws Exception { reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("AddressNumber")) { - place.setAddressNumber(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Categories")) { - place.setCategories(new ListUnmarshaller(StringJsonUnmarshaller - .getInstance() - ) - .unmarshall(context)); - } else if (name.equals("Country")) { - place.setCountry(StringJsonUnmarshaller.getInstance() + if (name.equals("Label")) { + place.setLabel(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Geometry")) { place.setGeometry(PlaceGeometryJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Interpolated")) { - place.setInterpolated(BooleanJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Label")) { - place.setLabel(StringJsonUnmarshaller.getInstance() + } else if (name.equals("AddressNumber")) { + place.setAddressNumber(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Municipality")) { - place.setMunicipality(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Street")) { + place.setStreet(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Neighborhood")) { place.setNeighborhood(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("PostalCode")) { - place.setPostalCode(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Municipality")) { + place.setMunicipality(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("SubRegion")) { + place.setSubRegion(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Region")) { place.setRegion(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Street")) { - place.setStreet(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Country")) { + place.setCountry(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("SubRegion")) { - place.setSubRegion(StringJsonUnmarshaller.getInstance() + } else if (name.equals("PostalCode")) { + place.setPostalCode(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Interpolated")) { + place.setInterpolated(BooleanJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("SupplementalCategories")) { - place.setSupplementalCategories(new ListUnmarshaller(StringJsonUnmarshaller - .getInstance() - ) - .unmarshall(context)); } else if (name.equals("TimeZone")) { place.setTimeZone(TimeZoneJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("UnitType")) { + place.setUnitType(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("UnitNumber")) { place.setUnitNumber(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("UnitType")) { - place.setUnitType(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Categories")) { + place.setCategories(new ListUnmarshaller(StringJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); + } else if (name.equals("SupplementalCategories")) { + place.setSupplementalCategories(new ListUnmarshaller(StringJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); + } else if (name.equals("SubMunicipality")) { + place.setSubMunicipality(StringJsonUnmarshaller.getInstance() .unmarshall(context)); } else { reader.skipValue(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonMarshaller.java index ec6a2633eb..e0a73556eb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonUnmarshaller.java index 144a583098..eda9afedb8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PositionalAccuracyJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceRequestMarshaller.java index 2f2ecb595b..690dac1760 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -68,6 +68,11 @@ public Request marshall(PutGeofenceRequest putGeofenceReques AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); + if (putGeofenceRequest.getGeometry() != null) { + GeofenceGeometry geometry = putGeofenceRequest.getGeometry(); + jsonWriter.name("Geometry"); + GeofenceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); + } if (putGeofenceRequest.getGeofenceProperties() != null) { java.util.Map geofenceProperties = putGeofenceRequest .getGeofenceProperties(); @@ -83,11 +88,6 @@ public Request marshall(PutGeofenceRequest putGeofenceReques } jsonWriter.endObject(); } - if (putGeofenceRequest.getGeometry() != null) { - GeofenceGeometry geometry = putGeofenceRequest.getGeometry(); - jsonWriter.name("Geometry"); - GeofenceGeometryJsonMarshaller.getInstance().marshall(geometry, jsonWriter); - } jsonWriter.endObject(); jsonWriter.close(); @@ -100,7 +100,7 @@ public Request marshall(PutGeofenceRequest putGeofenceReques "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("geofencing."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceResultJsonUnmarshaller.java index 158e17e424..30ad163e3f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/PutGeofenceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,13 +33,13 @@ public PutGeofenceResult unmarshall(JsonUnmarshallerContext context) throws Exce reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CreateTime")) { + if (name.equals("GeofenceId")) { + putGeofenceResult.setGeofenceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("CreateTime")) { putGeofenceResult.setCreateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) .unmarshall(context)); - } else if (name.equals("GeofenceId")) { - putGeofenceResult.setGeofenceId(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("UpdateTime")) { putGeofenceResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ResourceNotFoundExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ResourceNotFoundExceptionUnmarshaller.java index 236959089c..42ba4ba42d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ResourceNotFoundExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ResourceNotFoundExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonMarshaller.java index f3c1c53333..c809d8904e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonUnmarshaller.java index 91c168989d..34894d1ddb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryErrorJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonMarshaller.java index 0a0bc74695..20e9588a65 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonUnmarshaller.java index bc33e5c5f9..22dbcba500 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/RouteMatrixEntryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonMarshaller.java index 2f8b571b0f..86dc41d4ee 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class SearchForPositionResultJsonMarshaller { public void marshall(SearchForPositionResult searchForPositionResult, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (searchForPositionResult.getDistance() != null) { - Double distance = searchForPositionResult.getDistance(); - jsonWriter.name("Distance"); - jsonWriter.value(distance); - } if (searchForPositionResult.getPlace() != null) { Place place = searchForPositionResult.getPlace(); jsonWriter.name("Place"); PlaceJsonMarshaller.getInstance().marshall(place, jsonWriter); } + if (searchForPositionResult.getDistance() != null) { + Double distance = searchForPositionResult.getDistance(); + jsonWriter.name("Distance"); + jsonWriter.value(distance); + } if (searchForPositionResult.getPlaceId() != null) { String placeId = searchForPositionResult.getPlaceId(); jsonWriter.name("PlaceId"); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonUnmarshaller.java index 5d16864082..db2edbc68d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForPositionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,12 +36,12 @@ public SearchForPositionResult unmarshall(JsonUnmarshallerContext context) throw reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Distance")) { - searchForPositionResult.setDistance(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Place")) { + if (name.equals("Place")) { searchForPositionResult.setPlace(PlaceJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Distance")) { + searchForPositionResult.setDistance(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("PlaceId")) { searchForPositionResult.setPlaceId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonMarshaller.java index be6dd4f28f..0cd0601927 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,6 +27,16 @@ class SearchForSuggestionsResultJsonMarshaller { public void marshall(SearchForSuggestionsResult searchForSuggestionsResult, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (searchForSuggestionsResult.getText() != null) { + String text = searchForSuggestionsResult.getText(); + jsonWriter.name("Text"); + jsonWriter.value(text); + } + if (searchForSuggestionsResult.getPlaceId() != null) { + String placeId = searchForSuggestionsResult.getPlaceId(); + jsonWriter.name("PlaceId"); + jsonWriter.value(placeId); + } if (searchForSuggestionsResult.getCategories() != null) { java.util.List categories = searchForSuggestionsResult.getCategories(); jsonWriter.name("Categories"); @@ -38,11 +48,6 @@ public void marshall(SearchForSuggestionsResult searchForSuggestionsResult, } jsonWriter.endArray(); } - if (searchForSuggestionsResult.getPlaceId() != null) { - String placeId = searchForSuggestionsResult.getPlaceId(); - jsonWriter.name("PlaceId"); - jsonWriter.value(placeId); - } if (searchForSuggestionsResult.getSupplementalCategories() != null) { java.util.List supplementalCategories = searchForSuggestionsResult .getSupplementalCategories(); @@ -55,11 +60,6 @@ public void marshall(SearchForSuggestionsResult searchForSuggestionsResult, } jsonWriter.endArray(); } - if (searchForSuggestionsResult.getText() != null) { - String text = searchForSuggestionsResult.getText(); - jsonWriter.name("Text"); - jsonWriter.value(text); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonUnmarshaller.java index 1514c5d66f..a1d32f89bb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForSuggestionsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,22 +36,22 @@ public SearchForSuggestionsResult unmarshall(JsonUnmarshallerContext context) th reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Categories")) { + if (name.equals("Text")) { + searchForSuggestionsResult.setText(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("PlaceId")) { + searchForSuggestionsResult.setPlaceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Categories")) { searchForSuggestionsResult.setCategories(new ListUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("PlaceId")) { - searchForSuggestionsResult.setPlaceId(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("SupplementalCategories")) { searchForSuggestionsResult.setSupplementalCategories(new ListUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Text")) { - searchForSuggestionsResult.setText(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonMarshaller.java index 7c31145c4f..592141a1b5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,26 +27,26 @@ class SearchForTextResultJsonMarshaller { public void marshall(SearchForTextResult searchForTextResult, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (searchForTextResult.getDistance() != null) { - Double distance = searchForTextResult.getDistance(); - jsonWriter.name("Distance"); - jsonWriter.value(distance); - } if (searchForTextResult.getPlace() != null) { Place place = searchForTextResult.getPlace(); jsonWriter.name("Place"); PlaceJsonMarshaller.getInstance().marshall(place, jsonWriter); } - if (searchForTextResult.getPlaceId() != null) { - String placeId = searchForTextResult.getPlaceId(); - jsonWriter.name("PlaceId"); - jsonWriter.value(placeId); + if (searchForTextResult.getDistance() != null) { + Double distance = searchForTextResult.getDistance(); + jsonWriter.name("Distance"); + jsonWriter.value(distance); } if (searchForTextResult.getRelevance() != null) { Double relevance = searchForTextResult.getRelevance(); jsonWriter.name("Relevance"); jsonWriter.value(relevance); } + if (searchForTextResult.getPlaceId() != null) { + String placeId = searchForTextResult.getPlaceId(); + jsonWriter.name("PlaceId"); + jsonWriter.value(placeId); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonUnmarshaller.java index f9fbb00be6..d133c80aab 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchForTextResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,18 +36,18 @@ public SearchForTextResult unmarshall(JsonUnmarshallerContext context) throws Ex reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Distance")) { - searchForTextResult.setDistance(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Place")) { + if (name.equals("Place")) { searchForTextResult.setPlace(PlaceJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("PlaceId")) { - searchForTextResult.setPlaceId(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Distance")) { + searchForTextResult.setDistance(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Relevance")) { searchForTextResult.setRelevance(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("PlaceId")) { + searchForTextResult.setPlaceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionRequestMarshaller.java index 45b14b4e89..e261299e75 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -69,16 +69,6 @@ public Request marshall( AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (searchPlaceIndexForPositionRequest.getLanguage() != null) { - String language = searchPlaceIndexForPositionRequest.getLanguage(); - jsonWriter.name("Language"); - jsonWriter.value(language); - } - if (searchPlaceIndexForPositionRequest.getMaxResults() != null) { - Integer maxResults = searchPlaceIndexForPositionRequest.getMaxResults(); - jsonWriter.name("MaxResults"); - jsonWriter.value(maxResults); - } if (searchPlaceIndexForPositionRequest.getPosition() != null) { java.util.List position = searchPlaceIndexForPositionRequest.getPosition(); jsonWriter.name("Position"); @@ -90,6 +80,16 @@ public Request marshall( } jsonWriter.endArray(); } + if (searchPlaceIndexForPositionRequest.getMaxResults() != null) { + Integer maxResults = searchPlaceIndexForPositionRequest.getMaxResults(); + jsonWriter.name("MaxResults"); + jsonWriter.value(maxResults); + } + if (searchPlaceIndexForPositionRequest.getLanguage() != null) { + String language = searchPlaceIndexForPositionRequest.getLanguage(); + jsonWriter.name("Language"); + jsonWriter.value(language); + } jsonWriter.endObject(); jsonWriter.close(); @@ -102,7 +102,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("places."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionResultJsonUnmarshaller.java index 26a309b5f5..292afbe63d 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,17 +34,17 @@ public SearchPlaceIndexForPositionResult unmarshall(JsonUnmarshallerContext cont reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Results")) { + if (name.equals("Summary")) { + searchPlaceIndexForPositionResult + .setSummary(SearchPlaceIndexForPositionSummaryJsonUnmarshaller + .getInstance() + .unmarshall(context)); + } else if (name.equals("Results")) { searchPlaceIndexForPositionResult .setResults(new ListUnmarshaller( SearchForPositionResultJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Summary")) { - searchPlaceIndexForPositionResult - .setSummary(SearchPlaceIndexForPositionSummaryJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonMarshaller.java index 2630f7bea0..e3ba8bf05e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,21 +27,6 @@ class SearchPlaceIndexForPositionSummaryJsonMarshaller { public void marshall(SearchPlaceIndexForPositionSummary searchPlaceIndexForPositionSummary, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (searchPlaceIndexForPositionSummary.getDataSource() != null) { - String dataSource = searchPlaceIndexForPositionSummary.getDataSource(); - jsonWriter.name("DataSource"); - jsonWriter.value(dataSource); - } - if (searchPlaceIndexForPositionSummary.getLanguage() != null) { - String language = searchPlaceIndexForPositionSummary.getLanguage(); - jsonWriter.name("Language"); - jsonWriter.value(language); - } - if (searchPlaceIndexForPositionSummary.getMaxResults() != null) { - Integer maxResults = searchPlaceIndexForPositionSummary.getMaxResults(); - jsonWriter.name("MaxResults"); - jsonWriter.value(maxResults); - } if (searchPlaceIndexForPositionSummary.getPosition() != null) { java.util.List position = searchPlaceIndexForPositionSummary.getPosition(); jsonWriter.name("Position"); @@ -53,6 +38,21 @@ public void marshall(SearchPlaceIndexForPositionSummary searchPlaceIndexForPosit } jsonWriter.endArray(); } + if (searchPlaceIndexForPositionSummary.getMaxResults() != null) { + Integer maxResults = searchPlaceIndexForPositionSummary.getMaxResults(); + jsonWriter.name("MaxResults"); + jsonWriter.value(maxResults); + } + if (searchPlaceIndexForPositionSummary.getDataSource() != null) { + String dataSource = searchPlaceIndexForPositionSummary.getDataSource(); + jsonWriter.name("DataSource"); + jsonWriter.value(dataSource); + } + if (searchPlaceIndexForPositionSummary.getLanguage() != null) { + String language = searchPlaceIndexForPositionSummary.getLanguage(); + jsonWriter.name("Language"); + jsonWriter.value(language); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonUnmarshaller.java index eb86d32868..924cb18579 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForPositionSummaryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,22 +37,22 @@ public SearchPlaceIndexForPositionSummary unmarshall(JsonUnmarshallerContext con reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("DataSource")) { + if (name.equals("Position")) { + searchPlaceIndexForPositionSummary.setPosition(new ListUnmarshaller( + DoubleJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("MaxResults")) { + searchPlaceIndexForPositionSummary.setMaxResults(IntegerJsonUnmarshaller + .getInstance() + .unmarshall(context)); + } else if (name.equals("DataSource")) { searchPlaceIndexForPositionSummary.setDataSource(StringJsonUnmarshaller .getInstance() .unmarshall(context)); } else if (name.equals("Language")) { searchPlaceIndexForPositionSummary.setLanguage(StringJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("MaxResults")) { - searchPlaceIndexForPositionSummary.setMaxResults(IntegerJsonUnmarshaller - .getInstance() - .unmarshall(context)); - } else if (name.equals("Position")) { - searchPlaceIndexForPositionSummary.setPosition(new ListUnmarshaller( - DoubleJsonUnmarshaller.getInstance() - ) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsRequestMarshaller.java index 377b319b51..6045d0f7b0 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -70,6 +70,11 @@ public Request marshall( AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); + if (searchPlaceIndexForSuggestionsRequest.getText() != null) { + String text = searchPlaceIndexForSuggestionsRequest.getText(); + jsonWriter.name("Text"); + jsonWriter.value(text); + } if (searchPlaceIndexForSuggestionsRequest.getBiasPosition() != null) { java.util.List biasPosition = searchPlaceIndexForSuggestionsRequest .getBiasPosition(); @@ -94,18 +99,6 @@ public Request marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForSuggestionsRequest.getFilterCategories() != null) { - java.util.List filterCategories = searchPlaceIndexForSuggestionsRequest - .getFilterCategories(); - jsonWriter.name("FilterCategories"); - jsonWriter.beginArray(); - for (String filterCategoriesItem : filterCategories) { - if (filterCategoriesItem != null) { - jsonWriter.value(filterCategoriesItem); - } - } - jsonWriter.endArray(); - } if (searchPlaceIndexForSuggestionsRequest.getFilterCountries() != null) { java.util.List filterCountries = searchPlaceIndexForSuggestionsRequest .getFilterCountries(); @@ -118,20 +111,27 @@ public Request marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForSuggestionsRequest.getLanguage() != null) { - String language = searchPlaceIndexForSuggestionsRequest.getLanguage(); - jsonWriter.name("Language"); - jsonWriter.value(language); - } if (searchPlaceIndexForSuggestionsRequest.getMaxResults() != null) { Integer maxResults = searchPlaceIndexForSuggestionsRequest.getMaxResults(); jsonWriter.name("MaxResults"); jsonWriter.value(maxResults); } - if (searchPlaceIndexForSuggestionsRequest.getText() != null) { - String text = searchPlaceIndexForSuggestionsRequest.getText(); - jsonWriter.name("Text"); - jsonWriter.value(text); + if (searchPlaceIndexForSuggestionsRequest.getLanguage() != null) { + String language = searchPlaceIndexForSuggestionsRequest.getLanguage(); + jsonWriter.name("Language"); + jsonWriter.value(language); + } + if (searchPlaceIndexForSuggestionsRequest.getFilterCategories() != null) { + java.util.List filterCategories = searchPlaceIndexForSuggestionsRequest + .getFilterCategories(); + jsonWriter.name("FilterCategories"); + jsonWriter.beginArray(); + for (String filterCategoriesItem : filterCategories) { + if (filterCategoriesItem != null) { + jsonWriter.value(filterCategoriesItem); + } + } + jsonWriter.endArray(); } jsonWriter.endObject(); @@ -145,7 +145,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("places."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsResultJsonUnmarshaller.java index dba86855cb..2bd1853a4e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,17 +34,17 @@ public SearchPlaceIndexForSuggestionsResult unmarshall(JsonUnmarshallerContext c reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Results")) { + if (name.equals("Summary")) { + searchPlaceIndexForSuggestionsResult + .setSummary(SearchPlaceIndexForSuggestionsSummaryJsonUnmarshaller + .getInstance() + .unmarshall(context)); + } else if (name.equals("Results")) { searchPlaceIndexForSuggestionsResult .setResults(new ListUnmarshaller( SearchForSuggestionsResultJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Summary")) { - searchPlaceIndexForSuggestionsResult - .setSummary(SearchPlaceIndexForSuggestionsSummaryJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonMarshaller.java index aa6fc87ddb..ab1f97f0c4 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -28,6 +28,11 @@ public void marshall( SearchPlaceIndexForSuggestionsSummary searchPlaceIndexForSuggestionsSummary, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (searchPlaceIndexForSuggestionsSummary.getText() != null) { + String text = searchPlaceIndexForSuggestionsSummary.getText(); + jsonWriter.name("Text"); + jsonWriter.value(text); + } if (searchPlaceIndexForSuggestionsSummary.getBiasPosition() != null) { java.util.List biasPosition = searchPlaceIndexForSuggestionsSummary .getBiasPosition(); @@ -40,11 +45,6 @@ public void marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForSuggestionsSummary.getDataSource() != null) { - String dataSource = searchPlaceIndexForSuggestionsSummary.getDataSource(); - jsonWriter.name("DataSource"); - jsonWriter.value(dataSource); - } if (searchPlaceIndexForSuggestionsSummary.getFilterBBox() != null) { java.util.List filterBBox = searchPlaceIndexForSuggestionsSummary .getFilterBBox(); @@ -57,18 +57,6 @@ public void marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForSuggestionsSummary.getFilterCategories() != null) { - java.util.List filterCategories = searchPlaceIndexForSuggestionsSummary - .getFilterCategories(); - jsonWriter.name("FilterCategories"); - jsonWriter.beginArray(); - for (String filterCategoriesItem : filterCategories) { - if (filterCategoriesItem != null) { - jsonWriter.value(filterCategoriesItem); - } - } - jsonWriter.endArray(); - } if (searchPlaceIndexForSuggestionsSummary.getFilterCountries() != null) { java.util.List filterCountries = searchPlaceIndexForSuggestionsSummary .getFilterCountries(); @@ -81,20 +69,32 @@ public void marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForSuggestionsSummary.getLanguage() != null) { - String language = searchPlaceIndexForSuggestionsSummary.getLanguage(); - jsonWriter.name("Language"); - jsonWriter.value(language); - } if (searchPlaceIndexForSuggestionsSummary.getMaxResults() != null) { Integer maxResults = searchPlaceIndexForSuggestionsSummary.getMaxResults(); jsonWriter.name("MaxResults"); jsonWriter.value(maxResults); } - if (searchPlaceIndexForSuggestionsSummary.getText() != null) { - String text = searchPlaceIndexForSuggestionsSummary.getText(); - jsonWriter.name("Text"); - jsonWriter.value(text); + if (searchPlaceIndexForSuggestionsSummary.getDataSource() != null) { + String dataSource = searchPlaceIndexForSuggestionsSummary.getDataSource(); + jsonWriter.name("DataSource"); + jsonWriter.value(dataSource); + } + if (searchPlaceIndexForSuggestionsSummary.getLanguage() != null) { + String language = searchPlaceIndexForSuggestionsSummary.getLanguage(); + jsonWriter.name("Language"); + jsonWriter.value(language); + } + if (searchPlaceIndexForSuggestionsSummary.getFilterCategories() != null) { + java.util.List filterCategories = searchPlaceIndexForSuggestionsSummary + .getFilterCategories(); + jsonWriter.name("FilterCategories"); + jsonWriter.beginArray(); + for (String filterCategoriesItem : filterCategories) { + if (filterCategoriesItem != null) { + jsonWriter.value(filterCategoriesItem); + } + } + jsonWriter.endArray(); } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonUnmarshaller.java index 020149cdc7..28ad1265ce 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForSuggestionsSummaryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,43 +37,43 @@ public SearchPlaceIndexForSuggestionsSummary unmarshall(JsonUnmarshallerContext reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("BiasPosition")) { + if (name.equals("Text")) { + searchPlaceIndexForSuggestionsSummary.setText(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("BiasPosition")) { searchPlaceIndexForSuggestionsSummary.setBiasPosition(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("DataSource")) { - searchPlaceIndexForSuggestionsSummary.setDataSource(StringJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else if (name.equals("FilterBBox")) { searchPlaceIndexForSuggestionsSummary.setFilterBBox(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("FilterCategories")) { - searchPlaceIndexForSuggestionsSummary - .setFilterCategories(new ListUnmarshaller(StringJsonUnmarshaller - .getInstance() - ) - .unmarshall(context)); } else if (name.equals("FilterCountries")) { searchPlaceIndexForSuggestionsSummary .setFilterCountries(new ListUnmarshaller(StringJsonUnmarshaller .getInstance() ) .unmarshall(context)); - } else if (name.equals("Language")) { - searchPlaceIndexForSuggestionsSummary.setLanguage(StringJsonUnmarshaller - .getInstance() - .unmarshall(context)); } else if (name.equals("MaxResults")) { searchPlaceIndexForSuggestionsSummary.setMaxResults(IntegerJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("Text")) { - searchPlaceIndexForSuggestionsSummary.setText(StringJsonUnmarshaller.getInstance() + } else if (name.equals("DataSource")) { + searchPlaceIndexForSuggestionsSummary.setDataSource(StringJsonUnmarshaller + .getInstance() .unmarshall(context)); + } else if (name.equals("Language")) { + searchPlaceIndexForSuggestionsSummary.setLanguage(StringJsonUnmarshaller + .getInstance() + .unmarshall(context)); + } else if (name.equals("FilterCategories")) { + searchPlaceIndexForSuggestionsSummary + .setFilterCategories(new ListUnmarshaller(StringJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextRequestMarshaller.java index b03cc7f7ac..68299d9541 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -69,6 +69,11 @@ public Request marshall( AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); + if (searchPlaceIndexForTextRequest.getText() != null) { + String text = searchPlaceIndexForTextRequest.getText(); + jsonWriter.name("Text"); + jsonWriter.value(text); + } if (searchPlaceIndexForTextRequest.getBiasPosition() != null) { java.util.List biasPosition = searchPlaceIndexForTextRequest .getBiasPosition(); @@ -92,18 +97,6 @@ public Request marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForTextRequest.getFilterCategories() != null) { - java.util.List filterCategories = searchPlaceIndexForTextRequest - .getFilterCategories(); - jsonWriter.name("FilterCategories"); - jsonWriter.beginArray(); - for (String filterCategoriesItem : filterCategories) { - if (filterCategoriesItem != null) { - jsonWriter.value(filterCategoriesItem); - } - } - jsonWriter.endArray(); - } if (searchPlaceIndexForTextRequest.getFilterCountries() != null) { java.util.List filterCountries = searchPlaceIndexForTextRequest .getFilterCountries(); @@ -116,20 +109,27 @@ public Request marshall( } jsonWriter.endArray(); } - if (searchPlaceIndexForTextRequest.getLanguage() != null) { - String language = searchPlaceIndexForTextRequest.getLanguage(); - jsonWriter.name("Language"); - jsonWriter.value(language); - } if (searchPlaceIndexForTextRequest.getMaxResults() != null) { Integer maxResults = searchPlaceIndexForTextRequest.getMaxResults(); jsonWriter.name("MaxResults"); jsonWriter.value(maxResults); } - if (searchPlaceIndexForTextRequest.getText() != null) { - String text = searchPlaceIndexForTextRequest.getText(); - jsonWriter.name("Text"); - jsonWriter.value(text); + if (searchPlaceIndexForTextRequest.getLanguage() != null) { + String language = searchPlaceIndexForTextRequest.getLanguage(); + jsonWriter.name("Language"); + jsonWriter.value(language); + } + if (searchPlaceIndexForTextRequest.getFilterCategories() != null) { + java.util.List filterCategories = searchPlaceIndexForTextRequest + .getFilterCategories(); + jsonWriter.name("FilterCategories"); + jsonWriter.beginArray(); + for (String filterCategoriesItem : filterCategories) { + if (filterCategoriesItem != null) { + jsonWriter.value(filterCategoriesItem); + } + } + jsonWriter.endArray(); } jsonWriter.endObject(); @@ -143,7 +143,7 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } request.setHostPrefix("places."); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextResultJsonUnmarshaller.java index 6c53f5317d..a44de4389a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,15 +34,15 @@ public SearchPlaceIndexForTextResult unmarshall(JsonUnmarshallerContext context) reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Results")) { + if (name.equals("Summary")) { + searchPlaceIndexForTextResult + .setSummary(SearchPlaceIndexForTextSummaryJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Results")) { searchPlaceIndexForTextResult.setResults(new ListUnmarshaller( SearchForTextResultJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Summary")) { - searchPlaceIndexForTextResult - .setSummary(SearchPlaceIndexForTextSummaryJsonUnmarshaller.getInstance() - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonMarshaller.java index 12e409642e..ad0206e9ea 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,6 +27,11 @@ class SearchPlaceIndexForTextSummaryJsonMarshaller { public void marshall(SearchPlaceIndexForTextSummary searchPlaceIndexForTextSummary, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (searchPlaceIndexForTextSummary.getText() != null) { + String text = searchPlaceIndexForTextSummary.getText(); + jsonWriter.name("Text"); + jsonWriter.value(text); + } if (searchPlaceIndexForTextSummary.getBiasPosition() != null) { java.util.List biasPosition = searchPlaceIndexForTextSummary.getBiasPosition(); jsonWriter.name("BiasPosition"); @@ -38,11 +43,6 @@ public void marshall(SearchPlaceIndexForTextSummary searchPlaceIndexForTextSumma } jsonWriter.endArray(); } - if (searchPlaceIndexForTextSummary.getDataSource() != null) { - String dataSource = searchPlaceIndexForTextSummary.getDataSource(); - jsonWriter.name("DataSource"); - jsonWriter.value(dataSource); - } if (searchPlaceIndexForTextSummary.getFilterBBox() != null) { java.util.List filterBBox = searchPlaceIndexForTextSummary.getFilterBBox(); jsonWriter.name("FilterBBox"); @@ -54,18 +54,6 @@ public void marshall(SearchPlaceIndexForTextSummary searchPlaceIndexForTextSumma } jsonWriter.endArray(); } - if (searchPlaceIndexForTextSummary.getFilterCategories() != null) { - java.util.List filterCategories = searchPlaceIndexForTextSummary - .getFilterCategories(); - jsonWriter.name("FilterCategories"); - jsonWriter.beginArray(); - for (String filterCategoriesItem : filterCategories) { - if (filterCategoriesItem != null) { - jsonWriter.value(filterCategoriesItem); - } - } - jsonWriter.endArray(); - } if (searchPlaceIndexForTextSummary.getFilterCountries() != null) { java.util.List filterCountries = searchPlaceIndexForTextSummary .getFilterCountries(); @@ -78,11 +66,6 @@ public void marshall(SearchPlaceIndexForTextSummary searchPlaceIndexForTextSumma } jsonWriter.endArray(); } - if (searchPlaceIndexForTextSummary.getLanguage() != null) { - String language = searchPlaceIndexForTextSummary.getLanguage(); - jsonWriter.name("Language"); - jsonWriter.value(language); - } if (searchPlaceIndexForTextSummary.getMaxResults() != null) { Integer maxResults = searchPlaceIndexForTextSummary.getMaxResults(); jsonWriter.name("MaxResults"); @@ -99,10 +82,27 @@ public void marshall(SearchPlaceIndexForTextSummary searchPlaceIndexForTextSumma } jsonWriter.endArray(); } - if (searchPlaceIndexForTextSummary.getText() != null) { - String text = searchPlaceIndexForTextSummary.getText(); - jsonWriter.name("Text"); - jsonWriter.value(text); + if (searchPlaceIndexForTextSummary.getDataSource() != null) { + String dataSource = searchPlaceIndexForTextSummary.getDataSource(); + jsonWriter.name("DataSource"); + jsonWriter.value(dataSource); + } + if (searchPlaceIndexForTextSummary.getLanguage() != null) { + String language = searchPlaceIndexForTextSummary.getLanguage(); + jsonWriter.name("Language"); + jsonWriter.value(language); + } + if (searchPlaceIndexForTextSummary.getFilterCategories() != null) { + java.util.List filterCategories = searchPlaceIndexForTextSummary + .getFilterCategories(); + jsonWriter.name("FilterCategories"); + jsonWriter.beginArray(); + for (String filterCategoriesItem : filterCategories) { + if (filterCategoriesItem != null) { + jsonWriter.value(filterCategoriesItem); + } + } + jsonWriter.endArray(); } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonUnmarshaller.java index 2c837caa1f..424952ff28 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/SearchPlaceIndexForTextSummaryJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -37,32 +37,24 @@ public SearchPlaceIndexForTextSummary unmarshall(JsonUnmarshallerContext context reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("BiasPosition")) { + if (name.equals("Text")) { + searchPlaceIndexForTextSummary.setText(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("BiasPosition")) { searchPlaceIndexForTextSummary.setBiasPosition(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("DataSource")) { - searchPlaceIndexForTextSummary.setDataSource(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("FilterBBox")) { searchPlaceIndexForTextSummary.setFilterBBox(new ListUnmarshaller( DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("FilterCategories")) { - searchPlaceIndexForTextSummary.setFilterCategories(new ListUnmarshaller( - StringJsonUnmarshaller.getInstance() - ) - .unmarshall(context)); } else if (name.equals("FilterCountries")) { searchPlaceIndexForTextSummary.setFilterCountries(new ListUnmarshaller( StringJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Language")) { - searchPlaceIndexForTextSummary.setLanguage(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); } else if (name.equals("MaxResults")) { searchPlaceIndexForTextSummary.setMaxResults(IntegerJsonUnmarshaller.getInstance() .unmarshall(context)); @@ -71,9 +63,17 @@ public SearchPlaceIndexForTextSummary unmarshall(JsonUnmarshallerContext context DoubleJsonUnmarshaller.getInstance() ) .unmarshall(context)); - } else if (name.equals("Text")) { - searchPlaceIndexForTextSummary.setText(StringJsonUnmarshaller.getInstance() + } else if (name.equals("DataSource")) { + searchPlaceIndexForTextSummary.setDataSource(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Language")) { + searchPlaceIndexForTextSummary.setLanguage(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("FilterCategories")) { + searchPlaceIndexForTextSummary.setFilterCategories(new ListUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ServiceQuotaExceededExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ServiceQuotaExceededExceptionUnmarshaller.java index f308fc2430..62d06b37b5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ServiceQuotaExceededExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ServiceQuotaExceededExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonMarshaller.java index 61d5427952..4bc427b8cd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -26,15 +26,16 @@ class StepJsonMarshaller { public void marshall(Step step, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (step.getDistance() != null) { - Double distance = step.getDistance(); - jsonWriter.name("Distance"); - jsonWriter.value(distance); - } - if (step.getDurationSeconds() != null) { - Double durationSeconds = step.getDurationSeconds(); - jsonWriter.name("DurationSeconds"); - jsonWriter.value(durationSeconds); + if (step.getStartPosition() != null) { + java.util.List startPosition = step.getStartPosition(); + jsonWriter.name("StartPosition"); + jsonWriter.beginArray(); + for (Double startPositionItem : startPosition) { + if (startPositionItem != null) { + jsonWriter.value(startPositionItem); + } + } + jsonWriter.endArray(); } if (step.getEndPosition() != null) { java.util.List endPosition = step.getEndPosition(); @@ -47,22 +48,21 @@ public void marshall(Step step, AwsJsonWriter jsonWriter) throws Exception { } jsonWriter.endArray(); } + if (step.getDistance() != null) { + Double distance = step.getDistance(); + jsonWriter.name("Distance"); + jsonWriter.value(distance); + } + if (step.getDurationSeconds() != null) { + Double durationSeconds = step.getDurationSeconds(); + jsonWriter.name("DurationSeconds"); + jsonWriter.value(durationSeconds); + } if (step.getGeometryOffset() != null) { Integer geometryOffset = step.getGeometryOffset(); jsonWriter.name("GeometryOffset"); jsonWriter.value(geometryOffset); } - if (step.getStartPosition() != null) { - java.util.List startPosition = step.getStartPosition(); - jsonWriter.name("StartPosition"); - jsonWriter.beginArray(); - for (Double startPositionItem : startPosition) { - if (startPositionItem != null) { - jsonWriter.value(startPositionItem); - } - } - jsonWriter.endArray(); - } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonUnmarshaller.java index 47cef5e4ee..b504d3fb3b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/StepJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -35,25 +35,25 @@ public Step unmarshall(JsonUnmarshallerContext context) throws Exception { reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Distance")) { - step.setDistance(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("DurationSeconds")) { - step.setDurationSeconds(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); + if (name.equals("StartPosition")) { + step.setStartPosition(new ListUnmarshaller(DoubleJsonUnmarshaller + .getInstance() + ) + .unmarshall(context)); } else if (name.equals("EndPosition")) { step.setEndPosition(new ListUnmarshaller(DoubleJsonUnmarshaller .getInstance() ) .unmarshall(context)); + } else if (name.equals("Distance")) { + step.setDistance(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("DurationSeconds")) { + step.setDurationSeconds(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("GeometryOffset")) { step.setGeometryOffset(IntegerJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("StartPosition")) { - step.setStartPosition(new ListUnmarshaller(DoubleJsonUnmarshaller - .getInstance() - ) - .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceRequestMarshaller.java index bae8415c78..f84ea61822 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -89,9 +89,9 @@ public Request marshall(TagResourceRequest tagResourceReques "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceResultJsonUnmarshaller.java index 2d218a1ffd..94c966ea9b 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TagResourceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ThrottlingExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ThrottlingExceptionUnmarshaller.java index 56e13a4a6e..759f47a266 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ThrottlingExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ThrottlingExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonMarshaller.java index ce245c2e31..41eaa417d5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonUnmarshaller.java index 275373af3a..39829a5bfd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TimeZoneJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonMarshaller.java new file mode 100644 index 0000000000..697b565379 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonMarshaller.java @@ -0,0 +1,64 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO TrackingFilterGeometry + */ +class TrackingFilterGeometryJsonMarshaller { + + public void marshall(TrackingFilterGeometry trackingFilterGeometry, AwsJsonWriter jsonWriter) + throws Exception { + jsonWriter.beginObject(); + if (trackingFilterGeometry.getPolygon() != null) { + java.util.List>> polygon = trackingFilterGeometry + .getPolygon(); + jsonWriter.name("Polygon"); + jsonWriter.beginArray(); + for (java.util.List> polygonItem : polygon) { + if (polygonItem != null) { + jsonWriter.beginArray(); + for (java.util.List polygonItemItem : polygonItem) { + if (polygonItemItem != null) { + jsonWriter.beginArray(); + for (Double polygonItemItemItem : polygonItemItem) { + if (polygonItemItemItem != null) { + jsonWriter.value(polygonItemItemItem); + } + } + jsonWriter.endArray(); + } + } + jsonWriter.endArray(); + } + } + jsonWriter.endArray(); + } + jsonWriter.endObject(); + } + + private static TrackingFilterGeometryJsonMarshaller instance; + + public static TrackingFilterGeometryJsonMarshaller getInstance() { + if (instance == null) + instance = new TrackingFilterGeometryJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonUnmarshaller.java new file mode 100644 index 0000000000..e1e2857a77 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TrackingFilterGeometryJsonUnmarshaller.java @@ -0,0 +1,64 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO TrackingFilterGeometry + */ +class TrackingFilterGeometryJsonUnmarshaller implements + Unmarshaller { + + public TrackingFilterGeometry unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + TrackingFilterGeometry trackingFilterGeometry = new TrackingFilterGeometry(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("Polygon")) { + trackingFilterGeometry + .setPolygon(new ListUnmarshaller>>( + new ListUnmarshaller>( + new ListUnmarshaller(DoubleJsonUnmarshaller + .getInstance() + ) + ) + ) + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return trackingFilterGeometry; + } + + private static TrackingFilterGeometryJsonUnmarshaller instance; + + public static TrackingFilterGeometryJsonUnmarshaller getInstance() { + if (instance == null) + instance = new TrackingFilterGeometryJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonMarshaller.java index efc00dbf39..0afca24c65 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,26 +27,26 @@ class TruckDimensionsJsonMarshaller { public void marshall(TruckDimensions truckDimensions, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (truckDimensions.getHeight() != null) { - Double height = truckDimensions.getHeight(); - jsonWriter.name("Height"); - jsonWriter.value(height); - } if (truckDimensions.getLength() != null) { Double length = truckDimensions.getLength(); jsonWriter.name("Length"); jsonWriter.value(length); } - if (truckDimensions.getUnit() != null) { - String unit = truckDimensions.getUnit(); - jsonWriter.name("Unit"); - jsonWriter.value(unit); + if (truckDimensions.getHeight() != null) { + Double height = truckDimensions.getHeight(); + jsonWriter.name("Height"); + jsonWriter.value(height); } if (truckDimensions.getWidth() != null) { Double width = truckDimensions.getWidth(); jsonWriter.name("Width"); jsonWriter.value(width); } + if (truckDimensions.getUnit() != null) { + String unit = truckDimensions.getUnit(); + jsonWriter.name("Unit"); + jsonWriter.value(unit); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonUnmarshaller.java index cdedc778e3..4ae37b4bbd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckDimensionsJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,18 +36,18 @@ public TruckDimensions unmarshall(JsonUnmarshallerContext context) throws Except reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Height")) { - truckDimensions.setHeight(DoubleJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Length")) { + if (name.equals("Length")) { truckDimensions.setLength(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); - } else if (name.equals("Unit")) { - truckDimensions.setUnit(StringJsonUnmarshaller.getInstance() + } else if (name.equals("Height")) { + truckDimensions.setHeight(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); } else if (name.equals("Width")) { truckDimensions.setWidth(DoubleJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Unit")) { + truckDimensions.setUnit(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonMarshaller.java index bd167bf584..1c622b8c6c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonUnmarshaller.java index 6537fe8348..a505e16cdb 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/TruckWeightJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceRequestMarshaller.java index a118b33b0c..bcb8a5754f 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -64,9 +64,9 @@ public Request marshall(UntagResourceRequest untagResource } request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceResultJsonUnmarshaller.java index ea97f95388..38c09e3a0c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UntagResourceResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionRequestMarshaller.java index 2cda75f08a..998cdfa729 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -65,11 +65,6 @@ public Request marshall( AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (updateGeofenceCollectionRequest.getDescription() != null) { - String description = updateGeofenceCollectionRequest.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); - } if (updateGeofenceCollectionRequest.getPricingPlan() != null) { String pricingPlan = updateGeofenceCollectionRequest.getPricingPlan(); jsonWriter.name("PricingPlan"); @@ -81,6 +76,11 @@ public Request marshall( jsonWriter.name("PricingPlanDataSource"); jsonWriter.value(pricingPlanDataSource); } + if (updateGeofenceCollectionRequest.getDescription() != null) { + String description = updateGeofenceCollectionRequest.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); + } jsonWriter.endObject(); jsonWriter.close(); @@ -93,9 +93,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("geofencing."); + request.setHostPrefix("cp.geofencing."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionResultJsonUnmarshaller.java index 048f5c0fe3..865a4abe91 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateGeofenceCollectionResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -34,12 +34,12 @@ public UpdateGeofenceCollectionResult unmarshall(JsonUnmarshallerContext context reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CollectionArn")) { - updateGeofenceCollectionResult.setCollectionArn(StringJsonUnmarshaller + if (name.equals("CollectionName")) { + updateGeofenceCollectionResult.setCollectionName(StringJsonUnmarshaller .getInstance() .unmarshall(context)); - } else if (name.equals("CollectionName")) { - updateGeofenceCollectionResult.setCollectionName(StringJsonUnmarshaller + } else if (name.equals("CollectionArn")) { + updateGeofenceCollectionResult.setCollectionArn(StringJsonUnmarshaller .getInstance() .unmarshall(context)); } else if (name.equals("UpdateTime")) { diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyRequestMarshaller.java index b6b09a5f6a..db5f8252e8 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -73,16 +73,16 @@ public Request marshall(UpdateKeyRequest updateKeyRequest) { jsonWriter.name("ExpireTime"); jsonWriter.value(DateUtils.formatISO8601Date(expireTime)); } - if (updateKeyRequest.getForceUpdate() != null) { - Boolean forceUpdate = updateKeyRequest.getForceUpdate(); - jsonWriter.name("ForceUpdate"); - jsonWriter.value(forceUpdate); - } if (updateKeyRequest.getNoExpiry() != null) { Boolean noExpiry = updateKeyRequest.getNoExpiry(); jsonWriter.name("NoExpiry"); jsonWriter.value(noExpiry); } + if (updateKeyRequest.getForceUpdate() != null) { + Boolean forceUpdate = updateKeyRequest.getForceUpdate(); + jsonWriter.name("ForceUpdate"); + jsonWriter.value(forceUpdate); + } if (updateKeyRequest.getRestrictions() != null) { ApiKeyRestrictions restrictions = updateKeyRequest.getRestrictions(); jsonWriter.name("Restrictions"); @@ -100,9 +100,9 @@ public Request marshall(UpdateKeyRequest updateKeyRequest) { "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("metadata."); + request.setHostPrefix("cp.metadata."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyResultJsonUnmarshaller.java index d39f103a5e..3ff9c33705 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateKeyResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapRequestMarshaller.java index f3db28487d..fbe997605c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -63,22 +63,22 @@ public Request marshall(UpdateMapRequest updateMapRequest) { AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (updateMapRequest.getConfigurationUpdate() != null) { - MapConfigurationUpdate configurationUpdate = updateMapRequest - .getConfigurationUpdate(); - jsonWriter.name("ConfigurationUpdate"); - MapConfigurationUpdateJsonMarshaller.getInstance().marshall(configurationUpdate, - jsonWriter); + if (updateMapRequest.getPricingPlan() != null) { + String pricingPlan = updateMapRequest.getPricingPlan(); + jsonWriter.name("PricingPlan"); + jsonWriter.value(pricingPlan); } if (updateMapRequest.getDescription() != null) { String description = updateMapRequest.getDescription(); jsonWriter.name("Description"); jsonWriter.value(description); } - if (updateMapRequest.getPricingPlan() != null) { - String pricingPlan = updateMapRequest.getPricingPlan(); - jsonWriter.name("PricingPlan"); - jsonWriter.value(pricingPlan); + if (updateMapRequest.getConfigurationUpdate() != null) { + MapConfigurationUpdate configurationUpdate = updateMapRequest + .getConfigurationUpdate(); + jsonWriter.name("ConfigurationUpdate"); + MapConfigurationUpdateJsonMarshaller.getInstance().marshall(configurationUpdate, + jsonWriter); } jsonWriter.endObject(); @@ -92,9 +92,9 @@ public Request marshall(UpdateMapRequest updateMapRequest) { "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("maps."); + request.setHostPrefix("cp.maps."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapResultJsonUnmarshaller.java index 509e6e2f06..78ed3e0ab5 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateMapResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,12 +33,12 @@ public UpdateMapResult unmarshall(JsonUnmarshallerContext context) throws Except reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("MapArn")) { - updateMapResult.setMapArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("MapName")) { + if (name.equals("MapName")) { updateMapResult.setMapName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("MapArn")) { + updateMapResult.setMapArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("UpdateTime")) { updateMapResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexRequestMarshaller.java index cca4716bd0..2b92a50c66 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -64,22 +64,22 @@ public Request marshall(UpdatePlaceIndexRequest updateP AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (updatePlaceIndexRequest.getDataSourceConfiguration() != null) { - DataSourceConfiguration dataSourceConfiguration = updatePlaceIndexRequest - .getDataSourceConfiguration(); - jsonWriter.name("DataSourceConfiguration"); - DataSourceConfigurationJsonMarshaller.getInstance().marshall( - dataSourceConfiguration, jsonWriter); + if (updatePlaceIndexRequest.getPricingPlan() != null) { + String pricingPlan = updatePlaceIndexRequest.getPricingPlan(); + jsonWriter.name("PricingPlan"); + jsonWriter.value(pricingPlan); } if (updatePlaceIndexRequest.getDescription() != null) { String description = updatePlaceIndexRequest.getDescription(); jsonWriter.name("Description"); jsonWriter.value(description); } - if (updatePlaceIndexRequest.getPricingPlan() != null) { - String pricingPlan = updatePlaceIndexRequest.getPricingPlan(); - jsonWriter.name("PricingPlan"); - jsonWriter.value(pricingPlan); + if (updatePlaceIndexRequest.getDataSourceConfiguration() != null) { + DataSourceConfiguration dataSourceConfiguration = updatePlaceIndexRequest + .getDataSourceConfiguration(); + jsonWriter.name("DataSourceConfiguration"); + DataSourceConfigurationJsonMarshaller.getInstance().marshall( + dataSourceConfiguration, jsonWriter); } jsonWriter.endObject(); @@ -93,9 +93,9 @@ public Request marshall(UpdatePlaceIndexRequest updateP "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("places."); + request.setHostPrefix("cp.places."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexResultJsonUnmarshaller.java index ac895eb9dd..29e4ac8437 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdatePlaceIndexResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,12 +33,12 @@ public UpdatePlaceIndexResult unmarshall(JsonUnmarshallerContext context) throws reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("IndexArn")) { - updatePlaceIndexResult.setIndexArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("IndexName")) { + if (name.equals("IndexName")) { updatePlaceIndexResult.setIndexName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("IndexArn")) { + updatePlaceIndexResult.setIndexArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("UpdateTime")) { updatePlaceIndexResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorRequestMarshaller.java index 7d946f9363..904fcf1b93 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -65,16 +65,16 @@ public Request marshall( AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); - if (updateRouteCalculatorRequest.getDescription() != null) { - String description = updateRouteCalculatorRequest.getDescription(); - jsonWriter.name("Description"); - jsonWriter.value(description); - } if (updateRouteCalculatorRequest.getPricingPlan() != null) { String pricingPlan = updateRouteCalculatorRequest.getPricingPlan(); jsonWriter.name("PricingPlan"); jsonWriter.value(pricingPlan); } + if (updateRouteCalculatorRequest.getDescription() != null) { + String description = updateRouteCalculatorRequest.getDescription(); + jsonWriter.name("Description"); + jsonWriter.value(description); + } jsonWriter.endObject(); jsonWriter.close(); @@ -87,9 +87,9 @@ public Request marshall( "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("routes."); + request.setHostPrefix("cp.routes."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorResultJsonUnmarshaller.java index 9db59b74d7..2c1f88c3ea 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateRouteCalculatorResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,12 +33,12 @@ public UpdateRouteCalculatorResult unmarshall(JsonUnmarshallerContext context) t reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("CalculatorArn")) { - updateRouteCalculatorResult.setCalculatorArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("CalculatorName")) { + if (name.equals("CalculatorName")) { updateRouteCalculatorResult.setCalculatorName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("CalculatorArn")) { + updateRouteCalculatorResult.setCalculatorArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("UpdateTime")) { updateRouteCalculatorResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerRequestMarshaller.java index c935862871..db491733b9 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerRequestMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerRequestMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -64,30 +64,36 @@ public Request marshall(UpdateTrackerRequest updateTracker AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); jsonWriter.beginObject(); + if (updateTrackerRequest.getPricingPlan() != null) { + String pricingPlan = updateTrackerRequest.getPricingPlan(); + jsonWriter.name("PricingPlan"); + jsonWriter.value(pricingPlan); + } + if (updateTrackerRequest.getPricingPlanDataSource() != null) { + String pricingPlanDataSource = updateTrackerRequest.getPricingPlanDataSource(); + jsonWriter.name("PricingPlanDataSource"); + jsonWriter.value(pricingPlanDataSource); + } if (updateTrackerRequest.getDescription() != null) { String description = updateTrackerRequest.getDescription(); jsonWriter.name("Description"); jsonWriter.value(description); } - if (updateTrackerRequest.getEventBridgeEnabled() != null) { - Boolean eventBridgeEnabled = updateTrackerRequest.getEventBridgeEnabled(); - jsonWriter.name("EventBridgeEnabled"); - jsonWriter.value(eventBridgeEnabled); - } if (updateTrackerRequest.getPositionFiltering() != null) { String positionFiltering = updateTrackerRequest.getPositionFiltering(); jsonWriter.name("PositionFiltering"); jsonWriter.value(positionFiltering); } - if (updateTrackerRequest.getPricingPlan() != null) { - String pricingPlan = updateTrackerRequest.getPricingPlan(); - jsonWriter.name("PricingPlan"); - jsonWriter.value(pricingPlan); + if (updateTrackerRequest.getEventBridgeEnabled() != null) { + Boolean eventBridgeEnabled = updateTrackerRequest.getEventBridgeEnabled(); + jsonWriter.name("EventBridgeEnabled"); + jsonWriter.value(eventBridgeEnabled); } - if (updateTrackerRequest.getPricingPlanDataSource() != null) { - String pricingPlanDataSource = updateTrackerRequest.getPricingPlanDataSource(); - jsonWriter.name("PricingPlanDataSource"); - jsonWriter.value(pricingPlanDataSource); + if (updateTrackerRequest.getKmsKeyEnableGeospatialQueries() != null) { + Boolean kmsKeyEnableGeospatialQueries = updateTrackerRequest + .getKmsKeyEnableGeospatialQueries(); + jsonWriter.name("KmsKeyEnableGeospatialQueries"); + jsonWriter.value(kmsKeyEnableGeospatialQueries); } jsonWriter.endObject(); @@ -101,9 +107,9 @@ public Request marshall(UpdateTrackerRequest updateTracker "Unable to marshall request to JSON: " + t.getMessage(), t); } if (!request.getHeaders().containsKey("Content-Type")) { - request.addHeader("Content-Type", "application/x-amz-json-1.1"); + request.addHeader("Content-Type", "application/x-amz-json-1.0"); } - request.setHostPrefix("tracking."); + request.setHostPrefix("cp.tracking."); return request; } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerResultJsonUnmarshaller.java index 91e46e5ca8..5b351e6253 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerResultJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/UpdateTrackerResultJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -33,12 +33,12 @@ public UpdateTrackerResult unmarshall(JsonUnmarshallerContext context) throws Ex reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("TrackerArn")) { - updateTrackerResult.setTrackerArn(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("TrackerName")) { + if (name.equals("TrackerName")) { updateTrackerResult.setTrackerName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("TrackerArn")) { + updateTrackerResult.setTrackerArn(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else if (name.equals("UpdateTime")) { updateTrackerResult.setUpdateTime(DateJsonUnmarshaller.getInstance( TimestampFormat.ISO_8601) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonMarshaller.java index b0ea5e4781..c804b7c499 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -27,16 +27,16 @@ class ValidationExceptionFieldJsonMarshaller { public void marshall(ValidationExceptionField validationExceptionField, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); - if (validationExceptionField.getMessage() != null) { - String message = validationExceptionField.getMessage(); - jsonWriter.name("Message"); - jsonWriter.value(message); - } if (validationExceptionField.getName() != null) { String name = validationExceptionField.getName(); jsonWriter.name("Name"); jsonWriter.value(name); } + if (validationExceptionField.getMessage() != null) { + String message = validationExceptionField.getMessage(); + jsonWriter.name("Message"); + jsonWriter.value(message); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonUnmarshaller.java index 5c4b604b44..44938fa11a 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionFieldJsonUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -36,12 +36,12 @@ public ValidationExceptionField unmarshall(JsonUnmarshallerContext context) thro reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Message")) { - validationExceptionField.setMessage(StringJsonUnmarshaller.getInstance() - .unmarshall(context)); - } else if (name.equals("Name")) { + if (name.equals("Name")) { validationExceptionField.setName(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("Message")) { + validationExceptionField.setMessage(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionUnmarshaller.java index b377054365..2cbe3e6eea 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/ValidationExceptionUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"). * You may not use this file except in compliance with the License. @@ -44,6 +44,7 @@ public AmazonServiceException unmarshall(JsonErrorResponse error) throws Excepti ValidationException e = (ValidationException) super.unmarshall(error); e.setErrorCode("ValidationException"); + e.setReason(String.valueOf(error.get("Reason"))); final AwsJsonReader jsonReader = JsonUtils.getJsonReader(new StringReader(error .get("FieldList"))); @@ -51,8 +52,6 @@ public AmazonServiceException unmarshall(JsonErrorResponse error) throws Excepti ValidationExceptionFieldJsonUnmarshaller.getInstance()) .unmarshall(new JsonUnmarshallerContext(jsonReader))); - e.setReason(String.valueOf(error.get("Reason"))); - return e; } } diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionRequestMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionRequestMarshaller.java new file mode 100644 index 0000000000..757bdff527 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionRequestMarshaller.java @@ -0,0 +1,96 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import static com.amazonaws.util.StringUtils.UTF8; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; + +import android.text.TextUtils; + +import com.amazonaws.AmazonClientException; +import com.amazonaws.Request; +import com.amazonaws.DefaultRequest; +import com.amazonaws.http.HttpMethodName; +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.Marshaller; +import com.amazonaws.util.BinaryUtils; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.StringUtils; +import com.amazonaws.util.StringInputStream; +import com.amazonaws.util.json.AwsJsonWriter; +import com.amazonaws.util.json.JsonUtils; + +/** + * JSON request marshaller for VerifyDevicePositionRequest + */ +public class VerifyDevicePositionRequestMarshaller implements + Marshaller, VerifyDevicePositionRequest> { + + public Request marshall( + VerifyDevicePositionRequest verifyDevicePositionRequest) { + if (verifyDevicePositionRequest == null) { + throw new AmazonClientException( + "Invalid argument passed to marshall(VerifyDevicePositionRequest)"); + } + + Request request = new DefaultRequest( + verifyDevicePositionRequest, "AmazonLocation"); + request.setHttpMethod(HttpMethodName.POST); + + String uriResourcePath = "/tracking/v0/trackers/{TrackerName}/positions/verify"; + uriResourcePath = uriResourcePath.replace( + "{TrackerName}", + (verifyDevicePositionRequest.getTrackerName() == null) ? "" : StringUtils + .fromString(verifyDevicePositionRequest.getTrackerName())); + request.setResourcePath(uriResourcePath); + try { + StringWriter stringWriter = new StringWriter(); + AwsJsonWriter jsonWriter = JsonUtils.getJsonWriter(stringWriter); + jsonWriter.beginObject(); + + if (verifyDevicePositionRequest.getDeviceState() != null) { + DeviceState deviceState = verifyDevicePositionRequest.getDeviceState(); + jsonWriter.name("DeviceState"); + DeviceStateJsonMarshaller.getInstance().marshall(deviceState, jsonWriter); + } + if (verifyDevicePositionRequest.getDistanceUnit() != null) { + String distanceUnit = verifyDevicePositionRequest.getDistanceUnit(); + jsonWriter.name("DistanceUnit"); + jsonWriter.value(distanceUnit); + } + + jsonWriter.endObject(); + jsonWriter.close(); + String snippet = stringWriter.toString(); + byte[] content = snippet.getBytes(UTF8); + request.setContent(new StringInputStream(snippet)); + request.addHeader("Content-Length", Integer.toString(content.length)); + } catch (Throwable t) { + throw new AmazonClientException( + "Unable to marshall request to JSON: " + t.getMessage(), t); + } + if (!request.getHeaders().containsKey("Content-Type")) { + request.addHeader("Content-Type", "application/x-amz-json-1.0"); + } + request.setHostPrefix("tracking."); + + return request; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionResultJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionResultJsonUnmarshaller.java new file mode 100644 index 0000000000..12eaebbf1b --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/VerifyDevicePositionResultJsonUnmarshaller.java @@ -0,0 +1,70 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for response VerifyDevicePositionResult + */ +public class VerifyDevicePositionResultJsonUnmarshaller implements + Unmarshaller { + + public VerifyDevicePositionResult unmarshall(JsonUnmarshallerContext context) throws Exception { + VerifyDevicePositionResult verifyDevicePositionResult = new VerifyDevicePositionResult(); + + AwsJsonReader reader = context.getReader(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("InferredState")) { + verifyDevicePositionResult.setInferredState(InferredStateJsonUnmarshaller + .getInstance() + .unmarshall(context)); + } else if (name.equals("DeviceId")) { + verifyDevicePositionResult.setDeviceId(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("SampleTime")) { + verifyDevicePositionResult.setSampleTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("ReceivedTime")) { + verifyDevicePositionResult.setReceivedTime(DateJsonUnmarshaller.getInstance( + TimestampFormat.ISO_8601) + .unmarshall(context)); + } else if (name.equals("DistanceUnit")) { + verifyDevicePositionResult.setDistanceUnit(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + + return verifyDevicePositionResult; + } + + private static VerifyDevicePositionResultJsonUnmarshaller instance; + + public static VerifyDevicePositionResultJsonUnmarshaller getInstance() { + if (instance == null) + instance = new VerifyDevicePositionResultJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonMarshaller.java new file mode 100644 index 0000000000..41b8d0cfcc --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonMarshaller.java @@ -0,0 +1,50 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO WiFiAccessPoint + */ +class WiFiAccessPointJsonMarshaller { + + public void marshall(WiFiAccessPoint wiFiAccessPoint, AwsJsonWriter jsonWriter) + throws Exception { + jsonWriter.beginObject(); + if (wiFiAccessPoint.getMacAddress() != null) { + String macAddress = wiFiAccessPoint.getMacAddress(); + jsonWriter.name("MacAddress"); + jsonWriter.value(macAddress); + } + if (wiFiAccessPoint.getRss() != null) { + Integer rss = wiFiAccessPoint.getRss(); + jsonWriter.name("Rss"); + jsonWriter.value(rss); + } + jsonWriter.endObject(); + } + + private static WiFiAccessPointJsonMarshaller instance; + + public static WiFiAccessPointJsonMarshaller getInstance() { + if (instance == null) + instance = new WiFiAccessPointJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonUnmarshaller.java new file mode 100644 index 0000000000..da1ccea0d8 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/WiFiAccessPointJsonUnmarshaller.java @@ -0,0 +1,60 @@ +/* + * Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO WiFiAccessPoint + */ +class WiFiAccessPointJsonUnmarshaller implements + Unmarshaller { + + public WiFiAccessPoint unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + WiFiAccessPoint wiFiAccessPoint = new WiFiAccessPoint(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("MacAddress")) { + wiFiAccessPoint.setMacAddress(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Rss")) { + wiFiAccessPoint.setRss(IntegerJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return wiFiAccessPoint; + } + + private static WiFiAccessPointJsonUnmarshaller instance; + + public static WiFiAccessPointJsonUnmarshaller getInstance() { + if (instance == null) + instance = new WiFiAccessPointJsonUnmarshaller(); + return instance; + } +}