Skip to content
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

Jump to bottom

Remove camelCase from ApiKey #85

Merged
merged 7 commits into from
Jan 1, 2021
Merged

Remove camelCase from ApiKey #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87ff896
Merge pull request #1 from coinapi/master
byblakeorriver Sep 2, 2020
8af781e
Merge pull request #2 from coinapi/master
byblakeorriver Sep 28, 2020
0e6ce12
Merge pull request #3 from coinapi/master
byblakeorriver Nov 24, 2020
fc0a569
Merge pull request #4 from coinapi/master
byblakeorriver Dec 18, 2020
cf22aee
Merge pull request #5 from coinapi/master
byblakeorriver Dec 31, 2020
bd43894
fix(apikey): remove camel case from apikey
byblakeorriver Dec 31, 2020
3053bf8
fix(apikey): remove camel case from apikey
byblakeorriver Dec 31, 2020
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
10 changes: 5 additions & 5 deletions data-api/java-websocket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,19 @@
<version>1.9.3</version>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-client-api</artifactId>
<version>1.1</version>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus.ext</groupId>
<artifactId>tyrus-client-java8</artifactId>
<version>1.17</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.tyrus</groupId>
<artifactId>tyrus-container-grizzly-client</artifactId>
<version>1.17</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
9 changes: 5 additions & 4 deletions data-api/java-websocket/src/main/java/io/coinapi/websocket/CoinAPIWebSocketImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import io.coinapi.websocket.model.Error;
import org.glassfish.tyrus.client.ClientManager;

import javax.websocket.*;
import jakarta.websocket.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -113,8 +113,7 @@ public void sendHelloMessage(Hello hello) throws IOException {

final ClientEndpointConfig cec = ClientEndpointConfig.Builder.create().build();

connection = Optional.ofNullable(client.connectToServer(new Endpoint() {

Endpoint endpoint = new Endpoint() {
@Override
public void onOpen(Session session, EndpointConfig config) {
try {
Expand All @@ -136,7 +135,9 @@ public void onMessage(String message) {
public void onClose(Session session, CloseReason closeReason) {
super.onClose(session, closeReason);
}
}, cec, new URI(isSandbox ? sandboxUrl : noSandboxUrl)));
};

connection = Optional.ofNullable(client.connectToServer(endpoint, cec, new URI(isSandbox ? sandboxUrl : noSandboxUrl)));
latch.await(100, TimeUnit.SECONDS);
} catch (Exception e) {
e.printStackTrace();
Expand Down
10 changes: 5 additions & 5 deletions data-api/java-websocket/src/main/java/io/coinapi/websocket/model/Hello.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
public class Hello {

private String type = "hello";
private String apiKey;
private String apikey;
private Boolean heartbeat = true;
private String[] subscribeDataType;
private String[] subscribeFilterSymbolId;
Expand All @@ -21,8 +21,8 @@ public String getType() {
return type;
}

public String getApiKey() {
return apiKey;
public String getApikey() {
return apikey;
}

public Boolean getHeartbeat() {
Expand Down Expand Up @@ -64,8 +64,8 @@ public Integer getSubscribeUpdateLimitMsBookSnapshot() {
return subscribeUpdateLimitMsBookSnapshot;
}

public void setApiKey(String apiKey) {
this.apiKey = apiKey;
public void setApikey(String apikey) {
this.apikey = apikey;
}

public void setHeartbeat(Boolean heartbeat) {
Expand Down
6 changes: 3 additions & 3 deletions data-api/java-websocket/src/test/java/CoinAPISDKTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@

public abstract class CoinAPISDKTest {

protected String apiKey;
protected String apikey;
protected CoinAPIWebSocket coinAPIWebSocket;

@Before
public void configuration() throws IOException {
Config config = new Config();
apiKey = config.getPropValues("coinapi_key");
apikey = config.getPropValues("coinapi_key");
coinAPIWebSocket = new CoinAPIWebSocketImpl(true);
}

public Hello createHello(String type) {
Hello hello = new Hello();
hello.setApiKey(apiKey);
hello.setApikey(apikey);
hello.setSubscribeDataType(new String[]{type});
return hello;
}
Expand Down
6 changes: 3 additions & 3 deletions data-api/java-websocket/src/test/java/MessageInjectableCoinAPISDKTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import java.util.concurrent.LinkedBlockingDeque;

public abstract class MessageInjectableCoinAPISDKTest {
protected String apiKey;
protected String apikey;
protected CoinAPIWebSocketImpl coinAPIWebSocket;
protected Queue messagesQueue;

@Before
public void configuration() throws IOException, NoSuchFieldException, IllegalAccessException {
Config config = new Config();
apiKey = config.getPropValues("coinapi_key");
apikey = config.getPropValues("coinapi_key");

//make private messagesQueue variable accessible for injecting messages during testing
Field messagesQueueField = CoinAPIWebSocketImpl.class.getDeclaredField("messagesQueue");
Expand All @@ -32,7 +32,7 @@ public void configuration() throws IOException, NoSuchFieldException, IllegalAcc

public Hello createHello(String type) {
Hello hello = new Hello();
hello.setApiKey(apiKey);
hello.setApikey(apikey);
hello.setSubscribeDataType(new String[]{type});
return hello;
}
Expand Down