Commit a6cbf805 authored by Gianluca Filippone's avatar Gianluca Filippone Committed by Francesco Chicchiricco
Browse files

[CRV-280] Refactoring of Choreography Client Console and Choreography REST client methods

parent b56d1280
......@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.panels.AVGOperationDirectoryPanel;
import org.apache.syncope.client.console.panels.ChartsLegendPanel;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.widgets.StatsWidget;
import org.apache.syncope.client.console.widgets.LabeledBarDataSet;
import org.apache.syncope.client.console.widgets.LabeledDoughnutChartData;
......@@ -44,7 +44,7 @@ public class AVGCDDetailPage extends BaseExtPage {
public static final String PREF_STATS_PAGINATOR_ROWS = "stats.paginator.rows";
private final ChoreographyRestClient restClient;
private final MonitorRestClient restClient;
private final String choreographyId;
......@@ -55,23 +55,23 @@ public class AVGCDDetailPage extends BaseExtPage {
public AVGCDDetailPage(final PageParameters parameters) {
super(parameters);
restClient = new ChoreographyRestClient();
restClient = new MonitorRestClient();
choreographyId = parameters.get("chor").toString();
cdName = parameters.get("cd").toString();
body.add(new Label("header", getString("header_title") + " " + cdName));
List<AVGOperationDataTO> operations = restClient.averageOperationList(choreographyId, cdName);
bundle = new CDStatisticsBundle(operations);
ChoreographyTO choreography = restClient.getChoreography(choreographyId);
List<AVGOperationDataTO> operations
= restClient.averageOperationList(choreography.getChoreographyId(), cdName);
bundle = new CDStatisticsBundle(operations);
body.add(BookmarkablePageLinkBuilder.build("dashboard", "dashboardBr", Dashboard.class));
body.add(BookmarkablePageLinkBuilder.build("choreographyBr", ChoreographyPage.class));
PageParameters choreographyParams = new PageParameters();
choreographyParams.add("chor", choreographyId);
choreographyParams.add("chorId", choreography.getChoreographyId());
body.add(new BookmarkablePageLink<>("choreographyDetailsBr", ChoreographyDetailPage.class, choreographyParams)
.add(new Label("choreographyTitle", choreography.getName())));
......@@ -84,6 +84,7 @@ public class AVGCDDetailPage extends BaseExtPage {
// Sleeptime, Overhead and Execution time for each operation
charts.add(new StatsWidget("operationsChart") {
private static final long serialVersionUID = -8150750732895436230L;
@Override
public void create() {
......
......@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.panels.AVGCDDirectoryPanel;
import org.apache.syncope.client.console.panels.AVGServiceDirectoryPanel;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
......@@ -40,19 +40,16 @@ public class AVGInstanceStatsPage extends BaseExtPage {
public static final String PREF_STATS_PAGINATOR_ROWS = "stats.paginator.rows";
private final ChoreographyRestClient restClient;
private final String choreographyId;
private final MonitorRestClient restClient;
private final ChoreographyTO choreography;
public AVGInstanceStatsPage(final PageParameters parameters) {
super(parameters);
restClient = new ChoreographyRestClient();
choreographyId = parameters.get("chor").toString();
restClient = new MonitorRestClient();
this.choreography = restClient.getChoreography(parameters.get("chorId").toString());
ChoreographyTO choreography = restClient.getChoreography(choreographyId);
body.add(new Label("header",
getString("header_title") + " " + choreography.getName()));
......@@ -60,7 +57,7 @@ public class AVGInstanceStatsPage extends BaseExtPage {
body.add(BookmarkablePageLinkBuilder.build("choreographyBr", ChoreographyPage.class));
PageParameters choreographyParams = new PageParameters();
choreographyParams.add("chor", choreographyId);
choreographyParams.add("chorId", choreography.getChoreographyId());
body.add(new BookmarkablePageLink<>("choreographyDetailsBr", ChoreographyDetailPage.class, choreographyParams)
.add(new Label("choreographyTitle", choreography.getName())));
......@@ -82,7 +79,7 @@ public class AVGInstanceStatsPage extends BaseExtPage {
@Override
public Panel getPanel(final String panelId) {
return new AVGInstanceChartsPanel(panelId, choreographyId);
return new AVGInstanceChartsPanel(panelId, choreography.getChoreographyId());
}
});
......@@ -92,7 +89,7 @@ public class AVGInstanceStatsPage extends BaseExtPage {
@Override
public Panel getPanel(final String panelId) {
return new AVGCDDirectoryPanel(panelId, getPageReference(), choreographyId);
return new AVGCDDirectoryPanel(panelId, getPageReference(), choreography.getChoreographyId());
}
});
......@@ -102,7 +99,7 @@ public class AVGInstanceStatsPage extends BaseExtPage {
@Override
public Panel getPanel(final String panelId) {
return new AVGServiceDirectoryPanel(panelId, getPageReference(), choreographyId);
return new AVGServiceDirectoryPanel(panelId, getPageReference(), choreography.getChoreographyId());
}
});
......
......@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.panels.AVGOperationDirectoryPanel;
import org.apache.syncope.client.console.panels.ChartsLegendPanel;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.widgets.StatsWidget;
import org.apache.syncope.client.console.widgets.LabeledBarDataSet;
import org.apache.wicket.markup.html.WebMarkupContainer;
......@@ -41,7 +41,7 @@ public class AVGServiceDetailPage extends BaseExtPage {
public static final String PREF_STATS_PAGINATOR_ROWS = "stats.paginator.rows";
private final ChoreographyRestClient restClient;
private final MonitorRestClient restClient;
private final String choreographyId;
......@@ -52,23 +52,24 @@ public class AVGServiceDetailPage extends BaseExtPage {
public AVGServiceDetailPage(final PageParameters parameters) {
super(parameters);
restClient = new ChoreographyRestClient();
restClient = new MonitorRestClient();
choreographyId = parameters.get("chor").toString();
serviceName = parameters.get("service").toString();
ChoreographyTO choreography = restClient.getChoreography(choreographyId);
body.add(new Label("header", getString("header_title") + " " + serviceName));
List<AVGOperationDataTO> operations = restClient.averageOperationList(choreographyId, serviceName);
bundle = new ServiceStatisticsBundle(operations);
ChoreographyTO choreography = restClient.getChoreography(choreographyId);
body.add(BookmarkablePageLinkBuilder.build("dashboard", "dashboardBr", Dashboard.class));
body.add(BookmarkablePageLinkBuilder.build("choreographyBr", ChoreographyPage.class));
PageParameters choreographyParams = new PageParameters();
choreographyParams.add("chor", choreographyId);
choreographyParams.add("chorId", choreography.getChoreographyId());
body.add(new BookmarkablePageLink<>("choreographyDetailsBr", ChoreographyDetailPage.class, choreographyParams)
.add(new Label("choreographyTitle", choreography.getName())));
......
......@@ -20,6 +20,7 @@ import com.pingunaut.wicket.chartjs.chart.impl.Doughnut;
import com.pingunaut.wicket.chartjs.core.panel.BarChartPanel;
import com.pingunaut.wicket.chartjs.core.panel.DoughnutChartPanel;
import eu.chorevolution.idm.common.to.ChoreographyInstanceTO;
import eu.chorevolution.idm.common.to.ChoreographyTO;
import eu.chorevolution.idm.common.to.CoordinationDelegateTO;
import eu.chorevolution.idm.common.to.OperationDataTO;
import eu.chorevolution.idm.common.types.ArtifactType;
......@@ -29,7 +30,7 @@ import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.panels.ChartsLegendPanel;
import org.apache.syncope.client.console.panels.OperationDirectoryPanel;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.widgets.StatsWidget;
import org.apache.syncope.client.console.widgets.LabeledBarDataSet;
import org.apache.syncope.client.console.widgets.LabeledDoughnutChartData;
......@@ -45,7 +46,7 @@ public class CDDetailPage extends BaseExtPage {
public static final String PREF_STATS_PAGINATOR_ROWS = "stats.paginator.rows";
private final ChoreographyRestClient restClient;
private final MonitorRestClient restClient;
private final String choreographyInstancePK;
......@@ -56,30 +57,30 @@ public class CDDetailPage extends BaseExtPage {
public CDDetailPage(final PageParameters parameters) {
super(parameters);
restClient = new ChoreographyRestClient();
restClient = new MonitorRestClient();
choreographyInstancePK = parameters.get("instance").toString();
cdName = parameters.get("cd").toString();
CoordinationDelegateTO cd = restClient.getCD(choreographyInstancePK, cdName);
ChoreographyInstanceTO choreographyInstance = restClient.getChoreographyInstance(choreographyInstancePK);
ChoreographyTO choreography = restClient.getChoreography(choreographyInstance.getChoreographyId());
body.add(new Label("header", getString("header_title") + " " + cd.getName()));
List<OperationDataTO> operations = restClient.operationList(choreographyInstancePK, cdName);
bundle = new CDStatisticsBundle(operations);
ChoreographyInstanceTO choreographyInstance = restClient.getChoreographyInstance(choreographyInstancePK);
body.add(BookmarkablePageLinkBuilder.build("dashboard", "dashboardBr", Dashboard.class));
body.add(BookmarkablePageLinkBuilder.build("choreographyBr", ChoreographyPage.class));
PageParameters choreographyParams = new PageParameters();
choreographyParams.add("chor", choreographyInstance.getChoreographyId());
choreographyParams.add("chor", choreography.getKey());
body.add(new BookmarkablePageLink<>("choreographyDetailsBr", ChoreographyDetailPage.class, choreographyParams)
.add(new Label("choreographyTitle", choreographyInstance.getChoreographyName())));
.add(new Label("choreographyTitle", choreography.getName())));
PageParameters instanceParams = new PageParameters();
instanceParams.add("instance", choreographyInstance.getId());
instanceParams.add("instance", choreographyInstance.getKey());
body.add(new BookmarkablePageLink<>("instanceStatsBr", InstanceStatsPage.class, instanceParams)
.add(new Label("instanceTitle", "Instance " + choreographyInstance.getChoreographyInstanceId())));
......@@ -92,6 +93,8 @@ public class CDDetailPage extends BaseExtPage {
// Sleeptime, Overhead and Execution time for each operation
charts.add(new StatsWidget("operationsChart") {
private static final long serialVersionUID = -8150750732895436230L;
@Override
public void create() {
......
......@@ -46,17 +46,18 @@ public class ChoreographyDetailPage extends BaseExtPage {
private final ChoreographyRestClient restClient;
private final String choreographyId;
private final String choreographyKey;
private final ChoreographyTO choreography;
public ChoreographyDetailPage(final PageParameters parameters) {
super(parameters);
choreographyKey = parameters.get("chor").toString();
restClient = new ChoreographyRestClient();
choreographyId = parameters.get("chor").toString();
choreography = restClient.getChoreography(choreographyId);
choreography = restClient.getChoreography(choreographyKey);
body.add(new Label("header", choreography.getName()));
......@@ -109,7 +110,7 @@ public class ChoreographyDetailPage extends BaseExtPage {
private static final long serialVersionUID = -5861786415855103549L;
@Override
public WebMarkupContainer getPanel(final String panelId) {
return new InstancesOverviewPanel(panelId, getPageReference(), restClient, choreographyId);
return new InstancesOverviewPanel(panelId, getPageReference(), choreography);
}
});
......@@ -117,7 +118,7 @@ public class ChoreographyDetailPage extends BaseExtPage {
private static final long serialVersionUID = -5861786415855103549L;
@Override
public WebMarkupContainer getPanel(final String panelId) {
return new ChoreographyServiceDirectoryPanel(panelId, getPageReference(), choreography);
return new ChoreographyServiceDirectoryPanel(panelId, getPageReference(), choreographyKey);
}
});
......
......@@ -18,13 +18,14 @@ package org.apache.syncope.client.console.pages;
import de.agilecoders.wicket.core.markup.html.bootstrap.tabs.AjaxBootstrapTabbedPanel;
import eu.chorevolution.idm.common.to.ChoreographyInstanceTO;
import eu.chorevolution.idm.common.to.ChoreographyTO;
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.panels.CDDirectoryPanel;
import org.apache.syncope.client.console.panels.InstanceChartsPanel;
import org.apache.syncope.client.console.panels.InstanceServiceDirectoryPanel;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
......@@ -41,19 +42,20 @@ public class InstanceStatsPage extends BaseExtPage {
public static final String PREF_STATS_PAGINATOR_ROWS = "stats.paginator.rows";
private final ChoreographyRestClient restClient;
private final MonitorRestClient restClient;
private final String instanceId;
private final String choreographyInstancePK;
private final ChoreographyInstanceTO choreographyInstance;
public InstanceStatsPage(final PageParameters parameters) {
super(parameters);
restClient = new ChoreographyRestClient();
instanceId = parameters.get("instance").toString();
choreographyInstance = restClient.getChoreographyInstance(instanceId);
restClient = new MonitorRestClient();
choreographyInstancePK = parameters.get("instance").toString();
choreographyInstance = restClient.getChoreographyInstance(choreographyInstancePK);
ChoreographyTO choreography = restClient.getChoreography(choreographyInstance.getChoreographyId());
// Set title
body.add(new Label("header",
getString("header_title") + " " + choreographyInstance.getChoreographyInstanceId()
......@@ -64,9 +66,9 @@ public class InstanceStatsPage extends BaseExtPage {
body.add(BookmarkablePageLinkBuilder.build("choreographyBr", ChoreographyPage.class));
PageParameters choreographyParams = new PageParameters();
choreographyParams.add("chor", choreographyInstance.getChoreographyId());
choreographyParams.add("chor", choreography.getKey());
body.add(new BookmarkablePageLink<>("choreographyDetailsBr", ChoreographyDetailPage.class, choreographyParams)
.add(new Label("choreographyTitle", choreographyInstance.getChoreographyName())));
.add(new Label("choreographyTitle", choreography.getName())));
body.add(new Label("instanceTitle", "Instance " + choreographyInstance.getChoreographyInstanceId()));
......@@ -98,7 +100,7 @@ public class InstanceStatsPage extends BaseExtPage {
@Override
public Panel getPanel(final String panelId) {
return new CDDirectoryPanel(panelId, getPageReference(), instanceId);
return new CDDirectoryPanel(panelId, getPageReference(), choreographyInstancePK);
}
});
......@@ -108,7 +110,7 @@ public class InstanceStatsPage extends BaseExtPage {
@Override
public Panel getPanel(final String panelId) {
return new InstanceServiceDirectoryPanel(panelId, getPageReference(), instanceId);
return new InstanceServiceDirectoryPanel(panelId, getPageReference(), choreographyInstancePK);
}
});
......
......@@ -18,6 +18,7 @@ package org.apache.syncope.client.console.pages;
import com.pingunaut.wicket.chartjs.chart.impl.Bar;
import com.pingunaut.wicket.chartjs.core.panel.BarChartPanel;
import eu.chorevolution.idm.common.to.ChoreographyInstanceTO;
import eu.chorevolution.idm.common.to.ChoreographyTO;
import eu.chorevolution.idm.common.to.OperationDataTO;
import eu.chorevolution.idm.common.types.ArtifactType;
import java.io.Serializable;
......@@ -26,7 +27,7 @@ import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
import org.apache.syncope.client.console.panels.ChartsLegendPanel;
import org.apache.syncope.client.console.panels.OperationDirectoryPanel;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.widgets.StatsWidget;
import org.apache.syncope.client.console.widgets.LabeledBarDataSet;
import org.apache.wicket.markup.html.WebMarkupContainer;
......@@ -41,7 +42,7 @@ public class ServiceDetailPage extends BaseExtPage {
public static final String PREF_STATS_PAGINATOR_ROWS = "stats.paginator.rows";
private final ChoreographyRestClient restClient;
private final MonitorRestClient restClient;
private final String choreographyInstancePK;
......@@ -52,7 +53,7 @@ public class ServiceDetailPage extends BaseExtPage {
public ServiceDetailPage(final PageParameters parameters) {
super(parameters);
restClient = new ChoreographyRestClient();
restClient = new MonitorRestClient();
choreographyInstancePK = parameters.get("instance").toString();
serviceName = parameters.get("service").toString();
......@@ -63,17 +64,18 @@ public class ServiceDetailPage extends BaseExtPage {
bundle = new ServiceStatisticsBundle(operations);
ChoreographyInstanceTO choreographyInstance = restClient.getChoreographyInstance(choreographyInstancePK);
ChoreographyTO choreography = restClient.getChoreography(choreographyInstance.getChoreographyId());
body.add(BookmarkablePageLinkBuilder.build("dashboard", "dashboardBr", Dashboard.class));
body.add(BookmarkablePageLinkBuilder.build("choreographyBr", ChoreographyPage.class));
PageParameters choreographyParams = new PageParameters();
choreographyParams.add("chor", choreographyInstance.getChoreographyId());
choreographyParams.add("chor", choreography.getKey());
body.add(new BookmarkablePageLink<>("choreographyDetailsBr", ChoreographyDetailPage.class, choreographyParams)
.add(new Label("choreographyTitle", choreographyInstance.getChoreographyName())));
.add(new Label("choreographyTitle", choreography.getName())));
PageParameters instanceParams = new PageParameters();
instanceParams.add("instance", choreographyInstance.getId());
instanceParams.add("instance", choreographyInstance.getKey());
body.add(new BookmarkablePageLink<>("instanceStatsBr", InstanceStatsPage.class, instanceParams)
.add(new Label("instanceTitle", "Instance " + choreographyInstance.getChoreographyInstanceId())));
......
......@@ -28,7 +28,7 @@ import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.pages.AVGCDDetailPage;
import org.apache.syncope.client.console.pages.InstanceStatsPage;
import org.apache.syncope.client.console.panels.AVGCDDirectoryPanel.CDProvider;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
import org.apache.wicket.PageReference;
......@@ -45,7 +45,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class AVGCDDirectoryPanel extends DirectoryPanel<
AVGCoordinationDelegateTO, AVGCoordinationDelegateTO, CDProvider, ChoreographyRestClient> {
AVGCoordinationDelegateTO, AVGCoordinationDelegateTO, CDProvider, MonitorRestClient> {
private static final long serialVersionUID = 3727444742501082182L;
......@@ -55,8 +55,8 @@ public class AVGCDDirectoryPanel extends DirectoryPanel<
super(id,
new DirectoryPanel.Builder<
AVGCoordinationDelegateTO, AVGCoordinationDelegateTO, ChoreographyRestClient>(
new ChoreographyRestClient(), pageRef) {
AVGCoordinationDelegateTO, AVGCoordinationDelegateTO, MonitorRestClient>(
new MonitorRestClient(), pageRef) {
private static final long serialVersionUID = 8769126634538601689L;
......@@ -77,7 +77,7 @@ public class AVGCDDirectoryPanel extends DirectoryPanel<
private AVGCDDirectoryPanel(final String id,
final DirectoryPanel.Builder<
AVGCoordinationDelegateTO, AVGCoordinationDelegateTO, ChoreographyRestClient> builder) {
AVGCoordinationDelegateTO, AVGCoordinationDelegateTO, MonitorRestClient> builder) {
super(id, builder);
}
......@@ -134,21 +134,6 @@ public class AVGCDDirectoryPanel extends DirectoryPanel<
public void populateItem(final Item<ICellPopulator<AVGCoordinationDelegateTO>> item,
final String componentId,
final IModel<AVGCoordinationDelegateTO> model) {
/* ActionLinksPanel.Builder<Serializable> actionLinks = ActionLinksPanel.builder();
* actionLinks.setDisableIndicator(true);
* actionLinks.add(new ActionLink<Serializable>() {
*
* private static final long serialVersionUID = -3722207913631435501L;
*
* @Override
* public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
* PageParameters param = new PageParameters();
* param.add("chor", choreographyId);
* param.add("cd", model.getObject().getName());
* setResponsePage(AVGCDDetailPage.class, param);
* }
* }, ActionLink.ActionType.SEARCH);
* item.add(actionLinks.build(componentId)); */
ChoreographyActionsPanel choreographyActionsPanel = new ChoreographyActionsPanel(componentId);
choreographyActionsPanel.addAction(new IndicatingAjaxLink<Void>("link") {
......
......@@ -23,7 +23,7 @@ import eu.chorevolution.idm.common.to.AVGCoordinationDelegateTO;
import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.widgets.LabeledBarDataSet;
import org.apache.syncope.client.console.widgets.LabeledDoughnutChartData;
import org.apache.syncope.client.console.widgets.StatsWidget;
......@@ -36,17 +36,14 @@ public class AVGInstanceChartsPanel extends Panel {
private static final long serialVersionUID = -7493658263848651963L;
private final ChoreographyRestClient restClient;
private final String choreographyId;
private final MonitorRestClient restClient;
private final AvgInstanceStatisticsBundle bundle;
public AVGInstanceChartsPanel(final String id, final String choreographyId) {
super(id);
restClient = new ChoreographyRestClient();
this.choreographyId = choreographyId;
restClient = new MonitorRestClient();
List<AVGCoordinationDelegateTO> cds = restClient.averageCdList(choreographyId);
bundle = new AvgInstanceStatisticsBundle(cds);
......@@ -59,6 +56,8 @@ public class AVGInstanceChartsPanel extends Panel {
//Total overhead and total execution time per CD
charts.add(new StatsWidget("cdTimesChart") {
private static final long serialVersionUID = -8150750732895436230L;
@Override
public void create() {
......
......@@ -43,7 +43,7 @@ import java.util.List;
import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.pages.CDDetailPage;
import org.apache.syncope.client.console.panels.AVGOperationDirectoryPanel.AVGOperationProvider;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
import org.apache.wicket.PageReference;
......@@ -54,7 +54,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.ResourceModel;
public class AVGOperationDirectoryPanel extends DirectoryPanel<
AVGOperationDataTO, AVGOperationDataTO, AVGOperationProvider, ChoreographyRestClient> {
AVGOperationDataTO, AVGOperationDataTO, AVGOperationProvider, MonitorRestClient> {
private static final long serialVersionUID = 3727444742501082182L;
......@@ -67,8 +67,8 @@ public class AVGOperationDirectoryPanel extends DirectoryPanel<
public AVGOperationDirectoryPanel(final String id, final PageReference pageRef,
final String choreographyId, final String artifactName, final ArtifactType artifactType) {
super(id, new DirectoryPanel.Builder<AVGOperationDataTO, AVGOperationDataTO, ChoreographyRestClient>(
new ChoreographyRestClient(), pageRef) {
super(id, new DirectoryPanel.Builder<AVGOperationDataTO, AVGOperationDataTO, MonitorRestClient>(
new MonitorRestClient(), pageRef) {
private static final long serialVersionUID = 4218621294354212530L;
......@@ -90,7 +90,7 @@ public class AVGOperationDirectoryPanel extends DirectoryPanel<
private AVGOperationDirectoryPanel(
final String id,
final DirectoryPanel.Builder<AVGOperationDataTO, AVGOperationDataTO, ChoreographyRestClient> builder) {
final DirectoryPanel.Builder<AVGOperationDataTO, AVGOperationDataTO, MonitorRestClient> builder) {
super(id, builder);
}
......
......@@ -28,7 +28,7 @@ import org.apache.syncope.client.console.commons.DirectoryDataProvider;
import org.apache.syncope.client.console.pages.InstanceStatsPage;
import org.apache.syncope.client.console.pages.AVGServiceDetailPage;
import org.apache.syncope.client.console.panels.AVGServiceDirectoryPanel.AVGServiceProvider;
import org.apache.syncope.client.console.rest.ChoreographyRestClient;
import org.apache.syncope.client.console.rest.MonitorRestClient;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
import org.apache.wicket.PageReference;
......@@ -45,7 +45,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class AVGServiceDirectoryPanel extends DirectoryPanel<
AVGServiceTO, AVGServiceTO, AVGServiceProvider, ChoreographyRestClient> {
AVGServiceTO, AVGServiceTO, AVGServiceProvider, MonitorRestClient> {