Merge pull request #47 from otaviojava/master

Otávio Santana · Otávio Santana · commit 78511f74df79 · 2014-10-20T19:09:15.000-02:00
slight improvement in performance and save memory
diff --git a/src/main/java/org/javamoney/moneta/BuildableCurrencyUnit.java b/src/main/java/org/javamoney/moneta/BuildableCurrencyUnit.java
@@ -122,7 +122,7 @@ public boolean equals(Object obj) {
     @Override
     public String toString(){
         return "BuildableCurrencyUnit(currencyCode=" + currencyCode + ", numericCode=" + numericCode +
-                ", defaultFractionDigits=" + defaultFractionDigits + ", context="+this.currencyContext+")";
+                ", defaultFractionDigits=" + defaultFractionDigits + ", context="+this.currencyContext+ ')';
     }
 
 
diff --git a/src/main/java/org/javamoney/moneta/DefaultExchangeRate.java b/src/main/java/org/javamoney/moneta/DefaultExchangeRate.java
@@ -236,7 +236,7 @@ public int compareTo(ExchangeRate o){
      */
     @Override
     public String toString(){
-        return "ExchangeRate [base=" + base + ", factor=" + factor + ", conversionContext=" + conversionContext + "]";
+        return "ExchangeRate [base=" + base + ", factor=" + factor + ", conversionContext=" + conversionContext + ']';
     }
 
     /*
diff --git a/src/main/java/org/javamoney/moneta/format/internal/CurrencyToken.java b/src/main/java/org/javamoney/moneta/format/internal/CurrencyToken.java
@@ -236,7 +236,7 @@ public void print(Appendable appendable, MonetaryAmount amount)
 	 */
 	@Override
 	public String toString() {
-		return "CurrencyToken [locale=" + locale + ", style=" + style + "]";
+		return "CurrencyToken [locale=" + locale + ", style=" + style + ']';
 	}
 
 }
diff --git a/src/main/java/org/javamoney/moneta/format/internal/LiteralToken.java b/src/main/java/org/javamoney/moneta/format/internal/LiteralToken.java
@@ -85,7 +85,7 @@ public void print(Appendable appendable, MonetaryAmount amount)
 	 */
 	@Override
 	public String toString() {
-		return "LiteralToken [token=" + token + "]";
+		return "LiteralToken [token=" + token + ']';
 	}
 
 }
diff --git a/src/main/java/org/javamoney/moneta/format/internal/ParseContext.java b/src/main/java/org/javamoney/moneta/format/internal/ParseContext.java
@@ -283,7 +283,7 @@ public String toString() {
 		return "ParseContext [index=" + index + ", errorIndex=" + errorIndex
 				+ ", originalInput='" + originalInput + "', parsedNumber="
 				+ parsedNumber + "', parsedCurrency=" + parsedCurrency
-				+ "]";
+				+ ']';
 	}
 
 	public CurrencyUnit getParsedCurrency() {
diff --git a/src/main/java/org/javamoney/moneta/function/DefaultMonetarySummaryStatistics.java b/src/main/java/org/javamoney/moneta/function/DefaultMonetarySummaryStatistics.java
@@ -141,12 +141,12 @@ public int hashCode() {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
-		sb.append("[currency: ").append(empty.getCurrency()).append(",");
-		sb.append("count:").append(count).append(",");
-		sb.append("min:").append(min).append(",");
-		sb.append("max:").append(max).append(",");
-		sb.append("sum:").append(sum).append(",");
-		sb.append("average:").append(average).append("]");
+		sb.append("[currency: ").append(empty.getCurrency()).append(',');
+		sb.append("count:").append(count).append(',');
+		sb.append("min:").append(min).append(',');
+		sb.append("max:").append(max).append(',');
+		sb.append("sum:").append(sum).append(',');
+		sb.append("average:").append(average).append(']');
 		return sb.toString();
 	}
 
diff --git a/src/main/java/org/javamoney/moneta/internal/ConfigurableCurrencyUnitProvider.java b/src/main/java/org/javamoney/moneta/internal/ConfigurableCurrencyUnitProvider.java
@@ -117,7 +117,7 @@ public static CurrencyUnit removeCurrencyUnit(Locale locale){
     @Override
     public String toString(){
         return "ConfigurableCurrencyUnitProvider [currencyUnits=" + currencyUnits + ", currencyUnitsByLocale=" +
-                currencyUnitsByLocale + "]";
+                currencyUnitsByLocale + ']';
     }
 
 }
diff --git a/src/main/java/org/javamoney/moneta/loader/internal/DefaultLoaderService.java b/src/main/java/org/javamoney/moneta/loader/internal/DefaultLoaderService.java
@@ -549,7 +549,7 @@ protected long parseDuration(String value) {
 
     @Override
     public String toString() {
-        return "DefaultLoaderService [resources=" + resources + "]";
+        return "DefaultLoaderService [resources=" + resources + ']';
     }
 
 
diff --git a/src/main/java/org/javamoney/moneta/loader/internal/DefaultResourceCache.java b/src/main/java/org/javamoney/moneta/loader/internal/DefaultResourceCache.java
@@ -234,7 +234,7 @@ private byte[] readFile(File f){
 
     @Override
     public String toString(){
-        return "DefaultResourceCache [localDir=" + localDir + ", cachedResources=" + cachedResources + "]";
+        return "DefaultResourceCache [localDir=" + localDir + ", cachedResources=" + cachedResources + ']';
     }
 
 }
diff --git a/src/main/java/org/javamoney/moneta/loader/internal/LoadableResource.java b/src/main/java/org/javamoney/moneta/loader/internal/LoadableResource.java
@@ -417,7 +417,7 @@ public boolean resetToFallback() throws IOException {
     public String toString() {
         return "LoadableResource [resourceId=" + resourceId + ", fallbackLocation=" +
                 fallbackLocation + ", remoteResources=" + remoteResources +
-                ", loadCount=" + loadCount + ", accessCount=" + accessCount + ", lastLoaded=" + lastLoaded + "]";
+                ", loadCount=" + loadCount + ", accessCount=" + accessCount + ", lastLoaded=" + lastLoaded + ']';
     }
 
     /**
diff --git a/src/main/java/org/javamoney/moneta/spi/AbstractCurrencyConversion.java b/src/main/java/org/javamoney/moneta/spi/AbstractCurrencyConversion.java
@@ -92,7 +92,7 @@ public ConversionContext getConversionContext(){
      */
     @Override
 	public MonetaryAmount apply(MonetaryAmount amount){
-		if (getCurrency().equals(Objects.requireNonNull(amount).getCurrency())) {
+		if (termCurrency.equals(Objects.requireNonNull(amount).getCurrency())) {
 			return amount;
 		}
         ExchangeRate rate = getExchangeRate(amount);
@@ -111,7 +111,7 @@ public MonetaryAmount apply(MonetaryAmount amount){
      */
     @Override
     public String toString(){
-        return getClass().getName() + " [MonetaryAmount -> MonetaryAmount" + "]";
+        return getClass().getName() + " [MonetaryAmount -> MonetaryAmount" + ']';
     }
 
 }
diff --git a/src/main/java/org/javamoney/moneta/spi/LazyBoundCurrencyConversion.java b/src/main/java/org/javamoney/moneta/spi/LazyBoundCurrencyConversion.java
@@ -70,7 +70,7 @@ public CurrencyConversion with(ConversionContext conversionContext){
     @Override
     public String toString(){
         return "CurrencyConversion [MonetaryAmount -> MonetaryAmount; provider=" + rateProvider + ", context=" +
-                getConversionContext() + ", termCurrency=" + getCurrency() + "]";
+                getConversionContext() + ", termCurrency=" + getCurrency() + ']';
     }
 
 }
diff --git a/src/test/java/org/javamoney/moneta/convert/TestMonetaryConversionSingletonSpi.java b/src/test/java/org/javamoney/moneta/convert/TestMonetaryConversionSingletonSpi.java
@@ -55,12 +55,12 @@ public boolean isConversionAvailable(ConversionQuery conversionQuery){
 
     @Override
     public List<String> getProviderNames(){
-        return Arrays.asList("test");
+        return Collections.singletonList("test");
     }
 
     @Override
     public List<String> getDefaultProviderChain(){
-        return Arrays.asList("test");
+        return Collections.singletonList("test");
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public boolean equals(Object obj) {`
`122`	`122`	`@Override`
`123`	`123`	`public String toString(){`
`124`	`124`	`return "BuildableCurrencyUnit(currencyCode=" + currencyCode + ", numericCode=" + numericCode +`
`125`		`- ", defaultFractionDigits=" + defaultFractionDigits + ", context="+this.currencyContext+")";`
	`125`	`+ ", defaultFractionDigits=" + defaultFractionDigits + ", context="+this.currencyContext+ ')';`
`126`	`126`	`}`
`127`	`127`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public int compareTo(ExchangeRate o){`
`236`	`236`	`*/`
`237`	`237`	`@Override`
`238`	`238`	`public String toString(){`
`239`		`- return "ExchangeRate [base=" + base + ", factor=" + factor + ", conversionContext=" + conversionContext + "]";`
	`239`	`+ return "ExchangeRate [base=" + base + ", factor=" + factor + ", conversionContext=" + conversionContext + ']';`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public void print(Appendable appendable, MonetaryAmount amount)`
`236`	`236`	`*/`
`237`	`237`	`@Override`
`238`	`238`	`public String toString() {`
`239`		`- return "CurrencyToken [locale=" + locale + ", style=" + style + "]";`
	`239`	`+ return "CurrencyToken [locale=" + locale + ", style=" + style + ']';`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public void print(Appendable appendable, MonetaryAmount amount)`
`85`	`85`	`*/`
`86`	`86`	`@Override`
`87`	`87`	`public String toString() {`
`88`		`- return "LiteralToken [token=" + token + "]";`
	`88`	`+ return "LiteralToken [token=" + token + ']';`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public String toString() {`
`283`	`283`	`return "ParseContext [index=" + index + ", errorIndex=" + errorIndex`
`284`	`284`	`+ ", originalInput='" + originalInput + "', parsedNumber="`
`285`	`285`	`+ parsedNumber + "', parsedCurrency=" + parsedCurrency`
`286`		`- + "]";`
	`286`	`+ + ']';`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`public CurrencyUnit getParsedCurrency() {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public static CurrencyUnit removeCurrencyUnit(Locale locale){`
`117`	`117`	`@Override`
`118`	`118`	`public String toString(){`
`119`	`119`	`return "ConfigurableCurrencyUnitProvider [currencyUnits=" + currencyUnits + ", currencyUnitsByLocale=" +`
`120`		`- currencyUnitsByLocale + "]";`
	`120`	`+ currencyUnitsByLocale + ']';`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ protected long parseDuration(String value) {`
`549`	`549`
`550`	`550`	`@Override`
`551`	`551`	`public String toString() {`
`552`		`- return "DefaultLoaderService [resources=" + resources + "]";`
	`552`	`+ return "DefaultLoaderService [resources=" + resources + ']';`
`553`	`553`	`}`
`554`	`554`
`555`	`555`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ private byte[] readFile(File f){`
`234`	`234`
`235`	`235`	`@Override`
`236`	`236`	`public String toString(){`
`237`		`- return "DefaultResourceCache [localDir=" + localDir + ", cachedResources=" + cachedResources + "]";`
	`237`	`+ return "DefaultResourceCache [localDir=" + localDir + ", cachedResources=" + cachedResources + ']';`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ public boolean resetToFallback() throws IOException {`
`417`	`417`	`public String toString() {`
`418`	`418`	`return "LoadableResource [resourceId=" + resourceId + ", fallbackLocation=" +`
`419`	`419`	`fallbackLocation + ", remoteResources=" + remoteResources +`
`420`		`- ", loadCount=" + loadCount + ", accessCount=" + accessCount + ", lastLoaded=" + lastLoaded + "]";`
	`420`	`+ ", loadCount=" + loadCount + ", accessCount=" + accessCount + ", lastLoaded=" + lastLoaded + ']';`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`/**`