Skip to content

Commit

Permalink
applied code review suggestion
Browse files Browse the repository at this point in the history
Signed-off-by: jarebudev <23311805+jarebudev@users.noreply.github.com>
  • Loading branch information
jarebudev authored and Kavindu-Dodan committed May 28, 2024
1 parent ce11275 commit 6bc1fd8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 23 deletions.
5 changes: 3 additions & 2 deletions src/main/java/dev/openfeature/sdk/OpenFeatureClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import dev.openfeature.sdk.exceptions.OpenFeatureError;
import dev.openfeature.sdk.internal.AutoCloseableLock;
import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
import dev.openfeature.sdk.internal.ErrorUtils;
import dev.openfeature.sdk.exceptions.ExceptionUtils;
import dev.openfeature.sdk.internal.ObjectUtils;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -127,7 +127,8 @@ private <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key

details = FlagEvaluationDetails.from(providerEval, key);
if (details.getErrorCode() != null) {
Exception e = ErrorUtils.instantiateErrorByErrorCode(details.getErrorCode(), details.getErrorMessage());
Exception e = ExceptionUtils.instantiateErrorByErrorCode(details.getErrorCode(),
details.getErrorMessage());
hookSupport.errorHooks(type, hookCtx, e, mergedHooks, hints);
} else {
hookSupport.afterHooks(type, hookCtx, details, mergedHooks, hints);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
package dev.openfeature.sdk.internal;
package dev.openfeature.sdk.exceptions;

import dev.openfeature.sdk.ErrorCode;
import dev.openfeature.sdk.exceptions.FlagNotFoundError;
import dev.openfeature.sdk.exceptions.GeneralError;
import dev.openfeature.sdk.exceptions.InvalidContextError;
import dev.openfeature.sdk.exceptions.OpenFeatureError;
import dev.openfeature.sdk.exceptions.ParseError;
import dev.openfeature.sdk.exceptions.ProviderNotReadyError;
import dev.openfeature.sdk.exceptions.TargetingKeyMissingError;
import dev.openfeature.sdk.exceptions.TypeMismatchError;
import lombok.experimental.UtilityClass;

@SuppressWarnings("checkstyle:MissingJavadocType")
@UtilityClass
public class ErrorUtils {
public class ExceptionUtils {

/**
* Creates an Error for the specific error code.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package dev.openfeature.sdk.internal;
package dev.openfeature.sdk.exceptions;

import dev.openfeature.sdk.ErrorCode;
import dev.openfeature.sdk.exceptions.FlagNotFoundError;
import dev.openfeature.sdk.exceptions.GeneralError;
import dev.openfeature.sdk.exceptions.InvalidContextError;
import dev.openfeature.sdk.exceptions.OpenFeatureError;
import dev.openfeature.sdk.exceptions.ParseError;
import dev.openfeature.sdk.exceptions.ProviderNotReadyError;
import dev.openfeature.sdk.exceptions.TargetingKeyMissingError;
import dev.openfeature.sdk.exceptions.TypeMismatchError;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
Expand All @@ -21,15 +13,15 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;

class ErrorUtilsTest {
class ExceptionUtilsTest {

@ParameterizedTest
@DisplayName("should produce correct exception for a provided ErrorCode")
@ArgumentsSource(ErrorCodeTestParameters.class)
void shouldProduceCorrectExceptionForErrorCode(ErrorCode errorCode, Class<? extends OpenFeatureError> exception) {

String errorMessage = "error message";
OpenFeatureError openFeatureError = ErrorUtils.instantiateErrorByErrorCode(errorCode, errorMessage);
OpenFeatureError openFeatureError = ExceptionUtils.instantiateErrorByErrorCode(errorCode, errorMessage);
assertInstanceOf(exception, openFeatureError);
assertThat(openFeatureError.getMessage()).isEqualTo(errorMessage);
assertThat(openFeatureError.getErrorCode()).isEqualByComparingTo(errorCode);
Expand Down

0 comments on commit 6bc1fd8

Please sign in to comment.