Skip to content

feat!: search Assets endpoint result by pair name and altname #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nyg merged 1 commit into from
Nov 29, 2025
Merged

feat!: search Assets endpoint result by pair name and altname #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 examples/src/main/java/dev/andstuff/kraken/example/SimpleExamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import dev.andstuff.kraken.api.KrakenAPI;
import dev.andstuff.kraken.api.endpoint.market.params.AssetPairParams;
import dev.andstuff.kraken.api.endpoint.market.response.AssetInfo;
import dev.andstuff.kraken.api.endpoint.market.response.AssetPair;
import dev.andstuff.kraken.api.endpoint.market.response.AssetPairs;
import dev.andstuff.kraken.api.endpoint.market.response.ServerTime;
import dev.andstuff.kraken.api.endpoint.market.response.SystemStatus;
import dev.andstuff.kraken.api.rest.KrakenCredentials;
Expand All @@ -37,10 +37,10 @@ public static void main(String[] args) {
Map<String, AssetInfo> assets2 = publicAPI.assetInfo(List.of("DOT", "ADA"), "currency");
log.info("{}", assets2);

Map<String, AssetPair> pairs1 = publicAPI.assetPairs(List.of("ETH/BTC", "ETH/USD"));
AssetPairs pairs1 = publicAPI.assetPairs(List.of("ETH/BTC", "ETH/USD"));
log.info("{}", pairs1);

Map<String, AssetPair> pairs2 = publicAPI.assetPairs(List.of("DOT/USD", "ADA/USD"), AssetPairParams.Info.MARGIN);
AssetPairs pairs2 = publicAPI.assetPairs(List.of("DOT/USD", "ADA/USD"), AssetPairParams.Info.MARGIN);
log.info("{}", pairs2);

JsonNode ticker = publicAPI.query(KrakenAPI.Public.TICKER, Map.of("pair", "XBTEUR"));
Expand Down
10 changes: 7 additions & 3 deletions library/src/main/java/dev/andstuff/kraken/api/KrakenAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import dev.andstuff.kraken.api.endpoint.market.TickerEndpoint;
import dev.andstuff.kraken.api.endpoint.market.params.AssetPairParams;
import dev.andstuff.kraken.api.endpoint.market.response.AssetInfo;
import dev.andstuff.kraken.api.endpoint.market.response.AssetPair;
import dev.andstuff.kraken.api.endpoint.market.response.AssetPairs;
import dev.andstuff.kraken.api.endpoint.market.response.ServerTime;
import dev.andstuff.kraken.api.endpoint.market.response.SystemStatus;
import dev.andstuff.kraken.api.endpoint.market.response.Ticker;
Expand Down Expand Up @@ -97,11 +97,15 @@ public Map<String, AssetInfo> assetInfo(List<String> assets, String assetClass)
return restRequester.execute(new AssetInfoEndpoint(assets, assetClass));
}

public Map<String, AssetPair> assetPairs(List<String> pairs) {
public AssetPairs assetPairs() {
return restRequester.execute(new AssetPairEndpoint());
}

public AssetPairs assetPairs(List<String> pairs) {
return restRequester.execute(new AssetPairEndpoint(pairs));
}

public Map<String, AssetPair> assetPairs(List<String> pair, AssetPairParams.Info info) {
public AssetPairs assetPairs(List<String> pair, AssetPairParams.Info info) {
return restRequester.execute(new AssetPairEndpoint(pair, info));
}

Expand Down
11 changes: 7 additions & 4 deletions library/src/main/java/dev/andstuff/kraken/api/endpoint/market/AssetPairEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
package dev.andstuff.kraken.api.endpoint.market;

import java.util.List;
import java.util.Map;

import com.fasterxml.jackson.core.type.TypeReference;

import dev.andstuff.kraken.api.endpoint.market.params.AssetPairParams;
import dev.andstuff.kraken.api.endpoint.market.response.AssetPair;
import dev.andstuff.kraken.api.endpoint.market.response.AssetPairs;
import dev.andstuff.kraken.api.endpoint.pub.PublicEndpoint;

public class AssetPairEndpoint extends PublicEndpoint<Map<String, AssetPair>> {
public class AssetPairEndpoint extends PublicEndpoint<AssetPairs> {

public AssetPairEndpoint() {
this(null, null);
}

public AssetPairEndpoint(List<String> pairs) {
this(pairs, AssetPairParams.Info.ALL);
this(pairs, null);
}

public AssetPairEndpoint(List<String> pairs, AssetPairParams.Info info) {
Expand Down
26 changes: 26 additions & 0 deletions library/src/main/java/dev/andstuff/kraken/api/endpoint/market/response/AssetPairs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package dev.andstuff.kraken.api.endpoint.market.response;

import static java.util.Optional.ofNullable;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toMap;

import java.util.Map;
import java.util.Optional;

import com.fasterxml.jackson.annotation.JsonCreator;

public class AssetPairs {

private final Map<String, AssetPair> assetPairsByName;
private final Map<String, AssetPair> assetPairsByAltName;

@JsonCreator
public AssetPairs(Map<String, AssetPair> assetPairs) {
assetPairsByName = assetPairs;
assetPairsByAltName = assetPairs.values().stream().collect(toMap(AssetPair::alternateName, identity()));
}

public Optional<AssetPair> findBy(String name) {
return ofNullable(assetPairsByName.getOrDefault(name, assetPairsByAltName.get(name)));
}
}