diff --git a/api/src/main/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDto.java b/api/src/main/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDto.java index 6c1011282a..6b9786e1f8 100644 --- a/api/src/main/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDto.java +++ b/api/src/main/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDto.java @@ -23,6 +23,7 @@ public NodeRepositoryFileDataDto() { } private DataNodeDto node; + private long dataSize = 0; public DataNodeDto getNode() { return node; @@ -32,6 +33,14 @@ public void setNode( DataNodeDto node ) { this.node = node; } + public long getDataSize() { + return dataSize; + } + + public void setDataSize( long dataSize ) { + this.dataSize = dataSize; + } + @SuppressWarnings( "nls" ) @Override public String toString() { diff --git a/api/src/test/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDtoTest.java b/api/src/test/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDtoTest.java index c01492f339..8352bee5dd 100644 --- a/api/src/test/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDtoTest.java +++ b/api/src/test/java/org/pentaho/platform/api/repository2/unified/webservices/NodeRepositoryFileDataDtoTest.java @@ -22,12 +22,22 @@ */ public class NodeRepositoryFileDataDtoTest { @Test - public void testDto() { + public void testDtoNode() { NodeRepositoryFileDataDto dto = new NodeRepositoryFileDataDto(); DataNodeDto nodeMock = new DataNodeDto(); dto.setNode( nodeMock ); - assertEquals( dto.getNode(), nodeMock ); + assertEquals( nodeMock, dto.getNode() ); + + } + + @Test + public void testDtoDataSize() { + + NodeRepositoryFileDataDto dto = new NodeRepositoryFileDataDto(); + int dataSize = 100; + dto.setDataSize( dataSize ); + assertEquals( dataSize, dto.getDataSize() ); } } diff --git a/repository/src/main/java/org/pentaho/platform/repository2/unified/webservices/NodeRepositoryFileDataAdapter.java b/repository/src/main/java/org/pentaho/platform/repository2/unified/webservices/NodeRepositoryFileDataAdapter.java index 8a4fdea6e4..3f7a45bc40 100644 --- a/repository/src/main/java/org/pentaho/platform/repository2/unified/webservices/NodeRepositoryFileDataAdapter.java +++ b/repository/src/main/java/org/pentaho/platform/repository2/unified/webservices/NodeRepositoryFileDataAdapter.java @@ -34,6 +34,7 @@ public NodeRepositoryFileDataDto marshal( final NodeRepositoryFileData v ) { NodeRepositoryFileDataDto d = new NodeRepositoryFileDataDto(); DataNodeDto node = new DataNodeDto(); d.setNode( node ); + d.setDataSize( v.getDataSize() ); toDataNodeDto( node, v.getNode() ); return d; } @@ -73,8 +74,7 @@ protected void toDataNodeDto( final DataNodeDto nodeDto, final DataNode node ) { @Override public NodeRepositoryFileData unmarshal( final NodeRepositoryFileDataDto v ) { DataNode node = toDataNode( v.getNode() ); - NodeRepositoryFileData data = new NodeRepositoryFileData( node ); - return data; + return new NodeRepositoryFileData( node, v.getDataSize() ); } protected DataNode toDataNode( final DataNodeDto nodeDto ) {