Skip to content

Commit 8d728f3

Browse files
committed
Allow namespace to come from connection string
1 parent 67c6fef commit 8d728f3

File tree

1 file changed

+52
-48
lines changed

1 file changed

+52
-48
lines changed

models/Client.cfc

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -45,55 +45,59 @@ component accessors=true singleton ThreadSafe {
4545
* Creates a new ServiceBusClientBuilder instance.
4646
*/
4747
function newClientBuilder( required string fullyQualifiedNamespace ) {
48-
var clientBuilder = createObject( 'java', 'com.azure.messaging.servicebus.ServiceBusClientBuilder' ).init()
49-
.fullyQualifiedNamespace( arguments.fullyQualifiedNamespace );
50-
var credOptions = settings.credentials;
51-
52-
if( credOptions.type == 'connectionString' ) {
53-
clientBuilder.connectionString( credOptions.connectionString );
54-
} else if( credOptions.type == 'default' ) {
55-
var credBuilder = createObject( 'java', 'com.azure.identity.DefaultAzureCredentialBuilder' ).init();
56-
57-
doAuthorityHost( credOptions, credBuilder );
58-
doTenantId( credOptions, credBuilder );
59-
doMaxRetry( credOptions, credBuilder );
60-
doTokenRefreshOffset( credOptions, credBuilder );
61-
62-
clientBuilder.credential( credBuilder.build() );
63-
} else if( credOptions.type == 'ClientSecret' ) {
64-
var credBuilder = createObject( 'java', 'com.azure.identity.ClientSecretCredentialBuilder' ).init();
65-
66-
doAuthorityHost( credOptions, credBuilder );
67-
doTenantId( credOptions, credBuilder );
68-
doMaxRetry( credOptions, credBuilder );
69-
doTokenRefreshOffset( credOptions, credBuilder );
70-
doClientSecret( credOptions, credBuilder );
71-
doEnablePersistentCache( credOptions, credBuilder );
72-
doClientId( credOptions, credBuilder );
73-
74-
clientBuilder.credential( credBuilder.build() );
75-
} else if( credOptions.type == 'ClientCertificate' ) {
76-
var credBuilder = createObject( 'java', 'com.azure.identity.ClientCertificateCredentialBuilder' ).init();
77-
78-
doAuthorityHost( credOptions, credBuilder );
79-
doClientId( credOptions, credBuilder );
80-
doTenantId( credOptions, credBuilder );
81-
doMaxRetry( credOptions, credBuilder );
82-
doTokenRefreshOffset( credOptions, credBuilder );
83-
doEnablePersistentCache( credOptions, credBuilder );
84-
doCertificatePath( credOptions, credBuilder );
85-
86-
clientBuilder.credential( credBuilder.build() );
87-
}
48+
var clientBuilder = createObject( 'java', 'com.azure.messaging.servicebus.ServiceBusClientBuilder' ).init();
49+
50+
if( !isNull( arguments.fullyQualifiedNamespace ) && !arguments.fullyQualifiedNamespace.isEmpty() ) {
51+
clientBuilder.fullyQualifiedNamespace( arguments.fullyQualifiedNamespace );
52+
53+
}
54+
var credOptions = settings.credentials;
55+
56+
if( credOptions.type == 'connectionString' ) {
57+
clientBuilder.connectionString( credOptions.connectionString );
58+
} else if( credOptions.type == 'default' ) {
59+
var credBuilder = createObject( 'java', 'com.azure.identity.DefaultAzureCredentialBuilder' ).init();
60+
61+
doAuthorityHost( credOptions, credBuilder );
62+
doTenantId( credOptions, credBuilder );
63+
doMaxRetry( credOptions, credBuilder );
64+
doTokenRefreshOffset( credOptions, credBuilder );
65+
66+
clientBuilder.credential( credBuilder.build() );
67+
} else if( credOptions.type == 'ClientSecret' ) {
68+
var credBuilder = createObject( 'java', 'com.azure.identity.ClientSecretCredentialBuilder' ).init();
69+
70+
doAuthorityHost( credOptions, credBuilder );
71+
doTenantId( credOptions, credBuilder );
72+
doMaxRetry( credOptions, credBuilder );
73+
doTokenRefreshOffset( credOptions, credBuilder );
74+
doClientSecret( credOptions, credBuilder );
75+
doEnablePersistentCache( credOptions, credBuilder );
76+
doClientId( credOptions, credBuilder );
77+
78+
clientBuilder.credential( credBuilder.build() );
79+
} else if( credOptions.type == 'ClientCertificate' ) {
80+
var credBuilder = createObject( 'java', 'com.azure.identity.ClientCertificateCredentialBuilder' ).init();
81+
82+
doAuthorityHost( credOptions, credBuilder );
83+
doClientId( credOptions, credBuilder );
84+
doTenantId( credOptions, credBuilder );
85+
doMaxRetry( credOptions, credBuilder );
86+
doTokenRefreshOffset( credOptions, credBuilder );
87+
doEnablePersistentCache( credOptions, credBuilder );
88+
doCertificatePath( credOptions, credBuilder );
89+
90+
clientBuilder.credential( credBuilder.build() );
91+
}
8892

89-
// TODO: implement these more in-depth options
90-
// .clientOptions()
91-
// .configuration()
92-
// .retryOptions()
93-
// .enableCrossEntityTransactions()
94-
// .proxyOptions()
95-
// .retryOptions()
96-
// .transportType()
93+
// TODO: implement these more in-depth options
94+
// .clientOptions()
95+
// .configuration()
96+
// .retryOptions()
97+
// .enableCrossEntityTransactions()
98+
// .proxyOptions()
99+
// .retryOptions()
100+
// .transportType()
97101

98102

99103

0 commit comments

Comments
 (0)