dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39981
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20241: Minor
------------------------------------------------------------
revno: 20241
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2015-09-19 10:23:14 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceService.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceService.java 2015-09-10 12:43:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceService.java 2015-09-19 08:23:14 +0000
@@ -36,9 +36,14 @@
public interface FileResourceService
{
FileResource getFileResource( String uid );
+
String saveFileResource( FileResource fileResource, ByteSource content );
+
void deleteFileResource( String uid );
+
ByteSource getFileResourceContent( FileResource fileResource );
+
boolean fileResourceExists( String uid );
+
void updateFileResource( FileResource fileResource );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceService.java 2015-09-18 21:24:50 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceService.java 2015-09-19 08:23:14 +0000
@@ -28,15 +28,14 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.google.common.io.ByteSource;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
-import org.jclouds.blobstore.BlobStore;
-import org.jclouds.blobstore.BlobStoreContext;
import org.springframework.transaction.annotation.Transactional;
+import com.google.common.io.ByteSource;
+
/**
* @author Halvdan Hoem Grelland
*/
@@ -45,10 +44,6 @@
{
private static final Log log = LogFactory.getLog( DefaultFileResourceService.class );
- private BlobStore blobStore;
-
- private BlobStoreContext blobStoreContext;
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------