Skip to content

Commit 50f58e5

Browse files
jodastephenjodastephen
authored
Update dependencies, fix resulting code issues (#155)
* Update dependencies, fix resulting code issues * Remove mockito as it is not used
1 parent d5a5679 commit 50f58e5

23 files changed

Lines changed: 92 additions & 94 deletions

‎modules/common/src/main/java/com/opengamma/sdk/common/auth/AccessTokenResult.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ public int hashCode() {
151151
public String toString() {
152152
StringBuilder buf = new StringBuilder(128);
153153
buf.append("AccessTokenResult{");
154-
buf.append("accessToken").append('=').append(accessToken).append(',').append(' ');
155-
buf.append("tokenType").append('=').append(tokenType).append(',').append(' ');
154+
buf.append("accessToken").append('=').append(JodaBeanUtils.toString(accessToken)).append(',').append(' ');
155+
buf.append("tokenType").append('=').append(JodaBeanUtils.toString(tokenType)).append(',').append(' ');
156156
buf.append("expiresIn").append('=').append(JodaBeanUtils.toString(expiresIn));
157157
buf.append('}');
158158
return buf.toString();

‎modules/common/src/main/java/com/opengamma/sdk/common/auth/ApiKeyCredentials.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public int hashCode() {
116116
public String toString() {
117117
StringBuilder buf = new StringBuilder(96);
118118
buf.append("ApiKeyCredentials{");
119-
buf.append("apiKey").append('=').append(apiKey).append(',').append(' ');
119+
buf.append("apiKey").append('=').append(JodaBeanUtils.toString(apiKey)).append(',').append(' ');
120120
buf.append("secret").append('=').append(JodaBeanUtils.toString(secret));
121121
buf.append('}');
122122
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/CcpInfo.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public static CcpInfo of(
8484
String defaultCurrency,
8585
List<String> reportingCurrencies,
8686
List<String> calculationCurrencies) {
87+
8788
return new CcpInfo(
8889
valuationDates,
8990
defaultCurrency,
@@ -261,11 +262,11 @@ public int hashCode() {
261262
public String toString() {
262263
StringBuilder buf = new StringBuilder(224);
263264
buf.append("CcpInfo{");
264-
buf.append("valuationDates").append('=').append(valuationDates).append(',').append(' ');
265-
buf.append("defaultCurrency").append('=').append(defaultCurrency).append(',').append(' ');
266-
buf.append("reportingCurrencies").append('=').append(reportingCurrencies).append(',').append(' ');
267-
buf.append("calculationCurrencies").append('=').append(calculationCurrencies).append(',').append(' ');
268-
buf.append("calculationTypes").append('=').append(calculationTypes).append(',').append(' ');
265+
buf.append("valuationDates").append('=').append(JodaBeanUtils.toString(valuationDates)).append(',').append(' ');
266+
buf.append("defaultCurrency").append('=').append(JodaBeanUtils.toString(defaultCurrency)).append(',').append(' ');
267+
buf.append("reportingCurrencies").append('=').append(JodaBeanUtils.toString(reportingCurrencies)).append(',').append(' ');
268+
buf.append("calculationCurrencies").append('=').append(JodaBeanUtils.toString(calculationCurrencies)).append(',').append(' ');
269+
buf.append("calculationTypes").append('=').append(JodaBeanUtils.toString(calculationTypes)).append(',').append(' ');
269270
buf.append("calculationModes").append('=').append(JodaBeanUtils.toString(calculationModes));
270271
buf.append('}');
271272
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/ErrorMessage.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ public int hashCode() {
170170
public String toString() {
171171
StringBuilder buf = new StringBuilder(160);
172172
buf.append("ErrorMessage{");
173-
buf.append("status").append('=').append(status).append(',').append(' ');
174-
buf.append("reason").append('=').append(reason).append(',').append(' ');
175-
buf.append("message").append('=').append(message).append(',').append(' ');
173+
buf.append("status").append('=').append(JodaBeanUtils.toString(status)).append(',').append(' ');
174+
buf.append("reason").append('=').append(JodaBeanUtils.toString(reason)).append(',').append(' ');
175+
buf.append("message").append('=').append(JodaBeanUtils.toString(message)).append(',').append(' ');
176176
buf.append("type").append('=').append(JodaBeanUtils.toString(type));
177177
buf.append('}');
178178
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/LchMarginDetail.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,13 @@ public int hashCode() {
209209

210210
@Override
211211
public String toString() {
212-
StringBuilder buf = new StringBuilder(160);
212+
StringBuilder buf = new StringBuilder(192);
213213
buf.append("LchMarginDetail{");
214-
buf.append("totalMargin").append('=').append(totalMargin).append(',').append(' ');
215-
buf.append("baseScenarioIds").append('=').append(baseScenarioIds).append(',').append(' ');
216-
buf.append("indices").append('=').append(indices).append(',').append(' ');
217-
buf.append("scenarios").append('=').append(JodaBeanUtils.toString(scenarios));
214+
buf.append("totalMargin").append('=').append(JodaBeanUtils.toString(totalMargin)).append(',').append(' ');
215+
buf.append("baseScenarioIds").append('=').append(JodaBeanUtils.toString(baseScenarioIds)).append(',').append(' ');
216+
buf.append("indices").append('=').append(JodaBeanUtils.toString(indices)).append(',').append(' ');
217+
buf.append("scenarios").append('=').append(JodaBeanUtils.toString(scenarios)).append(',').append(' ');
218+
buf.append("ccp").append('=').append(JodaBeanUtils.toString(getCcp()));
218219
buf.append('}');
219220
return buf.toString();
220221
}
@@ -403,12 +404,13 @@ public LchMarginDetail build() {
403404
//-----------------------------------------------------------------------
404405
@Override
405406
public String toString() {
406-
StringBuilder buf = new StringBuilder(160);
407+
StringBuilder buf = new StringBuilder(192);
407408
buf.append("LchMarginDetail.Builder{");
408409
buf.append("totalMargin").append('=').append(JodaBeanUtils.toString(totalMargin)).append(',').append(' ');
409410
buf.append("baseScenarioIds").append('=').append(JodaBeanUtils.toString(baseScenarioIds)).append(',').append(' ');
410411
buf.append("indices").append('=').append(JodaBeanUtils.toString(indices)).append(',').append(' ');
411-
buf.append("scenarios").append('=').append(JodaBeanUtils.toString(scenarios));
412+
buf.append("scenarios").append('=').append(JodaBeanUtils.toString(scenarios)).append(',').append(' ');
413+
buf.append("ccp").append('=').append(JodaBeanUtils.toString(null));
412414
buf.append('}');
413415
return buf.toString();
414416
}

‎modules/margin/src/main/java/com/opengamma/sdk/margin/LchMarginIndex.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ public int hashCode() {
170170
public String toString() {
171171
StringBuilder buf = new StringBuilder(160);
172172
buf.append("LchMarginIndex{");
173-
buf.append("indexName").append('=').append(indexName).append(',').append(' ');
174-
buf.append("diversifiedBaseMargin").append('=').append(diversifiedBaseMargin).append(',').append(' ');
175-
buf.append("undiversifiedBaseMargin").append('=').append(undiversifiedBaseMargin).append(',').append(' ');
173+
buf.append("indexName").append('=').append(JodaBeanUtils.toString(indexName)).append(',').append(' ');
174+
buf.append("diversifiedBaseMargin").append('=').append(JodaBeanUtils.toString(diversifiedBaseMargin)).append(',').append(' ');
175+
buf.append("undiversifiedBaseMargin").append('=').append(JodaBeanUtils.toString(undiversifiedBaseMargin)).append(',').append(' ');
176176
buf.append("indexScenarioIds").append('=').append(JodaBeanUtils.toString(indexScenarioIds));
177177
buf.append('}');
178178
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/LchMarginScenario.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ public int hashCode() {
167167
public String toString() {
168168
StringBuilder buf = new StringBuilder(160);
169169
buf.append("LchMarginScenario{");
170-
buf.append("id").append('=').append(id).append(',').append(' ');
171-
buf.append("date").append('=').append(date).append(',').append(' ');
172-
buf.append("scaledPortfolioPnl").append('=').append(scaledPortfolioPnl).append(',').append(' ');
170+
buf.append("id").append('=').append(JodaBeanUtils.toString(id)).append(',').append(' ');
171+
buf.append("date").append('=').append(JodaBeanUtils.toString(date)).append(',').append(' ');
172+
buf.append("scaledPortfolioPnl").append('=').append(JodaBeanUtils.toString(scaledPortfolioPnl)).append(',').append(' ');
173173
buf.append("unscaledPortfolioPnl").append('=').append(JodaBeanUtils.toString(unscaledPortfolioPnl));
174174
buf.append('}');
175175
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/MarginBreakdown.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ public int hashCode() {
181181
public String toString() {
182182
StringBuilder buf = new StringBuilder(160);
183183
buf.append("MarginBreakdown{");
184-
buf.append("totalMargin").append('=').append(totalMargin).append(',').append(' ');
185-
buf.append("baseMargin").append('=').append(baseMargin).append(',').append(' ');
186-
buf.append("addOns").append('=').append(addOns).append(',').append(' ');
184+
buf.append("totalMargin").append('=').append(JodaBeanUtils.toString(totalMargin)).append(',').append(' ');
185+
buf.append("baseMargin").append('=').append(JodaBeanUtils.toString(baseMargin)).append(',').append(' ');
186+
buf.append("addOns").append('=').append(JodaBeanUtils.toString(addOns)).append(',').append(' ');
187187
buf.append("netLiquidatingValue").append('=').append(JodaBeanUtils.toString(netLiquidatingValue));
188188
buf.append('}');
189189
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/MarginCalcRequest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -515,14 +515,14 @@ public int hashCode() {
515515
public String toString() {
516516
StringBuilder buf = new StringBuilder(320);
517517
buf.append("MarginCalcRequest{");
518-
buf.append("calculationTypes").append('=').append(calculationTypes).append(',').append(' ');
519-
buf.append("mode").append('=').append(mode).append(',').append(' ');
520-
buf.append("valuationDate").append('=').append(valuationDate).append(',').append(' ');
521-
buf.append("applyClientMultiplier").append('=').append(applyClientMultiplier).append(',').append(' ');
522-
buf.append("reportingCurrency").append('=').append(reportingCurrency).append(',').append(' ');
523-
buf.append("calculationCurrency").append('=').append(calculationCurrency).append(',').append(' ');
524-
buf.append("portfolioData").append('=').append(portfolioData).append(',').append(' ');
525-
buf.append("fpmlPartySelectionRegex").append('=').append(fpmlPartySelectionRegex).append(',').append(' ');
518+
buf.append("calculationTypes").append('=').append(JodaBeanUtils.toString(calculationTypes)).append(',').append(' ');
519+
buf.append("mode").append('=').append(JodaBeanUtils.toString(mode)).append(',').append(' ');
520+
buf.append("valuationDate").append('=').append(JodaBeanUtils.toString(valuationDate)).append(',').append(' ');
521+
buf.append("applyClientMultiplier").append('=').append(JodaBeanUtils.toString(applyClientMultiplier)).append(',').append(' ');
522+
buf.append("reportingCurrency").append('=').append(JodaBeanUtils.toString(reportingCurrency)).append(',').append(' ');
523+
buf.append("calculationCurrency").append('=').append(JodaBeanUtils.toString(calculationCurrency)).append(',').append(' ');
524+
buf.append("portfolioData").append('=').append(JodaBeanUtils.toString(portfolioData)).append(',').append(' ');
525+
buf.append("fpmlPartySelectionRegex").append('=').append(JodaBeanUtils.toString(fpmlPartySelectionRegex)).append(',').append(' ');
526526
buf.append("portfolioOwnerCode").append('=').append(JodaBeanUtils.toString(portfolioOwnerCode));
527527
buf.append('}');
528528
return buf.toString();

‎modules/margin/src/main/java/com/opengamma/sdk/margin/MarginCalcResult.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -421,17 +421,17 @@ public int hashCode() {
421421
public String toString() {
422422
StringBuilder buf = new StringBuilder(416);
423423
buf.append("MarginCalcResult{");
424-
buf.append("status").append('=').append(status).append(',').append(' ');
425-
buf.append("calculationTypes").append('=').append(calculationTypes).append(',').append(' ');
426-
buf.append("mode").append('=').append(mode).append(',').append(' ');
427-
buf.append("valuationDate").append('=').append(valuationDate).append(',').append(' ');
428-
buf.append("reportingCurrency").append('=').append(reportingCurrency).append(',').append(' ');
429-
buf.append("calculationCurrency").append('=').append(calculationCurrency).append(',').append(' ');
430-
buf.append("applyClientMultiplier").append('=').append(applyClientMultiplier).append(',').append(' ');
431-
buf.append("portfolioItems").append('=').append(portfolioItems).append(',').append(' ');
432-
buf.append("margin").append('=').append(margin).append(',').append(' ');
433-
buf.append("marginDetail").append('=').append(marginDetail).append(',').append(' ');
434-
buf.append("tradeValuations").append('=').append(tradeValuations).append(',').append(' ');
424+
buf.append("status").append('=').append(JodaBeanUtils.toString(status)).append(',').append(' ');
425+
buf.append("calculationTypes").append('=').append(JodaBeanUtils.toString(calculationTypes)).append(',').append(' ');
426+
buf.append("mode").append('=').append(JodaBeanUtils.toString(mode)).append(',').append(' ');
427+
buf.append("valuationDate").append('=').append(JodaBeanUtils.toString(valuationDate)).append(',').append(' ');
428+
buf.append("reportingCurrency").append('=').append(JodaBeanUtils.toString(reportingCurrency)).append(',').append(' ');
429+
buf.append("calculationCurrency").append('=').append(JodaBeanUtils.toString(calculationCurrency)).append(',').append(' ');
430+
buf.append("applyClientMultiplier").append('=').append(JodaBeanUtils.toString(applyClientMultiplier)).append(',').append(' ');
431+
buf.append("portfolioItems").append('=').append(JodaBeanUtils.toString(portfolioItems)).append(',').append(' ');
432+
buf.append("margin").append('=').append(JodaBeanUtils.toString(margin)).append(',').append(' ');
433+
buf.append("marginDetail").append('=').append(JodaBeanUtils.toString(marginDetail)).append(',').append(' ');
434+
buf.append("tradeValuations").append('=').append(JodaBeanUtils.toString(tradeValuations)).append(',').append(' ');
435435
buf.append("failures").append('=').append(JodaBeanUtils.toString(failures));
436436
buf.append('}');
437437
return buf.toString();

0 commit comments

Comments
 (0)