From 3813d3510c09bf9a0526d1f9fd8c6b908a82fa82 Mon Sep 17 00:00:00 2001 From: Andrea Peruffo Date: Wed, 22 Nov 2023 09:46:50 +0000 Subject: [PATCH] review comments --- .../com/microsoft/kiota/serialization/mocks/MyEnum.java | 9 +++++---- .../microsoft/kiota/serialization/mocks/TestEntity.java | 7 +------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/MyEnum.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/MyEnum.java index 178dd144b..e91ac7175 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/MyEnum.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/MyEnum.java @@ -1,10 +1,11 @@ package com.microsoft.kiota.serialization.mocks; import com.microsoft.kiota.serialization.ValuedEnum; -import com.microsoft.kiota.serialization.ValuedEnumParser; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.Objects; -public enum MyEnum implements ValuedEnum, ValuedEnumParser { +public enum MyEnum implements ValuedEnum { MY_VALUE1("VALUE1"), MY_VALUE2("VALUE2"); public final String value; @@ -13,11 +14,11 @@ public enum MyEnum implements ValuedEnum, ValuedEnumParser { this.value = value; } - @jakarta.annotation.Nonnull public String getValue() { + @Nonnull public String getValue() { return this.value; } - @jakarta.annotation.Nullable public MyEnum forValue(@jakarta.annotation.Nonnull final String searchValue) { + @Nullable public static MyEnum forValue(@jakarta.annotation.Nonnull final String searchValue) { Objects.requireNonNull(searchValue); switch (searchValue) { case "VALUE1": diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java index cf08986aa..786b7db3e 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java @@ -131,12 +131,7 @@ public Map> getFieldDeserializers() { put( "myEnum", (n) -> { - setMyEnum( - n.getEnumValue( - value -> - (value == null || MyEnum.values().length < 1) - ? null - : MyEnum.values()[0].forValue(value))); + setMyEnum(n.getEnumValue(MyEnum::forValue)); }); put( "createdDateTime",