Skip to content

Commit 4ea7f60

Browse files
authored
[Java] Avoid ambiguous references for date and time classes (#18416) (#20230)
1 parent 77e9c1f commit 4ea7f60

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

modules/openapi-generator/src/main/resources/Java/JSON.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ import java.lang.reflect.Type;
3131
import java.text.DateFormat;
3232
import java.text.ParseException;
3333
import java.text.ParsePosition;
34+
{{#jsr310}}
3435
import java.time.LocalDate;
3536
import java.time.OffsetDateTime;
3637
import java.time.format.DateTimeFormatter;
38+
{{/jsr310}}
3739
import java.util.Date;
3840
import java.util.Locale;
3941
import java.util.Map;

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ import java.security.cert.CertificateException;
4747
import java.security.cert.CertificateFactory;
4848
import java.security.cert.X509Certificate;
4949
import java.text.DateFormat;
50+
{{#jsr310}}
5051
import java.time.LocalDate;
5152
import java.time.OffsetDateTime;
5253
import java.time.format.DateTimeFormatter;
54+
{{/jsr310}}
5355
import java.util.*;
5456
import java.util.Map.Entry;
5557
import java.util.concurrent.TimeUnit;

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ import java.lang.reflect.Type;
2828
import java.text.DateFormat;
2929
import java.text.ParseException;
3030
import java.text.ParsePosition;
31+
{{#jsr310}}
3132
import java.time.LocalDate;
3233
import java.time.OffsetDateTime;
3334
import java.time.format.DateTimeFormatter;
35+
{{/jsr310}}
3436
import java.util.Date;
3537
import java.util.Locale;
3638
import java.util.Map;

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ import java.io.IOException;
4646
import java.lang.annotation.Annotation;
4747
import java.lang.reflect.Type;
4848
import java.text.DateFormat;
49+
{{#jsr310}}
4950
import java.time.format.DateTimeFormatter;
51+
{{/jsr310}}
5052
import java.util.LinkedHashMap;
5153
import java.util.Map;
5254
import java.util.HashMap;

modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ import java.lang.reflect.Type;
3030
import java.text.DateFormat;
3131
import java.text.ParseException;
3232
import java.text.ParsePosition;
33+
{{#jsr310}}
3334
import java.time.LocalDate;
3435
import java.time.OffsetDateTime;
3536
import java.time.format.DateTimeFormatter;
37+
{{/jsr310}}
3638
import java.util.Date;
3739
import java.util.Locale;
3840
import java.util.Map;

0 commit comments

Comments
 (0)