Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Java codegen, use TCGC enum name for MPG #4315

Merged
merged 7 commits into from
Sep 20, 2024
+109 −32
Merged

Java codegen, use TCGC enum name for MPG #4315

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cafe5a9
fix
XiaofeiCao Sep 2, 2024
a7525a3
fix
XiaofeiCao Sep 3, 2024
b0cfe29
add/fix test
XiaofeiCao Sep 3, 2024
094fc88
regen
XiaofeiCao Sep 3, 2024
409627f
Merge branch 'main' into fix_mpg_choice_schema
XiaofeiCao Sep 9, 2024
c3d925c
Merge branch 'main' into fix_mpg_choice_schema
XiaofeiCao Sep 19, 2024
b8eea29
Merge branch 'main' into fix_mpg_choice_schema
XiaofeiCao Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
*/
public final class ManagedServiceIdentityType extends ExpandableStringEnum<ManagedServiceIdentityType> {
/**
* Static value None for ManagedServiceIdentityType.
* No managed identity.
XiaofeiCao marked this conversation as resolved.
Show resolved Hide resolved
*/
public static final ManagedServiceIdentityType NONE = fromString("None");

/**
* Static value SystemAssigned for ManagedServiceIdentityType.
* System assigned managed identity.
*/
public static final ManagedServiceIdentityType SYSTEM_ASSIGNED = fromString("SystemAssigned");

/**
* Static value UserAssigned for ManagedServiceIdentityType.
* User assigned managed identity.
*/
public static final ManagedServiceIdentityType USER_ASSIGNED = fromString("UserAssigned");

/**
* Static value SystemAssigned,UserAssigned for ManagedServiceIdentityType.
* System and user assigned managed identity.
*/
public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED
public static final ManagedServiceIdentityType SYSTEM_AND_USER_ASSIGNED_V3
XiaofeiCao marked this conversation as resolved.
Show resolved Hide resolved
= fromString("SystemAssigned,UserAssigned");

/**
Expand Down
6 changes: 3 additions & 3 deletions ...st/src/main/java/com/azure/resourcemanager/models/resources/models/ProvisioningState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
*/
public final class ProvisioningState extends ExpandableStringEnum<ProvisioningState> {
/**
* Static value Succeeded for ProvisioningState.
* Resource has been created.
*/
public static final ProvisioningState SUCCEEDED = fromString("Succeeded");

/**
* Static value Failed for ProvisioningState.
* Resource creation failed.
*/
public static final ProvisioningState FAILED = fromString("Failed");

/**
* Static value Canceled for ProvisioningState.
* Resource creation was canceled.
*/
public static final ProvisioningState CANCELED = fromString("Canceled");

Expand Down
2 changes: 1 addition & 1 deletion ...p-client-generator-test/src/main/java/com/cadl/armresourceprovider/models/ActionType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
public final class ActionType extends ExpandableStringEnum<ActionType> {
/**
* Static value Internal for ActionType.
* Actions are for internal-only APIs.
*/
public static final ActionType INTERNAL = fromString("Internal");

Expand Down
2 changes: 1 addition & 1 deletion ...tor/http-client-generator-test/src/main/java/com/cadl/armresourceprovider/models/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", defaultImpl = Dog.class, visible = true)
@JsonTypeName("Dog")
@JsonSubTypes({ @JsonSubTypes.Type(name = "golden", value = Golden.class) })
@JsonSubTypes({ @JsonSubTypes.Type(name = "golden_dog", value = Golden.class) })
@Fluent
public class Dog {
/*
Expand Down
4 changes: 2 additions & 2 deletions ...http-client-generator-test/src/main/java/com/cadl/armresourceprovider/models/DogKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
*/
public final class DogKind extends ExpandableStringEnum<DogKind> {
/**
* Static value golden for DogKind.
* Species golden.
*/
public static final DogKind GOLDEN = fromString("golden");
public static final DogKind GOLDEN = fromString("golden_dog");

/**
* Creates a new instance of DogKind value.
Expand Down
2 changes: 1 addition & 1 deletion .../http-client-generator-test/src/main/java/com/cadl/armresourceprovider/models/Golden.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Golden dog model.
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", defaultImpl = Golden.class, visible = true)
@JsonTypeName("golden")
@JsonTypeName("golden_dog")
@Fluent
public final class Golden extends Dog {
/**
Expand Down
10 changes: 5 additions & 5 deletions ...or-test/src/main/java/com/cadl/armresourceprovider/models/ManagedServiceIdentityType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
*/
public final class ManagedServiceIdentityType extends ExpandableStringEnum<ManagedServiceIdentityType> {
/**
* Static value None for ManagedServiceIdentityType.
* No managed identity.
*/
public static final ManagedServiceIdentityType NONE = fromString("None");

/**
* Static value SystemAssigned for ManagedServiceIdentityType.
* System assigned managed identity.
*/
public static final ManagedServiceIdentityType SYSTEM_ASSIGNED = fromString("SystemAssigned");

/**
* Static value UserAssigned for ManagedServiceIdentityType.
* User assigned managed identity.
*/
public static final ManagedServiceIdentityType USER_ASSIGNED = fromString("UserAssigned");

/**
* Static value SystemAssigned,UserAssigned for ManagedServiceIdentityType.
* System and user assigned managed identity.
*/
public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED
public static final ManagedServiceIdentityType SYSTEM_AND_USER_ASSIGNED_V3
= fromString("SystemAssigned,UserAssigned");

/**
Expand Down
6 changes: 3 additions & 3 deletions .../http-client-generator-test/src/main/java/com/cadl/armresourceprovider/models/Origin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
*/
public final class Origin extends ExpandableStringEnum<Origin> {
/**
* Static value user for Origin.
* Indicates the operation is initiated by a user.
*/
public static final Origin USER = fromString("user");

/**
* Static value system for Origin.
* Indicates the operation is initiated by a system.
*/
public static final Origin SYSTEM = fromString("system");

/**
* Static value user,system for Origin.
* Indicates the operation is initiated by a user or system.
*/
public static final Origin USER_SYSTEM = fromString("user,system");

Expand Down
6 changes: 3 additions & 3 deletions ...t-generator-test/src/main/java/com/cadl/armresourceprovider/models/ProvisioningState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
*/
public final class ProvisioningState extends ExpandableStringEnum<ProvisioningState> {
/**
* Static value Succeeded for ProvisioningState.
* Resource has been created.
*/
public static final ProvisioningState SUCCEEDED = fromString("Succeeded");

/**
* Static value Failed for ProvisioningState.
* Resource creation failed.
*/
public static final ProvisioningState FAILED = fromString("Failed");

/**
* Static value Canceled for ProvisioningState.
* Resource creation was canceled.
*/
public static final ProvisioningState CANCELED = fromString("Canceled");

Expand Down
Loading