From 13c27ffc812928ef5cf05159d37ad6bab421fc5a Mon Sep 17 00:00:00 2001
From: Tom Zurkan <thomas.zurkan@optimizely.com>
Date: Thu, 14 Nov 2019 18:11:25 -0800
Subject: [PATCH] release off of master (#347)

---
 CHANGELOG.md                                          |  7 +++++++
 .../src/main/java/com/optimizely/ab/Optimizely.java   | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e741f4a..70883695b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Optimizely Java X SDK Changelog
 
+## 3.3.3
+November 14th, 2019
+
+### New Features:
+- Require EventHandler in BatchEventProcessor builder. ([#333](https://github.com/optimizely/java-sdk/pull/333))
+- Defend against invalid BatchEventProcessor configuration overrides. i([#331](https://github.com/optimizely/java-sdk/pull/331))
+
 ## 3.3.2
 October 23rd, 2019
 
diff --git a/core-api/src/main/java/com/optimizely/ab/Optimizely.java b/core-api/src/main/java/com/optimizely/ab/Optimizely.java
index 8a6c31b9a..b47feb58b 100644
--- a/core-api/src/main/java/com/optimizely/ab/Optimizely.java
+++ b/core-api/src/main/java/com/optimizely/ab/Optimizely.java
@@ -76,6 +76,7 @@ public class Optimizely implements AutoCloseable {
     @VisibleForTesting
     final DecisionService decisionService;
     @VisibleForTesting
+    @Deprecated
     final EventHandler eventHandler;
     @VisibleForTesting
     final EventProcessor eventProcessor;
@@ -1032,11 +1033,21 @@ public Builder withErrorHandler(ErrorHandler errorHandler) {
             return this;
         }
 
+        /**
+         * The withEventHandler has has been moved to the EventProcessor which takes a EventHandler in it's builder
+         * method.
+         * {@link com.optimizely.ab.event.BatchEventProcessor.Builder#withEventHandler(com.optimizely.ab.event.EventHandler)}  label}
+         * Please use that builder method instead.
+         */
+        @Deprecated
         public Builder withEventHandler(EventHandler eventHandler) {
             this.eventHandler = eventHandler;
             return this;
         }
 
+        /**
+         * You can instantiate a BatchEventProcessor or a ForwardingEventProcessor or supply your own.
+         */
         public Builder withEventProcessor(EventProcessor eventProcessor) {
             this.eventProcessor = eventProcessor;
             return this;