Skip to content

Commit 3acf215

Browse files
committed
Remove redundant JSON decode calls in model classes
1 parent c5fff68 commit 3acf215

18 files changed

+20
-20
lines changed

lib/fog/aliyun/models/compute/eip_address.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def save(options = {})
3333
options[:bandwidth] = bandwidth if bandwidth
3434
options[:internet_charge_type] = charge_type if charge_type
3535

36-
data = Fog::JSON.decode(service.allocate_eip_address(options).body)
36+
data = service.allocate_eip_address(options).body
3737
merge_attributes(data)
3838
true
3939
end

lib/fog/aliyun/models/compute/eip_addresses.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class EipAddresses < Fog::Collection
1010
model Fog::Compute::Aliyun::EipAddress
1111

1212
def all(filters_arg = {})
13-
data = Fog::JSON.decode(service.list_eip_addresses(filters_arg).body)['EipAddresses']['EipAddress']
13+
data = service.list_eip_addresses(filters_arg).body['EipAddresses']['EipAddress']
1414
load(data)
1515
# load(data['volumeSet'])
1616
# if server

lib/fog/aliyun/models/compute/image.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def save(options = {})
3939
requires :snapshot_id
4040
options[:name] = name if name
4141
options[:description] = description if description
42-
data = Fog::JSON.decode(service.create_image(snapshot_id, options).body)
42+
data = service.create_image(snapshot_id, options).body
4343
merge_attributes(data)
4444
true
4545
end

lib/fog/aliyun/models/compute/images.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def all(filters_arg = {})
1414
Fog::Logger.deprecation("all with #{filters_arg.class} param is deprecated, use all('diskIds' => []) instead [light_black](#{caller.first})[/]")
1515
filters_arg = { imageId: filters_arg }
1616
end
17-
data = Fog::JSON.decode(service.list_images(filters_arg).body)['Images']['Image']
17+
data = service.list_images(filters_arg).body['Images']['Image']
1818
load(data)
1919
end
2020

lib/fog/aliyun/models/compute/route_entrys.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class RouteEntrys < Fog::Collection
1414
def all(options = {})
1515
requires :route_table
1616
options[:routeTableId] = route_table.id
17-
data = Fog::JSON.decode(service.list_route_tables(route_table.v_router_id, options).body)['RouteTables']['RouteTable'][0]['RouteEntrys']['RouteEntry']
17+
data = service.list_route_tables(route_table.v_router_id, options).body['RouteTables']['RouteTable'][0]['RouteEntrys']['RouteEntry']
1818
load(data)
1919
end
2020

lib/fog/aliyun/models/compute/route_tables.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class RouteTables < Fog::Collection
1313

1414
def all(options = {})
1515
requires :v_router
16-
data = Fog::JSON.decode(service.list_route_tables(v_router.id, options).body)['RouteTables']['RouteTable']
16+
data = service.list_route_tables(v_router.id, options).body['RouteTables']['RouteTable']
1717
load(data)
1818
end
1919

lib/fog/aliyun/models/compute/security_group.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def save(options = {})
2626
options[:vpcId] = vpc_id if vpc_id
2727
options[:name] = name if name
2828
options[:description] = description if description
29-
Fog::JSON.decode(service.create_security_group(options).body)
29+
service.create_security_group(options).body
3030
true
3131
end
3232

lib/fog/aliyun/models/compute/security_group_rules.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class SecurityGroupRules < Fog::Collection
1111
attribute :security_group_id
1212

1313
def get(security_group_id, options = {})
14-
data = Fog::JSON.decode(service.list_security_group_rules(security_group_id, options).body)
14+
data = service.list_security_group_rules(security_group_id, options).body
1515
self.security_group_id = data['SecurityGroupId']
1616
permissions = data['Permissions']['Permission']
1717
permissions.each do |permission|

lib/fog/aliyun/models/compute/security_groups.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class SecurityGroups < Fog::Collection
1010
model Fog::Compute::Aliyun::SecurityGroup
1111

1212
def all(options = {})
13-
data = Fog::JSON.decode(service.list_security_groups(options).body)['SecurityGroups']['SecurityGroup']
13+
data = service.list_security_groups(options).body['SecurityGroups']['SecurityGroup']
1414
load(data)
1515
# ['Images']['Image']
1616
end

lib/fog/aliyun/models/compute/snapshot.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def save(options = {})
3333
requires :volume_id
3434
options[:name] = name if name
3535
options[:description] = description if description
36-
data = Fog::JSON.decode(service.create_snapshot(volume_id, options).body)
36+
data = service.create_snapshot(volume_id, options).body
3737
merge_attributes(data)
3838
true
3939
end

0 commit comments

Comments
 (0)