Apply pmd improvements

Author: AB-xdev

chartjs-java-model/src/main/java/software/xdev/chartjs/model/EnumNameToCamelCase.java

@@ -35,8 +35,8 @@ public static String getName(final Enum<?> e)
 			}
 			else
 			{
-				sb.append(s.substring(0, 1).toUpperCase(Locale.ENGLISH));
-				sb.append(s.substring(1).toLowerCase(Locale.ENGLISH));
+				sb.append(s.substring(0, 1).toUpperCase(Locale.ENGLISH))
+					.append(s.substring(1).toLowerCase(Locale.ENGLISH));
 			}
 		}
 		return sb.toString();

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/BarChart.java

@@ -106,15 +106,4 @@ public boolean isDrawable()
 		}
 		return sufficientData;
 	}
-	
-	private boolean hasScaleWithId(final String id)
-	{
-		if(this.getOptions() != null
-			&& this.getOptions().getScales() != null
-			&& this.getOptions().getScales().getScalesList() != null)
-		{
-			return this.getOptions().getScales().getScalesList().get(id) != null;
-		}
-		return false;
-	}
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/HomogeneousChart.java

@@ -35,4 +35,15 @@ protected HomogeneousChart(final D data, final O options)
 	{
 		super(data, options);
 	}
+	
+	protected boolean hasScaleWithId(final String id)
+	{
+		if(this.getOptions() != null
+			&& this.getOptions().getScales() != null
+			&& this.getOptions().getScales().getScalesList() != null)
+		{
+			return this.getOptions().getScales().getScalesList().get(id) != null;
+		}
+		return false;
+	}
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/LineChart.java

@@ -95,14 +95,4 @@ public boolean isDrawable()
 		}
 		return sufficientData;
 	}
-	
-	private boolean hasScaleWithId(final String id)
-	{
-		if(this.getOptions() != null && this.getOptions().getScales() != null
-			&& this.getOptions().getScales().getScalesList() != null)
-		{
-			return this.getOptions().getScales().getScalesList().get(id) != null;
-		}
-		return false;
-	}
 }

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/ScatterChart.java

@@ -96,15 +96,4 @@ public boolean isDrawable()
 		}
 		return sufficientData;
 	}
-	
-	private boolean hasScaleWithId(final String id)
-	{
-		if(this.getOptions() != null
-			&& this.getOptions().getScales() != null
-			&& this.getOptions().getScales().getScalesList() != null)
-		{
-			return this.getOptions().getScales().getScalesList().get(id) != null;
-		}
-		return false;
-	}
 }

chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java

@@ -89,21 +89,6 @@ void testScale(final BiConsumer<BarDataset, BigDecimal> addDataFunc)
 	@Test
 	void testStacked()
 	{
-		final BarDataset dataset1 = new BarDataset()
-			.setLabel("First stack")
-			.setData(65, 59, 80)
-			.addBackgroundColors(Color.RED, Color.RED, Color.RED);
-		
-		final BarDataset dataset2 = new BarDataset()
-			.setLabel("Second stack")
-			.setData(28, 45, 10)
-			.addBackgroundColors(Color.GREEN, Color.GREEN, Color.GREEN);
-		
-		final BarData data = new BarData()
-			.addLabels("First", "Second", "Third")
-			.addDataset(dataset1)
-			.addDataset(dataset2);
-		
 		final BarOptions options = new BarOptions()
 			.setAnimation(false);
 		options
@@ -112,7 +97,7 @@ void testStacked()
 			.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
 
 		this.createScreenshotAndCompare(
-			new BarChart(data, options),
+			new BarChart(createDefaultTwoDatasetBarData(), options),
 			this.getWebContainer(),
 			"Stacked"
 		);
@@ -147,21 +132,6 @@ void testTicked()
 	@Test
 	void testStackedHorizontal()
 	{
-		final BarDataset dataset1 = new BarDataset()
-			.setLabel("First stack")
-			.setData(65, 59, 80)
-			.addBackgroundColors(Color.RED, Color.RED, Color.RED);
-		
-		final BarDataset dataset2 = new BarDataset()
-			.setLabel("Second stack")
-			.setData(28, 45, 10)
-			.addBackgroundColors(Color.GREEN, Color.GREEN, Color.GREEN);
-		
-		final BarData data = new BarData()
-			.addLabels("First", "Second", "Third")
-			.addDataset(dataset1)
-			.addDataset(dataset2);
-		
 		final BarOptions options = new BarOptions()
 			.setAnimation(false)
 			.setIndexAxis(BarOptions.IndexAxis.Y);
@@ -171,7 +141,7 @@ void testStackedHorizontal()
 			.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
 
 		this.createScreenshotAndCompare(
-			new BarChart(data, options),
+			new BarChart(createDefaultTwoDatasetBarData(), options),
 			this.getWebContainer(),
 			"StackedHorizontal"
 		);
@@ -219,4 +189,22 @@ void testStackedWithGroups()
 			"StackedWithGroups"
 		);
 	}
+	
+	static BarData createDefaultTwoDatasetBarData()
+	{
+		final BarDataset dataset1 = new BarDataset()
+			.setLabel("First stack")
+			.setData(65, 59, 80)
+			.addBackgroundColors(Color.RED, Color.RED, Color.RED);
+		
+		final BarDataset dataset2 = new BarDataset()
+			.setLabel("Second stack")
+			.setData(28, 45, 10)
+			.addBackgroundColors(Color.GREEN, Color.GREEN, Color.GREEN);
+		
+		return new BarData()
+			.addLabels("First", "Second", "Third")
+			.addDataset(dataset1)
+			.addDataset(dataset2);
+	}
 }