From 9bf77f00344d2ab43e0f23c7ae5c0ecbf37626e1 Mon Sep 17 00:00:00 2001 From: devjeonghwan Date: Sun, 23 Mar 2025 05:38:30 +0900 Subject: [PATCH 1/4] Add TimeFormat feature --- README.md | 42 +- .../java/com/realtimetech/opack/Opacker.java | 5 +- .../impl/time/CalendarTransformer.java | 35 +- .../impl/time/DateTransformer.java | 33 +- .../impl/time/annotation/TimeFormat.java | 44 ++ .../time/java8/LocalDateTimeTransformer.java | 21 +- .../impl/time/java8/LocalDateTransformer.java | 21 +- .../impl/time/java8/LocalTimeTransformer.java | 21 +- .../impl/uuid/UUIDTransformer.java | 71 +++ .../opack/util/ReflectionUtil.java | 6 + .../opacker/other/JavaJsonBenchmarkTest.java | 405 ++++++++++++++++++ .../time/Java8TimeTransformTest.java | 29 ++ .../transform/time/TimeTransformTest.java | 28 ++ 13 files changed, 743 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/realtimetech/opack/transformer/impl/time/annotation/TimeFormat.java create mode 100644 src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java create mode 100644 src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java diff --git a/README.md b/README.md index 7f4da72..493cc2a 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ public class SomeObject { ```java public class ByteToBase64Transformer implements Transformer { @Override - public @Nullable Object serialize(@NotNull Opacker opacker, @NotNull Class originalType, @Nullable Object object) throws SerializeException { + public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) throws SerializeException { if (object instanceof byte[]) { return Base64.getEncoder().encodeToString((byte[]) object); } @@ -231,7 +231,7 @@ public class ByteToBase64Transformer implements Transformer { } @Override - public @Nullable Object deserialize(@NotNull Opacker opacker, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { if (object instanceof String) { return Base64.getDecoder().decode((String) object); } @@ -261,16 +261,42 @@ public class SomeObject { } ``` -#### 4. Class Transformer +#### 4. Time Format + +```java +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; + +public class SomeObject { + // The below fields will serialize formatted using a given pattern + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private Date date; + + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private Calendar date; + + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private LocalTime date; + + @TimeFormat("yyyy-MM-dd") + private LocalDate date; + + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private LocalDateTime date; +} +``` + +#### 5. Class Transformer ```java public class AnimalTransformer implements Transformer { // Remove a `sound` from a serialized `Animal` @Override - public @Nullable Object serialize(@NotNull Opacker opacker, @NotNull Class originalType, @Nullable Object object) throws SerializeException { + public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) throws SerializeException { if (object instanceof Animal) { Animal animal = (Animal) object; - OpackValue opackValue = opacker.serialize(animal); + OpackValue opackValue = context.getOpacker().serialize(animal); if (opackValue instanceof OpackObject) { OpackObject opackObject = (OpackObject) opackValue; @@ -284,11 +310,11 @@ public class AnimalTransformer implements Transformer { // Restore `sound` from `Animal` before deserialization @Override - public @Nullable Object deserialize(@NotNull Opacker opacker, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { if (object instanceof OpackObject) { if (Animal.class.isAssignableFrom(goalType)) { OpackObject opackObject = (OpackObject) object; - Animal animal = (Animal) opacker.deserialize(goalType, opackObject); + Animal animal = (Animal) context.getOpacker().deserialize(goalType, opackObject); animal.setSound(animal.bark()); } } @@ -325,7 +351,7 @@ public class SomeObject { } ``` -#### 5. Handling Opack Value +#### 6. Handling Opack Value ```java public class Usage { diff --git a/src/main/java/com/realtimetech/opack/Opacker.java b/src/main/java/com/realtimetech/opack/Opacker.java index faaf47d..1e6c2e2 100644 --- a/src/main/java/com/realtimetech/opack/Opacker.java +++ b/src/main/java/com/realtimetech/opack/Opacker.java @@ -41,6 +41,7 @@ import com.realtimetech.opack.transformer.impl.time.java8.LocalDateTimeTransformer; import com.realtimetech.opack.transformer.impl.time.java8.LocalDateTransformer; import com.realtimetech.opack.transformer.impl.time.java8.LocalTimeTransformer; +import com.realtimetech.opack.transformer.impl.uuid.UUIDTransformer; import com.realtimetech.opack.util.OpackArrayConverter; import com.realtimetech.opack.util.ReflectionUtil; import com.realtimetech.opack.util.structure.FastStack; @@ -280,6 +281,8 @@ public enum State { this.typeCapturer.registerPredefinedTransformer(LocalTime.class, LocalTimeTransformer.class, true); this.typeCapturer.registerPredefinedTransformer(LocalDateTime.class, LocalDateTimeTransformer.class, true); + this.typeCapturer.registerPredefinedTransformer(UUID.class, UUIDTransformer.class, true); + this.typeCapturer.registerPredefinedTransformer(Class.class, ClassTransformer.class, true); } catch (InstantiationException exception) { throw new IllegalStateException(exception); @@ -669,7 +672,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { } else if (goalType.isAssignableFrom(object.getClass())) { return object; } else { - throw new DeserializeException("Found object, stack corruption."); + throw new DeserializeException("Failed to convert object(" + object + ") to the specified goal type: " + goalType.getName() + ". This could be due to a missing Transformer."); } } catch (TypeCaptureException exception) { throw new DeserializeException("Can't capture " + goalType.getName() + " class information.", exception); diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java index a4b7306..9550f51 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java @@ -23,10 +23,15 @@ package com.realtimetech.opack.transformer.impl.time; import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; +import com.realtimetech.opack.exception.DeserializeException; import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; @@ -42,7 +47,16 @@ public class CalendarTransformer implements Transformer { @Override public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof Calendar) { - return ((Calendar) object).getTime().getTime(); + Calendar calendar = (Calendar) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return new SimpleDateFormat(timeFormat.value()).format(calendar.getTime()); + } + + return calendar.getTime().getTime(); } return object; @@ -57,8 +71,23 @@ public class CalendarTransformer implements Transformer { * @return the deserialized value */ @Override - public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { - if (object instanceof Long) { + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { + if (object instanceof String) { + Calendar calendar = Calendar.getInstance(); + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + try { + calendar.setTime(new SimpleDateFormat(timeFormat.value()).parse((String) object)); + } catch (ParseException parseException) { + throw new DeserializeException(parseException); + } + + return calendar; + } + } else if (object instanceof Long) { Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date((Long) object)); diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java index 8ffcd76..e8fd75d 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java @@ -23,10 +23,15 @@ package com.realtimetech.opack.transformer.impl.time; import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; +import com.realtimetech.opack.exception.DeserializeException; import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; public class DateTransformer implements Transformer { @@ -41,7 +46,16 @@ public class DateTransformer implements Transformer { @Override public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof Date) { - return ((Date) object).getTime(); + Date date = (Date) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return new SimpleDateFormat(timeFormat.value()).format(date); + } + + return date.getTime(); } return object; @@ -54,10 +68,23 @@ public class DateTransformer implements Transformer { * @param goalType the goal type to deserialize * @param object the object to be deserialized * @return the deserialized value + * @throws DeserializeException if a problem occurs during deserializing */ @Override - public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { - if (object instanceof Long) { + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { + if (object instanceof String) { + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + try { + return new SimpleDateFormat(timeFormat.value()).parse((String) object); + } catch (ParseException parseException) { + throw new DeserializeException(parseException); + } + } + } else if (object instanceof Long) { return new Date((Long) object); } diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/annotation/TimeFormat.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/annotation/TimeFormat.java new file mode 100644 index 0000000..cad44e6 --- /dev/null +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/annotation/TimeFormat.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2025 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.transformer.impl.time.annotation; + +import org.jetbrains.annotations.NotNull; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Fields annotated with @TimeFormat("pattern") will be serialized and deserialized using a given time format + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ + ElementType.FIELD, +}) +public @interface TimeFormat { + /** + * @return the time format pattern to be used when serialize or deserialize + */ + @NotNull String value(); +} \ No newline at end of file diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java index a182dd5..0acef8c 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java @@ -23,12 +23,15 @@ package com.realtimetech.opack.transformer.impl.time.java8; import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; public class LocalDateTimeTransformer implements Transformer { /** @@ -43,6 +46,13 @@ public class LocalDateTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof LocalDateTime) { LocalDateTime localDateTime = (LocalDateTime) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return localDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } return OpackArray.createWithArrayObject( new int[]{ @@ -70,7 +80,16 @@ public class LocalDateTimeTransformer implements Transformer { */ @Override public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { - if (object instanceof OpackArray) { + if (object instanceof String) { + String string = (String) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return LocalDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } + } else if (object instanceof OpackArray) { OpackArray opackArray = (OpackArray) object; if (opackArray.length() == 7) { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java index a3db74f..dfe5113 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java @@ -23,12 +23,15 @@ package com.realtimetech.opack.transformer.impl.time.java8; import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; public class LocalDateTransformer implements Transformer { /** @@ -43,6 +46,13 @@ public class LocalDateTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof LocalDate) { LocalDate localDate = (LocalDate) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return localDate.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } return OpackArray.createWithArrayObject( new int[]{ @@ -66,7 +76,16 @@ public class LocalDateTransformer implements Transformer { */ @Override public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { - if (object instanceof OpackArray) { + if (object instanceof String) { + String string = (String) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return LocalDate.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } + } else if (object instanceof OpackArray) { OpackArray opackArray = (OpackArray) object; if (opackArray.length() == 3) { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java index 0ae76d7..4edd7ae 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java @@ -23,12 +23,15 @@ package com.realtimetech.opack.transformer.impl.time.java8; import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.time.LocalTime; +import java.time.format.DateTimeFormatter; public class LocalTimeTransformer implements Transformer { /** @@ -43,6 +46,13 @@ public class LocalTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof LocalTime) { LocalTime localTime = (LocalTime) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return localTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } return OpackArray.createWithArrayObject( new int[]{ @@ -67,7 +77,16 @@ public class LocalTimeTransformer implements Transformer { */ @Override public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { - if (object instanceof OpackArray) { + if (object instanceof String) { + String string = (String) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + return LocalTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } + } else if (object instanceof OpackArray) { OpackArray opackArray = (OpackArray) object; if (opackArray.length() == 4) { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java new file mode 100644 index 0000000..bc7375b --- /dev/null +++ b/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2025 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.transformer.impl.uuid; + +import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.exception.DeserializeException; +import com.realtimetech.opack.exception.SerializeException; +import com.realtimetech.opack.transformer.Transformer; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.nio.file.Path; +import java.util.UUID; + +public class UUIDTransformer implements Transformer { + /** + * Serialize specific value to opack value + * + * @param context the opacker context + * @param originalType the original type + * @param object the object to be serialized + * @return the opack value + * @throws SerializeException if a problem occurs during serializing + */ + @Override + public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) throws SerializeException { + if (object instanceof UUID) { + return ((UUID) object).toString(); + } + + return object; + } + + /** + * Deserialize opack value + * + * @param context the opacker context + * @param goalType the goal type to deserialize + * @param object the object to be deserialized + * @return the deserialized value + * @throws DeserializeException if a problem occurs during deserializing + */ + @Override + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { + if (object instanceof String) { + return UUID.fromString(String.valueOf(object)); + } + + return object; + } +} diff --git a/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java b/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java index facfc78..a85b9cc 100644 --- a/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java +++ b/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java @@ -28,6 +28,8 @@ import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.lang.reflect.*; +import java.math.BigDecimal; +import java.math.BigInteger; import java.util.LinkedList; import java.util.List; @@ -145,6 +147,10 @@ private static abstract class Allocator { return number.doubleValue(); } else if (type == long.class || type == Long.class) { return number.longValue(); + } else if (type == BigInteger.class) { + return BigInteger.valueOf(number.longValue()); + } else if (type == BigDecimal.class) { + return BigDecimal.valueOf(number.longValue()); } } else if (objectType == Boolean.class) { if (type == boolean.class || type == Boolean.class) { diff --git a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java new file mode 100644 index 0000000..33dea87 --- /dev/null +++ b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java @@ -0,0 +1,405 @@ +/* + * Copyright (C) 2025 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.test.opacker.other; + +import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.annotation.Type; +import com.realtimetech.opack.codec.json.Json; +import com.realtimetech.opack.exception.DecodeException; +import com.realtimetech.opack.exception.DeserializeException; +import com.realtimetech.opack.exception.SerializeException; +import com.realtimetech.opack.test.OpackAssert; +import com.realtimetech.opack.value.OpackValue; +import org.junit.jupiter.api.Test; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.util.*; + +public class JavaJsonBenchmarkTest { + public static class Clients { + @Type(ArrayList.class) + private List clients; + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Clients)) { + return false; + } + + Clients that = (Clients) o; + + return Objects.equals(clients, that.clients); + } + + @Override + public int hashCode() { + return Objects.hashCode(clients); + } + + @Override + public String toString() { + return "Clients{" + "clients=" + clients + '}'; + } + + public List getClients() { + return clients; + } + + public void setClients(List clients) { + this.clients = clients; + } + + public static final class Client { + private long id; + private int index; + private UUID guid; + private boolean isActive; + private BigDecimal balance; + private String picture; + private int age; + private EyeColor eyeColor; + private String name; + private String gender; + private String company; + private String[] emails; + private long[] phones; + private String address; + private String about; + private LocalDate registered; + private double latitude; + private double longitude; + @Type(ArrayList.class) + private List tags; + @Type(ArrayList.class) + private List partners; + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Client)) { + return false; + } + + Client client = (Client) o; + + return index == client.index && + isActive == client.isActive && + age == client.age && + Math.abs(Double.doubleToLongBits(client.latitude) - Double.doubleToLongBits(latitude)) < 3 && + Math.abs(Double.doubleToLongBits(client.longitude) - Double.doubleToLongBits(longitude)) < 3 && + Objects.equals(id, client.id) && + Objects.equals(guid, client.guid) && + balance.compareTo(client.balance) == 0 && + Objects.equals(picture, client.picture) && + Objects.equals(eyeColor, client.eyeColor) && + Objects.equals(name, client.name) && + Objects.equals(gender, client.gender) && + Objects.equals(company, client.company) && + Arrays.equals(emails, client.emails) && + Arrays.equals(phones, client.phones) && + Objects.equals(address, client.address) && + Objects.equals(about, client.about) && + Objects.equals(registered, client.registered) && + Objects.equals(tags, client.tags) && + Objects.equals(partners, client.partners); + } + + @Override + public int hashCode() { + return Objects.hash(id, index, guid, isActive, balance, picture, age, eyeColor, name, gender, company, + Arrays.hashCode(emails), Arrays.hashCode(phones), address, about, registered, tags, partners); + } + + private String toStr(long[] nums) { + StringBuilder sb = new StringBuilder(); + sb.append('['); + boolean first = true; + for(long l : nums) { + if (first) first = false; + else sb.append(','); + sb.append(l); + } + sb.append(']'); + return sb.toString(); + } + + @Override + public String toString() { + return "JsonDataObj{" + "id=" + id + ", index=" + index + ", guid=" + guid + ", isActive=" + isActive + ", balance=" + balance + ", picture=" + picture + ", age=" + age + ", eyeColor=" + eyeColor + ", name=" + name + ", gender=" + gender + ", company=" + company + ", emails=" + (emails != null ? Arrays.asList(emails) : null) + ", phones=" + toStr(phones) + ", address=" + address + ", about=" + about + ", registered=" + registered + ", latitude=" + latitude + ", longitude=" + longitude + ", tags=" + tags + ", partners=" + partners + '}'; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public int getIndex() { + return index; + } + + public void setIndex(int index) { + this.index = index; + } + + public UUID getGuid() { + return guid; + } + + public void setGuid(UUID guid) { + this.guid = guid; + } + + public boolean getIsActive() { + return isActive; + } + + public void setIsActive(boolean isActive) { + this.isActive = isActive; + } + + public BigDecimal getBalance() { + return balance; + } + + public void setBalance(BigDecimal balance) { + this.balance = balance; + } + + public String getPicture() { + return picture; + } + + public void setPicture(String picture) { + this.picture = picture; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public EyeColor getEyeColor() { + return eyeColor; + } + + public void setEyeColor(EyeColor eyeColor) { + this.eyeColor = eyeColor; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String[] getEmails() { + return emails; + } + + public void setEmails(String[] emails) { + this.emails = emails; + } + + public long[] getPhones() { + return phones; + } + + public void setPhones(long[] phones) { + this.phones = phones; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAbout() { + return about; + } + + public void setAbout(String about) { + this.about = about; + } + + public LocalDate getRegistered() { + return registered; + } + + public void setRegistered(LocalDate registered) { + this.registered = registered; + } + + public double getLatitude() { + return latitude; + } + + public void setLatitude(double latitude) { + this.latitude = latitude; + } + + public double getLongitude() { + return longitude; + } + + public void setLongitude(double longitude) { + this.longitude = longitude; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + public List getPartners() { + return partners; + } + + public void setPartners(List partners) { + this.partners = partners; + } + } + + public enum EyeColor { + BROWN, + BLUE, + GREEN; + + public static EyeColor fromNumber(int i) { + if (i == 0) return BROWN; + if (i == 1) return BLUE; + return GREEN; + } + } + + public static final class Partner { + private long id; + private String name; + private OffsetDateTime since; + + public Partner() { + } + + public static Partner create(long id, String name, OffsetDateTime since) { + Partner partner = new Partner(); + partner.id = id; + partner.name = name; + partner.since = since; + return partner; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Partner)) { + return false; + } + + Partner partner = (Partner) o; + + return id == partner.id && + Objects.equals(since, partner.since) && + Objects.equals(name, partner.name); + } + + @Override + public int hashCode() { + return Objects.hash(id, since, name); + } + + @Override + public String toString() { + return "Partner{" + "id=" + id + ", name=" + name + ", since=" + since + '}'; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public OffsetDateTime getSince() { + return since; + } + + public void setSince(OffsetDateTime since) { + this.since = since; + } + } + } + + @Test + public void test() throws SerializeException, DeserializeException, OpackAssert.AssertException, DecodeException { + Opacker opacker = Opacker.Builder.create().build(); + OpackValue serialized = Json.decode("{\"clients\":[{\"id\":112673038484856810,\"index\":1344055720,\"guid\":\"60688132-8a21-b944-f888-f509a6b90256\",\"isActive\":false,\"balance\":0.04548297857634076,\"picture\":\"vAwEeFeE9EM0mrfkg2ujwjCf77kbBYALtM9hutQ0cKRGmJkxM1nInZfBYXLZpCJOwGuoyv1bg9ocf7K4A8VrzTN1z23ifDgRkY6s\",\"age\":60,\"eyeColor\":\"BLUE\",\"name\":\"tnJW03NKSqfdWFShb4Zx\",\"gender\":\"mkHYjEd9AdQ9qugcOVPr\",\"company\":\"QBC3vKiRZz9KzZUFL387\",\"emails\":[],\"phones\":[746929031,561717506,990959217,1768136872,500288955,1213970016,1796482738,28628332,2066852063],\"address\":\"m9qwxh8ck4ZqfcTEn8DC\",\"about\":\"GPsNVdldwX7l5sKShO21\",\"registered\":\"1926-05-06\",\"latitude\":33.206450907142155,\"longitude\":22.589461322126944,\"tags\":[\"sgIXdOUPvN\",\"EaSpiLhL3E\",\"KheRxPm0oS\",\"njVbMOrzMf\",\"tKnGw8SNUk\",\"W56syc0sUv\",\"tnyhobz3Nm\",\"JO7ymoPNhf\",\"8oDGnPQeIX\",\"EP2Vgxe29b\",\"TMCD1h0s8V\",\"BjsKUHxlb2\",\"Gb10kL3FHo\",\"Mkyc0gT5wf\",\"FqOWswKKbb\",\"EURPNlWQHx\",\"NJjxMOFU1K\",\"oHCD4oBfIh\",\"uHYI3is1O8\",\"1ufor6JqZy\",\"JU7sDQCSFA\",\"LUiAfaDpgP\",\"Gp0ppmYBhh\",\"QQ7971iGtk\",\"NS8yP3IfVE\",\"pctZBahLR2\",\"k2msx6HoFv\",\"mRG8LGeAhx\",\"Ctp5PqxJc9\",\"cEP1p05GVa\",\"PqRmLI7U28\",\"Eb7UVo4nlI\",\"trDbHQy2sp\",\"ysv0FegxwU\",\"mlyr8PucKO\",\"W9Wqp4A8aL\",\"J56dFrPCbb\",\"y1fsnL7OXA\",\"tdvMCRMNCR\",\"OXdmNUvM4I\"],\"partners\":[{\"id\":6942554547810915627,\"name\":\"DwuzOOeuPautxtTzMHOvIxVHIboVis\",\"since\":\"1909-05-23T23:29:37.098674093Z\"},{\"id\":-8518542767576114527,\"name\":\"bGZuDwWWosUOgPbJzCviDkFUbvGDIn\",\"since\":\"1938-05-04T13:50:04.017434661Z\"},{\"id\":601371629166935988,\"name\":\"PlnjVauJisRvtUMkKZMaWDlFefJCwL\",\"since\":\"1987-05-09T20:46:24.620521962Z\"},{\"id\":4375579985883232220,\"name\":\"xAwXgtrZEcUxnPQJIRqXAmKCncRDTY\",\"since\":\"1990-11-01T06:38:20.380789524Z\"},{\"id\":8317268803618076921,\"name\":\"QQdmSLNtYJXcpLMQINKSzWQxJVQxLF\",\"since\":\"1940-05-18T10:51:42.883428669Z\"},{\"id\":4285484400196566404,\"name\":\"lfpUWBYwPYbMvRTtRvdORyZyCDJzlZ\",\"since\":\"2003-10-13T22:27:11.929616204Z\"},{\"id\":2265074678478192283,\"name\":\"alBTLDrrFIAdLOkRhGAYjrkgSYUoee\",\"since\":\"1980-12-02T14:27:57.767475522Z\"},{\"id\":8350482858520968813,\"name\":\"gOnmVOFQLyDkQFKmKPSRSozRHhmYoI\",\"since\":\"2008-01-07T15:11:04.239970727Z\"},{\"id\":-6587118629753263393,\"name\":\"TuFtTDQNEQGscizafoDcSRwMhkdTSB\",\"since\":\"1964-02-13T23:30:54.254993783Z\"},{\"id\":-2402179798706660819,\"name\":\"sJHfDYWhXfbQyXkAaiIyPAedPuRqEg\",\"since\":\"1934-12-12T23:22:00.430680784Z\"}]}]}"); + Clients deserialized = opacker.deserialize(Clients.class, serialized); + } +} diff --git a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java index f20166c..d47183b 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java @@ -26,6 +26,7 @@ import com.realtimetech.opack.exception.DeserializeException; import com.realtimetech.opack.exception.SerializeException; import com.realtimetech.opack.test.OpackAssert; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackValue; import org.junit.jupiter.api.Test; @@ -47,6 +48,22 @@ public Java8TimeTransformClass() { } } + @SuppressWarnings("ALL") + public static class Java8TimeTransformWithFormatClass { + @TimeFormat("yyyy-MM-dd") + private LocalDate localDate; + @TimeFormat("HH:mm:ss.SSSSSSSSS") + private LocalTime localTime; + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private LocalDateTime localDateTime; + + public Java8TimeTransformWithFormatClass() { + this.localDate = LocalDate.now(); + this.localTime = LocalTime.now(); + this.localDateTime = LocalDateTime.now(); + } + } + @Test public void test() throws SerializeException, DeserializeException, OpackAssert.AssertException { Opacker opacker = Opacker.Builder.create().build(); @@ -58,4 +75,16 @@ public void test() throws SerializeException, DeserializeException, OpackAssert. OpackAssert.assertEquals(originalObject, deserialized); } + + @Test + public void test_with_format() throws SerializeException, DeserializeException, OpackAssert.AssertException { + Opacker opacker = Opacker.Builder.create().build(); + Java8TimeTransformWithFormatClass originalObject = new Java8TimeTransformWithFormatClass(); + + OpackValue serialized = opacker.serialize(originalObject); + assert serialized != null; + Java8TimeTransformWithFormatClass deserialized = opacker.deserialize(Java8TimeTransformWithFormatClass.class, serialized); + + OpackAssert.assertEquals(originalObject, deserialized); + } } diff --git a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/TimeTransformTest.java b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/TimeTransformTest.java index 6127764..c0915ae 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/TimeTransformTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/TimeTransformTest.java @@ -26,6 +26,7 @@ import com.realtimetech.opack.exception.DeserializeException; import com.realtimetech.opack.exception.SerializeException; import com.realtimetech.opack.test.OpackAssert; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackValue; import org.junit.jupiter.api.Test; @@ -46,6 +47,21 @@ public TimeTransformClass() { } } + @SuppressWarnings("ALL") + public static class TimeTransformWithFormatClass { + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private Date date; + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private Calendar calendar; + + public TimeTransformWithFormatClass() { + this.date = new Date(); + + this.calendar = Calendar.getInstance(); + this.calendar.setTime(new Date()); + } + } + @Test public void test() throws SerializeException, DeserializeException, OpackAssert.AssertException { Opacker opacker = Opacker.Builder.create().build(); @@ -57,4 +73,16 @@ public void test() throws SerializeException, DeserializeException, OpackAssert. OpackAssert.assertEquals(originalObject, deserialized); } + + @Test + public void test_with_format() throws SerializeException, DeserializeException, OpackAssert.AssertException { + Opacker opacker = Opacker.Builder.create().build(); + TimeTransformWithFormatClass originalObject = new TimeTransformWithFormatClass(); + + OpackValue serialized = opacker.serialize(originalObject); + assert serialized != null; + TimeTransformWithFormatClass deserialized = opacker.deserialize(TimeTransformWithFormatClass.class, serialized); + + OpackAssert.assertEquals(originalObject, deserialized); + } } From 9d36cef03e875b3b79fde3c25232a01cd8853b7b Mon Sep 17 00:00:00 2001 From: devjeonghwan Date: Sun, 23 Mar 2025 06:03:36 +0900 Subject: [PATCH 2/4] Improve TimeFormat feature --- .../java/com/realtimetech/opack/Opacker.java | 13 +- .../impl/time/CalendarTransformer.java | 18 +-- .../impl/time/DateTransformer.java | 14 ++- .../time/java8/LocalDateTimeTransformer.java | 8 +- .../impl/time/java8/LocalDateTransformer.java | 8 +- .../impl/time/java8/LocalTimeTransformer.java | 8 +- .../time/java8/OffsetDateTimeTransformer.java | 117 ++++++++++++++++++ .../time/java8/OffsetTimeTransformer.java | 111 +++++++++++++++++ .../time/java8/ZonedDateTimeTransformer.java | 117 ++++++++++++++++++ .../impl/uuid/UUIDTransformer.java | 1 - .../realtimetech/opack/test/OpackAssert.java | 7 +- .../opacker/other/JavaJsonBenchmarkTest.java | 5 +- .../time/Java8TimeTransformTest.java | 27 +++- 13 files changed, 421 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java create mode 100644 src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java create mode 100644 src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java diff --git a/src/main/java/com/realtimetech/opack/Opacker.java b/src/main/java/com/realtimetech/opack/Opacker.java index 1e6c2e2..a290dbf 100644 --- a/src/main/java/com/realtimetech/opack/Opacker.java +++ b/src/main/java/com/realtimetech/opack/Opacker.java @@ -38,9 +38,7 @@ import com.realtimetech.opack.transformer.impl.reflection.ClassTransformer; import com.realtimetech.opack.transformer.impl.time.CalendarTransformer; import com.realtimetech.opack.transformer.impl.time.DateTransformer; -import com.realtimetech.opack.transformer.impl.time.java8.LocalDateTimeTransformer; -import com.realtimetech.opack.transformer.impl.time.java8.LocalDateTransformer; -import com.realtimetech.opack.transformer.impl.time.java8.LocalTimeTransformer; +import com.realtimetech.opack.transformer.impl.time.java8.*; import com.realtimetech.opack.transformer.impl.uuid.UUIDTransformer; import com.realtimetech.opack.util.OpackArrayConverter; import com.realtimetech.opack.util.ReflectionUtil; @@ -55,9 +53,7 @@ import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; import java.nio.file.Path; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; +import java.time.*; import java.util.*; public class Opacker { @@ -280,6 +276,9 @@ public enum State { this.typeCapturer.registerPredefinedTransformer(LocalDate.class, LocalDateTransformer.class, true); this.typeCapturer.registerPredefinedTransformer(LocalTime.class, LocalTimeTransformer.class, true); this.typeCapturer.registerPredefinedTransformer(LocalDateTime.class, LocalDateTimeTransformer.class, true); + this.typeCapturer.registerPredefinedTransformer(OffsetTime.class, OffsetTimeTransformer.class, true); + this.typeCapturer.registerPredefinedTransformer(OffsetDateTime.class, OffsetDateTimeTransformer.class, true); + this.typeCapturer.registerPredefinedTransformer(ZonedDateTime.class, ZonedDateTimeTransformer.class, true); this.typeCapturer.registerPredefinedTransformer(UUID.class, UUIDTransformer.class, true); @@ -660,7 +659,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { throw new DeserializeException("Can't create instance using unsafe method.", exception); } } else { - throw new DeserializeException("Target class is object. but, object is not OpackObject."); + throw new DeserializeException("Target class is object. but, object(" + object + ") is not OpackObject."); } } diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java index 9550f51..d5801ca 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java @@ -53,7 +53,9 @@ public class CalendarTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return new SimpleDateFormat(timeFormat.value()).format(calendar.getTime()); + if (timeFormat != null) { + return new SimpleDateFormat(timeFormat.value()).format(calendar.getTime()); + } } return calendar.getTime().getTime(); @@ -79,13 +81,15 @@ public class CalendarTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - try { - calendar.setTime(new SimpleDateFormat(timeFormat.value()).parse((String) object)); - } catch (ParseException parseException) { - throw new DeserializeException(parseException); - } + if (timeFormat != null) { + try { + calendar.setTime(new SimpleDateFormat(timeFormat.value()).parse((String) object)); + } catch (ParseException parseException) { + throw new DeserializeException(parseException); + } - return calendar; + return calendar; + } } } else if (object instanceof Long) { Calendar calendar = Calendar.getInstance(); diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java index e8fd75d..f8c7437 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java @@ -52,7 +52,9 @@ public class DateTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return new SimpleDateFormat(timeFormat.value()).format(date); + if (timeFormat != null) { + return new SimpleDateFormat(timeFormat.value()).format(date); + } } return date.getTime(); @@ -78,10 +80,12 @@ public class DateTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - try { - return new SimpleDateFormat(timeFormat.value()).parse((String) object); - } catch (ParseException parseException) { - throw new DeserializeException(parseException); + if (timeFormat != null) { + try { + return new SimpleDateFormat(timeFormat.value()).parse((String) object); + } catch (ParseException parseException) { + throw new DeserializeException(parseException); + } } } } else if (object instanceof Long) { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java index 0acef8c..8bfe8e1 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java @@ -51,7 +51,9 @@ public class LocalDateTimeTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return localDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + if (timeFormat != null) { + return localDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } } return OpackArray.createWithArrayObject( @@ -87,7 +89,9 @@ public class LocalDateTimeTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return LocalDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + if (timeFormat != null) { + return LocalDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } } } else if (object instanceof OpackArray) { OpackArray opackArray = (OpackArray) object; diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java index dfe5113..ef4bfc9 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java @@ -51,7 +51,9 @@ public class LocalDateTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return localDate.format(DateTimeFormatter.ofPattern(timeFormat.value())); + if (timeFormat != null) { + return localDate.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } } return OpackArray.createWithArrayObject( @@ -83,7 +85,9 @@ public class LocalDateTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return LocalDate.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + if (timeFormat != null) { + return LocalDate.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } } } else if (object instanceof OpackArray) { OpackArray opackArray = (OpackArray) object; diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java index 4edd7ae..955ec68 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java @@ -51,7 +51,9 @@ public class LocalTimeTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return localTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + if (timeFormat != null) { + return localTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } } return OpackArray.createWithArrayObject( @@ -84,7 +86,9 @@ public class LocalTimeTransformer implements Transformer { if (currentFieldProperty != null) { TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); - return LocalTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + if (timeFormat != null) { + return LocalTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } } } else if (object instanceof OpackArray) { OpackArray opackArray = (OpackArray) object; diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java new file mode 100644 index 0000000..3abebf9 --- /dev/null +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2022 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.transformer.impl.time.java8; + +import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; +import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; +import com.realtimetech.opack.value.OpackArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; + +public class OffsetDateTimeTransformer implements Transformer { + /** + * Serialize specific value to opack value + * + * @param context the opacker context + * @param originalType the original type + * @param object the object to be serialized + * @return the opack value + */ + @Override + public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { + if (object instanceof OffsetDateTime) { + OffsetDateTime offsetDateTime = (OffsetDateTime) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + if (timeFormat != null) { + return offsetDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } + } + + return OpackArray.createWithArrayObject( + new int[]{ + offsetDateTime.getYear(), + offsetDateTime.getMonthValue(), + offsetDateTime.getDayOfMonth(), + offsetDateTime.getHour(), + offsetDateTime.getMinute(), + offsetDateTime.getSecond(), + offsetDateTime.getNano(), + offsetDateTime.getOffset().getTotalSeconds() + } + ); + } + + return object; + } + + /** + * Deserialize opack value + * + * @param context the opacker context + * @param goalType the goal type to deserialize + * @param object the object to be deserialized + * @return the deserialized value + */ + @Override + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { + if (object instanceof String) { + String string = (String) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + if (timeFormat != null) { + return OffsetDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } + } + } else if (object instanceof OpackArray) { + OpackArray opackArray = (OpackArray) object; + + if (opackArray.length() == 8) { + return OffsetDateTime.of( + opackArray.getAsInt(0), + opackArray.getAsInt(1), + opackArray.getAsInt(2), + opackArray.getAsInt(3), + opackArray.getAsInt(4), + opackArray.getAsInt(5), + opackArray.getAsInt(6), + ZoneOffset.ofTotalSeconds(opackArray.getAsInt(7)) + ); + } + } + + return object; + } +} diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java new file mode 100644 index 0000000..6871bbf --- /dev/null +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.transformer.impl.time.java8; + +import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; +import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; +import com.realtimetech.opack.value.OpackArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.time.OffsetTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; + +public class OffsetTimeTransformer implements Transformer { + /** + * Serialize specific value to opack value + * + * @param context the opacker context + * @param originalType the original type + * @param object the object to be serialized + * @return the opack value + */ + @Override + public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { + if (object instanceof OffsetTime) { + OffsetTime offsetTime = (OffsetTime) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + if (timeFormat != null) { + return offsetTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } + } + + return OpackArray.createWithArrayObject( + new int[]{ + offsetTime.getHour(), + offsetTime.getMinute(), + offsetTime.getSecond(), + offsetTime.getNano(), + offsetTime.getOffset().getTotalSeconds() + } + ); + } + + return object; + } + + /** + * Deserialize opack value + * + * @param context the opacker context + * @param goalType the goal type to deserialize + * @param object the object to be deserialized + * @return the deserialized value + */ + @Override + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { + if (object instanceof String) { + String string = (String) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + if (timeFormat != null) { + return OffsetTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } + } + } else if (object instanceof OpackArray) { + OpackArray opackArray = (OpackArray) object; + + if (opackArray.length() == 5) { + return OffsetTime.of( + opackArray.getAsInt(0), + opackArray.getAsInt(1), + opackArray.getAsInt(2), + opackArray.getAsInt(3), + ZoneOffset.ofTotalSeconds(opackArray.getAsInt(4)) + ); + } + } + + return object; + } +} diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java new file mode 100644 index 0000000..3678902 --- /dev/null +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2022 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.transformer.impl.time.java8; + +import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.capture.CapturedType; +import com.realtimetech.opack.transformer.Transformer; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; +import com.realtimetech.opack.value.OpackArray; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +public class ZonedDateTimeTransformer implements Transformer { + /** + * Serialize specific value to opack value + * + * @param context the opacker context + * @param originalType the original type + * @param object the object to be serialized + * @return the opack value + */ + @Override + public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { + if (object instanceof ZonedDateTime) { + ZonedDateTime zonedDateTime = (ZonedDateTime) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + if (timeFormat != null) { + return zonedDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + } + } + + return OpackArray.createWithArrayObject( + new int[]{ + zonedDateTime.getYear(), + zonedDateTime.getMonthValue(), + zonedDateTime.getDayOfMonth(), + zonedDateTime.getHour(), + zonedDateTime.getMinute(), + zonedDateTime.getSecond(), + zonedDateTime.getNano(), + zonedDateTime.getOffset().getTotalSeconds() + } + ); + } + + return object; + } + + /** + * Deserialize opack value + * + * @param context the opacker context + * @param goalType the goal type to deserialize + * @param object the object to be deserialized + * @return the deserialized value + */ + @Override + public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { + if (object instanceof String) { + String string = (String) object; + CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + + if (currentFieldProperty != null) { + TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + + if (timeFormat != null) { + return ZonedDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + } + } + } else if (object instanceof OpackArray) { + OpackArray opackArray = (OpackArray) object; + + if (opackArray.length() == 8) { + return ZonedDateTime.of( + opackArray.getAsInt(0), + opackArray.getAsInt(1), + opackArray.getAsInt(2), + opackArray.getAsInt(3), + opackArray.getAsInt(4), + opackArray.getAsInt(5), + opackArray.getAsInt(6), + ZoneOffset.ofTotalSeconds(opackArray.getAsInt(7)) + ); + } + } + + return object; + } +} diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java index bc7375b..a338df4 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/uuid/UUIDTransformer.java @@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.nio.file.Path; import java.util.UUID; public class UUIDTransformer implements Transformer { diff --git a/src/test/java/com/realtimetech/opack/test/OpackAssert.java b/src/test/java/com/realtimetech/opack/test/OpackAssert.java index 1a6d2ac..cdcefaa 100644 --- a/src/test/java/com/realtimetech/opack/test/OpackAssert.java +++ b/src/test/java/com/realtimetech/opack/test/OpackAssert.java @@ -30,9 +30,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.nio.file.Path; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; +import java.time.*; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -170,6 +168,9 @@ static void assertSingleValue(Object originalObject, Object targetObject) throws originalObject instanceof LocalDate || originalObject instanceof LocalTime || originalObject instanceof LocalDateTime || + originalObject instanceof OffsetDateTime || + originalObject instanceof OffsetTime || + originalObject instanceof ZonedDateTime || originalObject instanceof Class) { OpackAssert.assertEquals(originalObject.toString(), targetObject.toString()); } else { diff --git a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java index 33dea87..be5c89d 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java @@ -29,6 +29,7 @@ import com.realtimetech.opack.exception.DeserializeException; import com.realtimetech.opack.exception.SerializeException; import com.realtimetech.opack.test.OpackAssert; +import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackValue; import org.junit.jupiter.api.Test; @@ -90,6 +91,7 @@ public static final class Client { private long[] phones; private String address; private String about; + @TimeFormat("yyyy-MM-dd") private LocalDate registered; private double latitude; private double longitude; @@ -141,7 +143,7 @@ private String toStr(long[] nums) { StringBuilder sb = new StringBuilder(); sb.append('['); boolean first = true; - for(long l : nums) { + for (long l : nums) { if (first) first = false; else sb.append(','); sb.append(l); @@ -331,6 +333,7 @@ public static EyeColor fromNumber(int i) { public static final class Partner { private long id; private String name; + @TimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSX") private OffsetDateTime since; public Partner() { diff --git a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java index d47183b..ec9c5be 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java @@ -30,9 +30,7 @@ import com.realtimetech.opack.value.OpackValue; import org.junit.jupiter.api.Test; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; +import java.time.*; public class Java8TimeTransformTest { @SuppressWarnings("ALL") @@ -41,10 +39,22 @@ public static class Java8TimeTransformClass { private LocalTime localTime; private LocalDateTime localDateTime; + /* + private OffsetTime offsetTime; + private OffsetDateTime offsetDateTime; + private ZonedDateTime zonedDateTime; + */ + public Java8TimeTransformClass() { this.localDate = LocalDate.now(); this.localTime = LocalTime.now(); this.localDateTime = LocalDateTime.now(); + + /* + this.offsetTime = OffsetTime.now(); + this.offsetDateTime = OffsetDateTime.now(); + this.zonedDateTime = ZonedDateTime.now(); + */ } } @@ -57,10 +67,21 @@ public static class Java8TimeTransformWithFormatClass { @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") private LocalDateTime localDateTime; + @TimeFormat("HH:mm:ss.SSSSSSSSS") + private OffsetTime offsetTime; + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private OffsetDateTime offsetDateTime; + @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + private ZonedDateTime zonedDateTime; + public Java8TimeTransformWithFormatClass() { this.localDate = LocalDate.now(); this.localTime = LocalTime.now(); this.localDateTime = LocalDateTime.now(); + + this.offsetTime = OffsetTime.now(); + this.offsetDateTime = OffsetDateTime.now(); + this.zonedDateTime = ZonedDateTime.now(); } } From 8d07788d9ab7c900bc08a70ec8745442af37cd58 Mon Sep 17 00:00:00 2001 From: devjeonghwan Date: Sun, 23 Mar 2025 11:48:45 +0900 Subject: [PATCH 3/4] Fix some error of TimeFormat feature --- .idea/modules/opack.main.iml | 2 +- .idea/modules/opack.test.iml | 2 +- .idea/opack.iml | 2 +- .../java/com/realtimetech/opack/Opacker.java | 44 +++++++++-------- .../opack/capture/CapturedType.java | 41 +++++++++++++++- .../impl/list/ListTransformer.java | 5 +- .../transformer/impl/map/MapTransformer.java | 7 ++- .../impl/time/CalendarTransformer.java | 12 ++--- .../impl/time/DateTransformer.java | 12 ++--- .../time/java8/LocalDateTimeTransformer.java | 12 ++--- .../impl/time/java8/LocalDateTransformer.java | 12 ++--- .../impl/time/java8/LocalTimeTransformer.java | 12 ++--- .../time/java8/OffsetDateTimeTransformer.java | 47 ++++--------------- .../time/java8/OffsetTimeTransformer.java | 41 ++++------------ .../time/java8/ZonedDateTimeTransformer.java | 47 ++++--------------- .../opack/util/ReflectionUtil.java | 2 +- .../realtimetech/opack/test/OpackAssert.java | 15 ++++-- .../opacker/other/JavaJsonBenchmarkTest.java | 1 - .../time/Java8TimeTransformTest.java | 10 ++-- 19 files changed, 147 insertions(+), 179 deletions(-) diff --git a/.idea/modules/opack.main.iml b/.idea/modules/opack.main.iml index 5efd723..b3a03d6 100644 --- a/.idea/modules/opack.main.iml +++ b/.idea/modules/opack.main.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/opack.test.iml b/.idea/modules/opack.test.iml index 19edd23..730cf28 100644 --- a/.idea/modules/opack.test.iml +++ b/.idea/modules/opack.test.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/opack.iml b/.idea/opack.iml index 3850624..a0ca158 100644 --- a/.idea/opack.iml +++ b/.idea/opack.iml @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/com/realtimetech/opack/Opacker.java b/src/main/java/com/realtimetech/opack/Opacker.java index a290dbf..8acc2a3 100644 --- a/src/main/java/com/realtimetech/opack/Opacker.java +++ b/src/main/java/com/realtimetech/opack/Opacker.java @@ -183,13 +183,13 @@ public static final class Context { private @Nullable CapturedType superType; - private @Nullable CapturedType.FieldProperty currentFieldProperty; + private @Nullable CapturedType.FieldProperty fieldProperty; public Context(@NotNull Opacker opacker) { this.opacker = opacker; this.superType = null; - this.currentFieldProperty = null; + this.fieldProperty = null; } public @NotNull Opacker getOpacker() { @@ -204,17 +204,21 @@ public void setSuperType(@Nullable CapturedType superType) { this.superType = superType; } - public @Nullable CapturedType.FieldProperty getCurrentFieldProperty() { - return this.currentFieldProperty; + public @Nullable CapturedType.FieldProperty getFieldProperty() { + return this.fieldProperty; } - public void setCurrentFieldProperty(@Nullable CapturedType.FieldProperty currentFieldProperty) { - this.currentFieldProperty = currentFieldProperty; + public void setFieldProperty(@Nullable CapturedType.FieldProperty fieldProperty) { + this.fieldProperty = fieldProperty; } void clear() { this.superType = null; - this.currentFieldProperty = null; + this.fieldProperty = null; + } + + public @NotNull String getPositionString() { + return "{" + "superType=" + superType + ", fieldProperty=" + fieldProperty + '}'; } } @@ -428,7 +432,7 @@ public enum State { if (this.overlapSet.contains(object)) { if (!this.enableConvertRecursiveDependencyToNull) { - throw new SerializeException("Recursive dependencies are not serializable."); + throw new SerializeException("Recursive dependencies are not serializable. " + this.context.getPositionString()); } return null; @@ -441,7 +445,7 @@ public enum State { return opackValue; } catch (TypeCaptureException exception) { - throw new SerializeException("Can't capture " + baseType.getName() + " class information.", exception); + throw new SerializeException("Can't capture " + baseType.getName() + " class information. " + this.context.getPositionString(), exception); } } @@ -462,7 +466,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { OpackArray opackArray = (OpackArray) opackValue; int length = Array.getLength(object); - this.context.setCurrentFieldProperty(null); + this.context.setFieldProperty(null); for (int index = 0; index < length; index++) { Object element = ReflectionUtil.getArrayItem(object, index); @@ -481,7 +485,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { Object element = fieldProperty.get(object); Class fieldType = fieldProperty.getType(); - this.context.setCurrentFieldProperty(fieldProperty); + this.context.setFieldProperty(fieldProperty); if (fieldProperty.isWithType()) { element = TypeWrapper.wrapObject(this.context, element); @@ -498,7 +502,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { } } catch (IllegalAccessException exception) { - throw new SerializeException("Can't get " + fieldProperty.getName() + " field data in " + capturedType.getType().getSimpleName() + ".", exception); + throw new SerializeException("Can't get " + fieldProperty.getName() + " field data in " + capturedType.getType().getSimpleName() + ". " + this.context.getPositionString(), exception); } } } @@ -646,7 +650,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { targetObject = Array.newInstance(goalType.getComponentType(), opackArray.length()); } else { - throw new DeserializeException("Target class is array. but, object is not OpackArray."); + throw new DeserializeException("Deserialize target class is array. but, object(" + object + ") is not OpackArray. " + this.context.getPositionString()); } } else { if (object instanceof OpackObject) { @@ -659,7 +663,7 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { throw new DeserializeException("Can't create instance using unsafe method.", exception); } } else { - throw new DeserializeException("Target class is object. but, object(" + object + ") is not OpackObject."); + throw new DeserializeException("Deserialize target class is object. but, object(" + object + ") is not OpackObject. " + this.context.getPositionString()); } } @@ -671,10 +675,10 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { } else if (goalType.isAssignableFrom(object.getClass())) { return object; } else { - throw new DeserializeException("Failed to convert object(" + object + ") to the specified goal type: " + goalType.getName() + ". This could be due to a missing Transformer."); + throw new DeserializeException("Failed to convert object(" + object + ") to the specified goal type: " + goalType.getName() + ". This could be due to a missing Transformer. " + this.context.getPositionString()); } } catch (TypeCaptureException exception) { - throw new DeserializeException("Can't capture " + goalType.getName() + " class information.", exception); + throw new DeserializeException("Can't capture " + goalType.getName() + " class information. " + this.context.getPositionString(), exception); } } @@ -696,7 +700,7 @@ private void executeDeserializeStack(int endOfStack) throws DeserializeException Class componentType = object.getClass().getComponentType(); int length = opackArray.length(); - this.context.setCurrentFieldProperty(null); + this.context.setFieldProperty(null); for (int index = 0; index < length; index++) { Object element = opackArray.get(index); @@ -723,14 +727,14 @@ private void executeDeserializeStack(int endOfStack) throws DeserializeException Class fieldType = fieldProperty.getType(); Class actualFieldType = fieldProperty.getField().getType(); - this.context.setCurrentFieldProperty(fieldProperty); + this.context.setFieldProperty(fieldProperty); if (opackObject.containsKey(propertyName)) { element = opackObject.get(propertyName); } else if (fieldProperty.getDefaultValueProvider() != null) { element = fieldProperty.getDefaultValueProvider().provide(this.context, object, fieldProperty); } else { - throw new DeserializeException("Missing " + fieldProperty.getName() + " fieldProperty value of for " + capturedType.getType().getSimpleName() + " in given opack value."); + throw new DeserializeException("Missing " + fieldProperty.getName() + " field property value of for " + capturedType.getType().getSimpleName() + " in given opack value. " + this.context.getPositionString()); } Object propertyValue = null; @@ -745,7 +749,7 @@ private void executeDeserializeStack(int endOfStack) throws DeserializeException fieldProperty.set(object, propertyValue); } catch (IllegalAccessException | IllegalArgumentException exception) { - throw new DeserializeException("Can't set " + fieldProperty.getName() + " field in " + capturedType.getType().getSimpleName() + ".", exception); + throw new DeserializeException("Can't set " + fieldProperty.getName() + " field in " + capturedType.getType().getSimpleName() + ". " + this.context.getPositionString(), exception); } } } diff --git a/src/main/java/com/realtimetech/opack/capture/CapturedType.java b/src/main/java/com/realtimetech/opack/capture/CapturedType.java index 8fb24db..eb2f1ad 100644 --- a/src/main/java/com/realtimetech/opack/capture/CapturedType.java +++ b/src/main/java/com/realtimetech/opack/capture/CapturedType.java @@ -27,11 +27,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; +import java.util.*; public final class CapturedType { public static final class FieldProperty { @@ -39,6 +39,7 @@ public static final class FieldProperty { private final @NotNull String name; private final @NotNull Class type; private final @NotNull Class @NotNull [] genericTypes; + private final @NotNull Map, Annotation[]> annotations; private final boolean withType; private final @Nullable Transformer transformer; @@ -65,6 +66,19 @@ public FieldProperty(@NotNull Field field, @Nullable String name, @Nullable Clas this.genericTypes = genericTypes.toArray(new Class[0]); + Map, List> annotations = new HashMap<>(); + for (Annotation annotation : this.field.getAnnotations()) { + if (!annotations.containsKey(annotation.annotationType())) { + annotations.put(annotation.annotationType(), new LinkedList()); + } + annotations.get(annotation.annotationType()).add(annotation); + } + + this.annotations = new HashMap<>(); + for (Map.Entry, List> entry : annotations.entrySet()) { + this.annotations.put(entry.getKey(), entry.getValue().toArray(new Annotation[0])); + } + this.withType = withType; this.transformer = transformer; @@ -87,6 +101,29 @@ public FieldProperty(@NotNull Field field, @Nullable String name, @Nullable Clas return genericTypes; } + public @Nullable Class getGenericType(int index) { + if (index < 0 || index >= genericTypes.length) { + return null; + } + + return genericTypes[index]; + } + + public @NotNull Map, Annotation[]> getAnnotations() { + return annotations; + } + + @SuppressWarnings("unchecked") + public @NotNull T @Nullable [] getAnnotations(Class annotationType) { + return (T[]) annotations.get(annotationType); + } + + @SuppressWarnings("unchecked") + public @Nullable T getAnnotation(Class annotationType) { + Annotation[] annotations = this.annotations.get(annotationType); + return annotations != null && annotations.length > 0 ? (T) annotations[0] : null; + } + public boolean isWithType() { return withType; } diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/list/ListTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/list/ListTransformer.java index 4096b09..a91e9cd 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/list/ListTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/list/ListTransformer.java @@ -81,9 +81,8 @@ public class ListTransformer extends DataStructureTransformer { List list = (List) ReflectionUtil.createInstance(goalType); Class genericType = null; - if (context.getCurrentFieldProperty() != null) { - Class[] genericTypes = context.getCurrentFieldProperty().getGenericTypes(); - genericType = genericTypes.length > 0 ? genericTypes[0] : null; + if (context.getFieldProperty() != null) { + genericType = context.getFieldProperty().getGenericType(0); } for (int index = 0; index < opackArray.length(); index++) { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/map/MapTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/map/MapTransformer.java index bac2d4a..f6ebba7 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/map/MapTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/map/MapTransformer.java @@ -87,10 +87,9 @@ public class MapTransformer extends DataStructureTransformer { Class keyGenericType = null; Class valueGenericType = null; - if (context.getCurrentFieldProperty() != null) { - Class[] genericTypes = context.getCurrentFieldProperty().getGenericTypes(); - keyGenericType = genericTypes.length > 0 ? genericTypes[0] : null; - valueGenericType = genericTypes.length > 1 ? genericTypes[1] : null; + if (context.getFieldProperty() != null) { + keyGenericType = context.getFieldProperty().getGenericType(0); + valueGenericType = context.getFieldProperty().getGenericType(1); } for (Map.Entry element : opackObject.entrySet()) { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java index d5801ca..a9d9cdb 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/CalendarTransformer.java @@ -48,10 +48,10 @@ public class CalendarTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof Calendar) { Calendar calendar = (Calendar) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return new SimpleDateFormat(timeFormat.value()).format(calendar.getTime()); @@ -76,10 +76,10 @@ public class CalendarTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { if (object instanceof String) { Calendar calendar = Calendar.getInstance(); - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { try { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java index f8c7437..8304f08 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/DateTransformer.java @@ -47,10 +47,10 @@ public class DateTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof Date) { Date date = (Date) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return new SimpleDateFormat(timeFormat.value()).format(date); @@ -75,10 +75,10 @@ public class DateTransformer implements Transformer { @Override public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) throws DeserializeException { if (object instanceof String) { - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { try { diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java index 8bfe8e1..b3d3a7a 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTimeTransformer.java @@ -46,10 +46,10 @@ public class LocalDateTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof LocalDateTime) { LocalDateTime localDateTime = (LocalDateTime) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return localDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); @@ -84,10 +84,10 @@ public class LocalDateTimeTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { if (object instanceof String) { String string = (String) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return LocalDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java index ef4bfc9..fe549bd 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalDateTransformer.java @@ -46,10 +46,10 @@ public class LocalDateTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof LocalDate) { LocalDate localDate = (LocalDate) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return localDate.format(DateTimeFormatter.ofPattern(timeFormat.value())); @@ -80,10 +80,10 @@ public class LocalDateTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { if (object instanceof String) { String string = (String) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return LocalDate.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java index 955ec68..4c2bde8 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/LocalTimeTransformer.java @@ -46,10 +46,10 @@ public class LocalTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof LocalTime) { LocalTime localTime = (LocalTime) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return localTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); @@ -81,10 +81,10 @@ public class LocalTimeTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { if (object instanceof String) { String string = (String) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + CapturedType.FieldProperty fieldProperty = context.getFieldProperty(); - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (fieldProperty != null) { + TimeFormat timeFormat = fieldProperty.getField().getAnnotation(TimeFormat.class); if (timeFormat != null) { return LocalTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java index 3abebf9..2857124 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetDateTimeTransformer.java @@ -23,15 +23,12 @@ package com.realtimetech.opack.transformer.impl.time.java8; import com.realtimetech.opack.Opacker; -import com.realtimetech.opack.capture.CapturedType; import com.realtimetech.opack.transformer.Transformer; import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; -import com.realtimetech.opack.value.OpackArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.time.OffsetDateTime; -import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; public class OffsetDateTimeTransformer implements Transformer { @@ -47,28 +44,17 @@ public class OffsetDateTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof OffsetDateTime) { OffsetDateTime offsetDateTime = (OffsetDateTime) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (context.getFieldProperty() != null) { + TimeFormat timeFormat = context.getFieldProperty().getAnnotation(TimeFormat.class); if (timeFormat != null) { - return offsetDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat.value()); } } - return OpackArray.createWithArrayObject( - new int[]{ - offsetDateTime.getYear(), - offsetDateTime.getMonthValue(), - offsetDateTime.getDayOfMonth(), - offsetDateTime.getHour(), - offsetDateTime.getMinute(), - offsetDateTime.getSecond(), - offsetDateTime.getNano(), - offsetDateTime.getOffset().getTotalSeconds() - } - ); + return offsetDateTime.format(dateTimeFormatter); } return object; @@ -86,30 +72,17 @@ public class OffsetDateTimeTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { if (object instanceof String) { String string = (String) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (context.getFieldProperty() != null) { + TimeFormat timeFormat = context.getFieldProperty().getAnnotation(TimeFormat.class); if (timeFormat != null) { - return OffsetDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat.value()); } } - } else if (object instanceof OpackArray) { - OpackArray opackArray = (OpackArray) object; - if (opackArray.length() == 8) { - return OffsetDateTime.of( - opackArray.getAsInt(0), - opackArray.getAsInt(1), - opackArray.getAsInt(2), - opackArray.getAsInt(3), - opackArray.getAsInt(4), - opackArray.getAsInt(5), - opackArray.getAsInt(6), - ZoneOffset.ofTotalSeconds(opackArray.getAsInt(7)) - ); - } + return OffsetDateTime.parse(string, dateTimeFormatter); } return object; diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java index 6871bbf..e61393c 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/OffsetTimeTransformer.java @@ -23,15 +23,12 @@ package com.realtimetech.opack.transformer.impl.time.java8; import com.realtimetech.opack.Opacker; -import com.realtimetech.opack.capture.CapturedType; import com.realtimetech.opack.transformer.Transformer; import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; -import com.realtimetech.opack.value.OpackArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.time.OffsetTime; -import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; public class OffsetTimeTransformer implements Transformer { @@ -47,25 +44,17 @@ public class OffsetTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof OffsetTime) { OffsetTime offsetTime = (OffsetTime) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_OFFSET_TIME; - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (context.getFieldProperty() != null) { + TimeFormat timeFormat = context.getFieldProperty().getAnnotation(TimeFormat.class); if (timeFormat != null) { - return offsetTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat.value()); } } - return OpackArray.createWithArrayObject( - new int[]{ - offsetTime.getHour(), - offsetTime.getMinute(), - offsetTime.getSecond(), - offsetTime.getNano(), - offsetTime.getOffset().getTotalSeconds() - } - ); + return offsetTime.format(dateTimeFormatter); } return object; @@ -83,27 +72,17 @@ public class OffsetTimeTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { if (object instanceof String) { String string = (String) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_OFFSET_TIME; - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (context.getFieldProperty() != null) { + TimeFormat timeFormat = context.getFieldProperty().getAnnotation(TimeFormat.class); if (timeFormat != null) { - return OffsetTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat.value()); } } - } else if (object instanceof OpackArray) { - OpackArray opackArray = (OpackArray) object; - if (opackArray.length() == 5) { - return OffsetTime.of( - opackArray.getAsInt(0), - opackArray.getAsInt(1), - opackArray.getAsInt(2), - opackArray.getAsInt(3), - ZoneOffset.ofTotalSeconds(opackArray.getAsInt(4)) - ); - } + return OffsetTime.parse(string, dateTimeFormatter); } return object; diff --git a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java index 3678902..6bb0653 100644 --- a/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java +++ b/src/main/java/com/realtimetech/opack/transformer/impl/time/java8/ZonedDateTimeTransformer.java @@ -23,14 +23,11 @@ package com.realtimetech.opack.transformer.impl.time.java8; import com.realtimetech.opack.Opacker; -import com.realtimetech.opack.capture.CapturedType; import com.realtimetech.opack.transformer.Transformer; import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; -import com.realtimetech.opack.value.OpackArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; @@ -47,28 +44,17 @@ public class ZonedDateTimeTransformer implements Transformer { public @Nullable Object serialize(@NotNull Opacker.Context context, @NotNull Class originalType, @Nullable Object object) { if (object instanceof ZonedDateTime) { ZonedDateTime zonedDateTime = (ZonedDateTime) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_ZONED_DATE_TIME; - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (context.getFieldProperty() != null) { + TimeFormat timeFormat = context.getFieldProperty().getAnnotation(TimeFormat.class); if (timeFormat != null) { - return zonedDateTime.format(DateTimeFormatter.ofPattern(timeFormat.value())); + dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat.value()); } } - return OpackArray.createWithArrayObject( - new int[]{ - zonedDateTime.getYear(), - zonedDateTime.getMonthValue(), - zonedDateTime.getDayOfMonth(), - zonedDateTime.getHour(), - zonedDateTime.getMinute(), - zonedDateTime.getSecond(), - zonedDateTime.getNano(), - zonedDateTime.getOffset().getTotalSeconds() - } - ); + return zonedDateTime.format(dateTimeFormatter); } return object; @@ -86,30 +72,17 @@ public class ZonedDateTimeTransformer implements Transformer { public @Nullable Object deserialize(@NotNull Opacker.Context context, @NotNull Class goalType, @Nullable Object object) { if (object instanceof String) { String string = (String) object; - CapturedType.FieldProperty currentFieldProperty = context.getCurrentFieldProperty(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_ZONED_DATE_TIME; - if (currentFieldProperty != null) { - TimeFormat timeFormat = currentFieldProperty.getField().getAnnotation(TimeFormat.class); + if (context.getFieldProperty() != null) { + TimeFormat timeFormat = context.getFieldProperty().getAnnotation(TimeFormat.class); if (timeFormat != null) { - return ZonedDateTime.parse(string, DateTimeFormatter.ofPattern(timeFormat.value())); + dateTimeFormatter = DateTimeFormatter.ofPattern(timeFormat.value()); } } - } else if (object instanceof OpackArray) { - OpackArray opackArray = (OpackArray) object; - if (opackArray.length() == 8) { - return ZonedDateTime.of( - opackArray.getAsInt(0), - opackArray.getAsInt(1), - opackArray.getAsInt(2), - opackArray.getAsInt(3), - opackArray.getAsInt(4), - opackArray.getAsInt(5), - opackArray.getAsInt(6), - ZoneOffset.ofTotalSeconds(opackArray.getAsInt(7)) - ); - } + return ZonedDateTime.parse(string, dateTimeFormatter); } return object; diff --git a/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java b/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java index a85b9cc..73f2419 100644 --- a/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java +++ b/src/main/java/com/realtimetech/opack/util/ReflectionUtil.java @@ -150,7 +150,7 @@ private static abstract class Allocator { } else if (type == BigInteger.class) { return BigInteger.valueOf(number.longValue()); } else if (type == BigDecimal.class) { - return BigDecimal.valueOf(number.longValue()); + return BigDecimal.valueOf(number.doubleValue()); } } else if (objectType == Boolean.class) { if (type == boolean.class || type == Boolean.class) { diff --git a/src/test/java/com/realtimetech/opack/test/OpackAssert.java b/src/test/java/com/realtimetech/opack/test/OpackAssert.java index cdcefaa..a7f3f8a 100644 --- a/src/test/java/com/realtimetech/opack/test/OpackAssert.java +++ b/src/test/java/com/realtimetech/opack/test/OpackAssert.java @@ -161,6 +161,18 @@ static void assertSingleValue(Object originalObject, Object targetObject) throws if (!originalObject.equals(targetObject)) { OpackAssert.throwException(originalObject, targetObject); } + } else if (originalObject instanceof OffsetDateTime) { + if (!((OffsetDateTime) originalObject).isEqual((OffsetDateTime) targetObject)) { + OpackAssert.throwException(originalObject, targetObject); + } + } else if (originalObject instanceof OffsetTime) { + if (!((OffsetTime) originalObject).isEqual((OffsetTime) targetObject)) { + OpackAssert.throwException(originalObject, targetObject); + } + } else if (originalObject instanceof ZonedDateTime) { + if (!((ZonedDateTime) originalObject).isEqual((ZonedDateTime) targetObject)) { + OpackAssert.throwException(originalObject, targetObject); + } } else if ((originalObject instanceof File && targetObject instanceof File) || (originalObject instanceof Path && targetObject instanceof Path) || (originalObject instanceof Date && targetObject instanceof Date) || @@ -168,9 +180,6 @@ static void assertSingleValue(Object originalObject, Object targetObject) throws originalObject instanceof LocalDate || originalObject instanceof LocalTime || originalObject instanceof LocalDateTime || - originalObject instanceof OffsetDateTime || - originalObject instanceof OffsetTime || - originalObject instanceof ZonedDateTime || originalObject instanceof Class) { OpackAssert.assertEquals(originalObject.toString(), targetObject.toString()); } else { diff --git a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java index be5c89d..40b45d5 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java @@ -333,7 +333,6 @@ public static EyeColor fromNumber(int i) { public static final class Partner { private long id; private String name; - @TimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSX") private OffsetDateTime since; public Partner() { diff --git a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java index ec9c5be..866e7a2 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/transform/time/Java8TimeTransformTest.java @@ -39,22 +39,18 @@ public static class Java8TimeTransformClass { private LocalTime localTime; private LocalDateTime localDateTime; - /* private OffsetTime offsetTime; private OffsetDateTime offsetDateTime; private ZonedDateTime zonedDateTime; - */ public Java8TimeTransformClass() { this.localDate = LocalDate.now(); this.localTime = LocalTime.now(); this.localDateTime = LocalDateTime.now(); - /* this.offsetTime = OffsetTime.now(); this.offsetDateTime = OffsetDateTime.now(); this.zonedDateTime = ZonedDateTime.now(); - */ } } @@ -67,11 +63,11 @@ public static class Java8TimeTransformWithFormatClass { @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") private LocalDateTime localDateTime; - @TimeFormat("HH:mm:ss.SSSSSSSSS") + @TimeFormat("HH:mm:ss.SSSSSSSSSXXXZ") private OffsetTime offsetTime; - @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + @TimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSXXXZ") private OffsetDateTime offsetDateTime; - @TimeFormat("yyyy-MM-dd HH:mm:ss.SSSSSSSSS") + @TimeFormat("yyyy-MM-dd'T'HH:mm:ss.SSSSSSSSSXXXZ") private ZonedDateTime zonedDateTime; public Java8TimeTransformWithFormatClass() { From 5d14e09771013472e96c8c0df170bad0cf2abe76 Mon Sep 17 00:00:00 2001 From: devjeonghwan Date: Sun, 30 Aug 2026 10:59:32 +0900 Subject: [PATCH 4/4] Migrate workflows, upgrade Gradle version, and enhance RandomUtil and Opacker functionality --- .github/workflows/linux.yml | 39 --- .github/workflows/windows-x64.yml | 191 ++++++++++++ .github/workflows/windows.yml | 36 --- .gitignore | 22 +- ...radle__com_esotericsoftware_kryo_5_6_2.xml | 10 - ...dle__com_esotericsoftware_minlog_1_3_1.xml | 10 - ...com_esotericsoftware_reflectasm_1_11_9.xml | 10 - ...ackson_core_jackson_annotations_2_18_3.xml | 10 - ...erxml_jackson_core_jackson_core_2_18_3.xml | 13 - ...l_jackson_core_jackson_databind_2_18_3.xml | 13 - ...adle__com_google_code_gson_gson_2_12_1.xml | 10 - ...orprone_error_prone_annotations_2_36_0.xml | 10 - ..._org_apiguardian_apiguardian_api_1_1_2.xml | 12 - ...adle__org_jetbrains_annotations_24_1_0.xml | 10 - ...junit_jupiter_junit_jupiter_api_5_11_1.xml | 10 - ...junit_jupiter_junit_jupiter_api_5_11_2.xml | 10 - ...it_jupiter_junit_jupiter_engine_5_11_2.xml | 10 - ...platform_junit_platform_commons_1_11_1.xml | 10 - ...platform_junit_platform_commons_1_11_2.xml | 10 - ..._platform_junit_platform_engine_1_11_2.xml | 10 - .../Gradle__org_objenesis_objenesis_3_4.xml | 10 - ...radle__org_opentest4j_opentest4j_1_3_0.xml | 10 - .idea/misc.xml | 13 - .idea/modules.xml | 10 - .idea/modules/opack.main.iml | 14 - .idea/modules/opack.test.iml | 33 -- .idea/opack.iml | 12 - .idea/uiDesigner.xml | 124 -------- build.gradle | 144 ++++----- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 46175 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 283 +++++++++++------- gradlew.bat | 40 +-- .../java/com/realtimetech/opack/Opacker.java | 24 +- .../realtimetech/opack/test/RandomUtil.java | 36 +++ .../annotation/AnnotationWithTypeMapTest.java | 103 +++++++ .../opacker/other/JavaJsonBenchmarkTest.java | 117 +++++++- 37 files changed, 737 insertions(+), 696 deletions(-) delete mode 100644 .github/workflows/linux.yml create mode 100644 .github/workflows/windows-x64.yml delete mode 100644 .github/workflows/windows.yml delete mode 100644 .idea/libraries/Gradle__com_esotericsoftware_kryo_5_6_2.xml delete mode 100644 .idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_1.xml delete mode 100644 .idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_11_9.xml delete mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_18_3.xml delete mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_18_3.xml delete mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_18_3.xml delete mode 100644 .idea/libraries/Gradle__com_google_code_gson_gson_2_12_1.xml delete mode 100644 .idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_36_0.xml delete mode 100644 .idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_1_2.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_annotations_24_1_0.xml delete mode 100644 .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_1.xml delete mode 100644 .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_2.xml delete mode 100644 .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_engine_5_11_2.xml delete mode 100644 .idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_1.xml delete mode 100644 .idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_2.xml delete mode 100644 .idea/libraries/Gradle__org_junit_platform_junit_platform_engine_1_11_2.xml delete mode 100644 .idea/libraries/Gradle__org_objenesis_objenesis_3_4.xml delete mode 100644 .idea/libraries/Gradle__org_opentest4j_opentest4j_1_3_0.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/modules/opack.main.iml delete mode 100644 .idea/modules/opack.test.iml delete mode 100644 .idea/opack.iml delete mode 100644 .idea/uiDesigner.xml create mode 100644 src/test/java/com/realtimetech/opack/test/opacker/annotation/AnnotationWithTypeMapTest.java diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml deleted file mode 100644 index c99a896..0000000 --- a/.github/workflows/linux.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: linux - -on: - push: - branches: [ main, develop ] - pull_request: - branches: [ main, develop ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Test with Gradle - run: ./gradlew test - - - name: Publish test results - uses: EnricoMi/publish-unit-test-result-action@v2 - if: always() - with: - files: '**/build/test-results/test/TEST-*.xml' - - - name: Add comments to a pull request - uses: mikepenz/action-junit-report@v3 - if: always() - with: - report_paths: '**/build/test-results/test/TEST-*.xml' \ No newline at end of file diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml new file mode 100644 index 0000000..68e89b1 --- /dev/null +++ b/.github/workflows/windows-x64.yml @@ -0,0 +1,191 @@ +name: windows-x64 + +on: + push: + branches: [ main, develop ] + pull_request: + branches: [ main, develop ] + +permissions: + contents: read + +jobs: + test: + runs-on: [ self-hosted, windows, x64 ] + + env: + JAVA_HOME: 'C:\jdk\v25.0.0' + + steps: + - uses: actions/checkout@v5 + + - name: Add Build Environments + run: | + "$env:JAVA_HOME\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + + - name: Validate Project Version Policy + run: | + $projectVersion = (& .\gradlew.bat -q printProjectVersion --no-daemon).Trim() + $isSnapshotVersion = $projectVersion.EndsWith("-SNAPSHOT") + + if ("${{ github.event_name }}" -eq "pull_request") { + $targetBranch = "${{ github.base_ref }}" + } else { + $targetBranch = "${{ github.ref_name }}" + } + + if ($targetBranch -eq "main" -and $isSnapshotVersion) { + throw "Main branch requires a release version without -SNAPSHOT. Current version: $projectVersion" + } + + "PROJECT_VERSION=$projectVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + - name: Build and Test + run: .\gradlew.bat clean test --no-daemon + + - name: Upload Unit Test Report + if: ${{ always() }} + uses: actions/upload-artifact@v4 + with: + name: unit-test-report-${{ runner.os }}-${{ runner.arch }} + path: | + **/build/reports/tests/test/** + retention-days: 14 + + - name: Upload Gradle Problems Report + if: ${{ always() }} + uses: actions/upload-artifact@v4 + with: + name: gradle-problems-report-${{ runner.os }}-${{ runner.arch }} + path: | + **/build/reports/problems/** + retention-days: 14 + + publish-snapshot: + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' && success() }} + + needs: test + runs-on: [ self-hosted, windows, x64 ] + + env: + JAVA_HOME: 'C:\jdk\v25.0.0' + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} + + concurrency: + group: maven-central-publish-develop + cancel-in-progress: false + + steps: + - uses: actions/checkout@v5 + + - name: Add Build Environments + run: | + "$env:JAVA_HOME\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + + - name: Validate Maven Central Secrets + run: | + if ([string]::IsNullOrWhiteSpace($env:MAVEN_USERNAME)) { + throw "Missing secret MAVEN_USERNAME." + } + + if ([string]::IsNullOrWhiteSpace($env:MAVEN_PASSWORD)) { + throw "Missing secret MAVEN_PASSWORD." + } + + - name: Check Snapshot Publish Eligibility + id: snapshot-version + run: | + $projectVersion = (& .\gradlew.bat -q printProjectVersion --no-daemon).Trim() + + "project_version=$projectVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + + if ($projectVersion.EndsWith("-SNAPSHOT")) { + "should_publish=true" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + } else { + Write-Host "Skipping snapshot publish because develop currently has release version: $projectVersion" + "should_publish=false" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append + } + + - name: Publish Snapshot to Maven Central Portal + if: ${{ steps.snapshot-version.outputs.should_publish == 'true' }} + run: .\gradlew.bat clean publishToMavenCentral --no-daemon + + - name: Upload Maven Artifacts + if: ${{ always() && steps.snapshot-version.outputs.should_publish == 'true' }} + uses: actions/upload-artifact@v4 + with: + name: maven-upload-artifacts-${{ runner.os }}-${{ runner.arch }}-develop + path: | + build/libs/** + build/publications/** + build/centralPortal/** + if-no-files-found: ignore + retention-days: 7 + + publish-release: + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && success() }} + + needs: test + runs-on: [ self-hosted, windows, x64 ] + + env: + JAVA_HOME: 'C:\jdk\v25.0.0' + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + MAVEN_SIGNING_KEY: ${{ secrets.MAVEN_SIGNING_KEY }} + MAVEN_SIGNING_PASSWORD: ${{ secrets.MAVEN_SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_PASSWORD }} + + concurrency: + group: maven-central-publish-main + cancel-in-progress: false + + steps: + - uses: actions/checkout@v5 + + - name: Add Build Environments + run: | + "$env:JAVA_HOME\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + + - name: Validate Maven Central Secrets + run: | + if ([string]::IsNullOrWhiteSpace($env:MAVEN_USERNAME)) { + throw "Missing secret MAVEN_USERNAME." + } + + if ([string]::IsNullOrWhiteSpace($env:MAVEN_PASSWORD)) { + throw "Missing secret MAVEN_PASSWORD." + } + + if ([string]::IsNullOrWhiteSpace($env:MAVEN_SIGNING_KEY)) { + throw "Missing secret MAVEN_SIGNING_KEY." + } + + - name: Validate Release Publish Eligibility + run: | + $projectVersion = (& .\gradlew.bat -q printProjectVersion --no-daemon).Trim() + + if ($projectVersion.EndsWith("-SNAPSHOT")) { + throw "Main branch requires a release version without -SNAPSHOT. Current version: $projectVersion" + } + + - name: Publish Release to Maven Central Portal + run: .\gradlew.bat clean publishAndReleaseToMavenCentral --no-daemon + + - name: Upload Maven Artifacts + if: ${{ always() }} + uses: actions/upload-artifact@v4 + with: + name: maven-upload-artifacts-${{ runner.os }}-${{ runner.arch }}-main + path: | + build/libs/** + build/publications/** + build/centralPortal/** + if-no-files-found: ignore + retention-days: 7 \ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 2e51093..0000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: windows - -on: - push: - branches: [ main, develop ] - pull_request: - branches: [ main, develop ] - -jobs: - build: - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - - - name: Test with Gradle - run: ./gradlew test - - - name: Publish test results - uses: EnricoMi/publish-unit-test-result-action/windows@v2 - if: always() - with: - files: '**/build/test-results/test/TEST-*.xml' - - - name: Add comments to a pull request - uses: mikepenz/action-junit-report@v3 - if: always() - with: - report_paths: '**/build/test-results/test/TEST-*.xml' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 5dc6f0f..a34654a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,23 @@ # Ignore Gradle project-specific cache directory .gradle +.maven -# Ignore Gradle build output directory -build \ No newline at end of file +# Ignore IntelliJ personal files +*.iml +*.ipr +*.iws +.idea/libraries +.idea/misc.xml +.idea/workspace.xml +.idea/modules.xml +.idea/artifacts/ +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Ignore Build Directory +build/ \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_esotericsoftware_kryo_5_6_2.xml b/.idea/libraries/Gradle__com_esotericsoftware_kryo_5_6_2.xml deleted file mode 100644 index 456dced..0000000 --- a/.idea/libraries/Gradle__com_esotericsoftware_kryo_5_6_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_1.xml b/.idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_1.xml deleted file mode 100644 index 2be4681..0000000 --- a/.idea/libraries/Gradle__com_esotericsoftware_minlog_1_3_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_11_9.xml b/.idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_11_9.xml deleted file mode 100644 index ba1eb7a..0000000 --- a/.idea/libraries/Gradle__com_esotericsoftware_reflectasm_1_11_9.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_18_3.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_18_3.xml deleted file mode 100644 index f04493f..0000000 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_18_3.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_18_3.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_18_3.xml deleted file mode 100644 index e04b20a..0000000 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_18_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_18_3.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_18_3.xml deleted file mode 100644 index d4e311e..0000000 --- a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_18_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_12_1.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_12_1.xml deleted file mode 100644 index 51b0b16..0000000 --- a/.idea/libraries/Gradle__com_google_code_gson_gson_2_12_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_36_0.xml b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_36_0.xml deleted file mode 100644 index 76a8b48..0000000 --- a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_36_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_1_2.xml b/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_1_2.xml deleted file mode 100644 index 723874b..0000000 --- a/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_1_2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_annotations_24_1_0.xml b/.idea/libraries/Gradle__org_jetbrains_annotations_24_1_0.xml deleted file mode 100644 index e158c3b..0000000 --- a/.idea/libraries/Gradle__org_jetbrains_annotations_24_1_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_1.xml b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_1.xml deleted file mode 100644 index d68ae47..0000000 --- a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_2.xml b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_2.xml deleted file mode 100644 index 3e41cd8..0000000 --- a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_11_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_engine_5_11_2.xml b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_engine_5_11_2.xml deleted file mode 100644 index c0bfc87..0000000 --- a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_engine_5_11_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_1.xml b/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_1.xml deleted file mode 100644 index 02c21d8..0000000 --- a/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_2.xml b/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_2.xml deleted file mode 100644 index 0249401..0000000 --- a/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_11_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_platform_junit_platform_engine_1_11_2.xml b/.idea/libraries/Gradle__org_junit_platform_junit_platform_engine_1_11_2.xml deleted file mode 100644 index 3a19239..0000000 --- a/.idea/libraries/Gradle__org_junit_platform_junit_platform_engine_1_11_2.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_objenesis_objenesis_3_4.xml b/.idea/libraries/Gradle__org_objenesis_objenesis_3_4.xml deleted file mode 100644 index 57054e6..0000000 --- a/.idea/libraries/Gradle__org_objenesis_objenesis_3_4.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_3_0.xml b/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_3_0.xml deleted file mode 100644 index feb67c9..0000000 --- a/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_3_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e4e37bb..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 737fa0f..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/opack.main.iml b/.idea/modules/opack.main.iml deleted file mode 100644 index b3a03d6..0000000 --- a/.idea/modules/opack.main.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/opack.test.iml b/.idea/modules/opack.test.iml deleted file mode 100644 index 730cf28..0000000 --- a/.idea/modules/opack.test.iml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/opack.iml b/.idea/opack.iml deleted file mode 100644 index a0ca158..0000000 --- a/.idea/opack.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4ab97ac..b1776a5 100644 --- a/build.gradle +++ b/build.gradle @@ -20,89 +20,21 @@ * limitations under the License. */ plugins { - id 'java' - id "signing" - id "maven" + id 'java-library' + id 'com.vanniktech.maven.publish' version '0.37.0' } -group 'com.realtimetech' -archivesBaseName = "opack" -version = "0.2.1" - -compileJava.options.encoding = 'UTF-8' +group = 'com.realtimetech' +version = '0.2.2-SNAPSHOT' tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' + options.release = 11 } -tasks.register('javadocJar', Jar) { - archiveClassifier = 'javadoc' - from javadoc -} - -tasks.register('sourcesJar', Jar) { - archiveClassifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives javadocJar, sourcesJar -} - -signing { - sign configurations.archives -} - -uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: findProperty('ossrhUsername'), password: findProperty('ossrhPassword')) - } - - snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: findProperty('ossrhUsername'), password: findProperty('ossrhPassword')) - } - - pom.project { - name 'opack' - packaging 'jar' - description 'A object serialize and deserialize, encode and decode library' - url 'https://github.com/realtimetech-solution/opack' - - scm { - connection "scm:git:https://github.com/realtimetech-solution/opack" - developerConnection "scm:git:ssh://github.com/realtimetech-solution/opack.git" - url "https://github.com/realtimetech-solution/opack" - } - - licenses { - license { - name 'The Apache License, Version 2.0' - url 'https://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id "realtimetech" - name "RealtimeTech" - } - developer { - id "devjeonghwan" - name "Jeonghwan Park" - email = "dev.parkjeonghwan@gmail.com" - } - developer { - id "rodamin" - name "Soyeon Kim" - email = "epals8962@realtimetech.co.kr" - } - } - } - } +tasks.register('printProjectVersion') { + doLast { + println project.version } } @@ -113,16 +45,64 @@ repositories { dependencies { implementation 'org.jetbrains:annotations:24.1.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1' + testImplementation platform('org.junit:junit-bom:5.11.2') + testImplementation 'org.junit.jupiter:junit-jupiter' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' // For performance test - testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.12.1' - testImplementation group: 'com.esotericsoftware', name: 'kryo', version: '5.6.2' - testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.3' + testImplementation 'com.google.code.gson:gson:2.12.1' + testImplementation 'com.esotericsoftware:kryo:5.6.2' + testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3' } test { useJUnitPlatform() + + jvmArgs '--add-opens=java.base/java.time=ALL-UNNAMED', + '--add-opens=java.base/java.util=ALL-UNNAMED' +} + +mavenPublishing { + publishToMavenCentral() + signAllPublications() + + coordinates(project.group.toString(), project.name, project.version.toString()) + + pom { + name = 'opack' + description = 'An object serialization, deserialization, encoding, and decoding library' + inceptionYear = '2021' + url = 'https://github.com/realtimetech-solution/opack' + + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + distribution = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + + developers { + developer { + id = 'realtimetech' + name = 'RealtimeTech' + } + developer { + id = 'devjeonghwan' + name = 'Jeonghwan Park' + email = 'dev.parkjeonghwan@gmail.com' + } + developer { + id = 'rodamin' + name = 'Soyeon Kim' + email = 'epals8962@realtimetech.co.kr' + } + } + + scm { + connection = 'scm:git:https://github.com/realtimetech-solution/opack.git' + developerConnection = 'scm:git:ssh://git@github.com/realtimetech-solution/opack.git' + url = 'https://github.com/realtimetech-solution/opack' + } + } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..61285a659d17295f1de7c53e24fdf13ad755c379 100644 GIT binary patch literal 46175 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

pVX@HRij*jw$g4?}Pn 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 literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..19a6bde 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882..adff685 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,114 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/com/realtimetech/opack/Opacker.java b/src/main/java/com/realtimetech/opack/Opacker.java index 8acc2a3..2c5c076 100644 --- a/src/main/java/com/realtimetech/opack/Opacker.java +++ b/src/main/java/com/realtimetech/opack/Opacker.java @@ -496,7 +496,9 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { } if (element != null) { - opackObject.put(fieldProperty.getName(), this.prepareObjectSerialize(fieldType, element)); + Class baseType = fieldProperty.isWithType() ? element.getClass() : fieldType; + + opackObject.put(fieldProperty.getName(), this.prepareObjectSerialize(baseType, element)); } else { opackObject.put(fieldProperty.getName(), null); } @@ -572,6 +574,18 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { */ private synchronized @Nullable Object prepareObjectDeserialize(@NotNull Class goalType, @NotNull Object object, boolean withType, @Nullable Transformer fieldTransformer) throws DeserializeException { try { + if (withType) { + if (fieldTransformer != null) { + object = fieldTransformer.deserialize(this.context, goalType, object); + + if (object == null) { + return null; + } + } + + return TypeWrapper.unwrapObject(this.context, object); + } + CapturedType capturedType = this.typeCapturer.get(goalType); Transformer[] transformers = capturedType.getTransformers(); @@ -592,14 +606,6 @@ private void executeSerializeStack(int endOfStack) throws SerializeException { } } - if (withType) { - object = TypeWrapper.unwrapObject(this.context, object); - - if (object == null) { - return null; - } - } - /* Early stopping */ diff --git a/src/test/java/com/realtimetech/opack/test/RandomUtil.java b/src/test/java/com/realtimetech/opack/test/RandomUtil.java index cac2ce5..d12d52b 100644 --- a/src/test/java/com/realtimetech/opack/test/RandomUtil.java +++ b/src/test/java/com/realtimetech/opack/test/RandomUtil.java @@ -24,7 +24,9 @@ import org.jetbrains.annotations.NotNull; +import java.math.BigDecimal; import java.util.Random; +import java.util.UUID; public class RandomUtil { private static final long SEED = 3783655506793900820L; @@ -38,6 +40,10 @@ public static int nextInt(int bound) { return RANDOM.nextInt(bound); } + public static int nextInt(int min, int max) { + return RANDOM.nextInt(max - min) + min; + } + public static float nextFloat() { return RANDOM.nextFloat(); } @@ -50,7 +56,37 @@ public static double nextDouble() { return RANDOM.nextDouble(); } + public static double nextDouble(double min, double max) { + return RANDOM.nextDouble() * (max - min) + min; + } + public static long nextLong() { return RANDOM.nextLong(); } + + public static @NotNull String randomAlphabetic(int length) { + StringBuilder builder = new StringBuilder(length); + for (int i = 0; i < length; i++) { + builder.append((char) (RANDOM.nextInt(26) + 'a')); + } + return builder.toString(); + } + + public static @NotNull String randomAlphanumeric(int length) { + StringBuilder builder = new StringBuilder(length); + for (int i = 0; i < length; i++) { + builder.append((char) (RANDOM.nextInt(122 - 48) + 48)); + } + return builder.toString(); + } + + public static @NotNull UUID nextUUID() { + long mostSignificantBits = RANDOM.nextLong(); + long leastSignificantBits = RANDOM.nextLong(); + return new UUID(mostSignificantBits, leastSignificantBits); + } + + public static @NotNull BigDecimal randomBigDecimal() { + return BigDecimal.valueOf(nextDouble()); + } } diff --git a/src/test/java/com/realtimetech/opack/test/opacker/annotation/AnnotationWithTypeMapTest.java b/src/test/java/com/realtimetech/opack/test/opacker/annotation/AnnotationWithTypeMapTest.java new file mode 100644 index 0000000..e7010c1 --- /dev/null +++ b/src/test/java/com/realtimetech/opack/test/opacker/annotation/AnnotationWithTypeMapTest.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2026 REALTIMETECH All Rights Reserved + * + * Licensed either under the Apache License, Version 2.0, or (at your option) + * under the terms of the GNU General Public License as published by + * the Free Software Foundation (subject to the "Classpath" exception), + * either version 2, or any later version (collectively, the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.gnu.org/licenses/ + * http://www.gnu.org/software/classpath/license.html + * + * or as provided in the LICENSE file that accompanied this code. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.realtimetech.opack.test.opacker.annotation; + +import com.realtimetech.opack.Opacker; +import com.realtimetech.opack.annotation.WithType; +import com.realtimetech.opack.codec.json.JsonCodec; +import com.realtimetech.opack.exception.DecodeException; +import com.realtimetech.opack.exception.DeserializeException; +import com.realtimetech.opack.exception.EncodeException; +import com.realtimetech.opack.exception.SerializeException; +import com.realtimetech.opack.test.OpackAssert; +import com.realtimetech.opack.value.OpackValue; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; + +public class AnnotationWithTypeMapTest { + @SuppressWarnings("ALL") + public static class WithTypeMapClass { + @WithType + private Map hashMap; + + @WithType + private Map linkedHashMap; + + @WithType + private Map treeMap; + + public WithTypeMapClass() { + this.hashMap = new HashMap<>(); + this.hashMap.put("string", "hash-map"); + this.hashMap.put("number", 1L); + + this.linkedHashMap = new LinkedHashMap<>(); + this.linkedHashMap.put("string", "linked-hash-map"); + this.linkedHashMap.put("number", 2L); + + this.treeMap = new TreeMap<>(); + this.treeMap.put("string", "tree-map"); + this.treeMap.put("number", 3L); + } + } + + @Test + public void testOpackRoundTrip() throws SerializeException, DeserializeException, OpackAssert.AssertException { + for (boolean enableWrapMapElementType : new boolean[]{false, true}) { + Opacker opacker = Opacker.Builder.create() + .setEnableWrapMapElementType(enableWrapMapElementType) + .build(); + WithTypeMapClass originalObject = new WithTypeMapClass(); + + OpackValue serialized = opacker.serialize(originalObject); + assert serialized != null; + WithTypeMapClass deserialized = opacker.deserialize(WithTypeMapClass.class, serialized); + + OpackAssert.assertEquals(originalObject, deserialized); + } + } + + @Test + public void testJsonRoundTrip() throws SerializeException, DeserializeException, EncodeException, DecodeException, OpackAssert.AssertException { + JsonCodec jsonCodec = JsonCodec.Builder.create().build(); + + for (boolean enableWrapMapElementType : new boolean[]{false, true}) { + Opacker opacker = Opacker.Builder.create() + .setEnableWrapMapElementType(enableWrapMapElementType) + .build(); + WithTypeMapClass originalObject = new WithTypeMapClass(); + + OpackValue serialized = opacker.serialize(originalObject); + assert serialized != null; + String encoded = jsonCodec.encode(serialized); + OpackValue decoded = jsonCodec.decode(encoded); + WithTypeMapClass deserialized = opacker.deserialize(WithTypeMapClass.class, decoded); + + OpackAssert.assertEquals(originalObject, deserialized); + } + } +} \ No newline at end of file diff --git a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java index 40b45d5..e35741d 100644 --- a/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java +++ b/src/test/java/com/realtimetech/opack/test/opacker/other/JavaJsonBenchmarkTest.java @@ -24,11 +24,10 @@ import com.realtimetech.opack.Opacker; import com.realtimetech.opack.annotation.Type; -import com.realtimetech.opack.codec.json.Json; -import com.realtimetech.opack.exception.DecodeException; import com.realtimetech.opack.exception.DeserializeException; import com.realtimetech.opack.exception.SerializeException; import com.realtimetech.opack.test.OpackAssert; +import com.realtimetech.opack.test.RandomUtil; import com.realtimetech.opack.transformer.impl.time.annotation.TimeFormat; import com.realtimetech.opack.value.OpackValue; import org.junit.jupiter.api.Test; @@ -36,6 +35,7 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.OffsetDateTime; +import java.time.ZoneOffset; import java.util.*; public class JavaJsonBenchmarkTest { @@ -398,10 +398,117 @@ public void setSince(OffsetDateTime since) { } } + public static void fillClients(Clients clients, int size) { + clients.setClients(new ArrayList<>()); + + for (int i = 0; i < size; i++) { + appendClient(clients); + } + } + + private static int appendClient(Clients uc) { + int expectedSize = 2; // {} + + Clients.Client u = new Clients.Client(); + u.setId(Math.abs(RandomUtil.nextLong())); + expectedSize += 9 + Long.toString(u.getId()).length(); // ,'id':'' + u.setIndex(RandomUtil.nextInt(0, Integer.MAX_VALUE)); + expectedSize += 11 + Integer.toString(u.getIndex()).length(); // ,'index':'' + u.setGuid(RandomUtil.nextUUID()); + expectedSize += 10 + 36; // ,'guid':'' + u.setIsActive(RandomUtil.nextInt(0, 2) == 1); + expectedSize += 17 + (u.getIsActive() ? 4 : 5); // ,'isActive':'' + u.setBalance(RandomUtil.randomBigDecimal()); + expectedSize += 16 + u.getBalance().toPlainString().length(); // ,'balance':'' + u.setPicture(RandomUtil.randomAlphanumeric(100)); + expectedSize += 16 + u.getPicture().length(); // ,'picture':'' + u.setAge(RandomUtil.nextInt(0, 100)); + expectedSize += 9 + Integer.toString(u.getAge()).length(); // ,'age':'' + u.setEyeColor(Clients.EyeColor.fromNumber(RandomUtil.nextInt(3))); + expectedSize += 17 + u.getEyeColor().name().length(); // ,'eyeColor':'' + u.setName(RandomUtil.randomAlphanumeric(20)); + expectedSize += 10 + u.getName().length(); // ,'name':'' + u.setGender(RandomUtil.randomAlphanumeric(20)); + expectedSize += 12 + u.getGender().length(); // ,'gender':'' + u.setCompany(RandomUtil.randomAlphanumeric(20)); + expectedSize += 13 + u.getCompany().length(); // ,'company':'' + u.setEmails(new String[]{ + RandomUtil.randomAlphabetic(RandomUtil.nextInt(100)), + RandomUtil.randomAlphabetic(RandomUtil.nextInt(100)), + RandomUtil.randomAlphabetic(RandomUtil.nextInt(100)) + }); + int calcSize = 0; + for (String e : u.getEmails()) { + calcSize += 3 + e.length(); + } + expectedSize += 11 + calcSize; // ,'email':'' + u.setPhones(new long[]{ + RandomUtil.nextInt(10), + RandomUtil.nextInt(10), + RandomUtil.nextInt(10), + RandomUtil.nextInt(10) + }); + calcSize = 0; + for (long p : u.getPhones()) { + calcSize += 1 + Long.toString(p).length(); + } + expectedSize += 11 + calcSize; // ,'phone':'' + u.setAddress(RandomUtil.randomAlphanumeric(20)); + expectedSize += 13 + u.getAddress().length(); // ,'address':'' + u.setAbout(RandomUtil.randomAlphanumeric(20)); + expectedSize += 11 + u.getAbout().length(); // ,'about':'' + u.setRegistered(LocalDate.of(1900 + RandomUtil.nextInt(110), 1 + RandomUtil.nextInt(12), 1 + RandomUtil.nextInt(28))); + expectedSize += 16 + 10; // ,'registered':'' + u.setLatitude(RandomUtil.nextDouble(0, 90)); + expectedSize += 14 + Double.toString(u.getLatitude()).length(); // ,'latitude':'' + u.setLongitude(RandomUtil.nextDouble(0, 180)); + expectedSize += 15 + Double.toString(u.getLongitude()).length(); // ,'longitude':'' + + u.setTags(new ArrayList<>()); + expectedSize += 10; // ,'tags':[] + int nTags = RandomUtil.nextInt(0, 50); + for (int i = 0; i < nTags; i++) { + String t = RandomUtil.randomAlphanumeric(10); + u.getTags().add(t); + expectedSize += t.length(); // '', + } + + int nPartners = RandomUtil.nextInt(0, 30); + u.setPartners(new ArrayList<>()); + expectedSize += 13; // ,'partners':[] + for (int i = 0; i < nPartners; i++) { + long id = RandomUtil.nextLong(); + String name = RandomUtil.randomAlphabetic(30); + OffsetDateTime at = OffsetDateTime.of( + 1900 + RandomUtil.nextInt(110), + 1 + RandomUtil.nextInt(12), + 1 + RandomUtil.nextInt(28), + RandomUtil.nextInt(24), + RandomUtil.nextInt(60), + RandomUtil.nextInt(60), + RandomUtil.nextInt(1000000000), + ZoneOffset.UTC + ); + u.getPartners().add(Clients.Partner.create(id, name, at)); + expectedSize += Long.toString(id).length() + name.length() + 50; // {'id':'','name':'','since':''}, + } + + uc.getClients().add(u); + + return expectedSize; + } + @Test - public void test() throws SerializeException, DeserializeException, OpackAssert.AssertException, DecodeException { + public void test() throws SerializeException, DeserializeException, OpackAssert.AssertException { + Clients clients = new Clients(); + fillClients(clients, 8); + Opacker opacker = Opacker.Builder.create().build(); - OpackValue serialized = Json.decode("{\"clients\":[{\"id\":112673038484856810,\"index\":1344055720,\"guid\":\"60688132-8a21-b944-f888-f509a6b90256\",\"isActive\":false,\"balance\":0.04548297857634076,\"picture\":\"vAwEeFeE9EM0mrfkg2ujwjCf77kbBYALtM9hutQ0cKRGmJkxM1nInZfBYXLZpCJOwGuoyv1bg9ocf7K4A8VrzTN1z23ifDgRkY6s\",\"age\":60,\"eyeColor\":\"BLUE\",\"name\":\"tnJW03NKSqfdWFShb4Zx\",\"gender\":\"mkHYjEd9AdQ9qugcOVPr\",\"company\":\"QBC3vKiRZz9KzZUFL387\",\"emails\":[],\"phones\":[746929031,561717506,990959217,1768136872,500288955,1213970016,1796482738,28628332,2066852063],\"address\":\"m9qwxh8ck4ZqfcTEn8DC\",\"about\":\"GPsNVdldwX7l5sKShO21\",\"registered\":\"1926-05-06\",\"latitude\":33.206450907142155,\"longitude\":22.589461322126944,\"tags\":[\"sgIXdOUPvN\",\"EaSpiLhL3E\",\"KheRxPm0oS\",\"njVbMOrzMf\",\"tKnGw8SNUk\",\"W56syc0sUv\",\"tnyhobz3Nm\",\"JO7ymoPNhf\",\"8oDGnPQeIX\",\"EP2Vgxe29b\",\"TMCD1h0s8V\",\"BjsKUHxlb2\",\"Gb10kL3FHo\",\"Mkyc0gT5wf\",\"FqOWswKKbb\",\"EURPNlWQHx\",\"NJjxMOFU1K\",\"oHCD4oBfIh\",\"uHYI3is1O8\",\"1ufor6JqZy\",\"JU7sDQCSFA\",\"LUiAfaDpgP\",\"Gp0ppmYBhh\",\"QQ7971iGtk\",\"NS8yP3IfVE\",\"pctZBahLR2\",\"k2msx6HoFv\",\"mRG8LGeAhx\",\"Ctp5PqxJc9\",\"cEP1p05GVa\",\"PqRmLI7U28\",\"Eb7UVo4nlI\",\"trDbHQy2sp\",\"ysv0FegxwU\",\"mlyr8PucKO\",\"W9Wqp4A8aL\",\"J56dFrPCbb\",\"y1fsnL7OXA\",\"tdvMCRMNCR\",\"OXdmNUvM4I\"],\"partners\":[{\"id\":6942554547810915627,\"name\":\"DwuzOOeuPautxtTzMHOvIxVHIboVis\",\"since\":\"1909-05-23T23:29:37.098674093Z\"},{\"id\":-8518542767576114527,\"name\":\"bGZuDwWWosUOgPbJzCviDkFUbvGDIn\",\"since\":\"1938-05-04T13:50:04.017434661Z\"},{\"id\":601371629166935988,\"name\":\"PlnjVauJisRvtUMkKZMaWDlFefJCwL\",\"since\":\"1987-05-09T20:46:24.620521962Z\"},{\"id\":4375579985883232220,\"name\":\"xAwXgtrZEcUxnPQJIRqXAmKCncRDTY\",\"since\":\"1990-11-01T06:38:20.380789524Z\"},{\"id\":8317268803618076921,\"name\":\"QQdmSLNtYJXcpLMQINKSzWQxJVQxLF\",\"since\":\"1940-05-18T10:51:42.883428669Z\"},{\"id\":4285484400196566404,\"name\":\"lfpUWBYwPYbMvRTtRvdORyZyCDJzlZ\",\"since\":\"2003-10-13T22:27:11.929616204Z\"},{\"id\":2265074678478192283,\"name\":\"alBTLDrrFIAdLOkRhGAYjrkgSYUoee\",\"since\":\"1980-12-02T14:27:57.767475522Z\"},{\"id\":8350482858520968813,\"name\":\"gOnmVOFQLyDkQFKmKPSRSozRHhmYoI\",\"since\":\"2008-01-07T15:11:04.239970727Z\"},{\"id\":-6587118629753263393,\"name\":\"TuFtTDQNEQGscizafoDcSRwMhkdTSB\",\"since\":\"1964-02-13T23:30:54.254993783Z\"},{\"id\":-2402179798706660819,\"name\":\"sJHfDYWhXfbQyXkAaiIyPAedPuRqEg\",\"since\":\"1934-12-12T23:22:00.430680784Z\"}]}]}"); + + OpackValue serialized = opacker.serialize(clients); + assert serialized != null; Clients deserialized = opacker.deserialize(Clients.class, serialized); + + OpackAssert.assertEquals(clients, deserialized); } -} +} \ No newline at end of file