> Multimap<String, Object> queryParams = addQueryParams(tokenValues, > invocation); > - Multimap<String, String> headers = buildHeaders(tokenValues, > invocation); > + > + Multimap<String, String> headers; > + > + if (caller != null) { > + headers = buildHeaders(tokenValues, caller); > + headers.putAll(buildHeaders(tokenValues, invocation)); > + } else { > + headers = buildHeaders(tokenValues, invocation);
I originally had something like that but then I found 2 other places within the apply method that had the style I eventually used. I opted to go for consistency rather than leaving the reader to guess why 3 things that were functionally equivalent were written differently. We could always refactor all 3 as a next step. --- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/226/files#r8235183