Skip to content

Commit 0667127

Browse files
committed
Update license
1 parent 8c5ce97 commit 0667127

27 files changed

+116
-120
lines changed

src/main/java/org/sourcelab/http/rest/HttpClientRestClient.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019
import org.apache.http.HttpEntity;
@@ -187,7 +186,7 @@ public void init(final Configuration configuration) {
187186
// parse ApiHost for Hostname and port.
188187
final URL apiUrl = new URL(configuration.getApiHost());
189188

190-
// Add Kafka-Connect credentials
189+
// Add credentials
191190
credsProvider.setCredentials(
192191
new AuthScope(apiUrl.getHost(), apiUrl.getPort()),
193192
new UsernamePasswordCredentials(

src/main/java/org/sourcelab/http/rest/HttpsContextBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;

src/main/java/org/sourcelab/http/rest/MockRestClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019
import org.sourcelab.http.rest.configuration.Configuration;

src/main/java/org/sourcelab/http/rest/NoopTrustManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019
import javax.net.ssl.X509TrustManager;

src/main/java/org/sourcelab/http/rest/RestClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019

src/main/java/org/sourcelab/http/rest/RestException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019
/**

src/main/java/org/sourcelab/http/rest/RestResponse.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, 2019 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
55
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
@@ -14,7 +14,6 @@
1414
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
1515
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1616
*/
17-
1817
package org.sourcelab.http.rest;
1918

2019
/**

src/main/java/org/sourcelab/http/rest/configuration/BasicConfiguration.java

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
/**
2-
* MIT License
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
4-
* Copyright (c) 2017, 2018, 2019 SourceLab.org (https://github.com/SourceLabOrg/kafka-webview/)
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
5+
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
7+
* persons to whom the Software is furnished to do so, subject to the following conditions:
58
*
6-
* Permission is hereby granted, free of charge, to any person obtaining a copy
7-
* of this software and associated documentation files (the "Software"), to deal
8-
* in the Software without restriction, including without limitation the rights
9-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
* copies of the Software, and to permit persons to whom the Software is
11-
* furnished to do so, subject to the following conditions:
9+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
10+
* Software.
1211
*
13-
* The above copyright notice and this permission notice shall be included in all
14-
* copies or substantial portions of the Software.
15-
*
16-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22-
* SOFTWARE.
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
13+
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
14+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
15+
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2316
*/
24-
2517
package org.sourcelab.http.rest.configuration;
2618

2719
import org.sourcelab.http.rest.interceptor.NoopRequestInterceptor;
@@ -50,7 +42,7 @@ public class BasicConfiguration<SELF extends BasicConfiguration> implements Conf
5042
private String basicAuthUsername = null;
5143
private String basicAuthPassword = null;
5244

53-
// Optional settings to validate Kafka-Connect's SSL certificate.
45+
// Optional settings to validate SSL certificate.
5446
private boolean ignoreInvalidSslCertificates = false;
5547
private File trustStoreFile = null;
5648
private String trustStorePassword = null;
@@ -93,8 +85,8 @@ public BasicConfiguration(final String apiHost) {
9385
/**
9486
* Allow setting http Basic-Authentication username and password to authenticate requests.
9587
*
96-
* @param username username to authenticate requests to Kafka-Connect with.
97-
* @param password password to authenticate requests to Kafka-Connect with.
88+
* @param username username to authenticate requests with.
89+
* @param password password to authenticate requests with.
9890
* @return Configuration instance.
9991
*/
10092
public SELF useBasicAuth(final String username, final String password) {

src/main/java/org/sourcelab/http/rest/configuration/Configuration.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
5+
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
7+
* persons to whom the Software is furnished to do so, subject to the following conditions:
8+
*
9+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
10+
* Software.
11+
*
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
13+
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
14+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
15+
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16+
*/
117
package org.sourcelab.http.rest.configuration;
218

319
import org.sourcelab.http.rest.interceptor.RequestInterceptor;

src/main/java/org/sourcelab/http/rest/configuration/ProxyConfiguration.java

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
/**
2-
* MIT License
2+
* Copyright 2019 SourceLab.org https://github.com/SourceLabOrg/HttpClientWrapper
33
*
4-
* Copyright (c) 2017, 2018, 2019 SourceLab.org (https://github.com/SourceLabOrg/kafka-webview/)
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
5+
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
7+
* persons to whom the Software is furnished to do so, subject to the following conditions:
58
*
6-
* Permission is hereby granted, free of charge, to any person obtaining a copy
7-
* of this software and associated documentation files (the "Software"), to deal
8-
* in the Software without restriction, including without limitation the rights
9-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
* copies of the Software, and to permit persons to whom the Software is
11-
* furnished to do so, subject to the following conditions:
9+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
10+
* Software.
1211
*
13-
* The above copyright notice and this permission notice shall be included in all
14-
* copies or substantial portions of the Software.
15-
*
16-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22-
* SOFTWARE.
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
13+
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
14+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
15+
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2316
*/
24-
2517
package org.sourcelab.http.rest.configuration;
2618

2719
import java.util.Objects;

0 commit comments

Comments
 (0)