Skip to content

Commit 7d8c340

Browse files
authored
Merge pull request #13 from SourceLabOrg/sp/updateDependencies
Update internal dependencies, resolve updated checkstyle rule violations
2 parents 2482b65 + 8cc5ffd commit 7d8c340

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

build/checkstyle-v1.5.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
3838
</module>
3939
<module name="NeedBraces"/>
40-
<module name="LeftCurly">
41-
<property name="maxLineLength" value="100"/>
42-
</module>
4340
<module name="RightCurly"/>
4441
<module name="RightCurly">
4542
<property name="option" value="alone"/>

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4848

4949
<!-- guava version -->
50-
<guava.version>25.0-jre</guava.version>
50+
<guava.version>27.0.1-jre</guava.version>
5151

5252
<!-- Http Components version -->
53-
<http-components.version>4.5.5</http-components.version>
53+
<http-components.version>4.5.7</http-components.version>
5454

5555
<!-- Jackson version -->
5656
<jackson.version>2.9.8</jackson.version>
@@ -61,10 +61,10 @@
6161
<!-- Specify which Checkstyle ruleset to use -->
6262
<checkstyle.ruleset>build/checkstyle-v1.5.xml</checkstyle.ruleset>
6363
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
64-
<checkstyle.version>8.0</checkstyle.version>
64+
<checkstyle.version>8.17</checkstyle.version>
6565

6666
<!-- Log4J Version -->
67-
<log4j2.version>2.8.2</log4j2.version>
67+
<log4j2.version>2.11.1</log4j2.version>
6868

6969
<!-- test toggling -->
7070
<skipTests>false</skipTests>
@@ -141,7 +141,7 @@
141141
<dependency>
142142
<groupId>org.hamcrest</groupId>
143143
<artifactId>hamcrest-library</artifactId>
144-
<version>1.3</version>
144+
<version>2.1</version>
145145
<scope>test</scope>
146146
</dependency>
147147

src/main/java/org/sourcelab/kafka/connect/apiclient/KafkaConnectClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
import org.sourcelab.kafka.connect.apiclient.request.put.PutConnectorPluginConfigValidate;
4747
import org.sourcelab.kafka.connect.apiclient.request.put.PutConnectorResume;
4848
import org.sourcelab.kafka.connect.apiclient.rest.HttpClientRestClient;
49-
import org.sourcelab.kafka.connect.apiclient.rest.exceptions.InvalidRequestException;
5049
import org.sourcelab.kafka.connect.apiclient.rest.RestClient;
5150
import org.sourcelab.kafka.connect.apiclient.rest.RestResponse;
51+
import org.sourcelab.kafka.connect.apiclient.rest.exceptions.InvalidRequestException;
5252

5353
import java.io.IOException;
5454
import java.util.Collection;

src/main/java/org/sourcelab/kafka/connect/apiclient/request/Request.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,20 @@
2626
public interface Request<T> {
2727

2828
/**
29-
* @return The name of the end point this request uses. Example: "campaign", "user", etc..
29+
* The name of the API end point to issue a request against. This is appended to the API Hostname.
30+
* @return The name of the end point this request uses.
3031
*/
3132
String getApiEndpoint();
3233

3334
/**
35+
* Request Method, IE POST, GET, etc..
3436
* @return The type of HTTP Request.
3537
*/
3638
RequestMethod getRequestMethod();
3739

3840
/**
39-
* @return correctly formatted request parameters.
41+
* Object to be submitted as the body of the request. It will be serialized to JSON using Jackson.
42+
* @return Object representing request body content.
4043
*/
4144
Object getRequestBody();
4245

src/main/java/org/sourcelab/kafka/connect/apiclient/request/dto/ConnectorPluginConfigDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class ConnectorPluginConfigDefinition {
2929
private final Map<String, String> config;
3030

3131
/**
32-
* Constructor
32+
* Constructor.
3333
* @param connectorPluginName Name of Connector Plugin.
3434
* @param config Configuration values for connector.
3535
*/

src/main/java/org/sourcelab/kafka/connect/apiclient/request/dto/NewConnectorDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class NewConnectorDefinition {
2929
private final Map<String, String> config;
3030

3131
/**
32-
* Constructor
32+
* Constructor.
3333
* @param name Name of Connector.
3434
* @param config Configuration values for connector.
3535
*/

src/main/java/org/sourcelab/kafka/connect/apiclient/request/post/PostConnector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class PostConnector implements PostRequest<ConnectorDefinition> {
3131
private final NewConnectorDefinition connectorDefinition;
3232

3333
/**
34-
* Constructor
34+
* Constructor.
3535
* @param connectorDefinition Defines the new connector to be deployed.
3636
*/
3737
public PostConnector(final NewConnectorDefinition connectorDefinition) {

src/main/java/org/sourcelab/kafka/connect/apiclient/rest/exceptions/InvalidRequestException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public InvalidRequestException(final String message, final Throwable cause) {
4848
}
4949

5050
/**
51-
* @return Http Error Code.
51+
* Resulting HTTP Status code.
52+
* @return Http Status Code.
5253
*/
5354
public int getErrorCode() {
5455
return errorCode;

0 commit comments

Comments
 (0)