Skip to content

Commit d42b79f

Browse files
authored
Merge pull request #1081 from watson-developer-cloud/cnc-update
Update Compare and Comply with model fix
2 parents 576fad9 + 0be8cfe commit d42b79f

File tree

85 files changed

+294
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+294
-377
lines changed

compare-comply/src/main/java/com/ibm/watson/compare_comply/v1/CompareComply.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at
@@ -58,7 +58,7 @@ public Boolean isIdenticalText() {
5858
/**
5959
* Gets the provenanceIds.
6060
*
61-
* One or more hashed values that you can send to IBM to provide feedback or receive support.
61+
* Hashed values that you can send to IBM to provide feedback or receive support.
6262
*
6363
* @return the provenanceIds
6464
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

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

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at
@@ -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
private List<Attribute> attributes;
5050

5151
/**
@@ -129,54 +129,68 @@ public Long getColumnIndexEnd() {
129129
/**
130130
* Gets the rowHeaderIds.
131131
*
132+
* An array that contains 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 that contains 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 that contains 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 that contains 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/compare_comply/v1/model/Category.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at
@@ -96,7 +96,7 @@ public String getLabel() {
9696
/**
9797
* Gets the provenanceIds.
9898
*
99-
* One or more hashed values that you can send to IBM to provide feedback or receive support.
99+
* Hashed values that you can send to IBM to provide feedback or receive support.
100100
*
101101
* @return the provenanceIds
102102
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 IBM Corp. All Rights Reserved.
2+
* (C) Copyright IBM Corp. 2019.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

0 commit comments

Comments
 (0)