on develop help sign in
Adding various override fixes
commitcbb92c63d928a13335bca35555cbaed0736ec024 authorBrendan Hay <brendan.g.hay@gmail.com> dateTue 6 Oct 2015, 20:18 (11 years ago) parent0e58f57
9 files changed+37−32
core/src/Network/Google/Types.hs+4−5 gen/annex/groupssettings.json+7−2 gen/src/Gen/Text.hs+1 gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Get.hs+2−2 gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Patch.hs+2−2 gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Update.hs+2−2 gogol-qpxexpress/gen/Network/Google/QPXExpress.hs+2−2 gogol-qpxexpress/gen/Network/Google/QPXExpress/Types.hs+2−2 gogol-qpxexpress/gen/Network/Google/QPXExpress/Types/Product.hs+15−15
core/src/Network/Google/Types.hs+4−5
@@ -72,9 +72,8 @@ newtype OAuthToken = OAuthToken Text
7272 deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, ToText, FromText)
7373
7474class GoogleAuth a where
75− authKey :: Traversal' a AuthKey
76− authToken :: Traversal' a OAuthToken
77− -- ^ only set if unset semantics?
75+ _AuthKey :: Traversal' a AuthKey
76+ _AuthToken :: Traversal' a OAuthToken
7877
7978newtype MediaDownload a = MediaDownload a
8079
@@ -82,8 +81,8 @@ _MediaDownload :: Iso' (MediaDownload a) a
8281_MediaDownload = iso (\(MediaDownload x) -> x) MediaDownload
8382
8483instance GoogleAuth a => GoogleAuth (MediaDownload a) where
85− authKey = _MediaDownload . authKey
86− authToken = _MediaDownload . authToken
84+ _AuthKey = _MediaDownload . _AuthKey
85+ _AuthToken = _MediaDownload . _AuthToken
8786
8887_Coerce :: (Coercible a b, Coercible b a) => Iso' a b
8988_Coerce = iso coerce coerce
gen/annex/groupssettings.json+7−2
@@ -1,5 +1,10 @@
11{
22 "library": "groups-settings",
3− "canonicalName": "GroupsSettings"
4−}
3+ "canonicalName": "GroupsSettings",
4+ "parameters": {
5+ "alt": {
6+ "default": "json"
57
8+ }
9+ }
10+}
gen/src/Gen/Text.hs+1
@@ -131,6 +131,7 @@ renameReserved x
131131 , "Patch"
132132 , "Put"
133133 , "log"
134+ , "Data"
134135 ] ++ map Text.pack (reservedNames haskellDef)
135136
136137camelAcronym :: Text -> Text
gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Get.hs+2−2
@@ -55,7 +55,7 @@ type GroupsGetResource =
5555 QueryParam "fields" Text :>
5656 QueryParam "key" AuthKey :>
5757 QueryParam "oauth_token" OAuthToken :>
58− QueryParam "alt" AltATOM :> Get '[JSON] Groups
58+ QueryParam "alt" AltJSON :> Get '[JSON] Groups
5959
6060-- | Gets one resource by id.
6161--
@@ -154,6 +154,6 @@ instance GoogleRequest GroupsGet' where
154154 _ggFields
155155 _ggKey
156156 _ggOAuthToken
157− (Just AltATOM)
157+ (Just AltJSON)
158158 where go
159159 = clientBuild (Proxy :: Proxy GroupsGetResource) rq
gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Patch.hs+2−2
@@ -56,7 +56,7 @@ type GroupsPatchResource =
5656 QueryParam "fields" Text :>
5757 QueryParam "key" AuthKey :>
5858 QueryParam "oauth_token" OAuthToken :>
59− QueryParam "alt" AltATOM :>
59+ QueryParam "alt" AltJSON :>
6060 ReqBody '[JSON] Groups :> Patch '[JSON] Groups
6161
6262-- | Updates an existing resource. This method supports patch semantics.
@@ -166,7 +166,7 @@ instance GoogleRequest GroupsPatch' where
166166 _gpFields
167167 _gpKey
168168 _gpOAuthToken
169− (Just AltATOM)
169+ (Just AltJSON)
170170 _gpPayload
171171 where go
172172 = clientBuild (Proxy :: Proxy GroupsPatchResource) rq
gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Update.hs+2−2
@@ -56,7 +56,7 @@ type GroupsUpdateResource =
5656 QueryParam "fields" Text :>
5757 QueryParam "key" AuthKey :>
5858 QueryParam "oauth_token" OAuthToken :>
59− QueryParam "alt" AltATOM :>
59+ QueryParam "alt" AltJSON :>
6060 ReqBody '[JSON] Groups :> Put '[JSON] Groups
6161
6262-- | Updates an existing resource.
@@ -166,7 +166,7 @@ instance GoogleRequest GroupsUpdate' where
166166 _guFields
167167 _guKey
168168 _guOAuthToken
169− (Just AltATOM)
169+ (Just AltJSON)
170170 _guPayload
171171 where go
172172 = clientBuild (Proxy :: Proxy GroupsUpdateResource)
gogol-qpxexpress/gen/Network/Google/QPXExpress.hs+2−2
@@ -65,8 +65,8 @@ module Network.Google.QPXExpress
6565 , todrLatestTime
6666 , todrEarliestTime
6767
68− -- ** Data
69− , Data
68+ -- ** Data'
69+ , Data'
7070 , data'
7171 , dCarrier
7272 , dKind
gogol-qpxexpress/gen/Network/Google/QPXExpress/Types.hs+2−2
@@ -50,8 +50,8 @@ module Network.Google.QPXExpress.Types
5050 , todrLatestTime
5151 , todrEarliestTime
5252
53− -- * Data
54− , Data
53+ -- * Data'
54+ , Data'
5555 , data'
5656 , dCarrier
5757 , dKind
gogol-qpxexpress/gen/Network/Google/QPXExpress/Types/Product.hs+15−15
@@ -26,7 +26,7 @@ import Network.Google.QPXExpress.Types.Sum
2626data TripOptionsResponse = TripOptionsResponse
2727 { _torRequestId :: !(Maybe Text)
2828 , _torKind :: !Text
29− , _torData :: !(Maybe Data)
29+ , _torData :: !(Maybe Data')
3030 , _torTripOption :: !(Maybe [TripOption])
3131 } deriving (Eq,Show,Data,Typeable,Generic)
3232
@@ -62,7 +62,7 @@ torKind :: Lens' TripOptionsResponse Text
6262torKind = lens _torKind (\ s a -> s{_torKind = a})
6363
6464-- | Informational data global to list of solutions.
65−torData :: Lens' TripOptionsResponse (Maybe Data)
65+torData :: Lens' TripOptionsResponse (Maybe Data')
6666torData = lens _torData (\ s a -> s{_torData = a})
6767
6868-- | A list of priced itinerary solutions to the QPX Express query.
@@ -312,7 +312,7 @@ instance ToJSON TimeOfDayRange where
312312-- aircraft.
313313--
314314-- /See:/ 'data'' smart constructor.
315−data Data = Data
315+data Data' = Data'
316316 { _dCarrier :: !(Maybe [CarrierData])
317317 , _dKind :: !Text
318318 , _dAircraft :: !(Maybe [AircraftData])
@@ -337,9 +337,9 @@ data Data = Data
337337--
338338-- * 'dTax'
339339data'
340− :: Data
340+ :: Data'
341341data' =
342− Data
342+ Data'
343343 { _dCarrier = Nothing
344344 , _dKind = "qpxexpress#data"
345345 , _dAircraft = Nothing
@@ -350,7 +350,7 @@ data' =
350350
351351-- | The airline carrier of the aircraft flying between an origin and
352352-- destination. Allowed values are IATA carrier codes.
353−dCarrier :: Lens' Data [CarrierData]
353+dCarrier :: Lens' Data' [CarrierData]
354354dCarrier
355355 = lens _dCarrier (\ s a -> s{_dCarrier = a}) .
356356 _Default
@@ -359,40 +359,40 @@ dCarrier
359359-- | Identifies this as QPX Express response resource, including a trip\'s
360360-- airport, city, taxes, airline, and aircraft. Value: the fixed string
361361-- qpxexpress#data.
362−dKind :: Lens' Data Text
362+dKind :: Lens' Data' Text
363363dKind = lens _dKind (\ s a -> s{_dKind = a})
364364
365365-- | The aircraft that is flying between an origin and destination.
366−dAircraft :: Lens' Data [AircraftData]
366+dAircraft :: Lens' Data' [AircraftData]
367367dAircraft
368368 = lens _dAircraft (\ s a -> s{_dAircraft = a}) .
369369 _Default
370370 . _Coerce
371371
372372-- | The airport of an origin or destination.
373−dAirport :: Lens' Data [AirportData]
373+dAirport :: Lens' Data' [AirportData]
374374dAirport
375375 = lens _dAirport (\ s a -> s{_dAirport = a}) .
376376 _Default
377377 . _Coerce
378378
379379-- | The city that is either the origin or destination of part of a trip.
380−dCity :: Lens' Data [CityData]
380+dCity :: Lens' Data' [CityData]
381381dCity
382382 = lens _dCity (\ s a -> s{_dCity = a}) . _Default .
383383 _Coerce
384384
385385-- | The taxes due for flying between an origin and a destination.
386−dTax :: Lens' Data [TaxData]
386+dTax :: Lens' Data' [TaxData]
387387dTax
388388 = lens _dTax (\ s a -> s{_dTax = a}) . _Default .
389389 _Coerce
390390
391−instance FromJSON Data where
391+instance FromJSON Data' where
392392 parseJSON
393393 = withObject "Data"
394394 (\ o ->
395− Data <$>
395+ Data' <$>
396396 (o .:? "carrier" .!= mempty) <*>
397397 (o .:? "kind" .!= "qpxexpress#data")
398398 <*> (o .:? "aircraft" .!= mempty)
@@ -400,8 +400,8 @@ instance FromJSON Data where
400400 <*> (o .:? "city" .!= mempty)
401401 <*> (o .:? "tax" .!= mempty))
402402
403−instance ToJSON Data where
404− toJSON Data{..}
403+instance ToJSON Data' where
404+ toJSON Data'{..}
405405 = object
406406 (catMaybes
407407 [("carrier" .=) <$> _dCarrier,