Skip to content

Commit facb636

Browse files
Merge branch 'develop' into 634/add-nlu-readme
2 parents 4e53c8f + f9899ba commit facb636

File tree

26 files changed

+229
-24
lines changed

26 files changed

+229
-24
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ script:
3434
- ./gradlew test
3535
- ./gradlew codeCoverageReport
3636
- ./gradlew docs > /dev/null # build the javadoc
37+
- ./gradlew checkstyleMain
38+
- ./gradlew checkstyleTest
3739

3840
after_success:
3941
- bash <(curl -s https://codecov.io/bash)

alchemy/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ signArchives {
5151

5252
checkstyle {
5353
configFile = rootProject.file('checkstyle.xml')
54+
ignoreFailures = false
5455
}
5556

5657
dependencies {

build.gradle

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@ javadoc {
1717
source = 'src/main/java'
1818
}
1919

20+
checkstyle {
21+
ignoreFailures = false
22+
}
23+
24+
checkstyleMain {
25+
ignoreFailures = false
26+
}
27+
28+
checkstyleTest {
29+
ignoreFailures = false
30+
}
31+
32+
2033
task docs(type: Javadoc) {
2134
destinationDir = file("$buildDir/docs/all")
2235
}
@@ -45,8 +58,12 @@ allprojects {
4558

4659
subprojects {
4760

61+
checkstyleMain {
62+
ignoreFailures = false
63+
}
64+
4865
checkstyleTest {
49-
ignoreFailures = true
66+
ignoreFailures = false
5067
}
5168

5269
afterEvaluate {

conversation/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ signArchives {
5151

5252
checkstyle {
5353
configFile = rootProject.file('checkstyle.xml')
54+
ignoreFailures = false
5455
}
5556

5657
dependencies {

core/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,10 @@ signArchives {
4949
}
5050
}
5151

52-
checkstyleTest {
53-
ignoreFailures = true
54-
}
5552

5653
checkstyle {
5754
configFile = rootProject.file('checkstyle.xml')
58-
ignoreFailures = true
55+
ignoreFailures = false
5956
}
6057

6158
task testJar(type: Jar) {

core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected OkHttpClient configureHttpClient() {
134134
.build();
135135

136136
builder.connectionSpecs(Arrays.asList(spec, ConnectionSpec.CLEARTEXT));
137-
137+
138138
return builder.build();
139139
}
140140

core/src/test/java/com/ibm/watson/developer_cloud/util/WaitFor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121

2222
public class WaitFor {
2323

24-
private WaitFor() {}
24+
private WaitFor() {
25+
26+
}
2527

2628
/**
2729
* Static method used to wait for a specific condition to be satisfied.

dialog/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ signArchives {
4949
}
5050
}
5151

52-
checkstyleTest {
53-
ignoreFailures = true
54-
}
5552
checkstyle {
5653
configFile = rootProject.file('checkstyle.xml')
54+
ignoreFailures = false
5755
}
5856

5957
task testJar(type: Jar) {

discovery/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ signArchives {
5050
}
5151

5252
checkstyleTest {
53-
ignoreFailures = true
53+
ignoreFailures = false
5454
}
5555

5656
checkstyle {
5757
configFile = rootProject.file('checkstyle.xml')
58-
ignoreFailures = true
58+
ignoreFailures = false
5959
}
6060

6161
dependencies {

discovery/src/main/java/com/ibm/watson/developer_cloud/discovery/v1/Discovery.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ public ServiceCall<CreateDocumentResponse> createDocument(CreateDocumentRequest
356356
}
357357
Validator.notNull(createRequest.getFile(), "Document " + FILE + " cannot be null");
358358
MediaType mediaType = supportedMediaTypes.get(createRequest.getMediaType());
359-
Validator.notNull(mediaType, String.format("Media Type '%s' not supported", createRequest.getMediaType()));
360359
RequestBody file = InputStreamRequestBody.create(mediaType, createRequest.getFile());
361360
MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
362361
multipartBuilder.setType(MultipartBody.FORM);

0 commit comments

Comments
 (0)