From 6044205964d4ac91c856f8e478466f8ab1d1928a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 12 May 2017 15:38:47 +0000 Subject: [PATCH] ref 8541: StatisticalAlgorithmImporter - Support Java 8 compatibility https://support.d4science.org/issues/8541 Updated to support Java 8 compatibility git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/github-connector@148621 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 16 ++- distro/changelog.xml | 4 + pom.xml | 33 ++--- .../client/GitHubConnectorController.java | 4 +- .../client/GitHubConnectorCredentialCard.java | 2 +- .../client/GitHubConnectorManager.java | 2 +- ...itHubConnectorRepositorySelectionCard.java | 4 +- .../client/GitHubConnectorWizard.java | 4 +- .../client/resource/GCResources.java | 4 +- .../client/resource/WizardCSS.java | 4 +- .../client/rpc/GitHubConnectorService.java | 2 +- .../rpc/GitHubConnectorServiceAsync.java | 2 +- .../client/util/AlertDialog.java | 4 +- .../client/util/GWTMessages.java | 4 +- .../client/util/WaitDialog.java | 4 +- .../client/wizard/SimpleWizardCard.java | 4 +- .../client/wizard/WizardCard.java | 4 +- .../client/wizard/WizardMessages.java | 2 +- .../client/wizard/WizardWindow.java | 114 +++++++----------- .../client/wizard/event/WizardEvent.java | 4 +- .../client/wizard/event/WizardEventType.java | 15 +-- .../portlet/GitHubConnectorPortlet.java | 2 +- .../server/GitHubConnectorServiceImpl.java | 4 +- .../githubconnector/server/SessionUtil.java | 41 +++---- .../server/git/GitConnectorService.java | 8 +- .../server/git/GitHubRepositoryBuilder.java | 45 +++---- .../server/storage/StorageUtil.java | 72 +++++------ .../server/util/ServiceCredentials.java | 4 +- .../githubconnector/shared/Constants.java | 2 +- .../ExpiredSessionServiceException.java | 14 ++- .../shared/exception/ServiceException.java | 22 ++-- .../shared/git/GitHubCloneSession.java | 25 ++-- .../shared/git/data/GitHubRepository.java | 2 +- .../shared/git/data/GitHubUser.java | 2 +- .../git/data/credential/GitHubCredential.java | 4 +- .../credential/GitHubCredentialAnonymous.java | 2 +- .../credential/GitHubCredentialLogin.java | 4 +- .../credential/GitHubCredentialOAuth2.java | 4 +- .../data/credential/GitHubCredentialType.java | 2 +- .../shared/session/UserInfo.java | 21 ++-- .../githubconnector/GitHubConnectorTest.java | 4 +- 41 files changed, 244 insertions(+), 276 deletions(-) diff --git a/.classpath b/.classpath index 7594b7e..5192f95 100644 --- a/.classpath +++ b/.classpath @@ -1,19 +1,27 @@ - + - + + + + + - + + + + + @@ -26,5 +34,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 16dcf62..03eb1e7 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Support Java 8 compatibility [ticket #8541] + Updated PortalContext support[ticket #6279] diff --git a/pom.xml b/pom.xml index 2592ddf..b242519 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.widgets github-connector - 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT jar github-connector @@ -40,8 +40,9 @@ config - - 1.7 + + 1.7 + 2.7.0 @@ -183,14 +184,10 @@ provided - + + - org.gcube.contentmanagement @@ -347,21 +344,12 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - ${javaVersion} - ${javaVersion} - - + org.apache.maven.plugins maven-assembly-plugin - 2.2 + ${distroDirectory}/descriptor.xml @@ -381,7 +369,8 @@ - + org.eclipse.m2e lifecycle-mapping diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorController.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorController.java index 5044b93..e288244 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorController.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorController.java @@ -12,8 +12,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubConnectorController { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorCredentialCard.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorCredentialCard.java index cd9ae90..82531bc 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorCredentialCard.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorCredentialCard.java @@ -20,7 +20,7 @@ import com.google.gwt.user.client.ui.TextBox; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class GitHubConnectorCredentialCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorManager.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorManager.java index 8c685f5..8bf8528 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorManager.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorManager.java @@ -10,7 +10,7 @@ import com.google.gwt.core.shared.GWT; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class GitHubConnectorManager implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorRepositorySelectionCard.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorRepositorySelectionCard.java index ac797ef..b326220 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorRepositorySelectionCard.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorRepositorySelectionCard.java @@ -28,8 +28,8 @@ import com.google.gwt.user.client.ui.TextBox; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubConnectorRepositorySelectionCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorWizard.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorWizard.java index d58488e..518f76f 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorWizard.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/GitHubConnectorWizard.java @@ -8,8 +8,8 @@ import com.google.gwt.user.client.Timer; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubConnectorWizard extends WizardWindow { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/GCResources.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/GCResources.java index 177cb25..fe031d2 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/GCResources.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/GCResources.java @@ -6,8 +6,8 @@ import com.google.gwt.resources.client.ImageResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface GCResources extends ClientBundle { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/WizardCSS.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/WizardCSS.java index ef3b649..7b01452 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/WizardCSS.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/resource/WizardCSS.java @@ -7,8 +7,8 @@ import com.google.gwt.resources.client.CssResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface WizardCSS extends CssResource { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorService.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorService.java index 642da5e..9776be5 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorService.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorService.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ @RemoteServiceRelativePath("githubconnectorservice") diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorServiceAsync.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorServiceAsync.java index 1a10e86..849e3dd 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorServiceAsync.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/rpc/GitHubConnectorServiceAsync.java @@ -13,7 +13,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public interface GitHubConnectorServiceAsync { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/AlertDialog.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/AlertDialog.java index 8c29fe1..477426f 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/AlertDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/AlertDialog.java @@ -11,8 +11,8 @@ import com.google.gwt.user.client.ui.HTML; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AlertDialog extends DialogBox implements ClickHandler { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/GWTMessages.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/GWTMessages.java index d7e1e95..7b66513 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/GWTMessages.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/GWTMessages.java @@ -4,8 +4,8 @@ import com.google.gwt.core.client.Callback; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GWTMessages { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/WaitDialog.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/WaitDialog.java index 394bb1c..38e45c3 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/WaitDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/util/WaitDialog.java @@ -14,8 +14,8 @@ import com.google.gwt.user.client.ui.HTML; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WaitDialog extends DialogBox { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/SimpleWizardCard.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/SimpleWizardCard.java index d93e193..a0f9e5a 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/SimpleWizardCard.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/SimpleWizardCard.java @@ -10,8 +10,8 @@ import com.google.gwt.user.client.ui.SimplePanel; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SimpleWizardCard extends WizardCard { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardCard.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardCard.java index 93d3cd5..d9227be 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardCard.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardCard.java @@ -17,8 +17,8 @@ import com.google.gwt.user.client.ui.Widget; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WizardCard extends SimplePanel { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardMessages.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardMessages.java index a522727..24168a1 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardMessages.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardMessages.java @@ -5,7 +5,7 @@ import com.google.gwt.i18n.client.Messages; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public interface WizardMessages extends Messages { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardWindow.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardWindow.java index 04b06ae..affcbee 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardWindow.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/WizardWindow.java @@ -37,8 +37,8 @@ import com.google.gwt.user.client.ui.Widget; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEventHandler { @@ -73,11 +73,10 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven // protected FillToolItem fillSpacingCardMoveToolBar; protected WizardMessages msgs; protected DeckPanel deckPanel; - - + private Node closeEventTarget = null; - private int zIndex=-1; + private int zIndex = -1; /** * Create a new Wizard Window with the specified title. @@ -102,17 +101,10 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven deckPanel = new DeckPanel(); - backButton = new Button("
" - + "" - + msgs.buttonBackLabel() + "" + "
"); + backButton = new Button("
" + "" + msgs.buttonBackLabel() + + "" + "
"); backButton.setEnabled(false); backButton.setTabIndex(1001); @@ -163,15 +155,14 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven } private void initHandler() { - resizeHandlerRegistration = Window - .addResizeHandler(new ResizeHandler() { + resizeHandlerRegistration = Window.addResizeHandler(new ResizeHandler() { - @Override - public void onResize(ResizeEvent event) { - center(); + @Override + public void onResize(ResizeEvent event) { + center(); - } - }); + } + }); } @@ -184,7 +175,6 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven this.originalTitle = title; } - /** * Shows the next available card. */ @@ -279,7 +269,7 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven /** * Returns the number of available cards. * - * @return + * @return the number of available cards */ public int getCardStackSize() { return cardStack.size(); @@ -288,7 +278,7 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven /** * Returns the current active card. * - * @return + * @return active card position */ public int getCurrentCard() { int index = deckPanel.getVisibleWidget(); @@ -309,13 +299,10 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven * Sets the label of next button to "Finish" value */ public void setNextButtonToFinish() { - nextButton.setHTML("
" + msgs.buttonFinishLabel() + "" + "
"); + nextButton.setHTML("
" + + msgs.buttonFinishLabel() + "" + "
"); // nextButton.setIcon(GCResources.INSTANCE.wizardGo()); // nextButton.setIconAlign(IconAlign.RIGHT); /* @@ -327,13 +314,10 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven } public void setNextButtonToDefault() { - nextButton.setHTML("
" + msgs.buttonNextLabel() + "" + "
"); + nextButton.setHTML("
" + + msgs.buttonNextLabel() + "" + "
"); } /** @@ -402,6 +386,7 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven * Set the card list. * * @param cards + * set the card list */ public void setCards(ArrayList cards) { for (WizardCard card : cards) { @@ -477,6 +462,7 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven * Sets visible next button. * * @param visible + * true if next button is visible */ protected void setNextButtonVisible(boolean visible) { nextButton.setVisible(visible); @@ -486,6 +472,7 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven * Sets visible back button. * * @param visible + * true if back button is visible */ protected void setBackButtonVisible(boolean visible) { backButton.setVisible(visible); @@ -516,20 +503,16 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven public ArrayList getCardStack() { return cardStack; } - + public void showErrorAndHide(final String title, final String message) { - showErrorAndHide(title, message, - new Throwable()); + showErrorAndHide(title, message, new Throwable()); } - - - public void showErrorAndHide(final String title, final String message, - final Throwable throwable) { - final WizardEvent event=new WizardEvent(WizardEventType.Failed); + + public void showErrorAndHide(final String title, final String message, final Throwable throwable) { + final WizardEvent event = new WizardEvent(WizardEventType.Failed); event.setErrorMessage(message); event.setException(new Exception(throwable)); - - + GWTMessages.alert(title, message, getZIndex(), new Callback() { @Override @@ -550,24 +533,15 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven } - - - - private void addToolIcon() { // get the "dialogTopRight" class td Element dialogTopRight = getCellElement(0, 2); // close button image html - dialogTopRight.setInnerHTML("
" - + "
"); + dialogTopRight.setInnerHTML("
" + + "
"); // set the event target closeEventTarget = dialogTopRight.getChild(0).getChild(0); @@ -577,9 +551,8 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven protected void onPreviewNativeEvent(NativePreviewEvent event) { NativeEvent nativeEvent = event.getNativeEvent(); - if (!event.isCanceled() && (event.getTypeInt() == Event.ONCLICK) - && isCloseEvent(nativeEvent)) { - final WizardEvent wizardEvent=new WizardEvent(WizardEventType.Aborted); + if (!event.isCanceled() && (event.getTypeInt() == Event.ONCLICK) && isCloseEvent(nativeEvent)) { + final WizardEvent wizardEvent = new WizardEvent(WizardEventType.Aborted); fireEvent(wizardEvent); this.hide(); } @@ -601,15 +574,14 @@ public class WizardWindow extends DialogBox implements WizardEvent.HasWizardEven } public void setZIndex(int zIndex) { - this.zIndex=zIndex; + this.zIndex = zIndex; getGlassElement().getStyle().setZIndex(zIndex); - getElement().getStyle().setZIndex(zIndex+1); - + getElement().getStyle().setZIndex(zIndex + 1); + } - - public int getZIndex(){ + + public int getZIndex() { return zIndex; } - } diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEvent.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEvent.java index 30e891b..51d4761 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEvent.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers; * Wizard Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WizardEvent extends GwtEvent { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEventType.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEventType.java index 8ff4cb2..c7777ba 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/client/wizard/event/WizardEventType.java @@ -5,17 +5,13 @@ import java.util.List; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum WizardEventType { - Completed("Completed"), Failed("Failed"), Aborted("Aborted"), Background( - "Background"); + Completed("Completed"), Failed("Failed"), Aborted("Aborted"), Background("Background"); - /** - * @param text - */ private WizardEventType(final String id) { this.id = id; } @@ -35,11 +31,6 @@ public enum WizardEventType { return id; } - /** - * - * @param id - * @return - */ public static WizardEventType getTypeFromId(String id) { if (id == null || id.isEmpty()) return null; diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/portlet/GitHubConnectorPortlet.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/portlet/GitHubConnectorPortlet.java index a792ec7..6975539 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/portlet/GitHubConnectorPortlet.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/portlet/GitHubConnectorPortlet.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; /** * * @author giancarlo - * email: g.panichi@isti.cnr.it + * * */ public class GitHubConnectorPortlet extends GenericPortlet { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/GitHubConnectorServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/GitHubConnectorServiceImpl.java index cab2289..6790a4b 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/GitHubConnectorServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/GitHubConnectorServiceImpl.java @@ -19,8 +19,8 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @SuppressWarnings("serial") diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/SessionUtil.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/SessionUtil.java index 5e971b4..78c208e 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/SessionUtil.java @@ -18,8 +18,8 @@ import org.gcube.vomanagement.usermanagement.model.GCubeUser; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ @@ -30,11 +30,12 @@ public class SessionUtil { /** * * @param httpServletRequest - * @return - * @throws TDGWTServiceException + * http servlet request + * @return service credentials + * @throws ServiceException + * service exception */ - public static ServiceCredentials getServiceCredentials( - HttpServletRequest httpServletRequest) + public static ServiceCredentials getServiceCredentials(HttpServletRequest httpServletRequest) throws ServiceException { return getServiceCredentials(httpServletRequest, null); } @@ -42,12 +43,14 @@ public class SessionUtil { /** * * @param httpServletRequest + * http service request * @param scopeGroupId - * @return - * @throws TDGWTServiceException + * scope group id + * @return service credentials + * @throws ServiceException + * service exception */ - public static ServiceCredentials getServiceCredentials( - HttpServletRequest httpServletRequest, String scopeGroupId) + public static ServiceCredentials getServiceCredentials(HttpServletRequest httpServletRequest, String scopeGroupId) throws ServiceException { ServiceCredentials sCredentials = null; @@ -105,8 +108,7 @@ public class SessionUtil { GCubeUser gCubeUser = pContext.getCurrentUser(httpServletRequest); if (gCubeUser == null) { - String error = "Error retrieving gCubeUser in scope " + scope - + ": " + gCubeUser; + String error = "Error retrieving gCubeUser in scope " + scope + ": " + gCubeUser; logger.error(error); throw new ServiceException(error); } @@ -114,8 +116,7 @@ public class SessionUtil { userName = gCubeUser.getUsername(); if (userName == null || userName.isEmpty()) { - String error = "Error retrieving username in scope " + scope - + ": " + userName; + String error = "Error retrieving username in scope " + scope + ": " + userName; logger.error(error); throw new ServiceException(error); } @@ -123,8 +124,7 @@ public class SessionUtil { token = pContext.getCurrentUserToken(scope, userName); if (token == null || token.isEmpty()) { - String error = "Error retrieving token for " + userName - + " in " + scope + ": " + token; + String error = "Error retrieving token for " + userName + " in " + scope + ": " + token; logger.error(error); throw new ServiceException(error); } @@ -168,16 +168,14 @@ public class SessionUtil { } else { - groupId = String.valueOf(pContext - .getCurrentGroupId(httpServletRequest)); + groupId = String.valueOf(pContext.getCurrentGroupId(httpServletRequest)); groupName = pContext.getCurrentGroupName(httpServletRequest); } - sCredentials = new ServiceCredentials(userName, fullName, name, - lastName, email, scope, groupId, groupName, userAvatarURL, - token); + sCredentials = new ServiceCredentials(userName, fullName, name, lastName, email, scope, groupId, groupName, + userAvatarURL, token); } logger.info("ServiceCredentials: " + sCredentials); @@ -185,5 +183,4 @@ public class SessionUtil { return sCredentials; } - } diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitConnectorService.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitConnectorService.java index 3080449..3c8a4e1 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitConnectorService.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitConnectorService.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitConnectorService { @@ -37,8 +37,8 @@ public class GitConnectorService { /** * - * @param userName - * @param gitHubCredential + * @param userName user name + * @param gitHubCredential github credential */ public GitConnectorService(String userName, GitHubCredential gitHubCredential) { this.userName = userName; diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitHubRepositoryBuilder.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitHubRepositoryBuilder.java index 0e0c37a..c7fe846 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitHubRepositoryBuilder.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/git/GitHubRepositoryBuilder.java @@ -12,44 +12,36 @@ import org.gcube.portlets.widgets.githubconnector.shared.git.data.GitHubUser; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class GitHubRepositoryBuilder { - private static Logger logger = Logger - .getLogger(GitHubRepositoryBuilder.class); + private static Logger logger = Logger.getLogger(GitHubRepositoryBuilder.class); /** * * @param repository - * @return + * repository + * @return github repository * @throws ServiceException + * service exception */ - public static GitHubRepository build(Repository repository) - throws ServiceException { + public static GitHubRepository build(Repository repository) throws ServiceException { try { if (repository != null) { if (repository.getOwner() != null) { - GitHubUser gitHubUser = new GitHubUser(repository - .getOwner().getId(), repository.getOwner() - .getName(), repository.getOwner().getLogin(), - repository.getOwner().getCompany(), repository - .getOwner().getLocation(), repository - .getOwner().getUrl(), repository.getOwner() - .getEmail()); + GitHubUser gitHubUser = new GitHubUser(repository.getOwner().getId(), + repository.getOwner().getName(), repository.getOwner().getLogin(), + repository.getOwner().getCompany(), repository.getOwner().getLocation(), + repository.getOwner().getUrl(), repository.getOwner().getEmail()); - GitHubRepository gitHubRepository = new GitHubRepository( - repository.getId(), repository.getName(), - gitHubUser, repository.getDescription(), - repository.getGitUrl(), repository.getWatchers(), - repository.getCreatedAt(), - repository.getUpdatedAt()); + GitHubRepository gitHubRepository = new GitHubRepository(repository.getId(), repository.getName(), + gitHubUser, repository.getDescription(), repository.getGitUrl(), repository.getWatchers(), + repository.getCreatedAt(), repository.getUpdatedAt()); return gitHubRepository; } else { - logger.error("Invalid owner for repository: " - + repository.getName()); - throw new ServiceException("Invalid owner for repository: " - + repository.getName()); + logger.error("Invalid owner for repository: " + repository.getName()); + throw new ServiceException("Invalid owner for repository: " + repository.getName()); } } else { logger.error("Invalid repository: null"); @@ -67,11 +59,12 @@ public class GitHubRepositoryBuilder { /** * * @param repositories - * @return + * list of repositories + * @return list of github repository * @throws ServiceException + * service exception */ - public static ArrayList build( - List repositories) throws ServiceException { + public static ArrayList build(List repositories) throws ServiceException { if (repositories != null) { ArrayList gitHubRepositories = new ArrayList<>(); for (Repository repository : repositories) { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/storage/StorageUtil.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/storage/StorageUtil.java index 1412c52..c25b478 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/storage/StorageUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/storage/StorageUtil.java @@ -19,8 +19,8 @@ import org.gcube.portlets.widgets.githubconnector.shared.exception.ServiceExcept /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class StorageUtil { @@ -30,11 +30,13 @@ public class StorageUtil { /** * * @param user + * user * @param itemId + * item id * @throws ServiceException + * service exception */ - public static void deleteItem(String user, String itemId) - throws ServiceException { + public static void deleteItem(String user, String itemId) throws ServiceException { Workspace ws; try { logger.debug("User: " + user + ", ItemId:" + itemId); @@ -43,8 +45,7 @@ public class StorageUtil { ws.removeItems(itemId); return; - } catch (InsufficientPrivilegesException - | WorkspaceFolderNotFoundException | InternalErrorException + } catch (InsufficientPrivilegesException | WorkspaceFolderNotFoundException | InternalErrorException | HomeNotFoundException | ItemNotFoundException e) { e.printStackTrace(); throw new ServiceException(e.getLocalizedMessage(), e); @@ -52,71 +53,74 @@ public class StorageUtil { } } - + /** * * @param user + * user * @param destinationFolderId + * destination folder id * @param folderName + * folder name * @param folderDescription - * @return + * folder description + * @return folder id * @throws ServiceException + * service exception */ - public static String createFolderOnWorkspace(String user, - String destinationFolderId, String folderName, + public static String createFolderOnWorkspace(String user, String destinationFolderId, String folderName, String folderDescription) throws ServiceException { try { - logger.debug("CreateFolderOnWorkspace: [User=" + user - + ", FolderId:" + destinationFolderId + ", folderName=" - + folderName + ", folderDescription=" + folderDescription - + "]"); + logger.debug("CreateFolderOnWorkspace: [User=" + user + ", FolderId:" + destinationFolderId + + ", folderName=" + folderName + ", folderDescription=" + folderDescription + "]"); Workspace ws = HomeLibrary.getUserWorkspace(user); - WorkspaceFolder workspaceFolder=ws.createFolder(folderName, folderDescription, destinationFolderId); + WorkspaceFolder workspaceFolder = ws.createFolder(folderName, folderDescription, destinationFolderId); return workspaceFolder.getId(); - - - } catch (WorkspaceFolderNotFoundException | InternalErrorException - | HomeNotFoundException | InsufficientPrivilegesException | ItemAlreadyExistException | WrongDestinationException | ItemNotFoundException e) { + + } catch (WorkspaceFolderNotFoundException | InternalErrorException | HomeNotFoundException + | InsufficientPrivilegesException | ItemAlreadyExistException | WrongDestinationException + | ItemNotFoundException e) { logger.error("CreateFolderOnWorkspace: " + e.getLocalizedMessage()); e.printStackTrace(); throw new ServiceException(e.getLocalizedMessage(), e); } } - + /** * * @param user + * user * @param destinationFolderId + * destination folder id * @param fileName + * file name * @param fileDescription - * @param mimeType + * file description * @param is - * @return + * input stream + * @return file id * @throws ServiceException + * service exception */ - public static String saveOnWorkspace(String user, - String destinationFolderId, String fileName, - String fileDescription, InputStream is) - throws ServiceException { + public static String saveOnWorkspace(String user, String destinationFolderId, String fileName, + String fileDescription, InputStream is) throws ServiceException { try { - logger.debug("saveOnWorkspace: [User=" + user + ", FolderId:" - + destinationFolderId + ", fileName=" + fileName - + ", fileDescription=" + fileDescription + "]"); + logger.debug("saveOnWorkspace: [User=" + user + ", FolderId:" + destinationFolderId + ", fileName=" + + fileName + ", fileDescription=" + fileDescription + "]"); Workspace ws = HomeLibrary.getUserWorkspace(user); WorkspaceItem workspaceItem = ws.getItem(destinationFolderId); if (workspaceItem.isFolder()) { - ExternalFile externalfile = ws.createExternalFile(fileName, - fileDescription, null, is, destinationFolderId); + ExternalFile externalfile = ws.createExternalFile(fileName, fileDescription, null, is, + destinationFolderId); return externalfile.getId(); } else { throw new ServiceException("Invalid destination folder!"); } - } catch (WorkspaceFolderNotFoundException | InternalErrorException - | HomeNotFoundException | InsufficientPrivilegesException - | ItemAlreadyExistException | WrongDestinationException + } catch (WorkspaceFolderNotFoundException | InternalErrorException | HomeNotFoundException + | InsufficientPrivilegesException | ItemAlreadyExistException | WrongDestinationException | ItemNotFoundException e) { logger.error("SaveOnWorkspace: " + e.getLocalizedMessage()); e.printStackTrace(); diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/util/ServiceCredentials.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/util/ServiceCredentials.java index 7405d58..a2c70f1 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/server/util/ServiceCredentials.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/server/util/ServiceCredentials.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceCredentials implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/Constants.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/Constants.java index 48aa501..f639005 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/Constants.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.githubconnector.shared; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class Constants { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ExpiredSessionServiceException.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ExpiredSessionServiceException.java index db2f922..f95e61f 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ExpiredSessionServiceException.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ExpiredSessionServiceException.java @@ -5,11 +5,10 @@ package org.gcube.portlets.widgets.githubconnector.shared.exception; * * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ -public class ExpiredSessionServiceException extends - ServiceException { +public class ExpiredSessionServiceException extends ServiceException { private static final long serialVersionUID = -4831171355042165166L; @@ -22,6 +21,7 @@ public class ExpiredSessionServiceException extends /** * @param message + * message */ public ExpiredSessionServiceException(String message) { super(message); @@ -30,10 +30,12 @@ public class ExpiredSessionServiceException extends /** * * @param message - * @param t + * message + * @param throwable + * throwable */ - public ExpiredSessionServiceException(String message, Throwable t) { - super(message, t); + public ExpiredSessionServiceException(String message, Throwable throwable) { + super(message, throwable); } } diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ServiceException.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ServiceException.java index 830ca34..9e7d731 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ServiceException.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/exception/ServiceException.java @@ -5,16 +5,14 @@ package org.gcube.portlets.widgets.githubconnector.shared.exception; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class ServiceException extends Exception { - private static final long serialVersionUID = -2255657546267656458L; - /** * */ @@ -24,15 +22,21 @@ public class ServiceException extends Exception { /** * @param message + * message */ public ServiceException(String message) { super(message); } - - - public ServiceException(String message,Throwable t) { - super(message,t); + + /** + * + * @param message + * message + * @param throwable + * throwable + */ + public ServiceException(String message, Throwable throwable) { + super(message, throwable); } - } diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/GitHubCloneSession.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/GitHubCloneSession.java index 0bf0cd5..d5f29f2 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/GitHubCloneSession.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/GitHubCloneSession.java @@ -6,8 +6,8 @@ import org.gcube.portlets.widgets.githubconnector.shared.git.data.credential.Git /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubCloneSession implements Serializable { @@ -20,25 +20,29 @@ public class GitHubCloneSession implements Serializable { public GitHubCloneSession() { super(); } - + /** * * @param destinationFolderId + * destination folder id */ public GitHubCloneSession(String destinationFolderId) { super(); this.destinationFolderId = destinationFolderId; } - + /** * * @param destinationFolderId + * destination folder id * @param gitHubCredential + * git hub credential * @param repositoryOwner + * repository owner * @param repositoryName + * repository name */ - public GitHubCloneSession(String destinationFolderId, - GitHubCredential gitHubCredential, String repositoryOwner, + public GitHubCloneSession(String destinationFolderId, GitHubCredential gitHubCredential, String repositoryOwner, String repositoryName) { super(); this.destinationFolderId = destinationFolderId; @@ -81,12 +85,9 @@ public class GitHubCloneSession implements Serializable { @Override public String toString() { - return "GitHubCloneSession [destinationFolderId=" + destinationFolderId - + ", gitHubCredential=" + gitHubCredential - + ", repositoryOwner=" + repositoryOwner + ", repositoryName=" - + repositoryName + "]"; + return "GitHubCloneSession [destinationFolderId=" + destinationFolderId + ", gitHubCredential=" + + gitHubCredential + ", repositoryOwner=" + repositoryOwner + ", repositoryName=" + repositoryName + + "]"; } - - } diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubRepository.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubRepository.java index b91ca70..fdd1f1c 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubRepository.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubRepository.java @@ -6,7 +6,7 @@ import java.util.Date; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class GitHubRepository implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubUser.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubUser.java index a3c1a1e..35d5cc6 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubUser.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/GitHubUser.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class GitHubUser implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredential.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredential.java index 08e8ef7..fabf6a5 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredential.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredential.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubCredential implements Serializable { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialAnonymous.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialAnonymous.java index 2fc2120..74e1c70 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialAnonymous.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialAnonymous.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.githubconnector.shared.git.data.credential; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class GitHubCredentialAnonymous extends GitHubCredential { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialLogin.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialLogin.java index a8192d3..0688bf5 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialLogin.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialLogin.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.githubconnector.shared.git.data.credential; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubCredentialLogin extends GitHubCredential { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialOAuth2.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialOAuth2.java index 274b23a..26ed1db 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialOAuth2.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialOAuth2.java @@ -2,8 +2,8 @@ package org.gcube.portlets.widgets.githubconnector.shared.git.data.credential; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubCredentialOAuth2 extends GitHubCredential { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialType.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialType.java index 0f8d488..8e03d46 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialType.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/git/data/credential/GitHubCredentialType.java @@ -4,7 +4,7 @@ package org.gcube.portlets.widgets.githubconnector.shared.git.data.credential; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public enum GitHubCredentialType { diff --git a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/session/UserInfo.java b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/session/UserInfo.java index 4afadf4..23a9498 100644 --- a/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/session/UserInfo.java +++ b/src/main/java/org/gcube/portlets/widgets/githubconnector/shared/session/UserInfo.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UserInfo implements Serializable { @@ -26,15 +26,20 @@ public class UserInfo implements Serializable { /** * * @param username + * user name * @param groupId + * group id * @param groupName + * group name * @param scope - * @param scopeName + * scope * @param userEmailAddress + * email * @param userFullName + * full name */ - public UserInfo(String username, String groupId, String groupName, - String scope, String userEmailAddress, String userFullName) { + public UserInfo(String username, String groupId, String groupName, String scope, String userEmailAddress, + String userFullName) { super(); this.username = username; this.groupId = groupId; @@ -94,10 +99,8 @@ public class UserInfo implements Serializable { @Override public String toString() { - return "UserInfo [username=" + username + ", groupId=" + groupId - + ", groupName=" + groupName + ", scope=" + scope - + ", userEmailAddress=" + userEmailAddress + ", userFullName=" - + userFullName + "]"; + return "UserInfo [username=" + username + ", groupId=" + groupId + ", groupName=" + groupName + ", scope=" + + scope + ", userEmailAddress=" + userEmailAddress + ", userFullName=" + userFullName + "]"; } } diff --git a/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java b/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java index 2426f78..7c689a5 100644 --- a/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java +++ b/src/test/java/org/gcube/portlets/widgets/githubconnector/GitHubConnectorTest.java @@ -23,8 +23,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubConnectorTest extends TestCase {