Skip to content

Commit 77c495c

Browse files
committed
Fix CS
1 parent 2b6fd11 commit 77c495c

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ protected boolean hasScaleWithId(final String id)
4040
{
4141
if(this.getOptions() != null
4242
&& this.getOptions().getScales() != null
43-
&& this.getOptions().getScales().getScalesList() != null)
43+
&& this.getOptions().getScales().getScales() != null)
4444
{
45-
return this.getOptions().getScales().getScalesList().get(id) != null;
45+
return this.getOptions().getScales().getScales().get(id) != null;
4646
}
4747
return false;
4848
}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/options/scale/Scales.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,19 @@
2525

2626
public class Scales
2727
{
28+
@SuppressWarnings("java:S1700")
2829
@JsonIgnore
29-
Map<String, Object> scalesList = new LinkedHashMap<>();
30+
Map<String, Object> scales = new LinkedHashMap<>();
3031

3132
@JsonAnyGetter
32-
public Map<String, Object> getScalesList()
33+
public Map<String, Object> getScales()
3334
{
34-
return this.scalesList;
35+
return this.scales;
3536
}
3637

3738
public Scales addScale(final String customScaleName, final AbstractCoreScaleOptions<?, ?> scale)
3839
{
39-
this.getScalesList().put(customScaleName, scale);
40+
this.getScales().put(customScaleName, scale);
4041
return this;
4142
}
4243

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,23 +160,23 @@ static Stream<Arguments> basicTest()
160160
}
161161

162162
private static <D extends HomogeneousData<D, S>, S extends Dataset<S, Number>> Supplier<D> createData(
163-
final Map<String, BigDecimal> defaultDataMap,
163+
final Map<String, BigDecimal> defaultData,
164164
final Supplier<D> dataSupplier,
165165
final Supplier<S> dataSetSupplier)
166166
{
167-
return createData(defaultDataMap, dataSupplier, dataSetSupplier, Map.Entry::getValue);
167+
return createData(defaultData, dataSupplier, dataSetSupplier, Map.Entry::getValue);
168168
}
169169

170170
private static <D extends HomogeneousData<D, S>, S extends Dataset<S, O>, O> Supplier<D> createData(
171-
final Map<String, BigDecimal> defaultDataMap,
171+
final Map<String, BigDecimal> defaultData,
172172
final Supplier<D> dataSupplier,
173173
final Supplier<S> dataSetSupplier,
174174
final Function<Map.Entry<String, BigDecimal>, O> addDataFunc)
175175
{
176176
return () -> {
177177
final S dataset = dataSetSupplier.get();
178178
final D data = dataSupplier.get().addDataset(dataset);
179-
for(final Map.Entry<String, BigDecimal> entry : defaultDataMap.entrySet())
179+
for(final Map.Entry<String, BigDecimal> entry : defaultData.entrySet())
180180
{
181181
data.addLabel(entry.getKey());
182182
dataset.addData(addDataFunc.apply(entry));

0 commit comments

Comments
 (0)