[http-client-java]mgmt, fix instant max value (#9123)

Root cause:
`return RANDOM.nextInt() & Long.MAX_VALUE;`

`RANDOM.nextInt()` sometimes will return negative integer. 
With `& Long.MAX_VALUE`, it'll be promoted to long, with negative sign
removed.
The promoted number will exceed Integer.MAX_VALUE.

- bug fix in 65fa31c
- (improvement)Group primitive logic in `WireTypeClientTypeConverter`.
- (improvement)Added test case for primitive types.
- regen & test validation in
Azure/autorest.java#3233

Author: XiaofeiCao

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/clientmodel/PrimitiveType.java

@@ -3,6 +3,7 @@
 
 package com.microsoft.typespec.http.client.generator.core.model.clientmodel;
 
+import com.microsoft.typespec.http.client.generator.core.util.WireTypeClientTypeConverter;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.util.Set;
@@ -224,35 +225,12 @@ public final IType getClientType() {
 
     @Override
     public final String convertToClientType(String expression) {
-        if (getClientType() == this) {
-            return expression;
-        }
-
-        if (this == PrimitiveType.UNIX_TIME_LONG) {
-            expression
-                = String.format("OffsetDateTime.ofInstant(Instant.ofEpochSecond(%1$s), ZoneOffset.UTC)", expression);
-        } else if (this == PrimitiveType.DURATION_LONG) {
-            expression = String.format("Duration.ofSeconds(%s)", expression);
-        } else if (this == PrimitiveType.DURATION_DOUBLE) {
-            expression = String.format("Duration.ofNanos((long) (%s * 1000_000_000L))", expression);
-        }
-        return expression;
+        return WireTypeClientTypeConverter.convertToClientTypeExpression(this, expression);
     }
 
     @Override
     public final String convertFromClientType(String expression) {
-        if (getClientType() == this) {
-            return expression;
-        }
-
-        if (this == PrimitiveType.UNIX_TIME_LONG) {
-            expression = String.format("%1$s.toEpochSecond()", expression);
-        } else if (this == PrimitiveType.DURATION_LONG) {
-            expression = String.format("%s.getSeconds()", expression);
-        } else if (this == PrimitiveType.DURATION_DOUBLE) {
-            expression = String.format("(double) %s.toNanos() / 1000_000_000L", expression);
-        }
-        return expression;
+        return WireTypeClientTypeConverter.convertToWireTypeExpression(this, expression);
     }
 
     @Override

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/ModelTestCaseUtil.java

@@ -110,7 +110,7 @@ public static Object jsonFromType(int depth, IType type) {
             return randomString();
         } else if (type.asNullable() == ClassType.UNIX_TIME_LONG) {
             // use nextInt to avoid exceeding unixTime limit
-            return RANDOM.nextInt() & Long.MAX_VALUE;
+            return RANDOM.nextInt() & Integer.MAX_VALUE;
         } else if (type == ClassType.DATE_TIME) {
             return randomDateTime().toString();
         } else if (type == ClassType.DATE_TIME_RFC_1123) {

packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/WireTypeClientTypeConverter.java

@@ -4,6 +4,7 @@
 
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClassType;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.IType;
+import com.microsoft.typespec.http.client.generator.core.model.clientmodel.PrimitiveType;
 import io.clientcore.core.utils.Base64Uri;
 import io.clientcore.core.utils.DateTimeRfc1123;
 import java.time.Duration;
@@ -76,6 +77,57 @@ public static String convertToWireTypeExpression(ClassType clientType, String ex
         return expression;
     }
 
+    /**
+     * Convert client type expression to wire type expression.
+     * Any change to this method should also be reflected in {@link #convertLiteralToClientValue(IType, String)}, and
+     * {@link #convertToWireTypeExpression(PrimitiveType, String)} if necessary.
+     *
+     * @param wireType the wire type
+     * @param expression value expression
+     * @return value expression in wire type form
+     * @see #convertLiteralToClientValue(IType, String) {@link #convertToWireTypeExpression(PrimitiveType, String)}
+     */
+    public static String convertToClientTypeExpression(PrimitiveType wireType, String expression) {
+        if (wireType.getClientType() == wireType) {
+            return expression;
+        }
+
+        if (wireType == PrimitiveType.UNIX_TIME_LONG) {
+            expression
+                = String.format("OffsetDateTime.ofInstant(Instant.ofEpochSecond(%1$s), ZoneOffset.UTC)", expression);
+        } else if (wireType == PrimitiveType.DURATION_LONG) {
+            expression = String.format("Duration.ofSeconds(%s)", expression);
+        } else if (wireType == PrimitiveType.DURATION_DOUBLE) {
+            expression = String.format("Duration.ofNanos((long) (%s * 1000_000_000L))", expression);
+        }
+        return expression;
+    }
+
+    /**
+     * Convert client type expression to wire type expression.
+     * Any change to this method should also be reflected in {@link #convertLiteralToClientValue(IType, String)}, and
+     * {@link #convertToClientTypeExpression(PrimitiveType, String)} if necessary.
+     *
+     * @param clientType the client type
+     * @param expression value expression
+     * @return value expression in wire type form
+     * @see #convertLiteralToClientValue(IType, String) {@link #convertToClientTypeExpression(PrimitiveType, String)}
+     */
+    public static String convertToWireTypeExpression(PrimitiveType clientType, String expression) {
+        if (clientType.getClientType() == clientType) {
+            return expression;
+        }
+
+        if (clientType == PrimitiveType.UNIX_TIME_LONG) {
+            expression = String.format("%1$s.toEpochSecond()", expression);
+        } else if (clientType == PrimitiveType.DURATION_LONG) {
+            expression = String.format("%s.getSeconds()", expression);
+        } else if (clientType == PrimitiveType.DURATION_DOUBLE) {
+            expression = String.format("(double) %s.toNanos() / 1000_000_000L", expression);
+        }
+        return expression;
+    }
+
     /**
      * Convert example literal value in wire type, to literal value in client type.
      * <p>

packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java

@@ -8,6 +8,7 @@
 import com.azure.core.util.Base64Url;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.DateTimeRfc1123;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
@@ -32,11 +33,21 @@ public final class Encoded implements JsonSerializable<Encoded> {
      */
     private Long timeInSeconds;
 
+    /*
+     * The timeInSecondsPrimitive property.
+     */
+    private long timeInSecondsPrimitive;
+
     /*
      * The timeInSecondsFraction property.
      */
     private Double timeInSecondsFraction;
 
+    /*
+     * The timeInSecondsFractionPrimitive property.
+     */
+    private double timeInSecondsFractionPrimitive;
+
     /*
      * The dateTime property.
      */
@@ -52,6 +63,11 @@ public final class Encoded implements JsonSerializable<Encoded> {
      */
     private Long unixTimestamp;
 
+    /*
+     * The unixTimestampPrimitive property.
+     */
+    private long unixTimestampPrimitive;
+
     /*
      * The base64 property.
      */
@@ -95,6 +111,15 @@ public Duration timeInSeconds() {
         return Duration.ofSeconds(this.timeInSeconds);
     }
 
+    /**
+     * Get the timeInSecondsPrimitive property: The timeInSecondsPrimitive property.
+     * 
+     * @return the timeInSecondsPrimitive value.
+     */
+    public Duration timeInSecondsPrimitive() {
+        return Duration.ofSeconds(this.timeInSecondsPrimitive);
+    }
+
     /**
      * Get the timeInSecondsFraction property: The timeInSecondsFraction property.
      * 
@@ -107,6 +132,15 @@ public Duration timeInSecondsFraction() {
         return Duration.ofNanos((long) (this.timeInSecondsFraction * 1000_000_000L));
     }
 
+    /**
+     * Get the timeInSecondsFractionPrimitive property: The timeInSecondsFractionPrimitive property.
+     * 
+     * @return the timeInSecondsFractionPrimitive value.
+     */
+    public Duration timeInSecondsFractionPrimitive() {
+        return Duration.ofNanos((long) (this.timeInSecondsFractionPrimitive * 1000_000_000L));
+    }
+
     /**
      * Get the dateTime property: The dateTime property.
      * 
@@ -140,6 +174,15 @@ public OffsetDateTime unixTimestamp() {
         return OffsetDateTime.ofInstant(Instant.ofEpochSecond(this.unixTimestamp), ZoneOffset.UTC);
     }
 
+    /**
+     * Get the unixTimestampPrimitive property: The unixTimestampPrimitive property.
+     * 
+     * @return the unixTimestampPrimitive value.
+     */
+    public OffsetDateTime unixTimestampPrimitive() {
+        return OffsetDateTime.ofInstant(Instant.ofEpochSecond(this.unixTimestampPrimitive), ZoneOffset.UTC);
+    }
+
     /**
      * Get the base64 property: The base64 property.
      * 
@@ -194,14 +237,32 @@ public String unknownBytes() {
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (timeInSecondsPrimitive() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Missing required property timeInSecondsPrimitive in model Encoded"));
+        }
+        if (timeInSecondsFractionPrimitive() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property timeInSecondsFractionPrimitive in model Encoded"));
+        }
+        if (unixTimestampPrimitive() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Missing required property unixTimestampPrimitive in model Encoded"));
+        }
     }
 
+    private static final ClientLogger LOGGER = new ClientLogger(Encoded.class);
+
     /**
      * {@inheritDoc}
      */
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeLongField("timeInSecondsPrimitive", this.timeInSecondsPrimitive);
+        jsonWriter.writeDoubleField("timeInSecondsFractionPrimitive", this.timeInSecondsFractionPrimitive);
+        jsonWriter.writeLongField("unixTimestampPrimitive", this.unixTimestampPrimitive);
         jsonWriter.writeNumberField("timeInSeconds", this.timeInSeconds);
         jsonWriter.writeNumberField("timeInSecondsFraction", this.timeInSecondsFraction);
         jsonWriter.writeStringField("dateTime",
@@ -222,6 +283,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
      * @param jsonReader The JsonReader being read.
      * @return An instance of Encoded if the JsonReader was pointing to an instance of it, or null if it was pointing to
      * JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
      * @throws IOException If an error occurs while reading the Encoded.
      */
     public static Encoded fromJson(JsonReader jsonReader) throws IOException {
@@ -231,7 +293,13 @@ public static Encoded fromJson(JsonReader jsonReader) throws IOException {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
-                if ("timeInSeconds".equals(fieldName)) {
+                if ("timeInSecondsPrimitive".equals(fieldName)) {
+                    deserializedEncoded.timeInSecondsPrimitive = reader.getLong();
+                } else if ("timeInSecondsFractionPrimitive".equals(fieldName)) {
+                    deserializedEncoded.timeInSecondsFractionPrimitive = reader.getDouble();
+                } else if ("unixTimestampPrimitive".equals(fieldName)) {
+                    deserializedEncoded.unixTimestampPrimitive = reader.getLong();
+                } else if ("timeInSeconds".equals(fieldName)) {
                     deserializedEncoded.timeInSeconds = reader.getNullable(JsonReader::getLong);
                 } else if ("timeInSecondsFraction".equals(fieldName)) {
                     deserializedEncoded.timeInSecondsFraction = reader.getNullable(JsonReader::getDouble);

packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/StreamStyleSerializationTests.java

@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.jupiter.api.Assertions;
@@ -103,6 +104,12 @@ public void testPropertyWithNullValue() {
         Assertions.assertEquals("input", jsonDict.get("input"));
     }
 
+    @Test
+    public void ensureInstantMaxValue() {
+        // ensure Integer.MAX_VALUE doesn't exceeds Instant.MAX
+        Instant.ofEpochSecond(Integer.MAX_VALUE);
+    }
+
     private static HttpClient createExpandableEnumHttpClient() {
         AtomicInteger callCount = new AtomicInteger();
         HttpClient httpClient = request -> {

packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp

@@ -315,7 +315,11 @@ model Encoded {
   @encode(DurationKnownEncoding.seconds, int32)
   timeInSeconds?: duration;
 
+  @encode(DurationKnownEncoding.seconds, int32)
+  timeInSecondsPrimitive: duration;
+
   timeInSecondsFraction?: myDuration;
+  timeInSecondsFractionPrimitive: myDuration;
 
   @encode(DateTimeKnownEncoding.rfc3339)
   dateTime?: utcDateTime;
@@ -326,6 +330,9 @@ model Encoded {
   @encode(DateTimeKnownEncoding.unixTimestamp, int64)
   unixTimestamp?: utcDateTime;
 
+  @encode(DateTimeKnownEncoding.unixTimestamp, int64)
+  unixTimestampPrimitive: utcDateTime;
+
   @encode(BytesKnownEncoding.base64)
   base64?: bytes;