Skip to content

Commit 91ec35d

Browse files
author
SDKAuto
committed
CodeGen from PR 14749 in Azure/azure-rest-api-specs
Merge 6a5f970e9f7e2ed91bf0c11289daa8743f28e131 into 682c9680fd6ac7746d701bcf0c69948a3199671a
1 parent c859ce8 commit 91ec35d

File tree

10 files changed

+14
-237
lines changed

10 files changed

+14
-237
lines changed

sdk/signalr/azure-resourcemanager-signalr/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Release History
22

3-
## 1.0.0-beta.3 (Unreleased)
3+
## 1.0.0-beta.1 (2021-07-30)
44

5+
- Azure Resource Manager SignalR client library for Java. This package contains Microsoft Azure SDK for SignalR Management SDK. REST API for Azure SignalR Service. Package tag package-2021-04-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
56

67
## 1.0.0-beta.2 (2021-07-09)
78

sdk/signalr/azure-resourcemanager-signalr/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Azure Resource Manager SignalR client library for Java.
44

5-
This package contains Microsoft Azure SDK for SignalR Management SDK. REST API for Azure SignalR Service. Package tag package-2021-06-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
5+
This package contains Microsoft Azure SDK for SignalR Management SDK. REST API for Azure SignalR Service. Package tag package-2021-04-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
66

77
## We'd love to hear your feedback
88

@@ -32,7 +32,7 @@ Various documentation is available to help you get started
3232
<dependency>
3333
<groupId>com.azure.resourcemanager</groupId>
3434
<artifactId>azure-resourcemanager-signalr</artifactId>
35-
<version>1.0.0-beta.2</version>
35+
<version>1.0.0-beta.3</version>
3636
</dependency>
3737
```
3838
[//]: # ({x-version-update-end})
@@ -74,7 +74,6 @@ See [API design][design] for general introduction on design and key concepts on
7474

7575
## Examples
7676

77-
[Code snippets and samples](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/signalr/azure-resourcemanager-signalr/SAMPLE.md)
7877

7978

8079
## Troubleshooting

sdk/signalr/azure-resourcemanager-signalr/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<packaging>jar</packaging>
1414

1515
<name>Microsoft Azure SDK for SignalR Management</name>
16-
<description>This package contains Microsoft Azure SDK for SignalR Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for Azure SignalR Service. Package tag package-2021-06-01-preview.</description>
16+
<description>This package contains Microsoft Azure SDK for SignalR Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for Azure SignalR Service. Package tag package-2021-04-01-preview.</description>
1717
<url>https://github.com/Azure/azure-sdk-for-java</url>
1818

1919
<licenses>

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/SignalRManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public SignalRManager authenticate(TokenCredential credential, AzureProfile prof
190190
.append("-")
191191
.append("com.azure.resourcemanager.signalr")
192192
.append("/")
193-
.append("1.0.0-beta.2");
193+
.append("1.0.0-beta.1");
194194
if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
195195
userAgentBuilder
196196
.append(" (")

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/fluent/models/SignalRResourceInner.java

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -143,31 +143,6 @@ public class SignalRResourceInner extends Resource {
143143
@JsonProperty(value = "properties.networkACLs")
144144
private SignalRNetworkACLs networkACLs;
145145

146-
/*
147-
* Enable or disable public network access. Default to "Enabled".
148-
* When it's Enabled, network ACLs still apply.
149-
* When it's Disabled, public network access is always disabled no matter
150-
* what you set in network ACLs.
151-
*/
152-
@JsonProperty(value = "properties.publicNetworkAccess")
153-
private String publicNetworkAccess;
154-
155-
/*
156-
* DisableLocalAuth
157-
* Enable or disable local auth with AccessKey
158-
* When set as true, connection with AccessKey=xxx won't work.
159-
*/
160-
@JsonProperty(value = "properties.disableLocalAuth")
161-
private Boolean disableLocalAuth;
162-
163-
/*
164-
* disableAadAuth
165-
* Enable or disable aad auth
166-
* When set as true, connection with AuthType=aad won't work.
167-
*/
168-
@JsonProperty(value = "properties.disableAadAuth")
169-
private Boolean disableAadAuth;
170-
171146
/**
172147
* Get the sku property: The billing information of the resource.(e.g. Free, Standard).
173148
*
@@ -421,74 +396,6 @@ public SignalRResourceInner withNetworkACLs(SignalRNetworkACLs networkACLs) {
421396
return this;
422397
}
423398

424-
/**
425-
* Get the publicNetworkAccess property: Enable or disable public network access. Default to "Enabled". When it's
426-
* Enabled, network ACLs still apply. When it's Disabled, public network access is always disabled no matter what
427-
* you set in network ACLs.
428-
*
429-
* @return the publicNetworkAccess value.
430-
*/
431-
public String publicNetworkAccess() {
432-
return this.publicNetworkAccess;
433-
}
434-
435-
/**
436-
* Set the publicNetworkAccess property: Enable or disable public network access. Default to "Enabled". When it's
437-
* Enabled, network ACLs still apply. When it's Disabled, public network access is always disabled no matter what
438-
* you set in network ACLs.
439-
*
440-
* @param publicNetworkAccess the publicNetworkAccess value to set.
441-
* @return the SignalRResourceInner object itself.
442-
*/
443-
public SignalRResourceInner withPublicNetworkAccess(String publicNetworkAccess) {
444-
this.publicNetworkAccess = publicNetworkAccess;
445-
return this;
446-
}
447-
448-
/**
449-
* Get the disableLocalAuth property: DisableLocalAuth Enable or disable local auth with AccessKey When set as true,
450-
* connection with AccessKey=xxx won't work.
451-
*
452-
* @return the disableLocalAuth value.
453-
*/
454-
public Boolean disableLocalAuth() {
455-
return this.disableLocalAuth;
456-
}
457-
458-
/**
459-
* Set the disableLocalAuth property: DisableLocalAuth Enable or disable local auth with AccessKey When set as true,
460-
* connection with AccessKey=xxx won't work.
461-
*
462-
* @param disableLocalAuth the disableLocalAuth value to set.
463-
* @return the SignalRResourceInner object itself.
464-
*/
465-
public SignalRResourceInner withDisableLocalAuth(Boolean disableLocalAuth) {
466-
this.disableLocalAuth = disableLocalAuth;
467-
return this;
468-
}
469-
470-
/**
471-
* Get the disableAadAuth property: disableAadAuth Enable or disable aad auth When set as true, connection with
472-
* AuthType=aad won't work.
473-
*
474-
* @return the disableAadAuth value.
475-
*/
476-
public Boolean disableAadAuth() {
477-
return this.disableAadAuth;
478-
}
479-
480-
/**
481-
* Set the disableAadAuth property: disableAadAuth Enable or disable aad auth When set as true, connection with
482-
* AuthType=aad won't work.
483-
*
484-
* @param disableAadAuth the disableAadAuth value to set.
485-
* @return the SignalRResourceInner object itself.
486-
*/
487-
public SignalRResourceInner withDisableAadAuth(Boolean disableAadAuth) {
488-
this.disableAadAuth = disableAadAuth;
489-
return this;
490-
}
491-
492399
/** {@inheritDoc} */
493400
@Override
494401
public SignalRResourceInner withLocation(String location) {

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRManagementClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public SignalRSharedPrivateLinkResourcesClient getSignalRSharedPrivateLinkResour
214214
this.defaultPollInterval = defaultPollInterval;
215215
this.subscriptionId = subscriptionId;
216216
this.endpoint = endpoint;
217-
this.apiVersion = "2021-06-01-preview";
217+
this.apiVersion = "2021-04-01-preview";
218218
this.operations = new OperationsClientImpl(this);
219219
this.signalRs = new SignalRsClientImpl(this);
220220
this.usages = new UsagesClientImpl(this);

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/implementation/SignalRResourceImpl.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,6 @@ public SignalRNetworkACLs networkACLs() {
153153
return this.innerModel().networkACLs();
154154
}
155155

156-
public String publicNetworkAccess() {
157-
return this.innerModel().publicNetworkAccess();
158-
}
159-
160-
public Boolean disableLocalAuth() {
161-
return this.innerModel().disableLocalAuth();
162-
}
163-
164-
public Boolean disableAadAuth() {
165-
return this.innerModel().disableAadAuth();
166-
}
167-
168156
public Region region() {
169157
return Region.fromName(this.regionName());
170158
}
@@ -342,19 +330,4 @@ public SignalRResourceImpl withNetworkACLs(SignalRNetworkACLs networkACLs) {
342330
this.innerModel().withNetworkACLs(networkACLs);
343331
return this;
344332
}
345-
346-
public SignalRResourceImpl withPublicNetworkAccess(String publicNetworkAccess) {
347-
this.innerModel().withPublicNetworkAccess(publicNetworkAccess);
348-
return this;
349-
}
350-
351-
public SignalRResourceImpl withDisableLocalAuth(Boolean disableLocalAuth) {
352-
this.innerModel().withDisableLocalAuth(disableLocalAuth);
353-
return this;
354-
}
355-
356-
public SignalRResourceImpl withDisableAadAuth(Boolean disableAadAuth) {
357-
this.innerModel().withDisableAadAuth(disableAadAuth);
358-
return this;
359-
}
360333
}

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/ManagedIdentity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
10+
import com.fasterxml.jackson.annotation.JsonInclude;
1011
import com.fasterxml.jackson.annotation.JsonProperty;
1112
import java.util.Map;
1213

@@ -25,6 +26,7 @@ public class ManagedIdentity {
2526
* Get or set the user assigned identities
2627
*/
2728
@JsonProperty(value = "userAssignedIdentities")
29+
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
2830
private Map<String, UserAssignedIdentityProperty> userAssignedIdentities;
2931

3032
/*

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRFeature.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
import com.azure.core.annotation.Fluent;
88
import com.azure.core.util.logging.ClientLogger;
99
import com.fasterxml.jackson.annotation.JsonIgnore;
10+
import com.fasterxml.jackson.annotation.JsonInclude;
1011
import com.fasterxml.jackson.annotation.JsonProperty;
1112
import java.util.Map;
1213

13-
/** Feature of a resource, which controls the runtime behavior. */
14+
/** Feature of a SignalR resource, which controls the SignalR runtime behavior. */
1415
@Fluent
1516
public final class SignalRFeature {
1617
@JsonIgnore private final ClientLogger logger = new ClientLogger(SignalRFeature.class);
@@ -47,6 +48,7 @@ public final class SignalRFeature {
4748
* Optional properties related to this feature.
4849
*/
4950
@JsonProperty(value = "properties")
51+
@JsonInclude(value = JsonInclude.Include.NON_NULL, content = JsonInclude.Include.ALWAYS)
5052
private Map<String, String> properties;
5153

5254
/**

sdk/signalr/azure-resourcemanager-signalr/src/main/java/com/azure/resourcemanager/signalr/models/SignalRResource.java

Lines changed: 2 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -175,31 +175,6 @@ public interface SignalRResource {
175175
*/
176176
SignalRNetworkACLs networkACLs();
177177

178-
/**
179-
* Gets the publicNetworkAccess property: Enable or disable public network access. Default to "Enabled". When it's
180-
* Enabled, network ACLs still apply. When it's Disabled, public network access is always disabled no matter what
181-
* you set in network ACLs.
182-
*
183-
* @return the publicNetworkAccess value.
184-
*/
185-
String publicNetworkAccess();
186-
187-
/**
188-
* Gets the disableLocalAuth property: DisableLocalAuth Enable or disable local auth with AccessKey When set as
189-
* true, connection with AccessKey=xxx won't work.
190-
*
191-
* @return the disableLocalAuth value.
192-
*/
193-
Boolean disableLocalAuth();
194-
195-
/**
196-
* Gets the disableAadAuth property: disableAadAuth Enable or disable aad auth When set as true, connection with
197-
* AuthType=aad won't work.
198-
*
199-
* @return the disableAadAuth value.
200-
*/
201-
Boolean disableAadAuth();
202-
203178
/**
204179
* Gets the region of the resource.
205180
*
@@ -275,10 +250,7 @@ interface WithCreate
275250
DefinitionStages.WithFeatures,
276251
DefinitionStages.WithCors,
277252
DefinitionStages.WithUpstream,
278-
DefinitionStages.WithNetworkACLs,
279-
DefinitionStages.WithPublicNetworkAccess,
280-
DefinitionStages.WithDisableLocalAuth,
281-
DefinitionStages.WithDisableAadAuth {
253+
DefinitionStages.WithNetworkACLs {
282254
/**
283255
* Executes the create request.
284256
*
@@ -394,44 +366,6 @@ interface WithNetworkACLs {
394366
*/
395367
WithCreate withNetworkACLs(SignalRNetworkACLs networkACLs);
396368
}
397-
/** The stage of the SignalRResource definition allowing to specify publicNetworkAccess. */
398-
interface WithPublicNetworkAccess {
399-
/**
400-
* Specifies the publicNetworkAccess property: Enable or disable public network access. Default to
401-
* "Enabled". When it's Enabled, network ACLs still apply. When it's Disabled, public network access is
402-
* always disabled no matter what you set in network ACLs..
403-
*
404-
* @param publicNetworkAccess Enable or disable public network access. Default to "Enabled". When it's
405-
* Enabled, network ACLs still apply. When it's Disabled, public network access is always disabled no
406-
* matter what you set in network ACLs.
407-
* @return the next definition stage.
408-
*/
409-
WithCreate withPublicNetworkAccess(String publicNetworkAccess);
410-
}
411-
/** The stage of the SignalRResource definition allowing to specify disableLocalAuth. */
412-
interface WithDisableLocalAuth {
413-
/**
414-
* Specifies the disableLocalAuth property: DisableLocalAuth Enable or disable local auth with AccessKey
415-
* When set as true, connection with AccessKey=xxx won't work..
416-
*
417-
* @param disableLocalAuth DisableLocalAuth Enable or disable local auth with AccessKey When set as true,
418-
* connection with AccessKey=xxx won't work.
419-
* @return the next definition stage.
420-
*/
421-
WithCreate withDisableLocalAuth(Boolean disableLocalAuth);
422-
}
423-
/** The stage of the SignalRResource definition allowing to specify disableAadAuth. */
424-
interface WithDisableAadAuth {
425-
/**
426-
* Specifies the disableAadAuth property: disableAadAuth Enable or disable aad auth When set as true,
427-
* connection with AuthType=aad won't work..
428-
*
429-
* @param disableAadAuth disableAadAuth Enable or disable aad auth When set as true, connection with
430-
* AuthType=aad won't work.
431-
* @return the next definition stage.
432-
*/
433-
WithCreate withDisableAadAuth(Boolean disableAadAuth);
434-
}
435369
}
436370
/**
437371
* Begins update for the SignalRResource resource.
@@ -449,10 +383,7 @@ interface Update
449383
UpdateStages.WithFeatures,
450384
UpdateStages.WithCors,
451385
UpdateStages.WithUpstream,
452-
UpdateStages.WithNetworkACLs,
453-
UpdateStages.WithPublicNetworkAccess,
454-
UpdateStages.WithDisableLocalAuth,
455-
UpdateStages.WithDisableAadAuth {
386+
UpdateStages.WithNetworkACLs {
456387
/**
457388
* Executes the update request.
458389
*
@@ -559,44 +490,6 @@ interface WithNetworkACLs {
559490
*/
560491
Update withNetworkACLs(SignalRNetworkACLs networkACLs);
561492
}
562-
/** The stage of the SignalRResource update allowing to specify publicNetworkAccess. */
563-
interface WithPublicNetworkAccess {
564-
/**
565-
* Specifies the publicNetworkAccess property: Enable or disable public network access. Default to
566-
* "Enabled". When it's Enabled, network ACLs still apply. When it's Disabled, public network access is
567-
* always disabled no matter what you set in network ACLs..
568-
*
569-
* @param publicNetworkAccess Enable or disable public network access. Default to "Enabled". When it's
570-
* Enabled, network ACLs still apply. When it's Disabled, public network access is always disabled no
571-
* matter what you set in network ACLs.
572-
* @return the next definition stage.
573-
*/
574-
Update withPublicNetworkAccess(String publicNetworkAccess);
575-
}
576-
/** The stage of the SignalRResource update allowing to specify disableLocalAuth. */
577-
interface WithDisableLocalAuth {
578-
/**
579-
* Specifies the disableLocalAuth property: DisableLocalAuth Enable or disable local auth with AccessKey
580-
* When set as true, connection with AccessKey=xxx won't work..
581-
*
582-
* @param disableLocalAuth DisableLocalAuth Enable or disable local auth with AccessKey When set as true,
583-
* connection with AccessKey=xxx won't work.
584-
* @return the next definition stage.
585-
*/
586-
Update withDisableLocalAuth(Boolean disableLocalAuth);
587-
}
588-
/** The stage of the SignalRResource update allowing to specify disableAadAuth. */
589-
interface WithDisableAadAuth {
590-
/**
591-
* Specifies the disableAadAuth property: disableAadAuth Enable or disable aad auth When set as true,
592-
* connection with AuthType=aad won't work..
593-
*
594-
* @param disableAadAuth disableAadAuth Enable or disable aad auth When set as true, connection with
595-
* AuthType=aad won't work.
596-
* @return the next definition stage.
597-
*/
598-
Update withDisableAadAuth(Boolean disableAadAuth);
599-
}
600493
}
601494
/**
602495
* Refreshes the resource to sync with Azure.

0 commit comments

Comments
 (0)