Merge pull request #13 from open-feature/update-with-latest-spec

Update with latest spec

Author: Justin Abrahms

.gitignore

@@ -4,3 +4,4 @@
 # Ignore Gradle build output directory
 build
 .idea
+specification.json

lib/src/main/java/dev/openfeature/javasdk/BaseEvaluation.java

@@ -23,5 +23,5 @@ public interface BaseEvaluation<T> {
      * The error code, if applicable. Should only be set when the Reason is ERROR.
      * @return {ErrorCode}
      */
-    ErrorCode getErrorCode();
+    String getErrorCode();
 }

lib/src/main/java/dev/openfeature/javasdk/Client.java

@@ -1,4 +1,5 @@
 package dev.openfeature.javasdk;
 
-public interface Client extends FlagEvaluationLifecycle, Features{
+public interface Client extends FlagEvaluationLifecycle, Features {
+    Metadata getMetadata();
 }

lib/src/main/java/dev/openfeature/javasdk/FeatureProvider.java

@@ -1,7 +1,7 @@
 package dev.openfeature.javasdk;
 
 public interface FeatureProvider {
-    String getName();
+    Metadata getMetadata();
     ProviderEvaluation<Boolean> getBooleanEvaluation(String key, Boolean defaultValue, EvaluationContext ctx, FlagEvaluationOptions options);
     ProviderEvaluation<String> getStringEvaluation(String key, String defaultValue, EvaluationContext ctx, FlagEvaluationOptions options);
     ProviderEvaluation<Integer> getIntegerEvaluation(String key, Integer defaultValue, EvaluationContext ctx, FlagEvaluationOptions options);

lib/src/main/java/dev/openfeature/javasdk/FlagEvaluationDetails.java

@@ -11,7 +11,7 @@ public class FlagEvaluationDetails<T> implements BaseEvaluation<T> {
     T value;
     @Nullable String variant;
     Reason reason;
-    @Nullable ErrorCode errorCode;
+    @Nullable String errorCode;
 
     public static <T> FlagEvaluationDetails<T> from(ProviderEvaluation<T> providerEval, String flagKey) {
         return FlagEvaluationDetails.<T>builder()

lib/src/main/java/dev/openfeature/javasdk/HookContext.java

@@ -11,14 +11,15 @@ public class HookContext<T> {
     @NonNull FlagValueType type;
     @NonNull T defaultValue;
     @NonNull EvaluationContext ctx;
-    Client client;
-    FeatureProvider provider;
+    Metadata clientMetadata;
+    Metadata providerMetadata;
 
-    public static <T> HookContext<T> from(String key, FlagValueType type, Client client, EvaluationContext ctx, T defaultValue) {
+    public static <T> HookContext<T> from(String key, FlagValueType type, Metadata clientMetadata, Metadata providerMetadata, EvaluationContext ctx, T defaultValue) {
         return HookContext.<T>builder()
                 .flagKey(key)
                 .type(type)
-                .client(client)
+                .clientMetadata(clientMetadata)
+                .providerMetadata(providerMetadata)
                 .ctx(ctx)
                 .defaultValue(defaultValue)
                 .build();

lib/src/main/java/dev/openfeature/javasdk/Metadata.java

@@ -0,0 +1,5 @@
+package dev.openfeature.javasdk;
+
+public interface Metadata {
+    public String getName();
+}

lib/src/main/java/dev/openfeature/javasdk/NoOpProvider.java

@@ -7,6 +7,16 @@ public class NoOpProvider implements FeatureProvider {
     @Getter
     private final String name = "No-op Provider";
 
+    @Override
+    public Metadata getMetadata() {
+        return new Metadata() {
+            @Override
+            public String getName() {
+                return name;
+            }
+        };
+    }
+
     @Override
     public ProviderEvaluation<Boolean> getBooleanEvaluation(String key, Boolean defaultValue, EvaluationContext ctx, FlagEvaluationOptions options) {
         return ProviderEvaluation.<Boolean>builder()

lib/src/main/java/dev/openfeature/javasdk/OpenFeatureAPI.java

@@ -30,6 +30,10 @@ public Client getClient() {
         return getClient(null, null);
     }
 
+    public Metadata getProviderMetadata() {
+        return provider.getMetadata();
+    }
+
     public Client getClient(@Nullable String name) {
         return getClient(name, null);
     }

lib/src/main/java/dev/openfeature/javasdk/OpenFeatureClient.java

@@ -43,7 +43,7 @@ <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key, T defa
         // merge of: API.context, client.context, invocation.context
 
         // TODO: Context transformation?
-        HookContext hookCtx = HookContext.from(key, type, this, ctx, defaultValue);
+        HookContext hookCtx = HookContext.from(key, type, this.getMetadata(), OpenFeatureAPI.getInstance().getProvider().getMetadata(), ctx, defaultValue);
 
         List<Hook> mergedHooks;
         if (options != null && options.getHooks() != null) {
@@ -84,11 +84,7 @@ <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key, T defa
             }
             details.value = defaultValue;
             details.reason = Reason.ERROR;
-            if (e instanceof OpenFeatureError) { //NOPMD - suppressed AvoidInstanceofChecksInCatchClause - Don't want to duplicate detail creation logic.
-                details.errorCode = ((OpenFeatureError) e).getErrorCode();
-            } else {
-                details.errorCode = ErrorCode.GENERAL;
-            }
+            details.errorCode = e.getMessage();
             this.errorHooks(hookCtx, e, mergedHooks, hints);
         } finally {
             this.afterAllHooks(hookCtx, mergedHooks, hints);
@@ -99,13 +95,21 @@ <T> FlagEvaluationDetails<T> evaluateFlag(FlagValueType type, String key, T defa
 
     private void errorHooks(HookContext hookCtx, Exception e, List<Hook> hooks, ImmutableMap<String, Object> hints) {
         for (Hook hook : hooks) {
-            hook.error(hookCtx, e, hints);
+            try {
+                hook.error(hookCtx, e, hints);
+            } catch (Exception inner_exception) {
+                log.error("Exception when running error hooks " + hook.getClass().toString(), inner_exception);
+            }
         }
     }
 
     private void afterAllHooks(HookContext hookCtx, List<Hook> hooks, ImmutableMap<String, Object> hints) {
         for (Hook hook : hooks) {
-            hook.finallyAfter(hookCtx, hints);
+            try {
+                hook.finallyAfter(hookCtx, hints);
+            } catch (Exception inner_exception) {
+                log.error("Exception when running finally hooks " + hook.getClass().toString(), inner_exception);
+            }
         }
     }
 
@@ -247,4 +251,14 @@ public <T> FlagEvaluationDetails<T> getObjectDetails(String key, T defaultValue,
     public <T> FlagEvaluationDetails<T> getObjectDetails(String key, T defaultValue, EvaluationContext ctx, FlagEvaluationOptions options) {
         return this.evaluateFlag(FlagValueType.OBJECT, key, defaultValue, ctx, options);
     }
+
+    @Override
+    public Metadata getMetadata() {
+        return new Metadata() {
+            @Override
+            public String getName() {
+                return name;
+            }
+        };
+    }
 }