SonarQube fixes

benoitx · benoitx · commit 4491dd79f19a · 2017-12-10T19:25:27.000Z
diff --git a/fxcalc/src/main/java/net/objectlab/kit/fxcalc/FxRateCalculatorImpl.java b/fxcalc/src/main/java/net/objectlab/kit/fxcalc/FxRateCalculatorImpl.java
@@ -71,21 +71,26 @@ public Optional<FxRate> findFx(final CurrencyPair ccyPair) {
                     rates.put(ccyPair, fxRate);
                 }
             } else {
-                for (final String crossCcy : orderedCurrenciesForCross) {
-                    fxRate = findViaCrossCcy(ccyPair, crossCcy);
-                    if (fxRate != null) {
-                        if (cacheResults) {
-                            rates.put(ccyPair, fxRate);
-                        }
-                        break;
-                    }
-                }
+                fxRate = tryFindViaCrossCcy(ccyPair, fxRate);
             }
         }
 
         return Optional.ofNullable(fxRate);
     }
 
+    private FxRate tryFindViaCrossCcy(final CurrencyPair ccyPair, FxRate fxRate) {
+        for (final String crossCcy : orderedCurrenciesForCross) {
+            fxRate = findViaCrossCcy(ccyPair, crossCcy);
+            if (fxRate != null) {
+                if (cacheResults) {
+                    rates.put(ccyPair, fxRate);
+                }
+                break;
+            }
+        }
+        return fxRate;
+    }
+
     private FxRate findViaCrossCcy(final CurrencyPair ccyPair, final String crossCcy) {
         final CurrencyPair xCcyPair = CurrencyPair.of(crossCcy, ccyPair.getCcy1());
         FxRate xCcy1 = getBaseRate(xCcyPair);
diff --git a/portfolio/src/main/java/net/objectlab/kit/pf/package.html b/portfolio/src/main/java/net/objectlab/kit/pf/package.html
@@ -1,6 +1,7 @@
 <!-- Copyright ObjectLab Kit: http://objectlabkit.sf.net -->
 <!DOCTYPE html>
 <html>
+<head><title>Portfolio Validation</title></head>
 <body>
 <p>New to 1.5.0: Portfolio Validation framework.</p>
 </body>
diff --git a/utils/src/main/java/net/objectlab/kit/console/ConsoleMenu.java b/utils/src/main/java/net/objectlab/kit/console/ConsoleMenu.java
@@ -130,33 +130,40 @@ public void displayMenu() {
             } while ((opt <= 0 || opt > methods.size()) && opt != EXIT_CODE);
 
             if (opt == EXIT_CODE) {
-                ConsoleMenu.println("Exiting menu");
-                try {
-                    final Method meth = target.getClass().getMethod("tearDown", new Class[0]);
-                    if (meth != null) {
-                        meth.invoke(target, new Object());
-                    }
-                } catch (final Exception e) {
-                    log(e);
-                }
-
+                callTearDownIfRequired();
                 return;
             }
 
-            // now call the method
-            final String method = methods.get(opt - 1);
-            final Boolean repeat = askForRepeat.get(opt - 1);
+            callMenuOption(opt);
+        }
+    }
 
-            try {
-                final Method meth = target.getClass().getMethod(method, new Class[0]);
-                if (repeat) {
-                    target.repeat(meth);
-                } else {
-                    meth.invoke(target, new Object[0]);
-                }
-            } catch (final Exception e) {
-                log(e);
+    private void callMenuOption(int opt) {
+        // now call the method
+        final String method = methods.get(opt - 1);
+        final Boolean repeat = askForRepeat.get(opt - 1);
+
+        try {
+            final Method meth = target.getClass().getMethod(method, new Class[0]);
+            if (repeat) {
+                target.repeat(meth);
+            } else {
+                meth.invoke(target, new Object[0]);
             }
+        } catch (final Exception e) {
+            log(e);
+        }
+    }
+
+    private void callTearDownIfRequired() {
+        ConsoleMenu.println("Exiting menu");
+        try {
+            final Method meth = target.getClass().getMethod("tearDown", new Class[0]);
+            if (meth != null) {
+                meth.invoke(target, new Object());
+            }
+        } catch (final Exception e) {
+            log(e);
         }
     }
 
diff --git a/utils/src/main/java/net/objectlab/kit/util/FrequencyBucketDistribution.java b/utils/src/main/java/net/objectlab/kit/util/FrequencyBucketDistribution.java
@@ -17,27 +17,27 @@ public class FrequencyBucketDistribution {
     private final List<Bucket> orderedBuckets;
 
     public static class Bucket {
-        private final BigDecimal bucket;
+        private final BigDecimal bucketValue;
         private long count;
 
         public Bucket(final BigDecimal bucket) {
-            this.bucket = bucket;
+            this.bucketValue = bucket;
         }
 
         public void incrementCount() {
             count++;
         }
 
         public BigDecimal getBucket() {
-            return bucket;
+            return bucketValue;
         }
 
         public long getCount() {
             return count;
         }
 
         public boolean isUpperLimit() {
-            return bucket == null;
+            return bucketValue == null;
         }
     }
 
@@ -47,7 +47,7 @@ public boolean isUpperLimit() {
      */
     public FrequencyBucketDistribution(final List<BigDecimal> buckets) {
         if (buckets != null) {
-            orderedBuckets = buckets.stream().map(t -> new Bucket(t)).sorted((o1, o2) -> o1.bucket.compareTo(o2.bucket)).collect(Collectors.toList());
+            orderedBuckets = buckets.stream().map(t -> new Bucket(t)).sorted((o1, o2) -> o1.bucketValue.compareTo(o2.bucketValue)).collect(Collectors.toList());
             orderedBuckets.add(new Bucket(null)); // upper limit
         } else {
             orderedBuckets = Collections.emptyList();

Original file line number	Diff line number	Diff line change
`@@ -17,27 +17,27 @@ public class FrequencyBucketDistribution {`
`17`	`17`	`private final List<Bucket> orderedBuckets;`
`18`	`18`
`19`	`19`	`public static class Bucket {`
`20`		`- private final BigDecimal bucket;`
	`20`	`+ private final BigDecimal bucketValue;`
`21`	`21`	`private long count;`
`22`	`22`
`23`	`23`	`public Bucket(final BigDecimal bucket) {`
`24`		`- this.bucket = bucket;`
	`24`	`+ this.bucketValue = bucket;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public void incrementCount() {`
`28`	`28`	`count++;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public BigDecimal getBucket() {`
`32`		`- return bucket;`
	`32`	`+ return bucketValue;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public long getCount() {`
`36`	`36`	`return count;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public boolean isUpperLimit() {`
`40`		`- return bucket == null;`
	`40`	`+ return bucketValue == null;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`@@ -47,7 +47,7 @@ public boolean isUpperLimit() {`
`47`	`47`	`*/`
`48`	`48`	`public FrequencyBucketDistribution(final List<BigDecimal> buckets) {`
`49`	`49`	`if (buckets != null) {`
`50`		`- orderedBuckets = buckets.stream().map(t -> new Bucket(t)).sorted((o1, o2) -> o1.bucket.compareTo(o2.bucket)).collect(Collectors.toList());`
	`50`	`+ orderedBuckets = buckets.stream().map(t -> new Bucket(t)).sorted((o1, o2) -> o1.bucketValue.compareTo(o2.bucketValue)).collect(Collectors.toList());`
`51`	`51`	`orderedBuckets.add(new Bucket(null)); // upper limit`
`52`	`52`	`} else {`
`53`	`53`	`orderedBuckets = Collections.emptyList();`