Skip to content

Commit

Permalink
Development -> Master (salesforce-marketingcloud#72)
Browse files Browse the repository at this point in the history
* Development (salesforce-marketingcloud#67)

initial v1.2.2 update from development team

* v1.2.2 Development (salesforce-marketingcloud#71)

v1.2.2 update
  • Loading branch information
smunuswami authored and daniel-deutsch-zocdoc committed Nov 17, 2017
1 parent 0e3d11b commit 258b410
Show file tree
Hide file tree
Showing 981 changed files with 15,844 additions and 2,799 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# OS X
.DS_Store
fuelsdk.properties
log4j.properties
settings.xml

# Eclipse
Expand All @@ -16,3 +17,4 @@ settings.xml
# Maven
target/
/bin/
/nbproject/
27 changes: 7 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,13 @@ Java platform. Among other things, the SDK:
For more information about the Java SDK and how to use it, please see
the Javadocs at http://salesforce-marketingcloud.github.io/FuelSDK-Java/.

# New Features in Version 1.2.1
* New addition to the source packages
- Added support for Sendable Data Extension. Two new properties (SendableSubscriberField, SendableDataExtensionField) are added to ETDataExtension class to support Sendable Data Extension.
IsSendable property need to be set true. Code snippet to create sendable data extension:
<pre>
ETDataExtension dataExtension = new ETDataExtension();
dataExtension.setKey(UUID.randomUUID().toString());
dataExtension.setName(UUID.randomUUID().toString());
dataExtension.setIsSendable(true);
Attribute at = new Attribute();
at.setName("Subscriber Key");
at.setValue(null);
dataExtension.setSendableSubscriberField(at);
dataExtension.addColumn("EmailAddress", ETDataExtensionColumn.Type.EMAIL_ADDRESS, 100, null, null, true, true, null);
dataExtension.addColumn("FirstName", ETDataExtensionColumn.Type.TEXT);
dataExtension.setSendableDataExtensionField(dataExtension.getColumn("EmailAddress"));
ETResponse<ETDataExtension> response = client.create(dataExtension);
</pre>
New Features in Version 1.2.2
------------
* Content Area
* Data Extract
* Result Message
* Triggered Send Summary

* JUnit test case : Test cases added to DataExtension to test sendable data extension.

Installation
------------
Expand All @@ -54,7 +41,7 @@ The easiest way to install the Java SDK is via Maven&mdash;simply add the follow
<dependency>
<groupId>com.github.salesforce-marketingcloud</groupId>
<artifactId>fuelsdk</artifactId>
<version>1.2.1</version>
<version>1.2.2</version>
</dependency>

Maven will automatically resolve, download, and install all dependencies for you.
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## Version 1.2.2 - 11/13/2017 ##
* New addition to the source packages
- Added support for Content Area, Data Extract, Extract Description, Result Message, Triggered Send Summary.
* JUnit test case : Test cases added to test Content Area, Data Extract, Result Message, Triggered Send Summary.

## Version 1.2.1 - 08/28/2017 ##

* New addition to the source packages
Expand Down
15 changes: 13 additions & 2 deletions docs/allclasses-frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_131) on Mon Aug 28 10:32:51 EDT 2017 -->
<!-- Generated by javadoc (1.8.0_131) on Mon Nov 13 11:51:51 EST 2017 -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>All Classes (Salesforce Marketing Cloud Java SDK 1.2.1 API)</title>
<meta name="date" content="2017-08-28">
<meta name="date" content="2017-11-13">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down Expand Up @@ -143,43 +143,53 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/exacttarget/fuelsdk/ETApiObject.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETApiObject</a></li>
<li><a href="com/exacttarget/fuelsdk/ETApiProperty.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETApiProperty</a></li>
<li><a href="com/exacttarget/fuelsdk/ETAsset.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETAsset</a></li>
<li><a href="com/exacttarget/fuelsdk/ETBounceEvent.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETBounceEvent</a></li>
<li><a href="com/exacttarget/fuelsdk/ETCampaign.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETCampaign</a></li>
<li><a href="com/exacttarget/fuelsdk/ETCampaignAsset.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETCampaignAsset</a></li>
<li><a href="com/exacttarget/fuelsdk/ETClickEvent.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETClickEvent</a></li>
<li><a href="com/exacttarget/fuelsdk/ETClient.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETClient</a></li>
<li><a href="com/exacttarget/fuelsdk/ETConfiguration.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETConfiguration</a></li>
<li><a href="com/exacttarget/fuelsdk/ETContentArea.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETContentArea</a></li>
<li><a href="com/exacttarget/fuelsdk/ETDataExtension.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETDataExtension</a></li>
<li><a href="com/exacttarget/fuelsdk/ETDataExtensionColumn.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETDataExtensionColumn</a></li>
<li><a href="com/exacttarget/fuelsdk/ETDataExtensionColumn.Type.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETDataExtensionColumn.Type</a></li>
<li><a href="com/exacttarget/fuelsdk/ETDataExtensionRow.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETDataExtensionRow</a></li>
<li><a href="com/exacttarget/fuelsdk/ETDataExtract.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETDataExtract</a></li>
<li><a href="com/exacttarget/fuelsdk/ETEmail.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETEmail</a></li>
<li><a href="com/exacttarget/fuelsdk/ETEmail.Type.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETEmail.Type</a></li>
<li><a href="com/exacttarget/fuelsdk/ETExpression.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETExpression</a></li>
<li><a href="com/exacttarget/fuelsdk/ETExpression.Operator.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETExpression.Operator</a></li>
<li><a href="com/exacttarget/fuelsdk/ETExpressionParser.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETExpressionParser</a></li>
<li><a href="com/exacttarget/fuelsdk/ETExpressionParserConstants.html" title="interface in com.exacttarget.fuelsdk" target="classFrame"><span class="interfaceName">ETExpressionParserConstants</span></a></li>
<li><a href="com/exacttarget/fuelsdk/ETExpressionParserTokenManager.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETExpressionParserTokenManager</a></li>
<li><a href="com/exacttarget/fuelsdk/ETExtractDescription.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETExtractDescription</a></li>
<li><a href="com/exacttarget/fuelsdk/ETFilter.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETFilter</a></li>
<li><a href="com/exacttarget/fuelsdk/ETFilter.Operator.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETFilter.Operator</a></li>
<li><a href="com/exacttarget/fuelsdk/ETFolder.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETFolder</a></li>
<li><a href="com/exacttarget/fuelsdk/ETList.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETList</a></li>
<li><a href="com/exacttarget/fuelsdk/ETList.Classification.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETList.Classification</a></li>
<li><a href="com/exacttarget/fuelsdk/ETList.Type.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETList.Type</a></li>
<li><a href="com/exacttarget/fuelsdk/ETObject.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETObject</a></li>
<li><a href="com/exacttarget/fuelsdk/ETOpenEvent.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETOpenEvent</a></li>
<li><a href="com/exacttarget/fuelsdk/ETProfileAttribute.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETProfileAttribute</a></li>
<li><a href="com/exacttarget/fuelsdk/ETResponse.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETResponse</a></li>
<li><a href="com/exacttarget/fuelsdk/ETRestConnection.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETRestConnection</a></li>
<li><a href="com/exacttarget/fuelsdk/ETRestConnection.Method.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETRestConnection.Method</a></li>
<li><a href="com/exacttarget/fuelsdk/ETRestObject.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETRestObject</a></li>
<li><a href="com/exacttarget/fuelsdk/ETResult.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETResult</a></li>
<li><a href="com/exacttarget/fuelsdk/ETResult.Status.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETResult.Status</a></li>
<li><a href="com/exacttarget/fuelsdk/ETResultMessage.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETResultMessage</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSdkException.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETSdkException</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSentEvent.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETSentEvent</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSoapConnection.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETSoapConnection</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSoapObject.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETSoapObject</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSubscriber.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETSubscriber</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSubscriber.Status.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETSubscriber.Status</a></li>
<li><a href="com/exacttarget/fuelsdk/ETSubscriberList.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETSubscriberList</a></li>
<li><a href="com/exacttarget/fuelsdk/ETTriggeredEmail.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETTriggeredEmail</a></li>
<li><a href="com/exacttarget/fuelsdk/ETTriggeredEmail.Status.html" title="enum in com.exacttarget.fuelsdk" target="classFrame">ETTriggeredEmail.Status</a></li>
<li><a href="com/exacttarget/fuelsdk/ETTriggeredSendSummary.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETTriggeredSendSummary</a></li>
<li><a href="com/exacttarget/fuelsdk/ETUnsubEvent.html" title="class in com.exacttarget.fuelsdk" target="classFrame">ETUnsubEvent</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/EventType.html" title="enum in com.exacttarget.fuelsdk.internal" target="classFrame">EventType</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExecuteRequest.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExecuteRequest</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExecuteRequestMsg.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExecuteRequestMsg</a></li>
Expand All @@ -199,6 +209,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/exacttarget/fuelsdk/internal/ExtractRequest.Parameters.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExtractRequest.Parameters</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExtractRequestMsg.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExtractRequestMsg</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExtractResponseMsg.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExtractResponseMsg</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExtractResponseMsg.Results.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExtractResponseMsg.Results</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExtractResult.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExtractResult</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/ExtractTemplate.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">ExtractTemplate</a></li>
<li><a href="com/exacttarget/fuelsdk/internal/FieldMap.html" title="class in com.exacttarget.fuelsdk.internal" target="classFrame">FieldMap</a></li>
Expand Down
Loading

0 comments on commit 258b410

Please sign in to comment.