http-client-java, bug fix, unbranded does not have CoreUtils (#5129)

fix #5128 We may need some refactor over this `CoreUtils` related code.
microsoft · Nov 18, 2024 · ce9c388 · ce9c388
1 parent 9a923c2
commit ce9c388
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...n/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java b/...n/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/ClassType.java
@@ -309,13 +309,18 @@ private static ClassType.Builder getClassTypeBuilder(Class<?> classKey) {
         .jsonToken("JsonToken.STRING")
         .serializationValueGetterModifier(valueGetter -> valueGetter
             + " == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(" + valueGetter + ")")
-        .jsonDeserializationMethod("getNullable(nonNullReader -> " + CORE_UTILS.getName()
-            + ".parseBestOffsetDateTime(nonNullReader.getString()))")
+        .jsonDeserializationMethod(JavaSettings.getInstance().isBranded()
+            ? ("getNullable(nonNullReader -> " + CORE_UTILS.getName()
+                + ".parseBestOffsetDateTime(nonNullReader.getString()))")
+            : ("getNullable(nonNullReader -> OffsetDateTime.parse(nonNullReader.getString()))"))
         .serializationMethodBase("writeString")
-        .xmlElementDeserializationMethod(
-            "getNullableElement(dateString -> " + CORE_UTILS.getName() + ".parseBestOffsetDateTime(dateString))")
-        .xmlAttributeDeserializationTemplate("%s.getNullableAttribute(%s, %s, dateString -> " + CORE_UTILS.getName()
-            + ".parseBestOffsetDateTime(dateString))")
+        .xmlElementDeserializationMethod(JavaSettings.getInstance().isBranded()
+            ? ("getNullableElement(dateString -> " + CORE_UTILS.getName() + ".parseBestOffsetDateTime(dateString))")
+            : ("getNullableElement(dateString -> OffsetDateTime.parse(dateString))"))
+        .xmlAttributeDeserializationTemplate(JavaSettings.getInstance().isBranded()
+            ? ("%s.getNullableAttribute(%s, %s, dateString -> " + CORE_UTILS.getName()
+                + ".parseBestOffsetDateTime(dateString))")
+            : ("%s.getNullableAttribute(%s, %s, dateString -> OffsetDateTime.parse(dateString))"))
         .build();
 
     public static final ClassType DURATION = new Builder(false).knownClass(Duration.class)

diff --git a/...ator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java b/...ator/src/main/java/com/microsoft/typespec/http/client/generator/model/EmitterOptions.java
@@ -17,7 +17,7 @@
 public class EmitterOptions implements JsonSerializable<EmitterOptions> {
     private String namespace;
     private String outputDir;
-    private String flavor = "Azure";
+    private String flavor = "generic";
     private String serviceName;
     private List<String> serviceVersions;
     private Boolean generateTests = true;