git.iko.soy/gogol
on develop help sign in
Adding various override fixes
cbb92c6Brendan Hay
core/src/Network/Google/Types.hs+4−5
compare with develop
unifiedsplit
@@ -72,9 +72,8 @@ newtype OAuthToken = OAuthToken Text
72 deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, ToText, FromText)
72 deriving (Eq, Ord, Show, Read, Generic, Data, Typeable, ToText, FromText)
73
73
74class GoogleAuth a where
74class GoogleAuth a where
75− authKey :: Traversal' a AuthKey
75+ _AuthKey :: Traversal' a AuthKey
76− authToken :: Traversal' a OAuthToken
76+ _AuthToken :: Traversal' a OAuthToken
77− -- ^ only set if unset semantics?
78
77
79newtype MediaDownload a = MediaDownload a
78newtype MediaDownload a = MediaDownload a
80
79
@@ -82,8 +81,8 @@ _MediaDownload :: Iso' (MediaDownload a) a
82_MediaDownload = iso (\(MediaDownload x) -> x) MediaDownload
81_MediaDownload = iso (\(MediaDownload x) -> x) MediaDownload
83
82
84instance GoogleAuth a => GoogleAuth (MediaDownload a) where
83instance GoogleAuth a => GoogleAuth (MediaDownload a) where
85− authKey = _MediaDownload . authKey
84+ _AuthKey = _MediaDownload . _AuthKey
86− authToken = _MediaDownload . authToken
85+ _AuthToken = _MediaDownload . _AuthToken
87
86
88_Coerce :: (Coercible a b, Coercible b a) => Iso' a b
87_Coerce :: (Coercible a b, Coercible b a) => Iso' a b
89_Coerce = iso coerce coerce
88_Coerce = iso coerce coerce
gen/annex/groupssettings.json+7−2
@@ -1,5 +1,10 @@
1{
1{
2 "library": "groups-settings",
2 "library": "groups-settings",
3− "canonicalName": "GroupsSettings"
3+ "canonicalName": "GroupsSettings",
4−}
4+ "parameters": {
5+ "alt": {
6+ "default": "json"
5
7
8+ }
9+ }
10+}
gen/src/Gen/Text.hs+1
@@ -131,6 +131,7 @@ renameReserved x
131 , "Patch"
131 , "Patch"
132 , "Put"
132 , "Put"
133 , "log"
133 , "log"
134+ , "Data"
134 ] ++ map Text.pack (reservedNames haskellDef)
135 ] ++ map Text.pack (reservedNames haskellDef)
135
136
136camelAcronym :: Text -> Text
137camelAcronym :: Text -> Text
gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Get.hs+2−2
@@ -55,7 +55,7 @@ type GroupsGetResource =
55 QueryParam "fields" Text :>
55 QueryParam "fields" Text :>
56 QueryParam "key" AuthKey :>
56 QueryParam "key" AuthKey :>
57 QueryParam "oauth_token" OAuthToken :>
57 QueryParam "oauth_token" OAuthToken :>
58− QueryParam "alt" AltATOM :> Get '[JSON] Groups
58+ QueryParam "alt" AltJSON :> Get '[JSON] Groups
59
59
60-- | Gets one resource by id.
60-- | Gets one resource by id.
61--
61--
@@ -154,6 +154,6 @@ instance GoogleRequest GroupsGet' where
154 _ggFields
154 _ggFields
155 _ggKey
155 _ggKey
156 _ggOAuthToken
156 _ggOAuthToken
157− (Just AltATOM)
157+ (Just AltJSON)
158 where go
158 where go
159 = clientBuild (Proxy :: Proxy GroupsGetResource) rq
159 = clientBuild (Proxy :: Proxy GroupsGetResource) rq
gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Patch.hs+2−2
@@ -56,7 +56,7 @@ type GroupsPatchResource =
56 QueryParam "fields" Text :>
56 QueryParam "fields" Text :>
57 QueryParam "key" AuthKey :>
57 QueryParam "key" AuthKey :>
58 QueryParam "oauth_token" OAuthToken :>
58 QueryParam "oauth_token" OAuthToken :>
59− QueryParam "alt" AltATOM :>
59+ QueryParam "alt" AltJSON :>
60 ReqBody '[JSON] Groups :> Patch '[JSON] Groups
60 ReqBody '[JSON] Groups :> Patch '[JSON] Groups
61
61
62-- | Updates an existing resource. This method supports patch semantics.
62-- | Updates an existing resource. This method supports patch semantics.
@@ -166,7 +166,7 @@ instance GoogleRequest GroupsPatch' where
166 _gpFields
166 _gpFields
167 _gpKey
167 _gpKey
168 _gpOAuthToken
168 _gpOAuthToken
169− (Just AltATOM)
169+ (Just AltJSON)
170 _gpPayload
170 _gpPayload
171 where go
171 where go
172 = clientBuild (Proxy :: Proxy GroupsPatchResource) rq
172 = clientBuild (Proxy :: Proxy GroupsPatchResource) rq
gogol-groups-settings/gen/Network/Google/Resource/GroupsSettings/Groups/Update.hs+2−2
@@ -56,7 +56,7 @@ type GroupsUpdateResource =
56 QueryParam "fields" Text :>
56 QueryParam "fields" Text :>
57 QueryParam "key" AuthKey :>
57 QueryParam "key" AuthKey :>
58 QueryParam "oauth_token" OAuthToken :>
58 QueryParam "oauth_token" OAuthToken :>
59− QueryParam "alt" AltATOM :>
59+ QueryParam "alt" AltJSON :>
60 ReqBody '[JSON] Groups :> Put '[JSON] Groups
60 ReqBody '[JSON] Groups :> Put '[JSON] Groups
61
61
62-- | Updates an existing resource.
62-- | Updates an existing resource.
@@ -166,7 +166,7 @@ instance GoogleRequest GroupsUpdate' where
166 _guFields
166 _guFields
167 _guKey
167 _guKey
168 _guOAuthToken
168 _guOAuthToken
169− (Just AltATOM)
169+ (Just AltJSON)
170 _guPayload
170 _guPayload
171 where go
171 where go
172 = clientBuild (Proxy :: Proxy GroupsUpdateResource)
172 = clientBuild (Proxy :: Proxy GroupsUpdateResource)
gogol-qpxexpress/gen/Network/Google/QPXExpress.hs+2−2
@@ -65,8 +65,8 @@ module Network.Google.QPXExpress
65 , todrLatestTime
65 , todrLatestTime
66 , todrEarliestTime
66 , todrEarliestTime
67
67
68− -- ** Data
68+ -- ** Data'
69− , Data
69+ , Data'
70 , data'
70 , data'
71 , dCarrier
71 , dCarrier
72 , dKind
72 , dKind
gogol-qpxexpress/gen/Network/Google/QPXExpress/Types.hs+2−2
@@ -50,8 +50,8 @@ module Network.Google.QPXExpress.Types
50 , todrLatestTime
50 , todrLatestTime
51 , todrEarliestTime
51 , todrEarliestTime
52
52
53− -- * Data
53+ -- * Data'
54− , Data
54+ , Data'
55 , data'
55 , data'
56 , dCarrier
56 , dCarrier
57 , dKind
57 , dKind
gogol-qpxexpress/gen/Network/Google/QPXExpress/Types/Product.hs+15−15
@@ -26,7 +26,7 @@ import Network.Google.QPXExpress.Types.Sum
26data TripOptionsResponse = TripOptionsResponse
26data TripOptionsResponse = TripOptionsResponse
27 { _torRequestId :: !(Maybe Text)
27 { _torRequestId :: !(Maybe Text)
28 , _torKind :: !Text
28 , _torKind :: !Text
29− , _torData :: !(Maybe Data)
29+ , _torData :: !(Maybe Data')
30 , _torTripOption :: !(Maybe [TripOption])
30 , _torTripOption :: !(Maybe [TripOption])
31 } deriving (Eq,Show,Data,Typeable,Generic)
31 } deriving (Eq,Show,Data,Typeable,Generic)
32
32
@@ -62,7 +62,7 @@ torKind :: Lens' TripOptionsResponse Text
62torKind = lens _torKind (\ s a -> s{_torKind = a})
62torKind = lens _torKind (\ s a -> s{_torKind = a})
63
63
64-- | Informational data global to list of solutions.
64-- | Informational data global to list of solutions.
65−torData :: Lens' TripOptionsResponse (Maybe Data)
65+torData :: Lens' TripOptionsResponse (Maybe Data')
66torData = lens _torData (\ s a -> s{_torData = a})
66torData = lens _torData (\ s a -> s{_torData = a})
67
67
68-- | A list of priced itinerary solutions to the QPX Express query.
68-- | A list of priced itinerary solutions to the QPX Express query.
@@ -312,7 +312,7 @@ instance ToJSON TimeOfDayRange where
312-- aircraft.
312-- aircraft.
313--
313--
314-- /See:/ 'data'' smart constructor.
314-- /See:/ 'data'' smart constructor.
315−data Data = Data
315+data Data' = Data'
316 { _dCarrier :: !(Maybe [CarrierData])
316 { _dCarrier :: !(Maybe [CarrierData])
317 , _dKind :: !Text
317 , _dKind :: !Text
318 , _dAircraft :: !(Maybe [AircraftData])
318 , _dAircraft :: !(Maybe [AircraftData])
@@ -337,9 +337,9 @@ data Data = Data
337--
337--
338-- * 'dTax'
338-- * 'dTax'
339data'
339data'
340− :: Data
340+ :: Data'
341data' =
341data' =
342− Data
342+ Data'
343 { _dCarrier = Nothing
343 { _dCarrier = Nothing
344 , _dKind = "qpxexpress#data"
344 , _dKind = "qpxexpress#data"
345 , _dAircraft = Nothing
345 , _dAircraft = Nothing
@@ -350,7 +350,7 @@ data' =
350
350
351-- | The airline carrier of the aircraft flying between an origin and
351-- | The airline carrier of the aircraft flying between an origin and
352-- destination. Allowed values are IATA carrier codes.
352-- destination. Allowed values are IATA carrier codes.
353−dCarrier :: Lens' Data [CarrierData]
353+dCarrier :: Lens' Data' [CarrierData]
354dCarrier
354dCarrier
355 = lens _dCarrier (\ s a -> s{_dCarrier = a}) .
355 = lens _dCarrier (\ s a -> s{_dCarrier = a}) .
356 _Default
356 _Default
@@ -359,40 +359,40 @@ dCarrier
359-- | Identifies this as QPX Express response resource, including a trip\'s
359-- | Identifies this as QPX Express response resource, including a trip\'s
360-- airport, city, taxes, airline, and aircraft. Value: the fixed string
360-- airport, city, taxes, airline, and aircraft. Value: the fixed string
361-- qpxexpress#data.
361-- qpxexpress#data.
362−dKind :: Lens' Data Text
362+dKind :: Lens' Data' Text
363dKind = lens _dKind (\ s a -> s{_dKind = a})
363dKind = lens _dKind (\ s a -> s{_dKind = a})
364
364
365-- | The aircraft that is flying between an origin and destination.
365-- | The aircraft that is flying between an origin and destination.
366−dAircraft :: Lens' Data [AircraftData]
366+dAircraft :: Lens' Data' [AircraftData]
367dAircraft
367dAircraft
368 = lens _dAircraft (\ s a -> s{_dAircraft = a}) .
368 = lens _dAircraft (\ s a -> s{_dAircraft = a}) .
369 _Default
369 _Default
370 . _Coerce
370 . _Coerce
371
371
372-- | The airport of an origin or destination.
372-- | The airport of an origin or destination.
373−dAirport :: Lens' Data [AirportData]
373+dAirport :: Lens' Data' [AirportData]
374dAirport
374dAirport
375 = lens _dAirport (\ s a -> s{_dAirport = a}) .
375 = lens _dAirport (\ s a -> s{_dAirport = a}) .
376 _Default
376 _Default
377 . _Coerce
377 . _Coerce
378
378
379-- | The city that is either the origin or destination of part of a trip.
379-- | The city that is either the origin or destination of part of a trip.
380−dCity :: Lens' Data [CityData]
380+dCity :: Lens' Data' [CityData]
381dCity
381dCity
382 = lens _dCity (\ s a -> s{_dCity = a}) . _Default .
382 = lens _dCity (\ s a -> s{_dCity = a}) . _Default .
383 _Coerce
383 _Coerce
384
384
385-- | The taxes due for flying between an origin and a destination.
385-- | The taxes due for flying between an origin and a destination.
386−dTax :: Lens' Data [TaxData]
386+dTax :: Lens' Data' [TaxData]
387dTax
387dTax
388 = lens _dTax (\ s a -> s{_dTax = a}) . _Default .
388 = lens _dTax (\ s a -> s{_dTax = a}) . _Default .
389 _Coerce
389 _Coerce
390
390
391−instance FromJSON Data where
391+instance FromJSON Data' where
392 parseJSON
392 parseJSON
393 = withObject "Data"
393 = withObject "Data"
394 (\ o ->
394 (\ o ->
395− Data <$>
395+ Data' <$>
396 (o .:? "carrier" .!= mempty) <*>
396 (o .:? "carrier" .!= mempty) <*>
397 (o .:? "kind" .!= "qpxexpress#data")
397 (o .:? "kind" .!= "qpxexpress#data")
398 <*> (o .:? "aircraft" .!= mempty)
398 <*> (o .:? "aircraft" .!= mempty)
@@ -400,8 +400,8 @@ instance FromJSON Data where
400 <*> (o .:? "city" .!= mempty)
400 <*> (o .:? "city" .!= mempty)
401 <*> (o .:? "tax" .!= mempty))
401 <*> (o .:? "tax" .!= mempty))
402
402
403−instance ToJSON Data where
403+instance ToJSON Data' where
404− toJSON Data{..}
404+ toJSON Data'{..}
405 = object
405 = object
406 (catMaybes
406 (catMaybes
407 [("carrier" .=) <$> _dCarrier,
407 [("carrier" .=) <$> _dCarrier,