From 7460096c83472178f4a5b5744113e945ef8f3d90 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 10 Apr 2014 13:14:49 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@94700 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gwtservice/server/TDGWTServiceImpl.java | 5 ++- .../user/td/gwtservice/shared/Constants.java | 3 +- .../gwtservice/client/TestServiceTable.java | 39 ++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index cb66d7d..abee231 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -2869,7 +2869,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements Table table = service.getTable(new TableId(Long.valueOf(trId .getTableId()))); - TabValidationsMetadata tabValidationsMetadata=null; + TabValidationsMetadata tabValidationsMetadata=new TabValidationsMetadata(); if(table.contains(ValidationsMetadata.class)){ ValidationsMetadata validationsMetadata=table.getMetadata(ValidationsMetadata.class); if(validationsMetadata!=null){ @@ -2883,11 +2883,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements vList.add(valid); i++; } - tabValidationsMetadata=new TabValidationsMetadata(); tabValidationsMetadata.setValidations(vList); } } } + + logger.debug("TabValidationsMetadata: "+tabValidationsMetadata); return tabValidationsMetadata; } catch (Throwable e) { diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java index 98fd131..4e6ad8b 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java @@ -13,7 +13,8 @@ package org.gcube.portlets.user.td.gwtservice.shared; public class Constants { public final static String VERSION = "2.1.0"; - public final static String DEFAULT_USER = "test.user"; + public final static String TEST_DEFAULT_USER = "test.user"; + public final static String DEFAULT_USER = "giancarlo.panichi"; public final static String DEFAULT_SCOPE = "/gcube/devsec"; public static final String PARAMETER_ENCODING = "encoding"; diff --git a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestServiceTable.java b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestServiceTable.java index e8d4263..04d2c09 100644 --- a/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestServiceTable.java +++ b/src/test/java/org/gcube/portlets/user/td/gwtservice/client/TestServiceTable.java @@ -4,6 +4,7 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationProvider; import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationToken; import org.gcube.data.analysis.tabulardata.model.table.Table; +import org.gcube.data.analysis.tabulardata.model.table.TableId; import org.gcube.data.analysis.tabulardata.service.TabularDataService; import org.gcube.data.analysis.tabulardata.service.exception.InvalidTabularResourceException; import org.gcube.data.analysis.tabulardata.service.exception.NoSuchTableException; @@ -20,15 +21,18 @@ import org.junit.Test; * */ public class TestServiceTable { - private final static long trId = 2; - + private final static long trId = 100; + private final static long searchTableId=341; + private String user=Constants.DEFAULT_USER; + private String scope=Constants.DEFAULT_SCOPE; + @Test - public void TestTROperation() { - - ScopeProvider.instance.set(Constants.DEFAULT_SCOPE); + public void TestLastTable() { + + ScopeProvider.instance.set(scope); AuthorizationProvider.instance.set(new AuthorizationToken( - Constants.DEFAULT_USER)); + user)); TabularDataService service = TabularDataServiceFactory.getService(); TabularResourceId tabularResourceId = new TabularResourceId(trId); @@ -52,5 +56,28 @@ public class TestServiceTable { System.out.println(lastTable.toString()); } + + + @Test + public void TestTable() { + + ScopeProvider.instance.set(scope); + + AuthorizationProvider.instance.set(new AuthorizationToken( + user)); + TabularDataService service = TabularDataServiceFactory.getService(); + + + Table searchTable; + try { + searchTable = service.getTable(new TableId(searchTableId)); + } catch (NoSuchTableException e) { + System.out.println("No such last table for: " + trId); + e.printStackTrace(); + return; + } + + System.out.println(searchTable.toString()); + } }