-
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #144 from AtlassianPS/release/v2.0
Release v2.0 major version
- Loading branch information
Showing
122 changed files
with
924 additions
and
904 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
264 changes: 132 additions & 132 deletions
264
PSJira/Internal/ConvertFrom-Json2.ps1 → JiraPS/Internal/ConvertFrom-Json2.ps1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,132 +1,132 @@ | ||
| function ConvertFrom-Json2 | ||
| { | ||
| [CmdletBinding()] | ||
| param | ||
| ( | ||
| [Parameter(Mandatory = $true, | ||
| ValueFromPipeline = $true, | ||
| Position = 0)] | ||
| [Object[]] $InputObject, | ||
|
|
||
| [Parameter()] | ||
| [int] $MaxJsonLength = [int]::MaxValue | ||
| ) | ||
|
|
||
| begin { | ||
| function PopulateJsonFrom-Dictionary | ||
| { | ||
| param | ||
| ( | ||
| [System.Collections.Generic.IDictionary`2[String,Object]]$InputObject | ||
| ) | ||
|
|
||
| process | ||
| { | ||
| $returnObject = New-Object PSObject | ||
|
|
||
| foreach($key in $InputObject.Keys) | ||
| { | ||
| $pairObjectValue = $InputObject[$key] | ||
|
|
||
| if ($pairObjectValue -is [System.Collections.Generic.IDictionary`2].MakeGenericType([String],[Object])) | ||
| { | ||
| $pairObjectValue = PopulateJsonFrom-Dictionary $pairObjectValue | ||
| } | ||
| elseif ($pairObjectValue -is [System.Collections.Generic.ICollection`1].MakeGenericType([Object])) | ||
| { | ||
| $pairObjectValue = PopulateJsonFrom-Collection $pairObjectValue | ||
| } | ||
|
|
||
| $returnObject | Add-Member Noteproperty $key $pairObjectValue | ||
| } | ||
|
|
||
| return $returnObject | ||
| } | ||
| } | ||
|
|
||
| function PopulateJsonFrom-Collection | ||
| { | ||
| param | ||
| ( | ||
| [System.Collections.Generic.ICollection`1[Object]]$InputObject | ||
| ) | ||
|
|
||
| process | ||
| { | ||
| $returnList = New-Object ([System.Collections.Generic.List`1].MakeGenericType([Object])) | ||
| foreach($jsonObject in $InputObject) | ||
| { | ||
| $jsonObjectValue = $jsonObject | ||
|
|
||
| if ($jsonObjectValue -is [System.Collections.Generic.IDictionary`2].MakeGenericType([String],[Object])) | ||
| { | ||
| $jsonObjectValue = PopulateJsonFrom-Dictionary $jsonObjectValue | ||
| } | ||
| elseif ($jsonObjectValue -is [System.Collections.Generic.ICollection`1].MakeGenericType([Object])) | ||
| { | ||
| $jsonObjectValue = PopulateJsonFrom-Collection $jsonObjectValue | ||
| } | ||
|
|
||
| $returnList.Add($jsonObjectValue) | Out-Null | ||
| } | ||
|
|
||
| return $returnList.ToArray() | ||
| } | ||
| } | ||
|
|
||
| $scriptAssembly = [System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions") | ||
|
|
||
| $typeResolver = @" | ||
| public class JsonObjectTypeResolver : System.Web.Script.Serialization.JavaScriptTypeResolver | ||
| { | ||
| public override System.Type ResolveType(string id) | ||
| { | ||
| return typeof (System.Collections.Generic.Dictionary<string, object>); | ||
| } | ||
| public override string ResolveTypeId(System.Type type) | ||
| { | ||
| return string.Empty; | ||
| } | ||
| } | ||
| "@ | ||
|
|
||
| try { | ||
| Add-Type -TypeDefinition $typeResolver -ReferencedAssemblies $scriptAssembly.FullName | ||
| } | ||
| catch { | ||
| # This is a relatively common error that's harmless unless changing the actual C# | ||
| # code, so it can be ignored. Unfortunately, it's just a plain old System.Exception, | ||
| # so we can't try to catch a specific error type. | ||
| if (-not $_.ToString() -like "*The type name 'JsonObjectTypeResolver' already exists*") | ||
| { | ||
| throw $_ | ||
| } | ||
| } | ||
|
|
||
| $jsonserial = New-Object System.Web.Script.Serialization.JavaScriptSerializer(New-Object JsonObjectTypeResolver) | ||
| $jsonserial.MaxJsonLength = $MaxJsonLength | ||
| } | ||
|
|
||
| process | ||
| { | ||
| foreach ($i in $InputObject) | ||
| { | ||
| $s = $i.ToString() | ||
| if ($s) { | ||
| $jsonTree = $jsonserial.DeserializeObject($s) | ||
|
|
||
| if ($jsonTree -is [System.Collections.Generic.IDictionary`2].MakeGenericType([String],[Object])) | ||
| { | ||
| $jsonTree = PopulateJsonFrom-Dictionary $jsonTree | ||
| } | ||
| elseif ($jsonTree -is [System.Collections.Generic.ICollection`1].MakeGenericType([Object])) | ||
| { | ||
| $jsonTree = PopulateJsonFrom-Collection $jsonTree | ||
| } | ||
|
|
||
| Write-Output $jsonTree | ||
| } | ||
| } | ||
| } | ||
| } | ||
| function ConvertFrom-Json2 | ||
| { | ||
| [CmdletBinding()] | ||
| param | ||
| ( | ||
| [Parameter(Mandatory = $true, | ||
| ValueFromPipeline = $true, | ||
| Position = 0)] | ||
| [Object[]] $InputObject, | ||
|
|
||
| [Parameter()] | ||
| [int] $MaxJsonLength = [int]::MaxValue | ||
| ) | ||
|
|
||
| begin { | ||
| function PopulateJsonFrom-Dictionary | ||
| { | ||
| param | ||
| ( | ||
| [System.Collections.Generic.IDictionary`2[String,Object]]$InputObject | ||
| ) | ||
|
|
||
| process | ||
| { | ||
| $returnObject = New-Object PSObject | ||
|
|
||
| foreach($key in $InputObject.Keys) | ||
| { | ||
| $pairObjectValue = $InputObject[$key] | ||
|
|
||
| if ($pairObjectValue -is [System.Collections.Generic.IDictionary`2].MakeGenericType([String],[Object])) | ||
| { | ||
| $pairObjectValue = PopulateJsonFrom-Dictionary $pairObjectValue | ||
| } | ||
| elseif ($pairObjectValue -is [System.Collections.Generic.ICollection`1].MakeGenericType([Object])) | ||
| { | ||
| $pairObjectValue = PopulateJsonFrom-Collection $pairObjectValue | ||
| } | ||
|
|
||
| $returnObject | Add-Member Noteproperty $key $pairObjectValue | ||
| } | ||
|
|
||
| return $returnObject | ||
| } | ||
| } | ||
|
|
||
| function PopulateJsonFrom-Collection | ||
| { | ||
| param | ||
| ( | ||
| [System.Collections.Generic.ICollection`1[Object]]$InputObject | ||
| ) | ||
|
|
||
| process | ||
| { | ||
| $returnList = New-Object ([System.Collections.Generic.List`1].MakeGenericType([Object])) | ||
| foreach($jsonObject in $InputObject) | ||
| { | ||
| $jsonObjectValue = $jsonObject | ||
|
|
||
| if ($jsonObjectValue -is [System.Collections.Generic.IDictionary`2].MakeGenericType([String],[Object])) | ||
| { | ||
| $jsonObjectValue = PopulateJsonFrom-Dictionary $jsonObjectValue | ||
| } | ||
| elseif ($jsonObjectValue -is [System.Collections.Generic.ICollection`1].MakeGenericType([Object])) | ||
| { | ||
| $jsonObjectValue = PopulateJsonFrom-Collection $jsonObjectValue | ||
| } | ||
|
|
||
| $returnList.Add($jsonObjectValue) | Out-Null | ||
| } | ||
|
|
||
| return $returnList.ToArray() | ||
| } | ||
| } | ||
|
|
||
| $scriptAssembly = [System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions") | ||
|
|
||
| $typeResolver = @" | ||
| public class JsonObjectTypeResolver : System.Web.Script.Serialization.JavaScriptTypeResolver | ||
| { | ||
| public override System.Type ResolveType(string id) | ||
| { | ||
| return typeof (System.Collections.Generic.Dictionary<string, object>); | ||
| } | ||
| public override string ResolveTypeId(System.Type type) | ||
| { | ||
| return string.Empty; | ||
| } | ||
| } | ||
| "@ | ||
|
|
||
| try { | ||
| Add-Type -TypeDefinition $typeResolver -ReferencedAssemblies $scriptAssembly.FullName | ||
| } | ||
| catch { | ||
| # This is a relatively common error that's harmless unless changing the actual C# | ||
| # code, so it can be ignored. Unfortunately, it's just a plain old System.Exception, | ||
| # so we can't try to catch a specific error type. | ||
| if (-not $_.ToString() -like "*The type name 'JsonObjectTypeResolver' already exists*") | ||
| { | ||
| throw $_ | ||
| } | ||
| } | ||
|
|
||
| $jsonserial = New-Object System.Web.Script.Serialization.JavaScriptSerializer(New-Object JsonObjectTypeResolver) | ||
| $jsonserial.MaxJsonLength = $MaxJsonLength | ||
| } | ||
|
|
||
| process | ||
| { | ||
| foreach ($i in $InputObject) | ||
| { | ||
| $s = $i.ToString() | ||
| if ($s) { | ||
| $jsonTree = $jsonserial.DeserializeObject($s) | ||
|
|
||
| if ($jsonTree -is [System.Collections.Generic.IDictionary`2].MakeGenericType([String],[Object])) | ||
| { | ||
| $jsonTree = PopulateJsonFrom-Dictionary $jsonTree | ||
| } | ||
| elseif ($jsonTree -is [System.Collections.Generic.ICollection`1].MakeGenericType([Object])) | ||
| { | ||
| $jsonTree = PopulateJsonFrom-Collection $jsonTree | ||
| } | ||
|
|
||
| Write-Output $jsonTree | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.