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

Remove duplicate userAgent string #139

Merged
merged 1 commit into from
Dec 11, 2017
Merged

Remove duplicate userAgent string #139

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
5 changes: 2 additions & 3 deletions impl/src/main/java/com/okta/sdk/impl/http/support/UserAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,8 @@ public static String getUserAgentString() {

private static String createUserAgentString() {
String userAgent = getIntegrationString() + // okta-shiro | okta-spring-security
getOktaSDKComponentsString() + // okta-servlet-java | okta-spring-boot-starter
getOktaSdkString() + // okta-sdk-java
getOktaSdkString() + // okta-oktagration
getOktaSDKComponentsString() + // okta-servlet-java | okta-spring-boot-starter
getOktaSdkString() + // okta-sdk-java
getSecurityFrameworkString() + // shiro | spring-security
getIntegrationRuntimeString() + // spring
getSpringBootString() + // spring-boot
Expand Down
20 changes: 14 additions & 6 deletions impl/src/test/groovy/com/okta/sdk/impl/http/support/UserAgentTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,30 @@
*/
package com.okta.sdk.impl.http.support

import com.okta.sdk.lang.Assert
import com.okta.sdk.lang.Strings
import org.testng.annotations.Test

import static org.hamcrest.MatcherAssert.assertThat
import static org.hamcrest.Matchers.*

/**
* @since 0.5.0
*/
class UserAgentTest {

private static final String VERSION_SEPARATOR = "/";
private static final String ENTRY_SEPARATOR = " ";
private static final String VERSION_SEPARATOR = "/"
private static final String ENTRY_SEPARATOR = " "
private static final String SDK_KEY = "okta-sdk-java"

@Test
void testGetUserAgentString() {

String userAgent = UserAgent.getUserAgentString()
Assert.hasText(userAgent)
Assert.isTrue(userAgent.contains("okta-sdk-java" + VERSION_SEPARATOR + Version.getClientVersion() + ENTRY_SEPARATOR))
Assert.isTrue(userAgent.contains("java" + VERSION_SEPARATOR + System.getProperty("java.version") + ENTRY_SEPARATOR))
assertThat userAgent, allOf(
not(emptyString()),
containsString(SDK_KEY + VERSION_SEPARATOR + Version.getClientVersion() + ENTRY_SEPARATOR),
containsString("java" + VERSION_SEPARATOR + System.getProperty("java.version") + ENTRY_SEPARATOR)
)
assertThat "Expected '${SDK_KEY}' to appear in userAgent once once.", Strings.countOccurrencesOf(userAgent, SDK_KEY), equalTo(1)
}
}