Skip to content

Commit 5683a80

Browse files
sfodsfod
authored
Update codegen files (#570)
Code generated after smithy model updated to v2.
1 parent b3cfc7f commit 5683a80

File tree

2 files changed

+23
-41
lines changed

2 files changed

+23
-41
lines changed

‎awsiot/iotjobs.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ def publish_describe_job_execution(self, request, qos):
3434
request is successfully published. The Future's result will be an
3535
exception if the request cannot be published.
3636
"""
37-
if not request.thing_name:
38-
raise ValueError("request.thing_name is required")
3937
if not request.job_id:
4038
raise ValueError("request.job_id is required")
39+
if not request.thing_name:
40+
raise ValueError("request.thing_name is required")
4141

4242
return self._publish_operation(
4343
topic='$aws/things/{0.thing_name}/jobs/{0.job_id}/get'.format(request),
@@ -111,10 +111,10 @@ def publish_update_job_execution(self, request, qos):
111111
request is successfully published. The Future's result will be an
112112
exception if the request cannot be published.
113113
"""
114-
if not request.thing_name:
115-
raise ValueError("request.thing_name is required")
116114
if not request.job_id:
117115
raise ValueError("request.job_id is required")
116+
if not request.thing_name:
117+
raise ValueError("request.thing_name is required")
118118

119119
return self._publish_operation(
120120
topic='$aws/things/{0.thing_name}/jobs/{0.job_id}/update'.format(request),
@@ -143,10 +143,10 @@ def subscribe_to_describe_job_execution_accepted(self, request, qos, callback):
143143
to `unsubscribe()` to stop receiving messages. Note that messages
144144
may arrive before the subscription is acknowledged.
145145
"""
146-
if not request.thing_name:
147-
raise ValueError("request.thing_name is required")
148146
if not request.job_id:
149147
raise ValueError("request.job_id is required")
148+
if not request.thing_name:
149+
raise ValueError("request.thing_name is required")
150150

151151
if not callable(callback):
152152
raise ValueError("callback is required")
@@ -179,10 +179,10 @@ def subscribe_to_describe_job_execution_rejected(self, request, qos, callback):
179179
to `unsubscribe()` to stop receiving messages. Note that messages
180180
may arrive before the subscription is acknowledged.
181181
"""
182-
if not request.thing_name:
183-
raise ValueError("request.thing_name is required")
184182
if not request.job_id:
185183
raise ValueError("request.job_id is required")
184+
if not request.thing_name:
185+
raise ValueError("request.thing_name is required")
186186

187187
if not callable(callback):
188188
raise ValueError("callback is required")

‎awsiot/iotshadow.py

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ def subscribe_to_delete_named_shadow_accepted(self, request, qos, callback):
195195
to `unsubscribe()` to stop receiving messages. Note that messages
196196
may arrive before the subscription is acknowledged.
197197
"""
198-
if not request.thing_name:
199-
raise ValueError("request.thing_name is required")
200198
if not request.shadow_name:
201199
raise ValueError("request.shadow_name is required")
200+
if not request.thing_name:
201+
raise ValueError("request.thing_name is required")
202202

203203
if not callable(callback):
204204
raise ValueError("callback is required")
@@ -231,10 +231,10 @@ def subscribe_to_delete_named_shadow_rejected(self, request, qos, callback):
231231
to `unsubscribe()` to stop receiving messages. Note that messages
232232
may arrive before the subscription is acknowledged.
233233
"""
234-
if not request.thing_name:
235-
raise ValueError("request.thing_name is required")
236234
if not request.shadow_name:
237235
raise ValueError("request.shadow_name is required")
236+
if not request.thing_name:
237+
raise ValueError("request.thing_name is required")
238238

239239
if not callable(callback):
240240
raise ValueError("callback is required")
@@ -335,10 +335,10 @@ def subscribe_to_get_named_shadow_accepted(self, request, qos, callback):
335335
to `unsubscribe()` to stop receiving messages. Note that messages
336336
may arrive before the subscription is acknowledged.
337337
"""
338-
if not request.thing_name:
339-
raise ValueError("request.thing_name is required")
340338
if not request.shadow_name:
341339
raise ValueError("request.shadow_name is required")
340+
if not request.thing_name:
341+
raise ValueError("request.thing_name is required")
342342

343343
if not callable(callback):
344344
raise ValueError("callback is required")
@@ -371,10 +371,10 @@ def subscribe_to_get_named_shadow_rejected(self, request, qos, callback):
371371
to `unsubscribe()` to stop receiving messages. Note that messages
372372
may arrive before the subscription is acknowledged.
373373
"""
374-
if not request.thing_name:
375-
raise ValueError("request.thing_name is required")
376374
if not request.shadow_name:
377375
raise ValueError("request.shadow_name is required")
376+
if not request.thing_name:
377+
raise ValueError("request.thing_name is required")
378378

379379
if not callable(callback):
380380
raise ValueError("callback is required")
@@ -475,10 +475,10 @@ def subscribe_to_named_shadow_delta_updated_events(self, request, qos, callback)
475475
to `unsubscribe()` to stop receiving messages. Note that messages
476476
may arrive before the subscription is acknowledged.
477477
"""
478-
if not request.thing_name:
479-
raise ValueError("request.thing_name is required")
480478
if not request.shadow_name:
481479
raise ValueError("request.shadow_name is required")
480+
if not request.thing_name:
481+
raise ValueError("request.thing_name is required")
482482

483483
if not callable(callback):
484484
raise ValueError("callback is required")
@@ -615,10 +615,10 @@ def subscribe_to_update_named_shadow_accepted(self, request, qos, callback):
615615
to `unsubscribe()` to stop receiving messages. Note that messages
616616
may arrive before the subscription is acknowledged.
617617
"""
618-
if not request.thing_name:
619-
raise ValueError("request.thing_name is required")
620618
if not request.shadow_name:
621619
raise ValueError("request.shadow_name is required")
620+
if not request.thing_name:
621+
raise ValueError("request.thing_name is required")
622622

623623
if not callable(callback):
624624
raise ValueError("callback is required")
@@ -651,10 +651,10 @@ def subscribe_to_update_named_shadow_rejected(self, request, qos, callback):
651651
to `unsubscribe()` to stop receiving messages. Note that messages
652652
may arrive before the subscription is acknowledged.
653653
"""
654-
if not request.thing_name:
655-
raise ValueError("request.thing_name is required")
656654
if not request.shadow_name:
657655
raise ValueError("request.shadow_name is required")
656+
if not request.thing_name:
657+
raise ValueError("request.thing_name is required")
658658

659659
if not callable(callback):
660660
raise ValueError("callback is required")
@@ -765,10 +765,8 @@ def __init__(self, *args, **kwargs):
765765
def to_payload(self):
766766
# type: () -> typing.Dict[str, typing.Any]
767767
payload = {} # type: typing.Dict[str, typing.Any]
768-
769768
if self.client_token is not None:
770769
payload['clientToken'] = self.client_token
771-
772770
return payload
773771

774772
class DeleteNamedShadowSubscriptionRequest(awsiot.ModeledClass):
@@ -826,10 +824,8 @@ def __init__(self, *args, **kwargs):
826824
def to_payload(self):
827825
# type: () -> typing.Dict[str, typing.Any]
828826
payload = {} # type: typing.Dict[str, typing.Any]
829-
830827
if self.client_token is not None:
831828
payload['clientToken'] = self.client_token
832-
833829
return payload
834830

835831
class DeleteShadowResponse(awsiot.ModeledClass):
@@ -981,10 +977,8 @@ def __init__(self, *args, **kwargs):
981977
def to_payload(self):
982978
# type: () -> typing.Dict[str, typing.Any]
983979
payload = {} # type: typing.Dict[str, typing.Any]
984-
985980
if self.client_token is not None:
986981
payload['clientToken'] = self.client_token
987-
988982
return payload
989983

990984
class GetNamedShadowSubscriptionRequest(awsiot.ModeledClass):
@@ -1042,10 +1036,8 @@ def __init__(self, *args, **kwargs):
10421036
def to_payload(self):
10431037
# type: () -> typing.Dict[str, typing.Any]
10441038
payload = {} # type: typing.Dict[str, typing.Any]
1045-
10461039
if self.client_token is not None:
10471040
payload['clientToken'] = self.client_token
1048-
10491041
return payload
10501042

10511043
class GetShadowResponse(awsiot.ModeledClass):
@@ -1346,19 +1338,16 @@ def from_payload(cls, payload):
13461338
def to_payload(self):
13471339
# type: () -> typing.Dict[str, typing.Any]
13481340
payload = {} # type: typing.Dict[str, typing.Any]
1349-
13501341
if self.desired_is_nullable is True:
13511342
payload['desired'] = self.desired
13521343
else:
13531344
if self.desired is not None:
13541345
payload['desired'] = self.desired
1355-
13561346
if self.reported_is_nullable is True:
13571347
payload['reported'] = self.reported
13581348
else:
13591349
if self.reported is not None:
13601350
payload['reported'] = self.reported
1361-
13621351
return payload
13631352

13641353
class ShadowStateWithDelta(awsiot.ModeledClass):
@@ -1554,16 +1543,12 @@ def __init__(self, *args, **kwargs):
15541543
def to_payload(self):
15551544
# type: () -> typing.Dict[str, typing.Any]
15561545
payload = {} # type: typing.Dict[str, typing.Any]
1557-
15581546
if self.client_token is not None:
15591547
payload['clientToken'] = self.client_token
1560-
15611548
if self.state is not None:
15621549
payload['state'] = self.state.to_payload()
1563-
15641550
if self.version is not None:
15651551
payload['version'] = self.version
1566-
15671552
return payload
15681553

15691554
class UpdateNamedShadowSubscriptionRequest(awsiot.ModeledClass):
@@ -1627,16 +1612,12 @@ def __init__(self, *args, **kwargs):
16271612
def to_payload(self):
16281613
# type: () -> typing.Dict[str, typing.Any]
16291614
payload = {} # type: typing.Dict[str, typing.Any]
1630-
16311615
if self.client_token is not None:
16321616
payload['clientToken'] = self.client_token
1633-
16341617
if self.state is not None:
16351618
payload['state'] = self.state.to_payload()
1636-
16371619
if self.version is not None:
16381620
payload['version'] = self.version
1639-
16401621
return payload
16411622

16421623
class UpdateShadowResponse(awsiot.ModeledClass):
@@ -1717,3 +1698,4 @@ def __init__(self, *args, **kwargs):
17171698
# for backwards compatibility, read any arguments that used to be accepted by position
17181699
for key, val in zip(['thing_name'], args):
17191700
setattr(self, key, val)
1701+

0 commit comments

Comments
 (0)