Skip to content

Commit

Permalink
Merge pull request #1035 from watson-developer-cloud/compare-comply-m…
Browse files Browse the repository at this point in the history
…odels-fix

Compare comply models fix
  • Loading branch information
lpatino10 authored Jan 30, 2019
2 parents d4f7016 + 64a0187 commit ce57fd7
Show file tree
Hide file tree
Showing 23 changed files with 80 additions and 300 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 6.13.1
current_version = 6.13.2
commit = True
message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ All the services:
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>java-sdk</artifactId>
<version>6.13.1</version>
<version>6.13.2</version>
</dependency>
```

Expand All @@ -71,7 +71,7 @@ Only Discovery:
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>discovery</artifactId>
<version>6.13.1</version>
<version>6.13.2</version>
</dependency>
```

Expand All @@ -80,13 +80,13 @@ Only Discovery:
All the services:

```gradle
'com.ibm.watson.developer_cloud:java-sdk:6.13.1'
'com.ibm.watson.developer_cloud:java-sdk:6.13.2'
```

Only Assistant:

```gradle
'com.ibm.watson.developer_cloud:assistant:6.13.1'
'com.ibm.watson.developer_cloud:assistant:6.13.2'
```

##### Development snapshots
Expand All @@ -109,7 +109,7 @@ And then reference the snapshot version on your app module gradle
Only Speech to Text:

```gradle
'com.ibm.watson.developer_cloud:speech-to-text:6.13.2-SNAPSHOT'
'com.ibm.watson.developer_cloud:speech-to-text:6.13.3-SNAPSHOT'
```

##### JAR
Expand Down Expand Up @@ -388,7 +388,7 @@ Gradle:

```sh
cd java-sdk
gradle jar # build jar file (build/libs/watson-developer-cloud-6.13.1.jar)
gradle jar # build jar file (build/libs/watson-developer-cloud-6.13.2.jar)
gradle test # run tests
gradle check # performs quality checks on source files and generates reports
gradle testReport # run tests and generate the aggregated test report (build/reports/allTests)
Expand Down Expand Up @@ -441,4 +441,4 @@ or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
[ibm-cloud-onboarding]: http://cloud.ibm.com/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Java


[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.13.1/java-sdk-6.13.1-jar-with-dependencies.jar
[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-6.13.2/java-sdk-6.13.2-jar-with-dependencies.jar
4 changes: 2 additions & 2 deletions assistant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<dependency>
<groupId>com.ibm.watson.developer_cloud</groupId>
<artifactId>assistant</artifactId>
<version>6.13.1</version>
<version>6.13.2</version>
</dependency>
```

##### Gradle
```gradle
'com.ibm.watson.developer_cloud:assistant:6.13.1'
'com.ibm.watson.developer_cloud:assistant:6.13.2'
```

## Usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ public class BodyCells extends GenericModel {
@SerializedName("column_index_end")
private Long columnIndexEnd;
@SerializedName("row_header_ids")
private List<RowHeaderIds> rowHeaderIds;
private List<String> rowHeaderIds;
@SerializedName("row_header_texts")
private List<RowHeaderTexts> rowHeaderTexts;
private List<String> rowHeaderTexts;
@SerializedName("row_header_texts_normalized")
private List<RowHeaderTextsNormalized> rowHeaderTextsNormalized;
private List<String> rowHeaderTextsNormalized;
@SerializedName("column_header_ids")
private List<ColumnHeaderIds> columnHeaderIds;
private List<String> columnHeaderIds;
@SerializedName("column_header_texts")
private List<ColumnHeaderTexts> columnHeaderTexts;
private List<String> columnHeaderTexts;
@SerializedName("column_header_texts_normalized")
private List<ColumnHeaderTextsNormalized> columnHeaderTextsNormalized;
private List<String> columnHeaderTextsNormalized;

/**
* Gets the cellId.
Expand Down Expand Up @@ -129,54 +129,68 @@ public Long getColumnIndexEnd() {
/**
* Gets the rowHeaderIds.
*
* An array of values, each being the `id` value of a row header that is applicable to this body cell.
*
* @return the rowHeaderIds
*/
public List<RowHeaderIds> getRowHeaderIds() {
public List<String> getRowHeaderIds() {
return rowHeaderIds;
}

/**
* Gets the rowHeaderTexts.
*
* An array of values, each being the `text` value of a row header that is applicable to this body cell.
*
* @return the rowHeaderTexts
*/
public List<RowHeaderTexts> getRowHeaderTexts() {
public List<String> getRowHeaderTexts() {
return rowHeaderTexts;
}

/**
* Gets the rowHeaderTextsNormalized.
*
* If you provide customization input, the normalized version of the row header texts according to the customization;
* otherwise, the same value as `row_header_texts`.
*
* @return the rowHeaderTextsNormalized
*/
public List<RowHeaderTextsNormalized> getRowHeaderTextsNormalized() {
public List<String> getRowHeaderTextsNormalized() {
return rowHeaderTextsNormalized;
}

/**
* Gets the columnHeaderIds.
*
* An array of values, each being the `id` value of a column header that is applicable to the current cell.
*
* @return the columnHeaderIds
*/
public List<ColumnHeaderIds> getColumnHeaderIds() {
public List<String> getColumnHeaderIds() {
return columnHeaderIds;
}

/**
* Gets the columnHeaderTexts.
*
* An array of values, each being the `text` value of a column header that is applicable to the current cell.
*
* @return the columnHeaderTexts
*/
public List<ColumnHeaderTexts> getColumnHeaderTexts() {
public List<String> getColumnHeaderTexts() {
return columnHeaderTexts;
}

/**
* Gets the columnHeaderTextsNormalized.
*
* If you provide customization input, the normalized version of the column header texts according to the
* customization; otherwise, the same value as `column_header_texts`.
*
* @return the columnHeaderTextsNormalized
*/
public List<ColumnHeaderTextsNormalized> getColumnHeaderTextsNormalized() {
public List<String> getColumnHeaderTextsNormalized() {
return columnHeaderTextsNormalized;
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit ce57fd7

Please sign in to comment.