You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2026/06/03 15:08:50 UTC
(syncope) 04/04: Cleaning after AI-supported code
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 7fd3d9dca8987ac02376de2cd20dad191334d96e
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Jun 3 16:37:36 2026 +0200
Cleaning after AI-supported code
---
.../syncope/client/console/chartjs/Chart.java | 7 ++-
.../client/console/chartjs/ChartJSPanel.java | 27 +++++++++--
.../client/console/chartjs/ChartJSRenderer.java | 52 ----------------------
.../client/console/chartjs/data/ChartData.java | 2 +-
.../client/console/chartjs/data/Dataset.java | 2 +-
.../client/console/widgets/CompletenessWidget.java | 12 ++---
.../syncope/client/console/widgets/LoadWidget.java | 16 +++----
.../console/widgets/UsersByStatusWidget.java | 5 +--
8 files changed, 43 insertions(+), 80 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/Chart.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/Chart.java
index 6eae948aa8..fa32a540bc 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/Chart.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/Chart.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.syncope.client.console.chartjs;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -31,7 +30,7 @@ public class Chart implements Serializable {
private ChartType type;
- private ChartData<?> data = new ChartData<>();
+ private ChartData data = new ChartData();
private ChartOptions options;
@@ -43,11 +42,11 @@ public class Chart implements Serializable {
this.type = type;
}
- public ChartData<?> getData() {
+ public ChartData getData() {
return data;
}
- public void setData(final ChartData<?> data) {
+ public void setData(final ChartData data) {
this.data = data;
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
index 120813defa..f51a0d5c22 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
@@ -18,20 +18,27 @@
*/
package org.apache.syncope.client.console.chartjs;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.json.JsonMapper;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ChartJSPanel extends Panel {
private static final long serialVersionUID = -8670277955339192068L;
+ private static final Logger LOG = LoggerFactory.getLogger(ChartJSPanel.class);
+
+ private static final JsonMapper MAPPER = JsonMapper.builder().
+ findAndAddModules().defaultPropertyInclusion(JsonInclude.Value.ALL_NON_NULL).build();
+
private final IModel<Chart> model;
private final WebMarkupContainer container;
- private final ChartJSRenderer renderer = new ChartJSRenderer();
-
public ChartJSPanel(final String id, final IModel<Chart> model) {
super(id, model);
@@ -49,6 +56,20 @@ public class ChartJSPanel extends Panel {
}
public String generateChart(final String markupId) {
- return renderer.render(markupId, model.getObject());
+ try {
+ String data = MAPPER.writeValueAsString(model.getObject().getData());
+ String options = MAPPER.writeValueAsString(model.getObject().getOptions());
+
+ return "WicketCharts['" + markupId + "'] = new Chart("
+ + "getChartCtx('" + markupId + "'),"
+ + "{"
+ + "type: '" + model.getObject().getType() + "',"
+ + "data: " + data + ","
+ + "options: " + options
+ + "});";
+ } catch (Exception e) {
+ LOG.error("Error rendering chart JS", e);
+ return "";
+ }
}
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSRenderer.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSRenderer.java
deleted file mode 100644
index b56bf06188..0000000000
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSRenderer.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.syncope.client.console.chartjs;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ChartJSRenderer {
-
- private static final Logger LOG = LoggerFactory.getLogger(ChartJSRenderer.class);
-
- private static final ObjectMapper MAPPER = new ObjectMapper()
- .setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
-
- public String render(final String markupId, final Chart chart) {
- try {
- String data = MAPPER.writeValueAsString(chart.getData());
- String options = MAPPER.writeValueAsString(chart.getOptions());
-
- return "WicketCharts['" + markupId + "'] = new Chart("
- + "getChartCtx('" + markupId + "'),"
- + "{"
- + "type: '" + chart.getType() + "',"
- + "data: " + data + ","
- + "options: " + options
- + "});";
-
- } catch (Exception e) {
- LOG.error("Error rendering chart JS", e);
- return "";
- }
- }
-}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/ChartData.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/ChartData.java
index a2c6350740..d0e1dc4703 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/ChartData.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/ChartData.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ChartData<T extends Dataset> implements Serializable {
+public class ChartData implements Serializable {
private static final long serialVersionUID = -8489073681001237058L;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/Dataset.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/Dataset.java
index 5fb7e0575c..7e7002e9e4 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/Dataset.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/data/Dataset.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
@JsonInclude(JsonInclude.Include.NON_NULL)
-public abstract class Dataset implements Serializable {
+public class Dataset implements Serializable {
private static final long serialVersionUID = -9143409945075593686L;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
index 181f13adde..f90321d2e8 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
@@ -128,25 +128,24 @@ public class CompletenessWidget extends BaseWidget {
long donePercentage = total == 0 ? 0 : Math.round((double) done * 100 / total);
long todoPercentage = total == 0 ? 0 : 100 - donePercentage;
- final Chart resultChart = new Chart();
+ Chart resultChart = new Chart();
resultChart.setType(ChartType.doughnut);
resultChart.getOptions().setResponsive(true);
resultChart.getOptions().setMaintainAspectRatio(true);
- final TooltipOptions tooltip = new TooltipOptions();
+ TooltipOptions tooltip = new TooltipOptions();
tooltip.setEnabled(true);
- final TooltipCallback callbacks = new TooltipCallback();
+ TooltipCallback callbacks = new TooltipCallback();
callbacks.setLabel("function(context) {return context.label;}");
tooltip.setCallbacks(callbacks);
- final Plugins plugins = new Plugins();
+ Plugins plugins = new Plugins();
plugins.setTooltip(tooltip);
resultChart.getOptions().setPlugins(plugins);
- final Dataset ds = new Dataset() {
- };
+ Dataset ds = new Dataset();
ds.getBackgroundColor().add("green");
ds.getBackgroundColor().add("red");
ds.getBorderColor().add("green");
@@ -157,6 +156,7 @@ public class CompletenessWidget extends BaseWidget {
resultChart.getData().getLabels().add(getString("done") + " (" + donePercentage + "%)");
resultChart.getData().getLabels().add(getString("todo") + " (" + todoPercentage + "%)");
resultChart.getData().getDatasets().add(ds);
+
return Pair.of(resultChart, todo);
}
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
index a5b0956923..f447e940a7 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java
@@ -50,13 +50,11 @@ public class LoadWidget extends BaseWidget {
}
private static Chart build(final SystemInfo systeminfo) {
-
- final List<Double> cpuValues = new ArrayList<>();
- final List<Long> memValues = new ArrayList<>();
- final List<String> labels = new ArrayList<>();
+ List<Double> cpuValues = new ArrayList<>();
+ List<Long> memValues = new ArrayList<>();
+ List<String> labels = new ArrayList<>();
systeminfo.load().forEach(instant -> {
-
labels.add(DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT.format(
systeminfo.startTime() + instant.uptime()
));
@@ -65,23 +63,21 @@ public class LoadWidget extends BaseWidget {
memValues.add(instant.totalMemory());
});
- Dataset cpu = new Dataset() {
- };
+ Dataset cpu = new Dataset();
cpu.getLabel().add("CPU");
cpu.getData().addAll(cpuValues);
cpu.getBorderColor().add("purple");
cpu.getBackgroundColor().add("purple");
cpu.setTension(0.4);
- Dataset mem = new Dataset() {
- };
+ Dataset mem = new Dataset();
mem.getLabel().add("MEM");
mem.getData().addAll(memValues);
mem.getBorderColor().add("grey");
mem.getBackgroundColor().add("grey");
mem.setTension(0.4);
- ChartData<Dataset> data = new ChartData<>();
+ ChartData data = new ChartData();
data.getLabels().addAll(labels);
data.getDatasets().addAll(List.of(cpu, mem));
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java
index fc7e0bcd34..be105ab6cc 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/UsersByStatusWidget.java
@@ -61,8 +61,7 @@ public class UsersByStatusWidget extends BaseWidget {
colors.add(COLORS[i % COLORS.length]);
}
- Dataset dataset = new Dataset() {
- };
+ Dataset dataset = new Dataset();
dataset.getData().addAll(values);
dataset.getBackgroundColor().addAll(colors);
dataset.getBorderColor().addAll(colors);
@@ -70,7 +69,7 @@ public class UsersByStatusWidget extends BaseWidget {
List<Dataset> datasets = new ArrayList<>();
datasets.add(dataset);
- ChartData<Dataset> data = new ChartData<>();
+ ChartData data = new ChartData();
data.getLabels().addAll(labels);
data.getDatasets().addAll(datasets);