Skip to content

Commit aadc661

Browse files
LyncConnector - minor formatting
1 parent 9f9faaf commit aadc661

11 files changed

+62
-56
lines changed

src/LyncConnector/Scripts/1. Lync.Common.psm1

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,17 @@ function Enter-Script
3434
Also clear the $Error variable.
3535
#>
3636
[CmdletBinding()]
37-
param (
37+
param(
3838
[parameter(Mandatory = $true)]
3939
[string]
4040
$ScriptType
4141
)
4242

43-
Write-Verbose "$Global:ConnectorName - $ScriptType Script: Execution Started..."
44-
$Error.Clear()
43+
process
44+
{
45+
Write-Verbose "$Global:ConnectorName - $ScriptType Script: Execution Started..."
46+
$Error.Clear()
47+
}
4548
}
4649

4750
function Exit-Script
@@ -54,7 +57,7 @@ function Exit-Script
5457
Throws an exception if $Error is present
5558
#>
5659
[CmdletBinding()]
57-
param (
60+
param(
5861
[parameter(Mandatory = $true)]
5962
[string]
6063
$ScriptType,
@@ -66,19 +69,22 @@ function Exit-Script
6669
$ExceptionRaisedOnErrorCheck
6770
)
6871

69-
if ($Error.Count -ne 0 -and !$SuppressErrorCheck)
72+
process
7073
{
71-
$errorMessage = [string]$Error[0]
72-
73-
if ($ExceptionRaisedOnErrorCheck -eq $null)
74+
if ($Error.Count -ne 0 -and !$SuppressErrorCheck)
7475
{
75-
$ExceptionRaisedOnErrorCheck = [Microsoft.MetadirectoryServices.ExtensibleExtensionException]
76+
$errorMessage = [string]$Error[0]
77+
78+
if ($ExceptionRaisedOnErrorCheck -eq $null)
79+
{
80+
$ExceptionRaisedOnErrorCheck = [Microsoft.MetadirectoryServices.ExtensibleExtensionException]
81+
}
82+
83+
throw $errorMessage -as $ExceptionRaisedOnErrorCheck
7684
}
7785

78-
throw $errorMessage -as $ExceptionRaisedOnErrorCheck
86+
Write-Verbose "$Global:ConnectorName - $ScriptType Script: Execution Completed."
7987
}
80-
81-
Write-Verbose "$Global:ConnectorName - $ScriptType Script: Execution Completed."
8288
}
8389

8490
function Get-ExtensionsDirectory
@@ -92,7 +98,7 @@ function Get-ExtensionsDirectory
9298
#>
9399
[CmdletBinding()]
94100
[OutputType([string])]
95-
param (
101+
param(
96102
)
97103

98104
process
@@ -123,7 +129,7 @@ function New-GenericObject
123129

124130
[CmdletBinding()]
125131
[OutputType([object])]
126-
param (
132+
param(
127133
[parameter(Mandatory = $true)]
128134
[string]
129135
$TypeName,
@@ -172,7 +178,7 @@ function Test-Variable
172178

173179
[CmdletBinding()]
174180
[OutputType([bool])]
175-
param (
181+
param(
176182
[parameter(Mandatory = $true)]
177183
[string]
178184
$Name,
@@ -209,7 +215,7 @@ function ConvertFrom-SchemaXml
209215

210216
[CmdletBinding()]
211217
[OutputType([Microsoft.MetadirectoryServices.Schema])]
212-
param (
218+
param(
213219
[parameter(Mandatory = $true)]
214220
[ValidateScript({ Test-Path $_ -PathType "Leaf" })]
215221
[string]
@@ -281,7 +287,7 @@ function Get-CSEntryChangeValue
281287

282288
[CmdletBinding()]
283289
[OutputType([object])]
284-
param (
290+
param(
285291
[parameter(Mandatory = $true)]
286292
[Microsoft.MetadirectoryServices.CSEntryChange]
287293
$CSEntryChange,
@@ -349,7 +355,7 @@ function Get-CSEntryChangeValueIfChanged
349355

350356
[CmdletBinding()]
351357
[OutputType([object])]
352-
param (
358+
param(
353359
[parameter(Mandatory = $true)]
354360
[Microsoft.MetadirectoryServices.CSEntryChange]
355361
$CSEntryChange,
@@ -411,7 +417,7 @@ function Test-CSEntryChangeValueChanged
411417

412418
[CmdletBinding()]
413419
[OutputType([bool])]
414-
param (
420+
param(
415421
[parameter(Mandatory = $true)]
416422
[Microsoft.MetadirectoryServices.CSEntryChange]
417423
$CSEntryChange,
@@ -484,7 +490,7 @@ function Test-CSEntryChangeAttributeDeleted
484490

485491
[CmdletBinding()]
486492
[OutputType([bool])]
487-
param (
493+
param(
488494
[parameter(Mandatory = $true)]
489495
[Microsoft.MetadirectoryServices.CSEntryChange]
490496
$CSEntryChange,
@@ -524,7 +530,7 @@ function Get-CSEntryChangeDN
524530

525531
[CmdletBinding()]
526532
[OutputType([string])]
527-
param (
533+
param(
528534
[parameter(Mandatory = $true)]
529535
[Microsoft.MetadirectoryServices.CSEntryChange]
530536
$CSEntryChange
@@ -553,7 +559,7 @@ function Get-ConfigParameter
553559

554560
[CmdletBinding()]
555561
[OutputType([string])]
556-
param (
562+
param(
557563
[parameter(Mandatory = $true)]
558564
[System.Collections.ObjectModel.KeyedCollection[string,Microsoft.MetadirectoryServices.ConfigParameter]]
559565
$ConfigParameters,
@@ -959,7 +965,7 @@ function Select-PreferredDomainController
959965

960966
[CmdletBinding()]
961967
[OutputType([string])]
962-
param (
968+
param(
963969
[parameter(Mandatory = $false)]
964970
[string]
965971
$DomainControllerList

src/LyncConnector/Scripts/10. ExportScript-Lync.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#>
1010

1111
[CmdletBinding()]
12-
param (
12+
param(
1313
[parameter(Mandatory = $true)]
1414
[System.Collections.ObjectModel.KeyedCollection[string,Microsoft.MetadirectoryServices.ConfigParameter]]
1515
$ConfigParameters,
@@ -51,7 +51,7 @@ function Export-CSEntries
5151

5252
[CmdletBinding()]
5353
[OutputType([System.Collections.Generic.List[Microsoft.MetadirectoryServices.CSEntryChangeResult]])]
54-
param (
54+
param(
5555
)
5656

5757
$csentryChangeResults = New-GenericObject System.Collections.Generic.List Microsoft.MetadirectoryServices.CSEntryChangeResult
@@ -127,7 +127,7 @@ function Export-User
127127

128128
[CmdletBinding()]
129129
[OutputType([Hashtable])]
130-
param (
130+
param(
131131
[parameter(Mandatory = $true)]
132132
[Microsoft.MetadirectoryServices.CSEntryChange]
133133
$CSEntryChange
@@ -212,7 +212,7 @@ function Export-OrganizationalUnit
212212

213213
[CmdletBinding()]
214214
[OutputType([Hashtable])]
215-
param (
215+
param(
216216
[parameter(Mandatory = $true)]
217217
[Microsoft.MetadirectoryServices.CSEntryChange]
218218
$CSEntryChange
@@ -283,7 +283,7 @@ function Invoke-EnableCsUserCommand
283283
#>
284284

285285
[CmdletBinding()]
286-
param (
286+
param(
287287
[parameter(Mandatory = $true)]
288288
[Microsoft.MetadirectoryServices.CSEntryChange]
289289
$CSEntryChange
@@ -333,7 +333,7 @@ function Invoke-SetCsUserCommand
333333
#>
334334

335335
[CmdletBinding()]
336-
param (
336+
param(
337337
[parameter(Mandatory = $true)]
338338
[Microsoft.MetadirectoryServices.CSEntryChange]
339339
$CSEntryChange
@@ -387,7 +387,7 @@ function Invoke-GrantCsPolicyCommands
387387
#>
388388

389389
[CmdletBinding()]
390-
param (
390+
param(
391391
[parameter(Mandatory = $true)]
392392
[Microsoft.MetadirectoryServices.CSEntryChange]
393393
$CSEntryChange
@@ -457,7 +457,7 @@ function Invoke-MoveCsUserCommand
457457
#>
458458

459459
[CmdletBinding()]
460-
param (
460+
param(
461461
[parameter(Mandatory = $true)]
462462
[Microsoft.MetadirectoryServices.CSEntryChange]
463463
$CSEntryChange
@@ -493,7 +493,7 @@ function Invoke-DisableCsUserCommand
493493
#>
494494

495495
[CmdletBinding()]
496-
param (
496+
param(
497497
[parameter(Mandatory = $true)]
498498
[Microsoft.MetadirectoryServices.CSEntryChange]
499499
$CSEntryChange
@@ -548,7 +548,7 @@ function Get-CsIdentity
548548

549549
[CmdletBinding()]
550550
[OutputType([string])]
551-
param (
551+
param(
552552
[parameter(Mandatory = $true)]
553553
[Microsoft.MetadirectoryServices.CSEntryChange]
554554
$CSEntryChange

src/LyncConnector/Scripts/11. End-ExportScript-Lync.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#>
1111

1212
[CmdletBinding()]
13-
param (
13+
param(
1414
[parameter(Mandatory = $true)]
1515
[System.Collections.ObjectModel.KeyedCollection[string,Microsoft.MetadirectoryServices.ConfigParameter]]
1616
$ConfigParameters,

src/LyncConnector/Scripts/2. ValidationScript-Lync.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#>
1010

1111
[CmdletBinding()]
12-
param (
12+
param(
1313
[parameter(Mandatory = $true)]
1414
[System.Collections.ObjectModel.KeyedCollection[string,Microsoft.MetadirectoryServices.ConfigParameter]]
1515
$ConfigParameters,
@@ -48,7 +48,7 @@ function Test-ConfigParameterPage
4848

4949
[CmdletBinding()]
5050
[OutputType([Microsoft.MetadirectoryServices.ParameterValidationResult])]
51-
param (
51+
param(
5252
)
5353

5454
$validationResult = New-Object -TypeName "Microsoft.MetadirectoryServices.ParameterValidationResult" -ArgumentList "Success", $null, $null
@@ -95,7 +95,7 @@ function Test-ConnectivityConfigParameterPage
9595

9696
[CmdletBinding()]
9797
[OutputType([Microsoft.MetadirectoryServices.ParameterValidationResult])]
98-
param (
98+
param(
9999
[parameter(Mandatory = $false)]
100100
[ValidateSet("Partition", "Connectivity", "")]
101101
[string]
@@ -199,7 +199,7 @@ function Test-GlobalConfigParameterPage
199199

200200
[CmdletBinding()]
201201
[OutputType([Microsoft.MetadirectoryServices.ParameterValidationResult])]
202-
param (
202+
param(
203203
)
204204

205205
$validationResult = New-Object -TypeName "Microsoft.MetadirectoryServices.ParameterValidationResult" -ArgumentList "Success", $null, $null

src/LyncConnector/Scripts/3. SchemaScript-Lync.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function Get-ConnectorSchema
4545

4646
[CmdletBinding()]
4747
[OutputType([Microsoft.MetadirectoryServices.Schema])]
48-
param (
48+
param(
4949
)
5050

5151
$extensionsDir = Get-ExtensionsDirectory

src/LyncConnector/Scripts/4. PartitionScript-Lync.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#>
1010

1111
[CmdletBinding()]
12-
param (
12+
param(
1313
[parameter(Mandatory = $true)]
1414
[System.Collections.ObjectModel.KeyedCollection[string,Microsoft.MetadirectoryServices.ConfigParameter]]
1515
$ConfigParameters,
@@ -45,7 +45,7 @@ function Get-Partitions
4545

4646
[CmdletBinding()]
4747
[OutputType([System.Collections.Generic.List[Microsoft.MetadirectoryServices.Partition]])]
48-
param (
48+
param(
4949
)
5050

5151
$partitions = New-GenericObject System.Collections.Generic.List Microsoft.MetadirectoryServices.Partition

src/LyncConnector/Scripts/5. HierarchyScript-Lync.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#>
1010

1111
[CmdletBinding()]
12-
param (
12+
param(
1313
[parameter(Mandatory = $true)]
1414
[Microsoft.MetadirectoryServices.HierarchyNode]
1515
$HierarchyNode,
@@ -48,7 +48,7 @@ function Get-Hierarchy
4848

4949
[CmdletBinding()]
5050
[OutputType([System.Collections.Generic.List[Microsoft.MetadirectoryServices.HierarchyNode]])]
51-
param (
51+
param(
5252
)
5353

5454
$children = New-GenericObject System.Collections.Generic.List Microsoft.MetadirectoryServices.HierarchyNode

src/LyncConnector/Scripts/6. Begin-ImportScript-Lync.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#>
1111

1212
[CmdletBinding()]
13-
param (
13+
param(
1414
[parameter(Mandatory = $true)]
1515
[System.Collections.ObjectModel.KeyedCollection[string,Microsoft.MetadirectoryServices.ConfigParameter]]
1616
$ConfigParameters,
@@ -50,7 +50,7 @@ function Get-OpenImportConnectionResults
5050

5151
[CmdletBinding()]
5252
[OutputType([System.Collections.Generic.List[Microsoft.MetadirectoryServices.OpenImportConnectionResults]])]
53-
param (
53+
param(
5454
)
5555

5656
$watermark = Get-WaterMark
@@ -71,7 +71,7 @@ function Get-WaterMark
7171

7272
[CmdletBinding()]
7373
[OutputType([xml])]
74-
param (
74+
param(
7575
)
7676

7777
$waterMarkXml = $null

0 commit comments

Comments
 (0)