http-client-java, eng, upgrade to typespec compiler 0.61 (microsoft#4671

)
swatkatz · Nov 5, 2024 · 8b1399d · 8b1399d
1 parent 40dcaee
commit 8b1399d
Show file tree

Hide file tree

Showing 32 changed files with 223 additions and 207 deletions.
diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts
@@ -2111,7 +2111,7 @@ export class CodeModelBuilder {
           name: "string",
           crossLanguageDefinitionId: type.crossLanguageDefinitionId,
         },
-        description: type.doc,
+        doc: type.doc,
         valueType: type.additionalProperties,
         decorators: [],
       };

diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json
@@ -17,16 +17,16 @@
     "@typespec/http-client-java-tests": "file:"
   },
   "overrides": {
-    "@typespec/compiler": "~0.60.0",
-    "@typespec/http": "~0.60.0",
-    "@typespec/rest": "~0.60.0",
-    "@typespec/versioning": "~0.60.0",
-    "@typespec/openapi": "~0.60.0",
-    "@typespec/xml": "~0.60.0",
-    "@azure-tools/typespec-azure-core": "~0.46.0",
-    "@azure-tools/typespec-client-generator-core": "~0.46.0",
-    "@azure-tools/typespec-azure-resource-manager": "~0.46.0",
-    "@azure-tools/typespec-autorest": "~0.46.0"
+    "@typespec/compiler": "~0.61.0",
+    "@typespec/http": "~0.61.0",
+    "@typespec/rest": "~0.61.0",
+    "@typespec/versioning": "~0.61.0",
+    "@typespec/openapi": "~0.61.0",
+    "@typespec/xml": "~0.61.0",
+    "@azure-tools/typespec-azure-core": "~0.47.0",
+    "@azure-tools/typespec-client-generator-core": "~0.47.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.47.0",
+    "@azure-tools/typespec-autorest": "~0.47.0"
   },
   "private": true
 }
diff --git a/...resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java b/...resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java
@@ -29,7 +29,7 @@ public final class ManagedServiceIdentityType extends ExpandableStringEnum<Manag
     /**
      * System and user assigned managed identity.
      */
-    public static final ManagedServiceIdentityType SYSTEM_AND_USER_ASSIGNED_V3
+    public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED
         = fromString("SystemAssigned,UserAssigned");
 
     /**

diff --git a/...or-test/src/main/java/com/cadl/armresourceprovider/models/ManagedServiceIdentityType.java b/...or-test/src/main/java/com/cadl/armresourceprovider/models/ManagedServiceIdentityType.java
@@ -30,7 +30,7 @@ public final class ManagedServiceIdentityType extends ExpandableStringEnum<Manag
     /**
      * System and user assigned managed identity.
      */
-    public static final ManagedServiceIdentityType SYSTEM_AND_USER_ASSIGNED_V3
+    public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED
         = fromString("SystemAssigned,UserAssigned");
 
     /**

diff --git a/...c/main/java/com/type/property/additionalproperties/models/DifferentSpreadFloatRecord.java b/...c/main/java/com/type/property/additionalproperties/models/DifferentSpreadFloatRecord.java
@@ -26,7 +26,7 @@ public class DifferentSpreadFloatRecord implements JsonSerializable<DifferentSpr
     private final String name;
 
     /*
-     * Additional properties
+     * The model spread Record<float32> with the different known property type
      */
     @Generated
     private Map<String, Double> additionalProperties;
@@ -52,7 +52,8 @@ public String getName() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model spread Record&lt;float32&gt; with the different known property
+     * type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +63,8 @@ public Map<String, Double> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model spread Record&lt;float32&gt; with the different known property
+     * type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the DifferentSpreadFloatRecord object itself.

diff --git a/...n/java/com/type/property/additionalproperties/models/DifferentSpreadModelArrayRecord.java b/...n/java/com/type/property/additionalproperties/models/DifferentSpreadModelArrayRecord.java
@@ -27,7 +27,7 @@ public class DifferentSpreadModelArrayRecord implements JsonSerializable<Differe
     private final String knownProp;
 
     /*
-     * Additional properties
+     * The model spread Record<ModelForRecord[]> with the different known property type
      */
     @Generated
     private Map<String, List<ModelForRecord>> additionalProperties;
@@ -53,7 +53,8 @@ public String getKnownProp() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model spread Record&lt;ModelForRecord[]&gt; with the different known
+     * property type.
      * 
      * @return the additionalProperties value.
      */
@@ -63,7 +64,8 @@ public Map<String, List<ModelForRecord>> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model spread Record&lt;ModelForRecord[]&gt; with the different known
+     * property type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the DifferentSpreadModelArrayRecord object itself.

diff --git a/...c/main/java/com/type/property/additionalproperties/models/DifferentSpreadModelRecord.java b/...c/main/java/com/type/property/additionalproperties/models/DifferentSpreadModelRecord.java
@@ -26,7 +26,7 @@ public class DifferentSpreadModelRecord implements JsonSerializable<DifferentSpr
     private final String knownProp;
 
     /*
-     * Additional properties
+     * The model spread Record<ModelForRecord> with the different known property type
      */
     @Generated
     private Map<String, ModelForRecord> additionalProperties;
@@ -52,7 +52,8 @@ public String getKnownProp() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model spread Record&lt;ModelForRecord&gt; with the different known
+     * property type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +63,8 @@ public Map<String, ModelForRecord> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model spread Record&lt;ModelForRecord&gt; with the different known
+     * property type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the DifferentSpreadModelRecord object itself.

diff --git a/.../main/java/com/type/property/additionalproperties/models/DifferentSpreadStringRecord.java b/.../main/java/com/type/property/additionalproperties/models/DifferentSpreadStringRecord.java
@@ -26,7 +26,7 @@ public class DifferentSpreadStringRecord implements JsonSerializable<DifferentSp
     private final double id;
 
     /*
-     * Additional properties
+     * The model spread Record<string> with the different known property type
      */
     @Generated
     private Map<String, String> additionalProperties;
@@ -52,7 +52,8 @@ public double getId() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model spread Record&lt;string&gt; with the different known property
+     * type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +63,8 @@ public Map<String, String> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model spread Record&lt;string&gt; with the different known property
+     * type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the DifferentSpreadStringRecord object itself.

diff --git a/.../java/com/type/property/additionalproperties/models/ExtendsFloatAdditionalProperties.java b/.../java/com/type/property/additionalproperties/models/ExtendsFloatAdditionalProperties.java
@@ -26,7 +26,7 @@ public final class ExtendsFloatAdditionalProperties implements JsonSerializable<
     private final double id;
 
     /*
-     * Additional properties
+     * The model extends from Record<float32> type.
      */
     @Generated
     private Map<String, Double> additionalProperties;
@@ -52,7 +52,7 @@ public double getId() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model extends from Record&lt;float32&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +62,7 @@ public Map<String, Double> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model extends from Record&lt;float32&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the ExtendsFloatAdditionalProperties object itself.

diff --git a/.../java/com/type/property/additionalproperties/models/ExtendsModelAdditionalProperties.java b/.../java/com/type/property/additionalproperties/models/ExtendsModelAdditionalProperties.java
@@ -26,7 +26,7 @@ public final class ExtendsModelAdditionalProperties implements JsonSerializable<
     private final ModelForRecord knownProp;
 
     /*
-     * Additional properties
+     * The model extends from Record<ModelForRecord> type.
      */
     @Generated
     private Map<String, ModelForRecord> additionalProperties;
@@ -52,7 +52,7 @@ public ModelForRecord getKnownProp() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model extends from Record&lt;ModelForRecord&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +62,7 @@ public Map<String, ModelForRecord> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model extends from Record&lt;ModelForRecord&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the ExtendsModelAdditionalProperties object itself.

diff --git a/.../com/type/property/additionalproperties/models/ExtendsModelArrayAdditionalProperties.java b/.../com/type/property/additionalproperties/models/ExtendsModelArrayAdditionalProperties.java
@@ -28,7 +28,7 @@ public final class ExtendsModelArrayAdditionalProperties
     private final List<ModelForRecord> knownProp;
 
     /*
-     * Additional properties
+     * The model extends from Record<ModelForRecord[]> type.
      */
     @Generated
     private Map<String, List<ModelForRecord>> additionalProperties;
@@ -54,7 +54,7 @@ public List<ModelForRecord> getKnownProp() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model extends from Record&lt;ModelForRecord[]&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -64,7 +64,7 @@ public Map<String, List<ModelForRecord>> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model extends from Record&lt;ModelForRecord[]&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the ExtendsModelArrayAdditionalProperties object itself.

diff --git a/...java/com/type/property/additionalproperties/models/ExtendsStringAdditionalProperties.java b/...java/com/type/property/additionalproperties/models/ExtendsStringAdditionalProperties.java
@@ -26,7 +26,7 @@ public final class ExtendsStringAdditionalProperties implements JsonSerializable
     private final String name;
 
     /*
-     * Additional properties
+     * The model extends from Record<string> type.
      */
     @Generated
     private Map<String, String> additionalProperties;
@@ -52,7 +52,7 @@ public String getName() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model extends from Record&lt;string&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +62,7 @@ public Map<String, String> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model extends from Record&lt;string&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the ExtendsStringAdditionalProperties object itself.

diff --git a/...ava/com/type/property/additionalproperties/models/ExtendsUnknownAdditionalProperties.java b/...ava/com/type/property/additionalproperties/models/ExtendsUnknownAdditionalProperties.java
@@ -26,7 +26,7 @@ public class ExtendsUnknownAdditionalProperties implements JsonSerializable<Exte
     private final String name;
 
     /*
-     * Additional properties
+     * The model extends from Record<unknown> type.
      */
     @Generated
     private Map<String, Object> additionalProperties;
@@ -52,7 +52,7 @@ public String getName() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model extends from Record&lt;unknown&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +62,7 @@ public Map<String, Object> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model extends from Record&lt;unknown&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the ExtendsUnknownAdditionalProperties object itself.

diff --git a/...property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDiscriminated.java b/...property/additionalproperties/models/ExtendsUnknownAdditionalPropertiesDiscriminated.java
@@ -33,7 +33,7 @@ public class ExtendsUnknownAdditionalPropertiesDiscriminated
     private final String name;
 
     /*
-     * Additional properties
+     * The model extends from Record<unknown> with a discriminator.
      */
     @Generated
     private Map<String, Object> additionalProperties;
@@ -69,7 +69,7 @@ public String getName() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model extends from Record&lt;unknown&gt; with a discriminator.
      * 
      * @return the additionalProperties value.
      */
@@ -79,7 +79,7 @@ public Map<String, Object> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model extends from Record&lt;unknown&gt; with a discriminator.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the ExtendsUnknownAdditionalPropertiesDiscriminated object itself.

diff --git a/.../main/java/com/type/property/additionalproperties/models/IsFloatAdditionalProperties.java b/.../main/java/com/type/property/additionalproperties/models/IsFloatAdditionalProperties.java
@@ -26,7 +26,7 @@ public final class IsFloatAdditionalProperties implements JsonSerializable<IsFlo
     private final double id;
 
     /*
-     * Additional properties
+     * The model is from Record<float32> type.
      */
     @Generated
     private Map<String, Double> additionalProperties;
@@ -52,7 +52,7 @@ public double getId() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model is from Record&lt;float32&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +62,7 @@ public Map<String, Double> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model is from Record&lt;float32&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the IsFloatAdditionalProperties object itself.

diff --git a/.../main/java/com/type/property/additionalproperties/models/IsModelAdditionalProperties.java b/.../main/java/com/type/property/additionalproperties/models/IsModelAdditionalProperties.java
@@ -26,7 +26,7 @@ public final class IsModelAdditionalProperties implements JsonSerializable<IsMod
     private final ModelForRecord knownProp;
 
     /*
-     * Additional properties
+     * The model is from Record<ModelForRecord> type.
      */
     @Generated
     private Map<String, ModelForRecord> additionalProperties;
@@ -52,7 +52,7 @@ public ModelForRecord getKnownProp() {
     }
 
     /**
-     * Get the additionalProperties property: Additional properties.
+     * Get the additionalProperties property: The model is from Record&lt;ModelForRecord&gt; type.
      * 
      * @return the additionalProperties value.
      */
@@ -62,7 +62,7 @@ public Map<String, ModelForRecord> getAdditionalProperties() {
     }
 
     /**
-     * Set the additionalProperties property: Additional properties.
+     * Set the additionalProperties property: The model is from Record&lt;ModelForRecord&gt; type.
      * 
      * @param additionalProperties the additionalProperties value to set.
      * @return the IsModelAdditionalProperties object itself.