Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Changelog
## v6.1.0
* Added support for the CA1 Region
## v6.0.0
* Bumped Apache HTTP client dependency to v5 changing, slightly, our API contract
* Tightened access to some internal classes
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/uvasoftware/scanii/ScaniiTarget.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class ScaniiTarget {
public static final ScaniiTarget EU2 = new ScaniiTarget("https://api-eu2.scanii.com");
public static final ScaniiTarget AP1 = new ScaniiTarget("https://api-ap1.scanii.com");
public static final ScaniiTarget AP2 = new ScaniiTarget("https://api-ap2.scanii.com");
public static final ScaniiTarget CA1 = new ScaniiTarget("https://api-ca1.scanii.com");

private final URI endpoint;

Expand All @@ -25,7 +26,7 @@ public ScaniiTarget(String url) {
}

protected static List<ScaniiTarget> all() {
return Stream.of(AUTO, US1, EU1, EU2, AP1, AP2).collect(Collectors.toList());
return Stream.of(AUTO, US1, EU1, EU2, AP1, AP2, CA1).collect(Collectors.toList());
}

public String resolve(String path) {
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/com/uvasoftware/scanii/ScaniiTargetTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.util.List;

class ScaniiTargetTest {

@Test
Expand All @@ -16,4 +18,20 @@ void shouldResolvePaths() {
ScaniiTarget target = new ScaniiTarget("http://example.com");
Assertions.assertEquals("http://example.com/v2.1/api", target.resolve("/v2.1/api"));
}

@Test
void shouldReturnAll() {
var allEndpoints = ScaniiTarget.all();
Assertions.assertEquals(7, allEndpoints.size());
for (ScaniiTarget target : List.of(ScaniiTarget.AUTO, ScaniiTarget.US1, ScaniiTarget.EU1, ScaniiTarget.EU2, ScaniiTarget.AP1, ScaniiTarget.AP2, ScaniiTarget.CA1)) {
Assertions.assertTrue(allEndpoints.contains(target), "All did not include region " + target);
}
}

@Test
void getEndpoint() {
for (ScaniiTarget target : ScaniiTarget.all()) {
Assertions.assertNotNull(target.getEndpoint());
}
}
}
Loading