Remove redundant JSON decode calls in model classes

fog · Apr 4, 2019 · 3acf215 · 3acf215
1 parent c5fff68
commit 3acf215
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 20 deletions.
diff --git a/lib/fog/aliyun/models/compute/eip_address.rb b/lib/fog/aliyun/models/compute/eip_address.rb
@@ -33,7 +33,7 @@ def save(options = {})
           options[:bandwidth] = bandwidth if bandwidth
           options[:internet_charge_type] = charge_type if charge_type
 
-          data = Fog::JSON.decode(service.allocate_eip_address(options).body)
+          data = service.allocate_eip_address(options).body
           merge_attributes(data)
           true
         end

diff --git a/lib/fog/aliyun/models/compute/eip_addresses.rb b/lib/fog/aliyun/models/compute/eip_addresses.rb
@@ -10,7 +10,7 @@ class EipAddresses < Fog::Collection
         model Fog::Compute::Aliyun::EipAddress
 
         def all(filters_arg = {})
-          data = Fog::JSON.decode(service.list_eip_addresses(filters_arg).body)['EipAddresses']['EipAddress']
+          data = service.list_eip_addresses(filters_arg).body['EipAddresses']['EipAddress']
           load(data)
           # load(data['volumeSet'])
           # if server

diff --git a/lib/fog/aliyun/models/compute/image.rb b/lib/fog/aliyun/models/compute/image.rb
@@ -39,7 +39,7 @@ def save(options = {})
           requires :snapshot_id
           options[:name] = name if name
           options[:description] = description if description
-          data = Fog::JSON.decode(service.create_image(snapshot_id, options).body)
+          data = service.create_image(snapshot_id, options).body
           merge_attributes(data)
           true
         end

diff --git a/lib/fog/aliyun/models/compute/images.rb b/lib/fog/aliyun/models/compute/images.rb
@@ -14,7 +14,7 @@ def all(filters_arg = {})
             Fog::Logger.deprecation("all with #{filters_arg.class} param is deprecated, use all('diskIds' => []) instead [light_black](#{caller.first})[/]")
             filters_arg = { imageId: filters_arg }
           end
-          data = Fog::JSON.decode(service.list_images(filters_arg).body)['Images']['Image']
+          data = service.list_images(filters_arg).body['Images']['Image']
           load(data)
         end
 

diff --git a/lib/fog/aliyun/models/compute/route_entrys.rb b/lib/fog/aliyun/models/compute/route_entrys.rb
@@ -14,7 +14,7 @@ class RouteEntrys < Fog::Collection
         def all(options = {})
           requires :route_table
           options[:routeTableId] = route_table.id
-          data = Fog::JSON.decode(service.list_route_tables(route_table.v_router_id, options).body)['RouteTables']['RouteTable'][0]['RouteEntrys']['RouteEntry']
+          data = service.list_route_tables(route_table.v_router_id, options).body['RouteTables']['RouteTable'][0]['RouteEntrys']['RouteEntry']
           load(data)
         end
 

diff --git a/lib/fog/aliyun/models/compute/route_tables.rb b/lib/fog/aliyun/models/compute/route_tables.rb
@@ -13,7 +13,7 @@ class RouteTables < Fog::Collection
 
         def all(options = {})
           requires :v_router
-          data = Fog::JSON.decode(service.list_route_tables(v_router.id, options).body)['RouteTables']['RouteTable']
+          data = service.list_route_tables(v_router.id, options).body['RouteTables']['RouteTable']
           load(data)
         end
 

diff --git a/lib/fog/aliyun/models/compute/security_group.rb b/lib/fog/aliyun/models/compute/security_group.rb
@@ -26,7 +26,7 @@ def save(options = {})
           options[:vpcId] = vpc_id if vpc_id
           options[:name] = name if name
           options[:description] = description if description
-          Fog::JSON.decode(service.create_security_group(options).body)
+          service.create_security_group(options).body
           true
         end
 

diff --git a/lib/fog/aliyun/models/compute/security_group_rules.rb b/lib/fog/aliyun/models/compute/security_group_rules.rb
@@ -11,7 +11,7 @@ class SecurityGroupRules < Fog::Collection
         attribute :security_group_id
 
         def get(security_group_id, options = {})
-          data = Fog::JSON.decode(service.list_security_group_rules(security_group_id, options).body)
+          data = service.list_security_group_rules(security_group_id, options).body
           self.security_group_id = data['SecurityGroupId']
           permissions = data['Permissions']['Permission']
           permissions.each do |permission|

diff --git a/lib/fog/aliyun/models/compute/security_groups.rb b/lib/fog/aliyun/models/compute/security_groups.rb
@@ -10,7 +10,7 @@ class SecurityGroups < Fog::Collection
         model Fog::Compute::Aliyun::SecurityGroup
 
         def all(options = {})
-          data = Fog::JSON.decode(service.list_security_groups(options).body)['SecurityGroups']['SecurityGroup']
+          data = service.list_security_groups(options).body['SecurityGroups']['SecurityGroup']
           load(data)
           # ['Images']['Image']
         end

diff --git a/lib/fog/aliyun/models/compute/snapshot.rb b/lib/fog/aliyun/models/compute/snapshot.rb
@@ -33,7 +33,7 @@ def save(options = {})
           requires :volume_id
           options[:name] = name if name
           options[:description] = description if description
-          data = Fog::JSON.decode(service.create_snapshot(volume_id, options).body)
+          data = service.create_snapshot(volume_id, options).body
           merge_attributes(data)
           true
         end

diff --git a/lib/fog/aliyun/models/compute/snapshots.rb b/lib/fog/aliyun/models/compute/snapshots.rb
@@ -24,7 +24,7 @@ def all(filters_arg = {})
           volume_type = filters_arg[:volume_type]
           filters_arg[:diskId] = volume_id if volume_id
           filters_arg[:sourseDiskType] = volume_type if volume_type
-          data = Fog::JSON.decode(service.list_snapshots(filters_arg).body)['Snapshots']['Snapshot']
+          data = service.list_snapshots(filters_arg).body['Snapshots']['Snapshot']
           load(data)
         end
 

diff --git a/lib/fog/aliyun/models/compute/volume.rb b/lib/fog/aliyun/models/compute/volume.rb
@@ -63,10 +63,10 @@ def save(options = {})
           options[:name] = name if name
           options[:description] = description if description
           if snapshot_id
-            data = Fog::JSON.decode(service.create_disk_by_snapshot(snapshot_id, options).body)
+            data = service.create_disk_by_snapshot(snapshot_id, options).body
             merge_attributes(data)
           elsif size
-            data = Fog::JSON.decode(service.create_disk(size, options).body)
+            data = service.create_disk(size, options).body
             merge_attributes(data)
           end
 

diff --git a/lib/fog/aliyun/models/compute/volumes.rb b/lib/fog/aliyun/models/compute/volumes.rb
@@ -78,7 +78,7 @@ def all(filters_arg = {})
             Fog::Logger.deprecation("all with #{filters_arg.class} param is deprecated, use all('diskIds' => []) instead [light_black](#{caller.first})[/]")
             filters_arg = { 'diskIds' => [*filters_arg] }
           end
-          data = Fog::JSON.decode(service.list_disks(filters_arg).body)['Disks']['Disk']
+          data = service.list_disks(filters_arg).body['Disks']['Disk']
           load(data)
           # load(data['volumeSet'])
           # if server

diff --git a/lib/fog/aliyun/models/compute/vpc.rb b/lib/fog/aliyun/models/compute/vpc.rb
@@ -70,7 +70,7 @@ def save(options = {})
           requires :cidr_block
           options[:name] = name if name
           options[:description] = description if description
-          Fog::JSON.decode(service.create_vpc(cidr_block, options).body)
+          service.create_vpc(cidr_block, options).body
           true
         end
       end

diff --git a/lib/fog/aliyun/models/compute/vpcs.rb b/lib/fog/aliyun/models/compute/vpcs.rb
@@ -52,7 +52,7 @@ def all(filters_arg = {})
             Fog::Logger.warning("all with #{filters_arg.class} param is deprecated, use all('vpcId' => []) instead [light_black](#{caller.first})[/]")
             filters_arg = { 'vpcId' => [*filters_arg] }
           end
-          data = Fog::JSON.decode(service.list_vpcs(filters_arg).body)['Vpcs']['Vpc']
+          data = service.list_vpcs(filters_arg).body['Vpcs']['Vpc']
           load(data)
         end
 

diff --git a/lib/fog/aliyun/models/compute/vrouters.rb b/lib/fog/aliyun/models/compute/vrouters.rb
@@ -33,7 +33,7 @@ def all(filters_arg = {})
             Fog::Logger.warning("all with #{filters_arg.class} param is deprecated, use all('vRouterId' => "") instead [light_black](#{caller.first})[/]")
             filters_arg = { 'vRouterId' => filters_arg }
           end
-          data = Fog::JSON.decode(service.list_vrouters(filters_arg).body)['VRouters']['VRouter']
+          data = service.list_vrouters(filters_arg).body['VRouters']['VRouter']
           load(data)
         end
 

diff --git a/lib/fog/aliyun/models/compute/vswitch.rb b/lib/fog/aliyun/models/compute/vswitch.rb
@@ -55,7 +55,7 @@ def save(options = {})
           requires :vpc, :cidr_block
           options[:name] = name if name
           options[:description] = description if description
-          Fog::JSON.decode(service.create_vswitch(vpc.id, cidr_block, options).body)
+          service.create_vswitch(vpc.id, cidr_block, options).body
           true
         end
 
@@ -64,7 +64,7 @@ def vpc
         end
 
         def all
-          Fog::JSON.decode(service.list_vswitchs(vpc_id).body)['VSwitches']['VSwitch']
+          service.list_vswitchs(vpc_id).body['VSwitches']['VSwitch']
         end
       end
     end

diff --git a/lib/fog/aliyun/models/compute/vswitches.rb b/lib/fog/aliyun/models/compute/vswitches.rb
@@ -51,7 +51,7 @@ class Vswitches < Fog::Collection
 
         def all(options = {})
           requires :vpc
-          data = Fog::JSON.decode(service.list_vswitchs(vpc.id, options).body)['VSwitches']['VSwitch']
+          data = service.list_vswitchs(vpc.id, options).body['VSwitches']['VSwitch']
           load(data)
         end