Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
if: matrix.jdk == '8' && github.event_name == 'pull_request' && github.ref != 'refs/heads/master' && github.ref != 'refs/heads/development'
run: mvn checkstyle::check

- name: Deploy
if: matrix.jdk == '8' && github.event_name == 'push' && github.ref != 'refs/heads/master' && github.ref != 'refs/heads/development'
run: mvn --batch-mode deploy -P test
# - name: Deploy
# if: matrix.jdk == '8' && github.event_name == 'push' && github.ref != 'refs/heads/master' && github.ref != 'refs/heads/development'
# run: mvn --batch-mode deploy -P test

- name: SonarQube Scan (Push)
if: matrix.jdk == '11' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development')
Expand Down
4 changes: 2 additions & 2 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<parent>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
</parent>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
<artifactId>java-client</artifactId>
<packaging>jar</packaging>
<name>Java Client</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.apache.hc.core5.http.HttpHost;

import java.net.MalformedURLException;
import java.net.URL;

public class ProxyConfiguration {
Expand Down Expand Up @@ -39,8 +40,12 @@ public ProxyConfiguration.Builder credentialsProvider(ProxyCredentialsProvider p
return this;
}

public ProxyConfiguration.Builder url(URL url) {
_proxyHost = new HttpHost(url.getProtocol(), url.getHost(), url.getPort());
public ProxyConfiguration.Builder url(URL url) throws MalformedURLException {
try {
_proxyHost = new HttpHost(url.getProtocol(), url.getHost(), url.getPort());
} catch (Exception exc) {
throw new MalformedURLException("roxy configuration is ignored. The proxy `url` was not provided or is malformed");
}
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,15 @@ public void cannotUseInvalidHttpScheme() throws MalformedURLException {
.build();
}

@Test(expected = MalformedURLException.class)
public void cannotUseInvalidUrl() throws MalformedURLException {
SplitClientConfig.builder()
.proxyConfiguration(new ProxyConfiguration.Builder()
.url(new URL(""))
.build())
.build();
}

@Test(expected = IllegalArgumentException.class)
public void mustUseP12FileWithProxyMtls() throws MalformedURLException {
SplitClientConfig.builder()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.split.client;

import io.split.client.dtos.BearerCredentialsProvider;
import io.split.client.dtos.ProxyConfiguration;
import io.split.client.impressions.ImpressionsManager;
import io.split.client.utils.FileTypeEnum;
Expand Down
4 changes: 2 additions & 2 deletions okhttp-modules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
<artifactId>okhttp-modules</artifactId>
<packaging>jar</packaging>
<name>http-modules</name>
Expand Down
2 changes: 1 addition & 1 deletion pluggable-storage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
</parent>

<version>2.1.0</version>
Expand Down
20 changes: 1 addition & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -53,16 +53,8 @@
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/releases</url>
</repository>
<repository>
<id>maven-all-virtual</id>
<url>https://splitio.jfrog.io/artifactory/maven-all-virtual</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven-all-virtual</id>
<url>https://splitio.jfrog.io/artifactory/maven-all-virtual</url>
</pluginRepository>
</pluginRepositories>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -145,16 +137,6 @@
<profiles>
<profile>
<id>test</id>
<distributionManagement>
<repository>
<id>maven-dev</id>
<url>https://splitio.jfrog.io/artifactory/maven-dev/</url>
</repository>
<snapshotRepository>
<id>maven-dev</id>
<url>https://splitio.jfrog.io/artifactory/maven-dev/</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion redis-wrapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>java-client-parent</artifactId>
<groupId>io.split.client</groupId>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
</parent>
<artifactId>redis-wrapper</artifactId>
<version>3.1.1</version>
Expand Down
4 changes: 2 additions & 2 deletions testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<parent>
<groupId>io.split.client</groupId>
<artifactId>java-client-parent</artifactId>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
</parent>
<artifactId>java-client-testing</artifactId>
<packaging>jar</packaging>
<version>4.17.0-rc2</version>
<version>4.17.0-rc3</version>
<name>Java Client For Testing</name>
<description>Testing suite for Java SDK for Split</description>
<dependencies>
Expand Down