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
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![CircleCI Build Status](https://circleci.com/gh/palantir/http-remoting-api/tree/develop.svg?style=shield)](https://circleci.com/gh/palantir/http-remoting-api)
[![Download](https://api.bintray.com/packages/palantir/releases/http-remoting-api/images/download.svg) ](https://bintray.com/palantir/releases/http-remoting-api/_latestVersion)
[![CircleCI Build Status](https://circleci.com/gh/palantir/conjure-java-api/tree/develop.svg?style=shield)](https://circleci.com/gh/palantir/conjure-java-api)
[![Download](https://api.bintray.com/packages/palantir/releases/conjure-java-api/images/download.svg) ](https://bintray.com/palantir/releases/conjure-java-api/_latestVersion)

# APIs for http-remoting
# APIs for conjure-java-runtime

See https://github.com/palantir/http-remoting
See https://github.com/palantir/conjure-java-runtime
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public final class UserAgents {
/**
* The {@link UserAgent.Agent#name agent name} identifying the conjure-java library in a {@link UserAgent}.
*/
public static final String REMOTING_AGENT_NAME = "conjure-java";
public static final String CONJURE_AGENT_NAME = "conjure-java-runtime";

private static final Logger log = LoggerFactory.getLogger(UserAgents.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ public void testCorrectHeaderFormatWithNodeId() {
UserAgent baseUserAgent = UserAgent.of(UserAgent.Agent.of("service", "1.0.0"), "myNode");
assertThat(UserAgents.format(baseUserAgent)).isEqualTo("service/1.0.0 (nodeId:myNode)");

UserAgent derivedAgent = baseUserAgent.addAgent(UserAgent.Agent.of("remoting", "2.0.0"));
assertThat(UserAgents.format(derivedAgent)).isEqualTo("service/1.0.0 (nodeId:myNode) remoting/2.0.0");
UserAgent derivedAgent = baseUserAgent.addAgent(UserAgent.Agent.of("conjure", "2.0.0"));
assertThat(UserAgents.format(derivedAgent)).isEqualTo("service/1.0.0 (nodeId:myNode) conjure/2.0.0");
}

@Test
public void testCorrectHeaderFormatWithoutNodeId() {
UserAgent baseUserAgent = UserAgent.of(UserAgent.Agent.of("service", "1.0.0"));
assertThat(UserAgents.format(baseUserAgent)).isEqualTo("service/1.0.0");

UserAgent derivedAgent = baseUserAgent.addAgent(UserAgent.Agent.of("remoting", "2.0.0"));
assertThat(UserAgents.format(derivedAgent)).isEqualTo("service/1.0.0 remoting/2.0.0");
UserAgent derivedAgent = baseUserAgent.addAgent(UserAgent.Agent.of("conjure", "2.0.0"));
assertThat(UserAgents.format(derivedAgent)).isEqualTo("service/1.0.0 conjure/2.0.0");
}

@Test
Expand Down