|
|
|
@ -20,7 +20,7 @@ import org.gcube.portlets.admin.systemservicedefinition.definition.DefClientIdCo
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.definition.DefDescriptionComparator;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.definition.DefinitionItem;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.event.CreateSSDEvent;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.event.CreateSSDEventPublisher;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.event.DeleteSSDEvent;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.is.InformationSystemUtils;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.shared.Constants;
|
|
|
|
|
import org.gcube.portlets.admin.systemservicedefinition.util.UserCredentials;
|
|
|
|
@ -209,7 +209,7 @@ public class SystemServiceDefinition extends MVCPortlet {
|
|
|
|
|
*/
|
|
|
|
|
try {
|
|
|
|
|
itemsList = InformationSystemUtils.retrieveSSD(Constants.SYSTEM_SERVICE_CATEGORY,
|
|
|
|
|
userCredentials.getCurrentScope(), userCredentials.getAccessToken());
|
|
|
|
|
userCredentials.getCurrentScope());
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
logger.error("Error retrieving System Services from IS. {}", e.getLocalizedMessage(), e);
|
|
|
|
|
throw new PortletException("Error retrieving System Services from IS. " + e.getLocalizedMessage(), e);
|
|
|
|
@ -364,8 +364,8 @@ public class SystemServiceDefinition extends MVCPortlet {
|
|
|
|
|
String secret = UUID.randomUUID().toString();
|
|
|
|
|
DefinitionItem definitionItem = new DefinitionItem(clientId, description, username, secret);
|
|
|
|
|
InformationSystemUtils.publishSSD(definitionItem, Constants.SYSTEM_SERVICE_CATEGORY,
|
|
|
|
|
userCredentials.getCurrentScope(), userCredentials.getAccessToken());
|
|
|
|
|
// publishCreateSSDEvent(definitionItem);
|
|
|
|
|
userCredentials.getCurrentScope());
|
|
|
|
|
publishCreateSSDEvent(definitionItem);
|
|
|
|
|
SessionMessages.add(actionRequest, "success-definition-created");
|
|
|
|
|
actionResponse.setRenderParameter("jspPage", "/html/systemservicedefinition/view.jsp");
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
@ -393,17 +393,7 @@ public class SystemServiceDefinition extends MVCPortlet {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void publishCreateSSDEvent(DefinitionItem definitionItem) {
|
|
|
|
|
logger.debug("Trying to send the event to create System Service");
|
|
|
|
|
CreateSSDEvent toSend = new CreateSSDEvent(definitionItem);
|
|
|
|
|
new CreateSSDEventPublisher().publish(toSend);
|
|
|
|
|
logger.info("Done send event " + toSend.getName() + " for " + toSend.getUser());
|
|
|
|
|
try {
|
|
|
|
|
Thread.sleep(2000);
|
|
|
|
|
} catch (InterruptedException e) {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void editDefinition(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
|
|
|
|
|
@SuppressWarnings("unused")
|
|
|
|
@ -466,30 +456,61 @@ public class SystemServiceDefinition extends MVCPortlet {
|
|
|
|
|
|
|
|
|
|
paramsInfo(actionRequest);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
logger.debug("Delete Request");
|
|
|
|
|
String clientId = ParamUtil.getString(actionRequest, "clientId");
|
|
|
|
|
if (clientId == null || clientId.isEmpty()) {
|
|
|
|
|
logger.error("Invalid client id: " + clientId);
|
|
|
|
|
SessionErrors.add(actionRequest, "error-invalid-clientId");
|
|
|
|
|
SessionMessages.add(actionRequest,
|
|
|
|
|
PortalUtil.getPortletId(actionRequest) + SessionMessages.KEY_SUFFIX_HIDE_DEFAULT_ERROR_MESSAGE);
|
|
|
|
|
PortalUtil.copyRequestParameters(actionRequest, actionResponse);
|
|
|
|
|
actionResponse.setRenderParameter("jspPage", "/html/systemservicedefinition/view.jsp");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
DefinitionItem definitionItem=new DefinitionItem(clientId);
|
|
|
|
|
InformationSystemUtils.deleteSSD(definitionItem, Constants.SYSTEM_SERVICE_CATEGORY,
|
|
|
|
|
userCredentials.getCurrentScope());
|
|
|
|
|
publishDeleteSSDEvent(definitionItem);
|
|
|
|
|
SessionMessages.add(actionRequest, "success-definition-deleted");
|
|
|
|
|
actionResponse.setRenderParameter("jspPage", "/html/systemservicedefinition/view.jsp");
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* SessionErrors.add(actionRequest, "error-delete-definition");
|
|
|
|
|
* SessionMessages.add(actionRequest, PortalUtil.getPortletId(actionRequest) +
|
|
|
|
|
* SessionMessages.KEY_SUFFIX_HIDE_DEFAULT_ERROR_MESSAGE);
|
|
|
|
|
* actionResponse.setRenderParameter("jspPage",
|
|
|
|
|
* "/html/systemservicedefinition/view.jsp");
|
|
|
|
|
*/
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
logger.error(e.getLocalizedMessage(),e);
|
|
|
|
|
SessionErrors.add(actionRequest, "error-delete-definition");
|
|
|
|
|
SessionMessages.add(actionRequest,
|
|
|
|
|
PortalUtil.getPortletId(actionRequest) + SessionMessages.KEY_SUFFIX_HIDE_DEFAULT_ERROR_MESSAGE);
|
|
|
|
|
actionResponse.setRenderParameter("jspPage", "/html/systemservicedefinition/view.jsp");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* String portletName = (String)actionRequest.getAttribute(WebKeys.PORTLET_ID);
|
|
|
|
|
* ThemeDisplay themeDisplay =
|
|
|
|
|
* (ThemeDisplay)actionRequest.getAttribute(WebKeys.THEME_DISPLAY);
|
|
|
|
|
*
|
|
|
|
|
* PortletURL redirectURL =
|
|
|
|
|
* PortletURLFactoryUtil.create(PortalUtil.getHttpServletRequest(actionRequest),
|
|
|
|
|
* portletName,themeDisplay.getLayout().getPlid(), PortletRequest.RENDER_PHASE);
|
|
|
|
|
* redirectURL.setParameter("jspPage", "/registration.jsp");
|
|
|
|
|
* SessionErrors.add(actionRequest, "WRONG_FIRST_NAME_ERROR");
|
|
|
|
|
* actionResponse.sendRedirect(redirectURL.toString());
|
|
|
|
|
*/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void publishCreateSSDEvent(DefinitionItem definitionItem) {
|
|
|
|
|
logger.debug("Trying to send the event to create System Service");
|
|
|
|
|
CreateSSDEvent toCreate = new CreateSSDEvent(definitionItem);
|
|
|
|
|
toCreate.publisher.publish(toCreate);
|
|
|
|
|
logger.info("Done send create event " + toCreate.getName() + " for " + toCreate.getUser());
|
|
|
|
|
try {
|
|
|
|
|
Thread.sleep(2000);
|
|
|
|
|
} catch (InterruptedException e) {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void publishDeleteSSDEvent(DefinitionItem definitionItem) {
|
|
|
|
|
logger.debug("Trying to send the event to delete System Service");
|
|
|
|
|
DeleteSSDEvent toDelete = new DeleteSSDEvent(definitionItem);
|
|
|
|
|
toDelete.publisher.publish(toDelete);
|
|
|
|
|
logger.info("Done send delete event " + toDelete.getName() + " for " + toDelete.getUser());
|
|
|
|
|
try {
|
|
|
|
|
Thread.sleep(2000);
|
|
|
|
|
} catch (InterruptedException e) {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|