git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-analysis/RConnector/2.1@144070 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
e4387860dd
commit
2dc8b8c41a
|
@ -1,4 +1,7 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-02-22">
|
||||||
|
<Change>porting to tabular-data-cl 2.0.0</Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
|
<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
|
||||||
<Change>porting to smartgears 2.0</Change>
|
<Change>porting to smartgears 2.0</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.gcube.data.analysis</groupId>
|
<groupId>org.gcube.data.analysis</groupId>
|
||||||
<artifactId>r-connector</artifactId>
|
<artifactId>r-connector</artifactId>
|
||||||
<version>2.1.1-SNAPSHOT</version>
|
<version>2.1.2-SNAPSHOT</version>
|
||||||
<name>RConnector</name>
|
<name>RConnector</name>
|
||||||
<description>makes R available in the infrastructure</description>
|
<description>makes R available in the infrastructure</description>
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.data.analysis.tabulardata</groupId>
|
<groupId>org.gcube.data.analysis.tabulardata</groupId>
|
||||||
<artifactId>tabulardata-client-library</artifactId>
|
<artifactId>tabulardata-client-library</artifactId>
|
||||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- jersey -->
|
<!-- jersey -->
|
||||||
|
|
|
@ -16,10 +16,7 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.common.database.DatabaseEndpointIdentifier;
|
import org.gcube.common.database.DatabaseEndpointIdentifier;
|
||||||
import org.gcube.common.database.DatabaseProvider;
|
import org.gcube.common.database.DatabaseProvider;
|
||||||
import org.gcube.common.database.endpoint.DatabaseEndpoint;
|
import org.gcube.common.database.endpoint.DatabaseEndpoint;
|
||||||
import org.gcube.common.scope.api.ScopeProvider;
|
|
||||||
import org.gcube.data.analysis.rconnector.Info.DataBaseInfo;
|
import org.gcube.data.analysis.rconnector.Info.DataBaseInfo;
|
||||||
import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationProvider;
|
|
||||||
import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationToken;
|
|
||||||
import org.gcube.data.analysis.tabulardata.commons.webservice.types.TabularResource;
|
import org.gcube.data.analysis.tabulardata.commons.webservice.types.TabularResource;
|
||||||
import org.gcube.data.analysis.tabulardata.model.column.Column;
|
import org.gcube.data.analysis.tabulardata.model.column.Column;
|
||||||
import org.gcube.data.analysis.tabulardata.model.column.type.IdColumnType;
|
import org.gcube.data.analysis.tabulardata.model.column.type.IdColumnType;
|
||||||
|
@ -39,7 +36,6 @@ public class InfoRetriever {
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public Info retrieve(String userName, Long tabularResourceId){
|
public Info retrieve(String userName, Long tabularResourceId){
|
||||||
try {
|
try {
|
||||||
AuthorizationProvider.instance.set(new AuthorizationToken(userName, ScopeProvider.instance.get()));
|
|
||||||
TabularResource tr = tabularResource().build().getTabularResource(tabularResourceId);
|
TabularResource tr = tabularResource().build().getTabularResource(tabularResourceId);
|
||||||
Table table = history().build().getLastTable(tabularResourceId);
|
Table table = history().build().getLastTable(tabularResourceId);
|
||||||
if (table.contains(DatasetViewTableMetadata.class))
|
if (table.contains(DatasetViewTableMetadata.class))
|
||||||
|
|
Loading…
Reference in New Issue