fix build

Author: rvowles

.github/workflows/java.yaml

@@ -15,4 +15,4 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
-        run: sh setup.sh && mvn --batch-mode --quiet package
+        run: MVN_OPTS="--batch-mode --quiet" sh ./build_all_and_test.sh

build_alL_and_test.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
-cd support && mvn -f pom-tiles.xml install && mvn install && cd .. && mvn -T4C clean install
+MAVEN_OPTS=${MVN_OPTS:-"-T4C"}
+cd support && mvn -f pom-tiles.xml install && mvn install && cd .. && mvn $MAVEN_OPTS clean install
 

client-java-core/src/main/java/io/featurehub/client/BaseClientContext.java

@@ -150,7 +150,7 @@ protected void recordRelativeValuesForUser() {
     repository.recordUsageEvent(fillUsageCollection(repository.getUsageProvider().createUsageCollectionEvent()));
   }
 
-  protected UsageEvent fillUsageCollection(UsageEvent event) {
+  public <T extends UsageEvent> @NotNull T fillUsageCollection(@NotNull T event) {
     event.setUserKey(usageUserKey());
 
     if (event instanceof UsageFeaturesCollection) {
@@ -167,7 +167,7 @@ protected UsageEvent fillUsageCollection(UsageEvent event) {
   }
 
   @Override
-  public void recordUsageEvent(@NotNull UsageEvent event) {
+  public <T extends UsageEvent> void recordUsageEvent(@NotNull T event) {
     repository.recordUsageEvent(fillUsageCollection(event));
   }
 

client-java-core/src/main/java/io/featurehub/client/ClientContext.java

@@ -67,7 +67,16 @@ public interface ClientContext {
    * the current context if possible and add it to the analytics event.
    * @param event
    */
-  void recordUsageEvent(@NotNull UsageEvent event);
+  <T extends UsageEvent> void recordUsageEvent(@NotNull T event);
+
+  /**
+   * Use this method to set all the fields of your UsageEvent. It will add the user key in,
+   * collect all feature values (if a UsageFeaturesCollection) and add in the context attributes (if a UsageFeaturesCollectionContext)
+   * @param event -  the vent to fill in
+   * @return the filled in collection
+   * @param <T> a type that extends UsageEvent
+   */
+  @NotNull <T extends UsageEvent> T fillUsageCollection(@NotNull T event);
 
   void close();
 }

client-java-core/src/main/java/io/featurehub/client/ClientFeatureRepository.java

@@ -317,7 +317,7 @@ public boolean updateFeature(@NotNull io.featurehub.sse.model.FeatureState featu
       key,
       key1 -> {
         if (hasReceivedInitialState) {
-          log.error(
+          log.warn(
             "FeatureHub error: application requesting use of invalid key after initialization: `{}`",
             key1);
         }

client-java-core/src/main/java/io/featurehub/client/EdgeFeatureHubConfig.java

@@ -57,6 +57,13 @@ public EdgeFeatureHubConfig(@NotNull String edgeUrl, @NotNull List<String> apiKe
 
     serverEvaluation = !FeatureHubConfig.sdkKeyIsClientSideEvaluated(apiKeys);
 
+    // set defaults
+    if (serverEvaluation) {
+      rest();
+    } else {
+      streaming();
+    }
+
     if (edgeUrl.endsWith("/")) {
       edgeUrl = edgeUrl.substring(0, edgeUrl.length()-1);
     }
@@ -102,7 +109,7 @@ public String baseUrl() {
   }
 
   /**
-   * This is only intended to be used for client evaluated contexts, do not use it for server evaluated ones
+   * This provides an async wait to trigger off the client.
    */
   @Override
   public Future<ClientContext> init() {

client-java-core/src/main/java/io/featurehub/client/FeatureHubConfig.java

@@ -7,11 +7,29 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 public interface FeatureHubConfig {
+
+  /**
+   * Use environment variables to create a system config.
+   * @return system config
+   */
+  default FeatureHubConfig envConfig() {
+    return new EdgeFeatureHubConfig(System.getenv("FEATUREHUB_EDGE_URL"), System.getenv("FEATUREHUB_API_KEY"));
+  }
+
+  /**
+   * Use system properties to create a system config.
+   * @return system config
+   */
+  default FeatureHubConfig systemPropertyConfig() {
+    return new EdgeFeatureHubConfig(System.getProperty("featurehub.edge-url"), System.getProperty("featurehub.api-key"));
+  }
+
   /**
    * What is the fully deconstructed URL for the server?
    */

examples/todo-java/src/main/java/todo/backend/resources/FeatureAnalyticsFilter.java

@@ -1,21 +1,26 @@
 package todo.backend.resources;
 
 import cd.connect.app.config.DeclaredConfigResolver;
+import io.featurehub.client.ClientContext;
 import io.featurehub.client.ThreadLocalContext;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;
 import jakarta.ws.rs.container.ContainerResponseContext;
 import jakarta.ws.rs.container.ContainerResponseFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import todo.backend.FeatureHub;
 import todo.backend.UsageRequestMeasurement;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 public class FeatureAnalyticsFilter implements ContainerRequestFilter, ContainerResponseFilter {
 
   private final FeatureHub config;
+  private static final Logger log = LoggerFactory.getLogger(FeatureAnalyticsFilter.class);
 
   @Inject
   public FeatureAnalyticsFilter(FeatureHub config) {
@@ -27,19 +32,31 @@ public FeatureAnalyticsFilter(FeatureHub config) {
   public void filter(ContainerRequestContext requestContext) throws IOException {
     final long currentTime = System.currentTimeMillis();
     requestContext.setProperty("startTime", currentTime);
+    final List<String> user = requestContext.getUriInfo().getPathParameters().get("user");
+    if (user != null && !user.isEmpty()) {
+      try {
+        requestContext.setProperty("context", config.getConfig().newContext().build().get());
+      } catch (InterruptedException | ExecutionException e) {
+        throw new RuntimeException(e);
+      }
+    }
   }
 
   @Override
   public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) throws IOException {
-    Long start = (Long)requestContext.getProperty("startTime");
-    long duration = 0;
-    if (start != null) {
-      duration = System.currentTimeMillis() - start;
-    }
+    Long start = (Long) requestContext.getProperty("startTime");
+    ClientContext context = (ClientContext) requestContext.getProperty("context");
+
+    if (start != null && context != null) {
+      long duration = System.currentTimeMillis() - start;
+
+      final List<String> matchedURIs = requestContext.getUriInfo().getMatchedURIs();
 
-    final List<String> matchedURIs = requestContext.getUriInfo().getMatchedURIs();
-    if (!matchedURIs.isEmpty()) {
-      config.getConfig().recordUsageEvent(new UsageRequestMeasurement(duration, matchedURIs.get(0)));
+      if (!matchedURIs.isEmpty()) {
+        context.recordUsageEvent(new UsageRequestMeasurement(duration, matchedURIs.get(0)));
+      }
+    } else {
+      log.error("There was not start time {} and context {}", start, context);
     }
   }
 }