Refactor SessionMetadata and TransportCredentials toString() methods

This cleanups up the toString() methods of all implementations of
these interfaces, as pre-work for adding tests against the legacy
logging statement in FlowRunner used for ICANN reporting, so that we
can validate against any changes to that log statement in the future.

It removes system hash codes since those aren't really safe to rely on
in test code and they really don't help with debugging anyway.  It
also standardizes SessionMetadata.toString() a bit and regroups
methods on that interface so all the getters are together.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=125686039
This commit is contained in:
nickfelt 2016-06-23 09:37:42 -07:00 committed by Ben McIlwain
parent 84eb3c8666
commit 6fa1c2d91c
6 changed files with 26 additions and 20 deletions

View file

@ -53,6 +53,11 @@ public class HttpSessionMetadata implements SessionMetadata {
return (Set<String>) session.getAttribute(SERVICE_EXTENSIONS);
}
@Override
public int getFailedLoginAttempts() {
return Optional.fromNullable((Integer) session.getAttribute(FAILED_LOGIN_ATTEMPTS)).or(0);
}
@Override
public void setClientId(String clientId) {
session.setAttribute(CLIENT_ID, clientId);
@ -63,11 +68,6 @@ public class HttpSessionMetadata implements SessionMetadata {
session.setAttribute(SERVICE_EXTENSIONS, serviceExtensionUris);
}
@Override
public int getFailedLoginAttempts() {
return Optional.fromNullable((Integer) session.getAttribute(FAILED_LOGIN_ATTEMPTS)).or(0);
}
@Override
public void incrementFailedLoginAttempts() {
session.setAttribute(FAILED_LOGIN_ATTEMPTS, getFailedLoginAttempts() + 1);
@ -81,7 +81,6 @@ public class HttpSessionMetadata implements SessionMetadata {
@Override
public String toString() {
return toStringHelper(getClass())
.add("system hash code", System.identityHashCode(this))
.add("clientId", getClientId())
.add("failedLoginAttempts", getFailedLoginAttempts())
.add("serviceExtensionUris", Joiner.on('.').join(nullToEmpty(getServiceExtensionUris())))