Skip to content

Commit ce57fd7

Browse files
authored
Merge pull request #1035 from watson-developer-cloud/compare-comply-models-fix
Compare comply models fix
2 parents d4f7016 + 64a0187 commit ce57fd7

File tree

23 files changed

+80
-300
lines changed

23 files changed

+80
-300
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 6.13.1
2+
current_version = 6.13.2
33
commit = True
44
message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
55

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ All the services:
6161
<dependency>
6262
<groupId>com.ibm.watson.developer_cloud</groupId>
6363
<artifactId>java-sdk</artifactId>
64-
<version>6.13.1</version>
64+
<version>6.13.2</version>
6565
</dependency>
6666
```
6767

@@ -71,7 +71,7 @@ Only Discovery:
7171
<dependency>
7272
<groupId>com.ibm.watson.developer_cloud</groupId>
7373
<artifactId>discovery</artifactId>
74-
<version>6.13.1</version>
74+
<version>6.13.2</version>
7575
</dependency>
7676
```
7777

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

8282
```gradle
83-
'com.ibm.watson.developer_cloud:java-sdk:6.13.1'
83+
'com.ibm.watson.developer_cloud:java-sdk:6.13.2'
8484
```
8585

8686
Only Assistant:
8787

8888
```gradle
89-
'com.ibm.watson.developer_cloud:assistant:6.13.1'
89+
'com.ibm.watson.developer_cloud:assistant:6.13.2'
9090
```
9191

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

111111
```gradle
112-
'com.ibm.watson.developer_cloud:speech-to-text:6.13.2-SNAPSHOT'
112+
'com.ibm.watson.developer_cloud:speech-to-text:6.13.3-SNAPSHOT'
113113
```
114114

115115
##### JAR
@@ -388,7 +388,7 @@ Gradle:
388388

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

443443

444-
[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
444+
[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

assistant/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<dependency>
88
<groupId>com.ibm.watson.developer_cloud</groupId>
99
<artifactId>assistant</artifactId>
10-
<version>6.13.1</version>
10+
<version>6.13.2</version>
1111
</dependency>
1212
```
1313

1414
##### Gradle
1515
```gradle
16-
'com.ibm.watson.developer_cloud:assistant:6.13.1'
16+
'com.ibm.watson.developer_cloud:assistant:6.13.2'
1717
```
1818

1919
## Usage

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/BodyCells.java

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ public class BodyCells extends GenericModel {
3535
@SerializedName("column_index_end")
3636
private Long columnIndexEnd;
3737
@SerializedName("row_header_ids")
38-
private List<RowHeaderIds> rowHeaderIds;
38+
private List<String> rowHeaderIds;
3939
@SerializedName("row_header_texts")
40-
private List<RowHeaderTexts> rowHeaderTexts;
40+
private List<String> rowHeaderTexts;
4141
@SerializedName("row_header_texts_normalized")
42-
private List<RowHeaderTextsNormalized> rowHeaderTextsNormalized;
42+
private List<String> rowHeaderTextsNormalized;
4343
@SerializedName("column_header_ids")
44-
private List<ColumnHeaderIds> columnHeaderIds;
44+
private List<String> columnHeaderIds;
4545
@SerializedName("column_header_texts")
46-
private List<ColumnHeaderTexts> columnHeaderTexts;
46+
private List<String> columnHeaderTexts;
4747
@SerializedName("column_header_texts_normalized")
48-
private List<ColumnHeaderTextsNormalized> columnHeaderTextsNormalized;
48+
private List<String> columnHeaderTextsNormalized;
4949

5050
/**
5151
* Gets the cellId.
@@ -129,54 +129,68 @@ public Long getColumnIndexEnd() {
129129
/**
130130
* Gets the rowHeaderIds.
131131
*
132+
* An array of values, each being the `id` value of a row header that is applicable to this body cell.
133+
*
132134
* @return the rowHeaderIds
133135
*/
134-
public List<RowHeaderIds> getRowHeaderIds() {
136+
public List<String> getRowHeaderIds() {
135137
return rowHeaderIds;
136138
}
137139

138140
/**
139141
* Gets the rowHeaderTexts.
140142
*
143+
* An array of values, each being the `text` value of a row header that is applicable to this body cell.
144+
*
141145
* @return the rowHeaderTexts
142146
*/
143-
public List<RowHeaderTexts> getRowHeaderTexts() {
147+
public List<String> getRowHeaderTexts() {
144148
return rowHeaderTexts;
145149
}
146150

147151
/**
148152
* Gets the rowHeaderTextsNormalized.
149153
*
154+
* If you provide customization input, the normalized version of the row header texts according to the customization;
155+
* otherwise, the same value as `row_header_texts`.
156+
*
150157
* @return the rowHeaderTextsNormalized
151158
*/
152-
public List<RowHeaderTextsNormalized> getRowHeaderTextsNormalized() {
159+
public List<String> getRowHeaderTextsNormalized() {
153160
return rowHeaderTextsNormalized;
154161
}
155162

156163
/**
157164
* Gets the columnHeaderIds.
158165
*
166+
* An array of values, each being the `id` value of a column header that is applicable to the current cell.
167+
*
159168
* @return the columnHeaderIds
160169
*/
161-
public List<ColumnHeaderIds> getColumnHeaderIds() {
170+
public List<String> getColumnHeaderIds() {
162171
return columnHeaderIds;
163172
}
164173

165174
/**
166175
* Gets the columnHeaderTexts.
167176
*
177+
* An array of values, each being the `text` value of a column header that is applicable to the current cell.
178+
*
168179
* @return the columnHeaderTexts
169180
*/
170-
public List<ColumnHeaderTexts> getColumnHeaderTexts() {
181+
public List<String> getColumnHeaderTexts() {
171182
return columnHeaderTexts;
172183
}
173184

174185
/**
175186
* Gets the columnHeaderTextsNormalized.
176187
*
188+
* If you provide customization input, the normalized version of the column header texts according to the
189+
* customization; otherwise, the same value as `column_header_texts`.
190+
*
177191
* @return the columnHeaderTextsNormalized
178192
*/
179-
public List<ColumnHeaderTextsNormalized> getColumnHeaderTextsNormalized() {
193+
public List<String> getColumnHeaderTextsNormalized() {
180194
return columnHeaderTextsNormalized;
181195
}
182196
}

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/ColumnHeaderIds.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/ColumnHeaderTexts.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/ColumnHeaderTextsNormalized.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/RowHeaderIds.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/RowHeaderTexts.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

compare-comply/src/main/java/com/ibm/watson/developer_cloud/compare_comply/v1/model/RowHeaderTextsNormalized.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)