remove Classic support (#86)

* remove classic v1 tests
* remove v1 parsing and throw a parse error if we have a v1 datafile

Author: wangjoshuah

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -19,7 +19,6 @@
 import com.optimizely.ab.annotations.VisibleForTesting;
 import com.optimizely.ab.bucketing.Bucketer;
 import com.optimizely.ab.bucketing.UserProfile;
-import com.optimizely.ab.internal.UserProfileUtils;
 import com.optimizely.ab.config.Attribute;
 import com.optimizely.ab.config.EventType;
 import com.optimizely.ab.config.Experiment;
@@ -36,29 +35,27 @@
 import com.optimizely.ab.event.LogEvent;
 import com.optimizely.ab.event.internal.BuildVersionInfo;
 import com.optimizely.ab.event.internal.EventBuilder;
-import com.optimizely.ab.event.internal.EventBuilderV1;
 import com.optimizely.ab.event.internal.EventBuilderV2;
 import com.optimizely.ab.event.internal.payload.Event.ClientEngine;
 import com.optimizely.ab.internal.EventTagUtils;
 import com.optimizely.ab.internal.ProjectValidationUtils;
 import com.optimizely.ab.internal.ReservedEventKey;
-import com.optimizely.ab.notification.NotificationListener;
+import com.optimizely.ab.internal.UserProfileUtils;
 import com.optimizely.ab.notification.NotificationBroadcaster;
-
+import com.optimizely.ab.notification.NotificationListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
 /**
  * Top-level container class for Optimizely functionality.
  * Thread-safe, so can be created as a singleton and safely passed around.
@@ -464,7 +461,14 @@ private static ProjectConfig getProjectConfig(String datafile) throws ConfigPars
             throw new ConfigParseException("Unable to parse empty datafile.");
         }
 
-        return DefaultConfigParser.getInstance().parseProjectConfig(datafile);
+        ProjectConfig projectConfig = DefaultConfigParser.getInstance().parseProjectConfig(datafile);
+
+        if (projectConfig.getVersion().equals("1")) {
+            throw new ConfigParseException("This version of the Java SDK does not support version 1 datafiles. " +
+                    "Please use a version 2 or 3 datafile with this SDK.");
+        }
+
+        return projectConfig;
     }
 
     @Nullable
@@ -733,11 +737,7 @@ public Optimizely build() throws ConfigParseException {
             }
 
             if (eventBuilder == null) {
-                if (projectConfig.getVersion().equals(ProjectConfig.Version.V1.toString())) {
-                    eventBuilder = new EventBuilderV1();
-                } else {
-                    eventBuilder = new EventBuilderV2(clientEngine, clientVersion);
-                }
+                eventBuilder = new EventBuilderV2(clientEngine, clientVersion);
             }
 
             if (errorHandler == null) {

core-api/src/main/java/com/optimizely/ab/config/parser/JsonSimpleConfigParser.java

@@ -17,36 +17,34 @@
 package com.optimizely.ab.config.parser;
 
 import com.optimizely.ab.config.Attribute;
-import com.optimizely.ab.config.audience.AndCondition;
-import com.optimizely.ab.config.audience.Audience;
-import com.optimizely.ab.config.audience.Condition;
-import com.optimizely.ab.config.audience.NotCondition;
-import com.optimizely.ab.config.audience.OrCondition;
-import com.optimizely.ab.config.audience.UserAttribute;
 import com.optimizely.ab.config.EventType;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.Experiment.ExperimentStatus;
 import com.optimizely.ab.config.Group;
 import com.optimizely.ab.config.LiveVariable;
-import com.optimizely.ab.config.LiveVariableUsageInstance;
 import com.optimizely.ab.config.LiveVariable.VariableStatus;
 import com.optimizely.ab.config.LiveVariable.VariableType;
+import com.optimizely.ab.config.LiveVariableUsageInstance;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.TrafficAllocation;
 import com.optimizely.ab.config.Variation;
-
+import com.optimizely.ab.config.audience.AndCondition;
+import com.optimizely.ab.config.audience.Audience;
+import com.optimizely.ab.config.audience.Condition;
+import com.optimizely.ab.config.audience.NotCondition;
+import com.optimizely.ab.config.audience.OrCondition;
+import com.optimizely.ab.config.audience.UserAttribute;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 /**
  * {@code json-simple}-based config parser implementation.
  */
@@ -67,7 +65,7 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
 
             List<Attribute> attributes;
             if (version.equals(ProjectConfig.Version.V1.toString())) {
-                attributes = parseAttributes((JSONArray)rootObject.get("dimensions"));
+                throw new ConfigParseException("The Java SDK no longer supports datafile version 1. If you wish to use a Classic Custom Project, please use Java SDK version 1.6 or below.");
             } else {
                 attributes = parseAttributes((JSONArray)rootObject.get("attributes"));
             }

core-api/src/main/java/com/optimizely/ab/config/parser/ProjectConfigGsonDeserializer.java

@@ -22,14 +22,13 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
-
 import com.optimizely.ab.config.Attribute;
-import com.optimizely.ab.config.audience.Audience;
 import com.optimizely.ab.config.EventType;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.Group;
 import com.optimizely.ab.config.LiveVariable;
 import com.optimizely.ab.config.ProjectConfig;
+import com.optimizely.ab.config.audience.Audience;
 
 import java.lang.reflect.Type;
 import java.util.List;
@@ -73,7 +72,7 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
             context.deserialize(jsonObject.get("audiences").getAsJsonArray(), audienceType);
 
         boolean anonymizeIP = false;
-        // live variables should be null if using V1
+        // live variables should be null if using V2
         List<LiveVariable> liveVariables = null;
         if (version.equals(ProjectConfig.Version.V3.toString())) {
             Type liveVariablesType = new TypeToken<List<LiveVariable>>() {}.getType();