Skip to content

Commit

Permalink
Release 0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
weiqiangliu committed Dec 31, 2021
1 parent 883d13d commit 151455c
Show file tree
Hide file tree
Showing 10 changed files with 406 additions and 213 deletions.
4 changes: 2 additions & 2 deletions SensorsABTestSDK/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'signing'
apply plugin: 'maven-publish'

version = "0.1.2"
version = "0.1.3"
android {
compileSdkVersion 29

Expand Down Expand Up @@ -130,7 +130,7 @@ publishing {
def mavenUser = properties.getProperty("maven.user")
def mavenPassword = properties.getProperty("maven.password")
maven {
url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
credentials {
username mavenUser
password mavenPassword
Expand Down
17 changes: 8 additions & 9 deletions ...orsABTestSDK/src/main/java/com/sensorsdata/abtest/core/RequestExperimentTaskRecorder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@

import android.text.TextUtils;

import com.sensorsdata.abtest.OnABTestReceivedData;
import com.sensorsdata.abtest.entity.RequestingExperimentInfo;

import java.util.LinkedHashMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

public class RequestExperimentTaskRecorder {
Expand All @@ -30,7 +31,7 @@ public class RequestExperimentTaskRecorder {
private final String mParamName;
private final Map<String, Object> mProperties;
private final int mTimeoutMillSeconds;
private final Map<OnABTestReceivedData<Object>, Object> mCallbacksAndDefaultValueMap = new LinkedHashMap<>();
private final List<RequestingExperimentInfo> mRequestingExperimentInfoList = new ArrayList<>();
private boolean mIsMergedTask = false;

RequestExperimentTaskRecorder(String loginId, String anonymousId, String paramName, Map<String, Object> properties, int timeoutMillSeconds) {
Expand All @@ -41,14 +42,12 @@ public class RequestExperimentTaskRecorder {
this.mTimeoutMillSeconds = timeoutMillSeconds;
}

void putCallbackAndDefaultValue(OnABTestReceivedData<Object> onABTestReceivedData, Object defaultValue) {
if (!this.mCallbacksAndDefaultValueMap.containsKey(onABTestReceivedData)) {
this.mCallbacksAndDefaultValueMap.put(onABTestReceivedData, defaultValue);
}
void addRequestingExperimentInfo(RequestingExperimentInfo requestingExperimentInfo) {
mRequestingExperimentInfoList.add(requestingExperimentInfo);
}

Map<OnABTestReceivedData<Object>, Object> getCallbacksAndDefaultValueMap() {
return mCallbacksAndDefaultValueMap;
List<RequestingExperimentInfo> getRequestingExperimentList() {
return mRequestingExperimentInfoList;
}

boolean isSameExperimentTask(String loginId, String anonymousId, String paramName, Map<String, Object> properties, int timeoutMillSeconds) {
Expand Down
9 changes: 4 additions & 5 deletions ...stSDK/src/main/java/com/sensorsdata/abtest/core/RequestExperimentTaskRecorderManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.sensorsdata.abtest.core;

import com.sensorsdata.abtest.OnABTestReceivedData;
import com.sensorsdata.abtest.entity.RequestingExperimentInfo;
import com.sensorsdata.analytics.android.sdk.SALog;

import java.util.LinkedList;
Expand All @@ -39,22 +40,20 @@ static RequestExperimentTaskRecorderManager getInstance() {
return SingleHolder.INSTANCE;
}

@SuppressWarnings("unchecked")
synchronized <T> RequestExperimentTaskRecorder createRequest(String loginId, String anonymousId, String paramName,
Map<String, Object> properties, int timeoutMillSeconds,
OnABTestReceivedData<T> onABTestReceivedData, T defaultValue) {
SALog.i(TAG, "create new request task");
RequestExperimentTaskRecorder currentTask = new RequestExperimentTaskRecorder(loginId, anonymousId, paramName, properties, timeoutMillSeconds);
mTaskList.add(currentTask);
currentTask.putCallbackAndDefaultValue((OnABTestReceivedData<Object>) onABTestReceivedData, defaultValue);
currentTask.addRequestingExperimentInfo(new RequestingExperimentInfo(onABTestReceivedData, paramName, defaultValue));
currentTask.setIsMergedTask(false);
return currentTask;
}

@SuppressWarnings("unchecked")
synchronized <T> RequestExperimentTaskRecorder mergeRequest(String loginId, String anonymousId, String paramName,
Map<String, Object> properties, int timeoutMillSeconds,
OnABTestReceivedData<?> onABTestReceivedData, T defaultValue) {
OnABTestReceivedData<T> onABTestReceivedData, T defaultValue) {
boolean isTaskExist = false;
RequestExperimentTaskRecorder currentTask = null;
for (RequestExperimentTaskRecorder task : mTaskList) {
Expand All @@ -70,7 +69,7 @@ synchronized <T> RequestExperimentTaskRecorder mergeRequest(String loginId, Stri
isTaskExist = false;
}
SALog.i(TAG, "create new request task if not exist, task is exist = " + isTaskExist);
currentTask.putCallbackAndDefaultValue((OnABTestReceivedData<Object>) onABTestReceivedData, defaultValue);
currentTask.addRequestingExperimentInfo(new RequestingExperimentInfo(onABTestReceivedData, paramName, defaultValue));
currentTask.setIsMergedTask(isTaskExist);
return currentTask;
}
Expand Down
176 changes: 84 additions & 92 deletions ...orsABTestSDK/src/main/java/com/sensorsdata/abtest/core/SensorsABTestApiRequestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.sensorsdata.abtest.entity.AppConstants;
import com.sensorsdata.abtest.entity.Experiment;
import com.sensorsdata.abtest.entity.ExperimentRequest;
import com.sensorsdata.abtest.entity.RequestingExperimentInfo;
import com.sensorsdata.abtest.entity.SABErrorEnum;
import com.sensorsdata.abtest.exception.DataInvalidException;
import com.sensorsdata.abtest.util.SensorsDataHelper;
Expand All @@ -43,7 +44,9 @@
import org.json.JSONArray;
import org.json.JSONObject;

import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

Expand Down Expand Up @@ -122,81 +125,79 @@ public void requestExperimentByParamName(final String distinctId, final String l
}

// 启动定时器
final TimeoutRunnable runnable = new TimeoutRunnable(currentTask, defaultValue);
final TimeoutRunnable runnable = new TimeoutRunnable(currentTask);
TaskRunner.getBackHandler().postDelayed(runnable, timeoutMillSeconds);

mDistinctId = distinctId;
requestExperimentsAndUpdateCache(propertiesString, paramName, new IApiCallback<Map<String, Experiment>>() {
@Override
public void onSuccess(Map<String, Experiment> experimentMap) {
RequestExperimentTaskRecorderManager.getInstance().removeTask(currentTask);
Map<OnABTestReceivedData<Object>, Object> callbackAndDefaultValueMap = currentTask.getCallbacksAndDefaultValueMap();
try {
TaskRunner.getBackHandler().removeCallbacks(runnable);
if (experimentMap == null) {
if (!mHasCallback) {
SALog.i(TAG, "onSuccess response is empty and return default value: " + defaultValue);
doCallbackOnMainThread(callbackAndDefaultValueMap, null);
mHasCallback = true;
List<RequestingExperimentInfo> taskExperimentInfoList = currentTask.getRequestingExperimentList();
TaskRunner.getBackHandler().removeCallbacks(runnable);
if (mHasCallback) {
SALog.i(TAG, "Request success! but all callbacks has been returned with default value!");
return;
}
SALog.i(TAG, "Task merged request size is " + taskExperimentInfoList.size());
for (RequestingExperimentInfo item : taskExperimentInfoList) {
OnABTestReceivedData<?> onABTestReceivedData = item.getResultCallBack();
String itemParamName = item.getParamName();
Object itemDefaultValue = item.getDefaultValue();
try {
if (experimentMap == null) {
SALog.i(TAG, "onSuccess response is empty and return default value: " + itemDefaultValue);
doCallbackOnMainThread(onABTestReceivedData, itemDefaultValue);
continue;
}
return;
}

Experiment experiment = experimentMap.get(paramName);
if (experiment == null) {
if (!mHasCallback) {
SALog.i(TAG, "onSuccess experiment is empty and return default value: " + defaultValue);
doCallbackOnMainThread(callbackAndDefaultValueMap, null);
mHasCallback = true;
Experiment experiment = experimentMap.get(itemParamName);
if (experiment == null) {
SALog.i(TAG, "onSuccess experiment is empty and return default value: " + itemDefaultValue);
doCallbackOnMainThread(onABTestReceivedData, itemDefaultValue);
continue;
}
return;
}

if (!experiment.checkTypeIsValid(paramName, defaultValue)) {
if (!mHasCallback) {
if (defaultValue != null) {
if (!experiment.checkTypeIsValid(itemParamName, itemDefaultValue)) {
if (itemDefaultValue != null) {
String variableType = "";
Experiment.Variable variable = experiment.getVariableByParamName(paramName);
Experiment.Variable variable = experiment.getVariableByParamName(itemParamName);
if (variable != null) {
variableType = variable.type;
}
SABErrorDispatcher.dispatchSABException(SABErrorEnum.ASYNC_REQUEST_PARAMS_TYPE_NOT_VALID, paramName, variableType, defaultValue.getClass().toString());
SABErrorDispatcher.dispatchSABException(SABErrorEnum.ASYNC_REQUEST_PARAMS_TYPE_NOT_VALID, itemParamName, variableType, itemDefaultValue.getClass().toString());
}
doCallbackOnMainThread(callbackAndDefaultValueMap, null);
mHasCallback = true;
doCallbackOnMainThread(onABTestReceivedData, itemDefaultValue);
continue;
}
return;
}

T value = experiment.getVariableValue(paramName, defaultValue);
if (value != null) {
if (!mHasCallback) {
Object value = experiment.getVariableValue(itemParamName, itemDefaultValue);
if (value != null) {
SALog.i(TAG, "onSuccess return value: " + value);
doCallbackOnMainThread(callbackAndDefaultValueMap, value);
mHasCallback = true;
} else {
SALog.i(TAG, "mOnABTestReceivedData is null ");
}
if (!experiment.isWhiteList) {
SensorsABTestTrackHelper.getInstance().trackABTestTrigger(experiment, distinctId, loginId, anonymousId);
doCallbackOnMainThread(onABTestReceivedData, value);

if (!experiment.isWhiteList) {
SensorsABTestTrackHelper.getInstance().trackABTestTrigger(experiment, distinctId, loginId, anonymousId);
}
}
}
} catch (Exception e) {
if (!mHasCallback) {
SALog.i(TAG, "onSuccess Exception and return default value: " + defaultValue);
doCallbackOnMainThread(callbackAndDefaultValueMap, null);
mHasCallback = true;
} catch (Exception e) {
SALog.i(TAG, "onSuccess Exception and return default value: " + itemDefaultValue);
doCallbackOnMainThread(onABTestReceivedData, itemDefaultValue);
}
}
mHasCallback = true;
}

@Override
public void onFailure(int errorCode, String message) {
TaskRunner.getBackHandler().removeCallbacks(runnable);
RequestExperimentTaskRecorderManager.getInstance().removeTask(currentTask);
if (!mHasCallback) {
SALog.i(TAG, "onFailure and return default value: " + defaultValue);
doCallbackOnMainThread(currentTask.getCallbacksAndDefaultValueMap(), null);
List<RequestingExperimentInfo> taskExperimentInfoList = currentTask.getRequestingExperimentList();
SALog.i(TAG, "Task merged request size is " + taskExperimentInfoList.size());
for (RequestingExperimentInfo item : taskExperimentInfoList) {
OnABTestReceivedData<?> onABTestReceivedData = item.getResultCallBack();
Object itemDefaultValue = item.getDefaultValue();
doCallbackOnMainThread(onABTestReceivedData, itemDefaultValue);
SALog.i(TAG, "onFailure and return default value: " + itemDefaultValue);
}
mHasCallback = true;
}
}
Expand All @@ -208,13 +209,14 @@ void requestExperiments(Map<String, String> properties, String paramName, final
}

void requestExperiments(Map<String, String> properties, String paramName, JSONObject object, final IApiCallback<String> callBack) {
String url = null, key = null;
String url = null, key = null, requestBody = null;
SensorsABTestConfigOptions configOptions = SensorsABTest.shareInstance().getConfigOptions();
if (configOptions != null) {
String serverUrl = configOptions.getUrl();
url = UrlUtil.getApiBaseUrl(serverUrl);
key = UrlUtil.getProjectKey(serverUrl);
}
requestBody = new ExperimentRequest(properties, paramName, object).createRequestBody().toString();
if (TextUtils.isEmpty(url)) {
SALog.i(TAG, "url is empty and request cancel");
return;
Expand All @@ -223,12 +225,15 @@ void requestExperiments(Map<String, String> properties, String paramName, JSONOb
SALog.i(TAG, "key is empty and request cancel");
return;
}

if (TextUtils.isEmpty(requestBody)) {
SALog.i(TAG, "request body is empty and request cancel");
return;
}
Map<String, String> headers = new HashMap<>();
headers.put("project-key", key);
new RequestHelper.Builder(HttpMethod.POST, url)
.header(headers)
.jsonData(new ExperimentRequest(properties, paramName, object).createRequestBody().toString())
.jsonData(requestBody)
.callback(new HttpCallback.StringCallback() {
@Override
public void onFailure(final int code, final String errorMessage) {
Expand Down Expand Up @@ -299,62 +304,49 @@ public void onFailure(int errorCode, String message) {
});
}

private void doCallbackOnMainThread(final OnABTestReceivedData<T> callback, final T value) {
if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
callback.onResult(value);
} else {
TaskRunner.getUiThreadHandler().post(new Runnable() {
@Override
public void run() {
callback.onResult(value);
}
});
}
}

private void doCallbackOnMainThread(final Map<OnABTestReceivedData<Object>, Object> callbackAndDefaultValueMap, final Object value) {
if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
executeCallbacks(callbackAndDefaultValueMap, value);
} else {
TaskRunner.getUiThreadHandler().post(new Runnable() {
@Override
public void run() {
executeCallbacks(callbackAndDefaultValueMap, value);
}
});
}
}

private void executeCallbacks(Map<OnABTestReceivedData<Object>, Object> callbackAndDefaultValueMap, Object value) {
SALog.i(TAG, "executeCallbacks merged size: " + callbackAndDefaultValueMap.size());
for (Map.Entry<OnABTestReceivedData<Object>, Object> entry : callbackAndDefaultValueMap.entrySet()) {
OnABTestReceivedData<Object> callback = entry.getKey();
Object defaultValue = entry.getValue();
if (value != null && value.getClass().equals(defaultValue.getClass())) {
callback.onResult(value);
private void doCallbackOnMainThread(final OnABTestReceivedData<?> callback, final Object value) {
try {
final Method method = callback.getClass().getMethod("onResult", Object.class);
if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
method.invoke(callback, value);
} else {
callback.onResult(defaultValue);
TaskRunner.getUiThreadHandler().post(new Runnable() {
@Override
public void run() {
try {
method.invoke(callback, value);
} catch (Exception e) {
SALog.printStackTrace(e);
}
}
});
}
} catch (Exception e) {
SALog.printStackTrace(e);
}
}

private class TimeoutRunnable implements Runnable {

private final Object defaultValue;
private final RequestExperimentTaskRecorder currentTask;

TimeoutRunnable(RequestExperimentTaskRecorder currentTask, Object defaultValue) {
TimeoutRunnable(RequestExperimentTaskRecorder currentTask) {
this.currentTask = currentTask;
this.defaultValue = defaultValue;
}

@Override
public void run() {
RequestExperimentTaskRecorderManager.getInstance().removeTask(currentTask);
if (currentTask != null && !mHasCallback) {
SALog.i(TAG, "timeout return value: " + defaultValue);
SABErrorDispatcher.dispatchSABException(SABErrorEnum.ASYNC_REQUEST_TIMEOUT, defaultValue);
doCallbackOnMainThread(currentTask.getCallbacksAndDefaultValueMap(), null);
List<RequestingExperimentInfo> taskExperimentInfoList = currentTask.getRequestingExperimentList();
SALog.i(TAG, "Task merged request size is " + taskExperimentInfoList.size());
for (RequestingExperimentInfo item : taskExperimentInfoList) {
OnABTestReceivedData<?> onABTestReceivedData = item.getResultCallBack();
Object itemDefaultValue = item.getDefaultValue();
doCallbackOnMainThread(onABTestReceivedData, itemDefaultValue);
SALog.i(TAG, "timeout return value: " + itemDefaultValue);
SABErrorDispatcher.dispatchSABException(SABErrorEnum.ASYNC_REQUEST_TIMEOUT, itemDefaultValue);
}
mHasCallback = true;
}
}
Expand Down
Loading

0 comments on commit 151455c

Please sign in to comment.