Feature/1.0.2 featbit java sdk v1.0.2 (#5)

Author: dsun0720

.gitignore

@@ -116,3 +116,6 @@ fabric.properties
 # test data
 /src/test/resources/simplelogger.properties
 /src/test/java/co/featbit/Demos.java
+
+#sonarlint
+/.idea/sonarlint/issuestore/index.pb

README.md

@@ -45,7 +45,7 @@ install the sdk in using maven
     <dependency>
         <groupId>co.featbit</groupId>
         <artifactId>Featbit-Java-SDK</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </dependency>
 </dependencies>
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>co.featbit</groupId>
     <artifactId>featbit-java-sdk</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <name>featbit/featbit-java-sdk</name>
 
@@ -52,6 +52,7 @@
         <slf4j-version>1.7.35</slf4j-version>
         <ttl-version>2.12.6</ttl-version>
         <junit-version>5.8.1</junit-version>
+        <mock-version>4.3</mock-version>
     </properties>
 
     <dependencies>
@@ -111,6 +112,15 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>${mock-version}</version>
+            <scope>test</scope>
+        </dependency>
+
+
+
     </dependencies>
 
     <distributionManagement>
@@ -207,4 +217,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

src/main/java/co/featbit/server/DataModel.java

@@ -2,11 +2,12 @@
 
 import co.featbit.commons.json.JsonHelper;
 import co.featbit.server.exterior.DataStoreTypes;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.JsonAdapter;
+import org.jetbrains.annotations.NotNull;
 
-import java.time.Instant;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -47,7 +48,12 @@ public Long getTimestamp() {
 
         @Override
         public Integer getType() {
-            return FFC_ARCHIVED_ITEM;
+            return FB_ARCHIVED_ITEM;
+        }
+
+        @Override
+        public int compareTo(@NotNull DataStoreTypes.Item o) {
+            return timestamp.compareTo(o.getTimestamp());
         }
     }
 
@@ -105,8 +111,8 @@ boolean isProcessData() {
      */
     @JsonAdapter(JsonHelper.AfterJsonParseDeserializableTypeAdapterFactory.class)
     static class Data implements JsonHelper.AfterJsonParseDeserializable {
-
-        private final String eventType;
+        @VisibleForTesting
+        /*private*/ String eventType;
         private final List<FeatureFlag> featureFlags;
         private final List<Segment> segments;
         private Long timestamp;
@@ -228,6 +234,11 @@ public DataStoreTypes.Item toArchivedItem() {
         public void afterDeserialization() {
             this.timestamp = updatedAt.getTime();
         }
+
+        @Override
+        public int compareTo(@NotNull DataStoreTypes.Item o) {
+            return timestamp.compareTo(o.getTimestamp());
+        }
     }
 
     @JsonAdapter(JsonHelper.AfterJsonParseDeserializableTypeAdapterFactory.class)
@@ -288,7 +299,7 @@ public Long getTimestamp() {
 
         @Override
         public Integer getType() {
-            return FFC_FEATURE_FLAG;
+            return FB_FEATURE_FLAG;
         }
 
         public boolean exptIncludeAllTargets() {
@@ -346,6 +357,11 @@ public void afterDeserialization() {
                 this.variationMap = builder.build();
             }
         }
+
+        @Override
+        public int compareTo(@NotNull DataStoreTypes.Item o) {
+            return timestamp.compareTo(o.getTimestamp());
+        }
     }
 
     static final class Variation {

src/main/java/co/featbit/server/EvaluatorImp.java

@@ -16,7 +16,7 @@
 
 final class EvaluatorImp extends Evaluator {
 
-    public EvaluatorImp(Getter<DataModel.FeatureFlag> flagGetter, Getter<DataModel.Segment> segmentGetter) {
+    EvaluatorImp(Getter<DataModel.FeatureFlag> flagGetter, Getter<DataModel.Segment> segmentGetter) {
         super(flagGetter, segmentGetter);
     }
 

src/main/java/co/featbit/server/FBClientImp.java

@@ -12,7 +12,6 @@
 import co.featbit.server.exterior.FBClient;
 import co.featbit.server.exterior.InsightProcessor;
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -105,9 +104,8 @@ public FBClientImp(String envSecret, FBConfig config) {
         checkNotNull(config, "FBConfig Should not be null");
         this.offline = config.isOffline();
         if (!this.offline) {
-            checkArgument(Base64.isBase64(envSecret), "envSecret is invalid");
-            checkArgument(Utils.isUrl(config.getStreamingURL()), "streaming uri is invalid");
-            checkArgument(Utils.isUrl(config.getEventURL()), "event uri is invalid");
+            checkArgument(Utils.isValidEnvSecret(envSecret), "envSecret is invalid");
+            checkArgument(Utils.isUrl(config.getStreamingURL()) || Utils.isUrl(config.getEventURL()), "streaming or event url is invalid");
         }
         ContextImp context = new ContextImp(envSecret, config);
         //init components
@@ -155,7 +153,7 @@ public FBClientImp(String envSecret, FBConfig config) {
                 logger.error("FFC JAVA SDK: exception encountered when waiting for data update", e);
             }
 
-            if (!this.storage.isInitialized() && !offline) {
+            if (!this.dataSynchronizer.isInitialized() && !offline) {
                 logger.info("FFC JAVA SDK: SDK was not successfully initialized");
             }
         }
@@ -313,7 +311,7 @@ public boolean isFlagKnown(String featureKey) {
                 logger.warn("FFC JAVA SDK: isFlagKnown is called before Java SDK client is initialized for feature flag");
                 return false;
             }
-            return getFlagInternal(featureKey) == null;
+            return getFlagInternal(featureKey) != null;
         } catch (Exception ex) {
             logger.error("FFC JAVA SDK: unexpected error in isFlagKnown", ex);
         }
@@ -348,7 +346,7 @@ public boolean initializeFromExternalJson(String json) {
                 Map<DataStoreTypes.Category, Map<String, DataStoreTypes.Item>> allDataInStorageType = allData.toStorageType();
                 boolean res = dataUpdater.init(allDataInStorageType, version);
                 if (res) {
-                    dataUpdater.updateStatus(Status.StateType.OK, null);
+                    dataUpdater.updateStatus(Status.State.OKState());
                 }
                 return res;
             }
@@ -400,6 +398,16 @@ public void flush() {
         this.insightProcessor.flush();
     }
 
+    @Override
+    public void identify(FBUser user) {
+        if (user == null) {
+            Loggers.CLIENT.warn("FFC JAVA SDK: user invalid");
+            return;
+        }
+        InsightTypes.Event event = InsightTypes.UserEvent.of(user);
+        insightProcessor.send(event);
+    }
+
     @Override
     public void trackMetric(FBUser user, String eventName) {
         trackMetric(user, eventName, 1.0);

src/main/java/co/featbit/server/InsightTypes.java

@@ -51,6 +51,27 @@ public Event add(Object element) {
         }
     }
 
+    @JsonAdapter(UserEventSerializer.class)
+    final static class UserEvent extends Event {
+        private UserEvent(FBUser user) {
+            super(user);
+        }
+
+        static UserEvent of(FBUser user) {
+            return new UserEvent(user);
+        }
+
+        @Override
+        public boolean isSendEvent() {
+            return user != null;
+        }
+
+        @Override
+        public Event add(Object element) {
+            return this;
+        }
+    }
+
     @JsonAdapter(FlagEventSerializer.class)
     final static class FlagEvent extends Event {
         private final List<FlagEventVariation> userVariations = new ArrayList<>();
@@ -170,6 +191,13 @@ public String getAppType() {
         }
     }
 
+    final static class UserEventSerializer implements JsonSerializer<UserEvent> {
+        @Override
+        public JsonElement serialize(UserEvent userEvent, Type type, JsonSerializationContext jsonSerializationContext) {
+            return serializeUser(userEvent.getUser());
+        }
+    }
+
     final static class FlagEventSerializer implements JsonSerializer<FlagEvent> {
 
         @Override
@@ -181,7 +209,7 @@ public JsonElement serialize(FlagEvent flagEvent, Type type, JsonSerializationCo
                 JsonObject var = new JsonObject();
                 var.addProperty("featureFlagKey", variation.getFeatureFlagKeyName());
                 var.addProperty("sendToExperiment", variation.getVariation().isSendToExperiment());
-                var.addProperty("timestamp", Instant.now().toEpochMilli());
+                var.addProperty("timestamp", variation.getTimestamp());
                 JsonObject v = new JsonObject();
                 v.addProperty("id", variation.getVariation().getIndex());
                 v.addProperty("value", variation.getVariation().getValue());
@@ -232,26 +260,28 @@ private static JsonObject serializeUser(FBUser user) {
     }
 
     enum InsightMessageType {
-        FLAGS, FLUSH, SHUTDOWN, METRICS,
+        FLAGS, FLUSH, SHUTDOWN, METRICS, USERS, STATISTICS
     }
 
     static final class InsightMessage {
         private final InsightMessageType type;
         private final Event event;
-        private final Semaphore waitLock;
+        private final Object waitLock;
 
         // waitLock is initialized only when you need to wait until the message is completely handled
         // Ex, shutdown, in this case, we should to wait until all events are sent to server
-        InsightMessage(InsightMessageType type, Event event, boolean awaitTermination) {
+        InsightMessage(InsightMessageType type, Event event, boolean awaitToComplete) {
             this.type = type;
             this.event = event;
             // permit = 0, so wait until a permit releases
-            this.waitLock = awaitTermination ? new Semaphore(0) : null;
+            this.waitLock = awaitToComplete ? new Object() : null;
         }
 
         public void completed() {
             if (waitLock != null) {
-                waitLock.release();
+                synchronized (waitLock) {
+                    waitLock.notifyAll();
+                }
             }
         }
 
@@ -260,10 +290,12 @@ public void waitForComplete() {
                 return;
             }
             while (true) {
-                try {
-                    waitLock.acquire();
-                    return;
-                } catch (InterruptedException ignore) {
+                synchronized (waitLock) {
+                    try {
+                        waitLock.wait();
+                        return;
+                    } catch (InterruptedException ignore) {
+                    }
                 }
             }
 

src/main/java/co/featbit/server/Insights.java

@@ -49,6 +49,8 @@ public void send(InsightTypes.Event event) {
                     putEventAsync(InsightTypes.InsightMessageType.FLAGS, event);
                 } else if (event instanceof InsightTypes.MetricEvent) {
                     putEventAsync(InsightTypes.InsightMessageType.METRICS, event);
+                } else if (event instanceof InsightTypes.UserEvent) {
+                    putEventAsync(InsightTypes.InsightMessageType.USERS, event);
                 } else {
                     Loggers.EVENTS.debug("ignore event type: {}", event.getClass().getName());
                 }
@@ -133,7 +135,7 @@ public Boolean run() {
                             Loggers.EVENTS.debug("paload size: {}", partition.size());
                         });
             } catch (Exception unexpected) {
-                Loggers.EVENTS.error("FFC JAVA SDK: unexpected error in sending payload: {}", unexpected.getMessage());
+                Loggers.EVENTS.error("FFC JAVA SDK: unexpected error in sending payload", unexpected);
                 return false;
             }
             return true;
@@ -187,6 +189,7 @@ private void dispatchEvents() {
                             switch (message.getType()) {
                                 case FLAGS:
                                 case METRICS:
+                                case USERS:
                                     putEventToNextBuffer(message.getEvent());
                                     break;
                                 case FLUSH:
@@ -199,12 +202,12 @@ private void dispatchEvents() {
                             }
                             message.completed();
                         } catch (Exception unexpected) {
-                            Loggers.EVENTS.error("FFC JAVA SDK: unexpected error in event dispatcher {}", unexpected.getMessage());
+                            Loggers.EVENTS.error("FFC JAVA SDK: unexpected error in event dispatcher", unexpected);
                         }
                     }
                 } catch (InterruptedException ignore) {
                 } catch (Exception unexpected) {
-                    Loggers.EVENTS.error("FFC JAVA SDK: unexpected error in event dispatcher {}", unexpected.getMessage());
+                    Loggers.EVENTS.error("FFC JAVA SDK: unexpected error in event dispatcher", unexpected);
                 }
             }
         }
@@ -266,7 +269,7 @@ private void shutdown() {
                     config.getRight().close();
                 }
             } catch (Exception unexpected) {
-                Loggers.EVENTS.error("FFC JAVA SDK: unexpected error when closing event dispatcher: {}", unexpected.getMessage());
+                Loggers.EVENTS.error("FFC JAVA SDK: unexpected error when closing event dispatcher", unexpected);
             }
         }