Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Reuse SSL connections, update AWS SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Dozor committed Jan 29, 2018
1 parent fbb5da7 commit 07f3669
Show file tree
Hide file tree
Showing 6 changed files with 156 additions and 131 deletions.
80 changes: 42 additions & 38 deletions iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.mparticle.sdk.model.audienceprocessing.UserProfile;
import com.mparticle.sdk.model.eventprocessing.*;
import com.mparticle.sdk.model.registration.*;
import retrofit.Response;
import retrofit2.Response;

import java.io.IOException;
import java.util.*;
Expand All @@ -29,9 +29,7 @@ public class IterableExtension extends MessageProcessor {
@Override
public EventProcessingResponse processEventProcessingRequest(EventProcessingRequest request) throws IOException {
if (iterableService == null) {
Account account = request.getAccount();
String apiKey = account.getStringSetting(SETTING_API_KEY, true, null);
iterableService = IterableService.newInstance(apiKey);
iterableService = IterableService.newInstance();
}
Collections.sort(
request.getEvents(),
Expand All @@ -42,6 +40,21 @@ public EventProcessingResponse processEventProcessingRequest(EventProcessingRequ
return super.processEventProcessingRequest(request);
}

private static String getApiKey(Event event) {
Account account = event.getContext().getAccount();
return account.getStringSetting(SETTING_API_KEY, true, null);
}

private static String getApiKey(EventProcessingRequest event) {
Account account = event.getAccount();
return account.getStringSetting(SETTING_API_KEY, true, null);
}

private static String getApiKey(AudienceMembershipChangeRequest event) {
Account account = event.getAccount();
return account.getStringSetting(SETTING_API_KEY, true, null);
}

/**
* Verify that there's an email present, create a placeholder if not.
*
Expand Down Expand Up @@ -92,17 +105,16 @@ public void processPushSubscriptionEvent(PushSubscriptionEvent event) throws IOE
.filter(t -> t.getType().equals(UserIdentity.Type.EMAIL))
.findFirst()
.get();

request.email = email.getValue();
} catch (NoSuchElementException e) {
throw new IOException("Unable to construct Iterable RegisterDeviceTokenRequest - no user email.");
}

Response<IterableApiResponse> response = iterableService.registerToken(request).execute();
if (response.isSuccess() && !response.body().isSuccess()) {
Response<IterableApiResponse> response = iterableService.registerToken(getApiKey(event), request).execute();
if (response.isSuccessful() && !response.body().isSuccess()) {
throw new IOException(response.body().toString());
} else if (!response.isSuccess()) {
throw new IOException("Error sending push subscription to Iterable: HTTP " + response.code());
} else if (!response.isSuccessful()) {
throw new IOException("Error sending push subscription to Iterable: " + response.body().toString());
}
}

Expand Down Expand Up @@ -137,8 +149,8 @@ void updateUser(EventProcessingRequest request) throws IOException {
updateEmailRequest.currentEmail = placeholderEmail;
//this is safe due to the filters above
updateEmailRequest.newEmail = changeEvent.getAdded().get(0).getValue();
Response<IterableApiResponse> response = iterableService.updateEmail(updateEmailRequest).execute();
if (response.isSuccess()) {
Response<IterableApiResponse> response = iterableService.updateEmail(getApiKey(request), updateEmailRequest).execute();
if (response.isSuccessful()) {
IterableApiResponse apiResponse = response.body();
if (apiResponse != null && !apiResponse.isSuccess()) {
throw new IOException("Error while calling updateEmail() on iterable: HTTP " + apiResponse.code);
Expand All @@ -152,8 +164,8 @@ void updateUser(EventProcessingRequest request) throws IOException {
//these are safe due to the filters above
updateEmailRequest.currentEmail = changeEvent.getRemoved().get(0).getValue();
updateEmailRequest.newEmail = changeEvent.getAdded().get(0).getValue();
Response<IterableApiResponse> response = iterableService.updateEmail(updateEmailRequest).execute();
if (response.isSuccess()) {
Response<IterableApiResponse> response = iterableService.updateEmail(getApiKey(request), updateEmailRequest).execute();
if (response.isSuccessful()) {
IterableApiResponse apiResponse = response.body();
if (apiResponse != null && !apiResponse.isSuccess()) {
throw new IOException("Error while calling updateEmail() on iterable: HTTP " + apiResponse.code);
Expand All @@ -174,8 +186,8 @@ void updateUser(EventProcessingRequest request) throws IOException {
}
if (!isEmpty(userUpdateRequest.email) || !isEmpty(userUpdateRequest.userId)) {
userUpdateRequest.dataFields = context.getUserAttributes();
Response<IterableApiResponse> response = iterableService.userUpdate(userUpdateRequest).execute();
if (response.isSuccess()) {
Response<IterableApiResponse> response = iterableService.userUpdate(getApiKey(request), userUpdateRequest).execute();
if (response.isSuccessful()) {
IterableApiResponse apiResponse = response.body();
if (apiResponse != null && !apiResponse.isSuccess()) {
throw new IOException("Error while calling updateUser() on iterable: HTTP " + apiResponse.code);
Expand Down Expand Up @@ -214,10 +226,10 @@ public void processProductActionEvent(ProductActionEvent event) throws IOExcepti
.collect(Collectors.toList());
}

Response<IterableApiResponse> response = iterableService.trackPurchase(purchaseRequest).execute();
if (response.isSuccess() && !response.body().isSuccess()) {
Response<IterableApiResponse> response = iterableService.trackPurchase(getApiKey(event), purchaseRequest).execute();
if (response.isSuccessful() && !response.body().isSuccess()) {
throw new IOException(response.body().toString());
} else if (!response.isSuccess()) {
} else if (!response.isSuccessful()) {
throw new IOException("Error sending custom event to Iterable: HTTP " + response.code());
}
}
Expand Down Expand Up @@ -426,10 +438,10 @@ public void processCustomEvent(CustomEvent event) throws IOException {
//request.campaignId = event.getCustomFlags()....
//request.templateId = event.getCustomFlags()....

Response<IterableApiResponse> response = iterableService.track(request).execute();
if (response.isSuccess() && !response.body().isSuccess()) {
Response<IterableApiResponse> response = iterableService.track(getApiKey(event), request).execute();
if (response.isSuccessful() && !response.body().isSuccess()) {
throw new IOException(response.body().toString());
} else if (!response.isSuccess()) {
} else if (!response.isSuccessful()) {
throw new IOException("Error sending custom event to Iterable: HTTP " + response.code());
}
}
Expand Down Expand Up @@ -503,25 +515,17 @@ public void processPushMessageReceiptEvent(PushMessageReceiptEvent event) throws
request.messageId = mapper.writeValueAsString(((Map) payload.get("itbl")).get("messageId"));
}
request.createdAt = (int) (event.getTimestamp() / 1000.0);
Response<IterableApiResponse> response = iterableService.trackPushOpen(request).execute();
if (response.isSuccess() && !response.body().isSuccess()) {
Response<IterableApiResponse> response = iterableService.trackPushOpen(getApiKey(event), request).execute();
if (response.isSuccessful() && !response.body().isSuccess()) {
throw new IOException(response.body().toString());
} else if (!response.isSuccess()) {
} else if (!response.isSuccessful()) {
throw new IOException("Error sending push-open to Iterable: HTTP " + response.code());
}
}
}
}

@Override
public AudienceMembershipChangeResponse processAudienceMembershipChangeRequest(AudienceMembershipChangeRequest request) throws IOException {
Map<String, String> settings = request.getAccount().getAccountSettings();
String apiKey = settings.get(SETTING_API_KEY);
IterableService service = IterableService.newInstance(apiKey);
return processAudienceMembershipChangeRequest(request, service);
}

public AudienceMembershipChangeResponse processAudienceMembershipChangeRequest(AudienceMembershipChangeRequest request, IterableService service) throws IOException {
HashMap<Integer, List<ApiUser>> additions = new HashMap<>();
HashMap<Integer, List<Unsubscriber>> removals = new HashMap<>();
for (UserProfile profile : request.getUserProfiles()) {
Expand Down Expand Up @@ -569,13 +573,13 @@ public AudienceMembershipChangeResponse processAudienceMembershipChangeRequest(A
subscribeRequest.listId = entry.getKey();
subscribeRequest.subscribers = entry.getValue();
try {
Response<ListResponse> response = service.listSubscribe(subscribeRequest).execute();
if (response.isSuccess()) {
Response<ListResponse> response = iterableService.listSubscribe(getApiKey(request), subscribeRequest).execute();
if (response.isSuccessful()) {
ListResponse listResponse = response.body();
if (listResponse.failCount > 0) {
throw new IOException("Iterable list subscribe had positive fail count: " + listResponse.failCount);
}
} else if (!response.isSuccess()) {
} else if (!response.isSuccessful()) {
throw new IOException("Error sending list subscribe to Iterable: HTTP " + response.code());
}
} catch (Exception e) {
Expand All @@ -588,13 +592,13 @@ public AudienceMembershipChangeResponse processAudienceMembershipChangeRequest(A
unsubscribeRequest.listId = entry.getKey();
unsubscribeRequest.subscribers = entry.getValue();
try {
Response<ListResponse> response = service.listUnsubscribe(unsubscribeRequest).execute();
if (response.isSuccess()) {
Response<ListResponse> response = iterableService.listUnsubscribe(getApiKey(request), unsubscribeRequest).execute();
if (response.isSuccessful()) {
ListResponse listResponse = response.body();
if (listResponse.failCount > 0) {
throw new IOException("Iterable list unsubscribe had positive fail count: " + listResponse.failCount);
}
} else if (!response.isSuccess()) {
} else if (!response.isSuccessful()) {
throw new IOException("Error sending list unsubscribe to Iterable: HTTP " + response.code());
}
} catch (Exception e) {
Expand Down
4 changes: 2 additions & 2 deletions iterable-extension/src/main/java/com/mparticle/ext/iterable/IterableLambdaEndpoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

public class IterableLambdaEndpoint implements RequestStreamHandler {

MessageSerializer serializer = new MessageSerializer();
static MessageSerializer serializer = new MessageSerializer();
static IterableExtension processor = new IterableExtension();

@Override
public void handleRequest(InputStream input, OutputStream output, Context context) throws IOException {
IterableExtension processor = new IterableExtension();
Message request = serializer.deserialize(input, Message.class);
Message response = processor.processMessage(request);
serializer.serialize(output, response);
Expand Down
Loading

0 comments on commit 07f3669

Please sign in to comment.