RequestOption -> RequestMethod

Author: jonalmeida

src/main/java/com/snowplowanalytics/snowplow/tracker/Emitter.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.snowplowanalytics.snowplow.tracker.emitter.BufferOption;
 import com.snowplowanalytics.snowplow.tracker.emitter.HttpMethod;
-import com.snowplowanalytics.snowplow.tracker.emitter.RequestOption;
+import com.snowplowanalytics.snowplow.tracker.emitter.RequestMethod;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -43,7 +43,7 @@ public class Emitter {
     private URIBuilder uri;
     private BufferOption option = BufferOption.Default;
     private HttpMethod httpMethod = HttpMethod.GET;
-    private RequestOption requestOption = RequestOption.Synchronous;
+    private RequestMethod requestMethod = RequestMethod.Synchronous;
     private CloseableHttpClient httpClient;
     private CloseableHttpAsyncClient httpAsyncClient;
     private final ArrayList<Payload> buffer = new ArrayList<Payload>();
@@ -63,8 +63,8 @@ public void setBufferOption(BufferOption option) {
         this.option = option;
     }
 
-    public void setRequestOption(RequestOption option) {
-        this.requestOption = option;
+    public void setRequestMethod(RequestMethod option) {
+        this.requestMethod = option;
         this.httpAsyncClient = HttpAsyncClients.createDefault();
         this.httpAsyncClient.start();
     }
@@ -98,7 +98,7 @@ private void sendPostData(Payload payload) {
             StringEntity params = new StringEntity(payload.toString());
             HttpResponse httpResponse;
             httpPost.setEntity(params);
-            if (requestOption == RequestOption.Asynchronous) {
+            if (requestMethod == RequestMethod.Asynchronous) {
                 Future<HttpResponse> future = httpAsyncClient.execute(httpPost, null);
                 httpResponse = future.get();
             } else {
@@ -138,7 +138,7 @@ private void sendGetData(Payload payload) {
         try {
             HttpGet httpGet = new HttpGet(requestUri.build());
             HttpResponse httpResponse;
-            if (requestOption == RequestOption.Asynchronous) {
+            if (requestMethod == RequestMethod.Asynchronous) {
                 Future<HttpResponse> future = httpAsyncClient.execute(httpGet, null);
                 httpResponse = future.get();
             } else {

…wplow/tracker/emitter/RequestOption.java …wplow/tracker/emitter/RequestMethod.javasrc/main/java/com/snowplowanalytics/snowplow/tracker/emitter/RequestOption.java renamed to src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/RequestMethod.java src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/RequestOption.java renamed to src/main/java/com/snowplowanalytics/snowplow/tracker/emitter/RequestMethod.java

@@ -13,7 +13,7 @@
 
 package com.snowplowanalytics.snowplow.tracker.emitter;
 
-public enum RequestOption {
+public enum RequestMethod {
     Synchronous,
     Asynchronous
 }

src/test/java/com/snowplowanalytics/snowplow/tracker/TrackerTest.java

@@ -1,7 +1,7 @@
 package com.snowplowanalytics.snowplow.tracker;
 
 import com.snowplowanalytics.snowplow.tracker.emitter.HttpMethod;
-import com.snowplowanalytics.snowplow.tracker.emitter.RequestOption;
+import com.snowplowanalytics.snowplow.tracker.emitter.RequestMethod;
 
 import junit.framework.TestCase;
 
@@ -38,7 +38,7 @@ public void testTrackPageView3() throws Exception {
         Subject subject = new Subject();
         subject.setViewPort(320, 480);
         Tracker tracker = new Tracker(emitter, subject, "AF003", "cloudfront", true);
-        emitter.setRequestOption(RequestOption.Asynchronous);
+        emitter.setRequestMethod(RequestMethod.Asynchronous);
 
         Map<String, String> context = new HashMap<String, String>();
         context.put("some key", "some value");