diff --git a/README.md b/README.md index bdf09cd..2ff811f 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Add this dependency to your project's POM: com.twitter twitter-api-java-sdk - 2.0.1 + 2.0.2 ``` @@ -75,7 +75,7 @@ mavenLocal() // Needed if the 'twitter-api-java-sdk' jar has been publishe } dependencies { -implementation "com.twitter:twitter-api-java-sdk:2.0.1" +implementation "com.twitter:twitter-api-java-sdk:2.0.2" } ``` @@ -89,7 +89,7 @@ mvn clean package Then manually install the following JARs: -* `target/twitter-api-java-sdk-2.0.1.jar` +* `target/twitter-api-java-sdk-2.0.2.jar` * `target/lib/*.jar` ## Twitter Credentials diff --git a/docs/RulesLookupResponse.md b/docs/RulesLookupResponse.md index 0418bfb..5619f76 100644 --- a/docs/RulesLookupResponse.md +++ b/docs/RulesLookupResponse.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**data** | [**List<Rule>**](Rule.md) | | | +|**data** | [**List<Rule>**](Rule.md) | | [optional] | |**meta** | [**RulesResponseMetadata**](RulesResponseMetadata.md) | | | diff --git a/examples/pom.xml b/examples/pom.xml index 6f6f892..3716c2c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -16,7 +16,7 @@ com.twitter twitter-api-java-sdk - 2.0.1 + 2.0.2 compile diff --git a/pom.xml b/pom.xml index 0a61691..334286d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ twitter-api-java-sdk jar twitter-api-java-sdk - 2.0.1 + 2.0.2 https://github.com/twitterdev/twitter-api-java-sdk Twitter API v2 available endpoints diff --git a/src/main/java/com/twitter/clientlib/ApiClient.java b/src/main/java/com/twitter/clientlib/ApiClient.java index f6a35ca..0921fde 100644 --- a/src/main/java/com/twitter/clientlib/ApiClient.java +++ b/src/main/java/com/twitter/clientlib/ApiClient.java @@ -225,7 +225,7 @@ private void init() { json = new JSON(); // Set default User-Agent. - setUserAgent("twitter-api-java-sdk/2.0.1"); + setUserAgent("twitter-api-java-sdk/2.0.2"); authentications = new HashMap(); } diff --git a/src/main/java/com/twitter/clientlib/model/RulesLookupResponse.java b/src/main/java/com/twitter/clientlib/model/RulesLookupResponse.java index acc314b..8d3f8fe 100644 --- a/src/main/java/com/twitter/clientlib/model/RulesLookupResponse.java +++ b/src/main/java/com/twitter/clientlib/model/RulesLookupResponse.java @@ -64,7 +64,7 @@ public class RulesLookupResponse { public static final String SERIALIZED_NAME_DATA = "data"; @SerializedName(SERIALIZED_NAME_DATA) - private List data = new ArrayList<>(); + private List data = null; public static final String SERIALIZED_NAME_META = "meta"; @SerializedName(SERIALIZED_NAME_META) @@ -80,6 +80,9 @@ public RulesLookupResponse data(List data) { } public RulesLookupResponse addDataItem(Rule dataItem) { + if (this.data == null) { + this.data = new ArrayList<>(); + } this.data.add(dataItem); return this; } @@ -88,8 +91,8 @@ public RulesLookupResponse addDataItem(Rule dataItem) { * Get data * @return data **/ - @javax.annotation.Nonnull - @ApiModelProperty(required = true, value = "") + @javax.annotation.Nullable + @ApiModelProperty(value = "") public List getData() { return data; @@ -176,7 +179,6 @@ private String toIndentedString(Object o) { // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(); - openapiRequiredFields.add("data"); openapiRequiredFields.add("meta"); } diff --git a/src/test/java/com/twitter/clientlib/integration/ApiTweetBearerTester.java b/src/test/java/com/twitter/clientlib/integration/ApiTweetBearerTester.java index 2849f37..afb4467 100644 --- a/src/test/java/com/twitter/clientlib/integration/ApiTweetBearerTester.java +++ b/src/test/java/com/twitter/clientlib/integration/ApiTweetBearerTester.java @@ -75,18 +75,47 @@ private AddOrDeleteRulesResponse deleteRule(String ruleStrValue) throws ApiExcep .execute(); } + private void deleteAllRules() throws ApiException { + RulesLookupResponse result = apiInstance.tweets().getRules().execute(); + if(result.getData() != null) { + for(Rule rule : result.getData()) { + AddOrDeleteRulesRequest request = new AddOrDeleteRulesRequest(); + DeleteRulesRequest dr = new DeleteRulesRequest(); + DeleteRulesRequestDelete drd = new DeleteRulesRequestDelete(); + drd.setValues(Arrays.asList(rule.getValue())); + dr.setDelete(drd); + request.setActualInstance(dr); + apiInstance.tweets().addOrDeleteRules(request).dryRun(false).execute(); + } + } + } - /* @Test + @Test public void getRulesAllTest() throws ApiException { - GetRulesResponse result = apiInstance.tweets().getRules(null, null, null); - assertNotNull(result.getData()); - assertNotNull(result.getData().get(0)); - assertNotNull(result.getData().get(0).getValue()); - assertNotNull(result.getData().get(0).getId()); + try { + addRule(ruleValue); + RulesLookupResponse result = apiInstance.tweets().getRules().execute(); + assertNotNull(result.getData()); + assertNotNull(result.getData().get(0)); + assertNotNull(result.getData().get(0).getValue()); + assertNotNull(result.getData().get(0).getId()); + assertNotNull(result.getMeta()); + assertNotNull(result.getMeta().getSent()); + assertTrue(result.getMeta().getResultCount() > 0); + } finally { + deleteRule(ruleValue); + } + } + + @Test + public void getRulesNoRulesTest() throws ApiException { + deleteAllRules(); + RulesLookupResponse result = apiInstance.tweets().getRules().execute(); + assertNull(result.getData()); assertNotNull(result.getMeta()); assertNotNull(result.getMeta().getSent()); - assertTrue(result.getMeta().getResultCount() > 0); - } */ + assertEquals(0, result.getMeta().getResultCount()); + } @Test public void addOrDeleteRulesAddTest() throws ApiException {