Author: reto
Date: Mon Mar 22 14:22:49 2010
New Revision: 926100
URL: http://svn.apache.org/viewvc?rev=926100&view=rev
Log:
CLEREZZA-167: avoiding byte-arrays streamin directly to zip and to entity-stream
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java?rev=926100&r1=926099&r2=926100&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Backup.java
Mon Mar 22 14:22:49 2010
@@ -18,45 +18,20 @@
*/
package org.apache.clerezza.rdf.web.core;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.MGraph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
-import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.web.ontologies.BACKUP;
/**
* This JAX-RS resource provides a method to retrieve a zip file containing
@@ -72,15 +47,10 @@ import org.apache.clerezza.rdf.web.ontol
@Path("/admin/backup")
public class Backup {
- @Reference
- TcManager tcManager;
-
- @Reference
- Serializer serializer;
+
final Logger logger = LoggerFactory.getLogger(Backup.class);
- private final String folder = "graphs/";
/**
* Get a zipped file containing all triple collections which the
@@ -93,105 +63,24 @@ public class Backup {
* triplecollections.nt.
*
* @return
- * a zipped file
+ * a response that will cause the creation of a zipped file
*/
@GET
@Path("download")
@Produces("application/zip")
public Response download() {
- byte[] byteArray = createBackup();
ResponseBuilder responseBuilder = Response.status(Status.OK).
- entity(byteArray);
+ entity(this);
responseBuilder.header("Content-Disposition",
"attachment; filename=backup" +
getCurrentDate() +".zip");
return responseBuilder.build();
}
-
- byte[] createBackup() {
- Map<String, Integer> fileNameCount = new HashMap<String,
Integer>();
-
- ByteArrayOutputStream result = new ByteArrayOutputStream();
- MGraph backupContents = new SimpleMGraph();
- try {
- ZipOutputStream compressedTcs = new
ZipOutputStream(result);
-
- compressedTcs.putNextEntry(new ZipEntry(folder));
-
- Set<UriRef> tripleCollections =
tcManager.listTripleCollections();
- Iterator<UriRef> tcUriRefs =
tripleCollections.iterator();
- while (tcUriRefs.hasNext()) {
- UriRef tcUri = tcUriRefs.next();
- String fileName = folder + getTcFileName(tcUri,
".nt",
- fileNameCount);
- archive(compressedTcs,
tcManager.getTriples(tcUri), fileName);
- backupContents.add(new TripleImpl(tcUri,
RDF.type,
- BACKUP.Graph));
- backupContents.add(new TripleImpl(tcUri,
BACKUP.file,
-
LiteralFactory.getInstance().createTypedLiteral(
- fileName)));
- }
- archive(compressedTcs, backupContents,
"triplecollections.nt");
- compressedTcs.close();
-
- } catch (UnsupportedFormatException ufe) {
- throw new WebApplicationException(Response.status(
-
Status.NOT_ACCEPTABLE).entity(ufe.getMessage()).build());
- } catch (IOException ex) {
- throw new WebApplicationException(ex);
- }
- return result.toByteArray();
- }
-
- private void archive(ZipOutputStream compressedTcs,
- TripleCollection tripleCollection,
- String fileName) throws IOException,
UnsupportedFormatException {
- Lock readLock = null;
- final int BUF_SIZE = 2048;
- byte buffer[] = new byte[BUF_SIZE];
- ByteArrayOutputStream serializedGraph = new
ByteArrayOutputStream();
-
- if (tripleCollection instanceof LockableMGraph) {
- readLock = ((LockableMGraph)
tripleCollection).getLock().readLock();
- readLock.lock();
- }
- try {
- serializer.serialize(serializedGraph, tripleCollection,
- SupportedFormat.N_TRIPLE);
- } finally {
- if (readLock != null) {
- readLock.unlock();
- }
- }
- ByteArrayInputStream graphToCompress = new ByteArrayInputStream(
- serializedGraph.toByteArray());
-
- compressedTcs.putNextEntry(new ZipEntry(fileName));
- int count;
- while ((count = graphToCompress.read(buffer, 0, BUF_SIZE)) !=
-1) {
- compressedTcs.write(buffer, 0, count);
- }
- graphToCompress.close();
- }
-
- private String getTcFileName(UriRef tcUri, String extension,
- Map<String, Integer> fileNameCount) {
- String fileName = tcUri.getUnicodeString();
- fileName = fileName.substring(fileName.lastIndexOf("/")+1);
- Integer count = fileNameCount.get(fileName);
- if (count == null) {
- fileNameCount.put(fileName, 0);
- } else {
- count++;
- fileNameCount.put(fileName, count);
- fileName = fileName.concat("_" + count);
- }
- return fileName.concat(extension);
- }
-
+
private String getCurrentDate(){
DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
Date date = new Date();
return dateFormat.format(date);
}
+
}
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java?rev=926100&view=auto
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
(added)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
Mon Mar 22 14:22:49 2010
@@ -0,0 +1,175 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.rdf.web.core;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.clerezza.rdf.core.LiteralFactory;
+import org.apache.clerezza.rdf.core.MGraph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
+import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
+import org.apache.clerezza.rdf.ontologies.RDF;
+import org.apache.clerezza.rdf.web.ontologies.BACKUP;
+
+/**
+ * This does the actual work of producing a backup
+ *
+ * @author hasan, reto
+ */
+...@component
+...@service(Object.class)
+...@property(name="javax.ws.rs", boolValue=true)
+...@produces("application/zip")
+...@provider
+public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
+
+ @Reference
+ TcManager tcManager;
+
+ @Reference
+ Serializer serializer;
+
+ final Logger logger =
LoggerFactory.getLogger(BackupMessageBodyWriter.class);
+
+ private final String folder = "graphs/";
+
+
+ byte[] createBackup() {
+ ByteArrayOutputStream result = new ByteArrayOutputStream();
+ writeBackup(result);
+ return result.toByteArray();
+ }
+
+ private void archive(ZipOutputStream compressedTcs,
+ TripleCollection tripleCollection,
+ String fileName) throws IOException,
UnsupportedFormatException {
+ Lock readLock = null;
+ compressedTcs.putNextEntry(new ZipEntry(fileName));
+ if (tripleCollection instanceof LockableMGraph) {
+ readLock = ((LockableMGraph)
tripleCollection).getLock().readLock();
+ readLock.lock();
+ }
+ try {
+ serializer.serialize(compressedTcs, tripleCollection,
+ SupportedFormat.N_TRIPLE);
+ } finally {
+ if (readLock != null) {
+ readLock.unlock();
+ }
+ }
+ }
+
+ private String getTcFileName(UriRef tcUri, String extension,
+ Map<String, Integer> fileNameCount) {
+ String fileName = tcUri.getUnicodeString();
+ fileName = fileName.substring(fileName.lastIndexOf("/")+1);
+ Integer count = fileNameCount.get(fileName);
+ if (count == null) {
+ fileNameCount.put(fileName, 0);
+ } else {
+ count++;
+ fileNameCount.put(fileName, count);
+ fileName = fileName.concat("_" + count);
+ }
+ return fileName.concat(extension);
+ }
+
+ private void writeBackup(OutputStream result) {
+ Map<String, Integer> fileNameCount = new HashMap<String,
Integer>();
+ MGraph backupContents = new SimpleMGraph();
+ try {
+ ZipOutputStream compressedTcs = new
ZipOutputStream(result);
+
+ compressedTcs.putNextEntry(new ZipEntry(folder));
+
+ Set<UriRef> tripleCollections =
tcManager.listTripleCollections();
+ Iterator<UriRef> tcUriRefs =
tripleCollections.iterator();
+ while (tcUriRefs.hasNext()) {
+ UriRef tcUri = tcUriRefs.next();
+ String fileName = folder + getTcFileName(tcUri,
".nt",
+ fileNameCount);
+ archive(compressedTcs,
tcManager.getTriples(tcUri), fileName);
+ backupContents.add(new TripleImpl(tcUri,
RDF.type,
+ BACKUP.Graph));
+ backupContents.add(new TripleImpl(tcUri,
BACKUP.file,
+
LiteralFactory.getInstance().createTypedLiteral(
+ fileName)));
+ }
+ archive(compressedTcs, backupContents,
"triplecollections.nt");
+ compressedTcs.close();
+
+ } catch (UnsupportedFormatException ufe) {
+ throw new WebApplicationException(Response.status(
+
Status.NOT_ACCEPTABLE).entity(ufe.getMessage()).build());
+ } catch (IOException ex) {
+ throw new WebApplicationException(ex);
+ }
+ }
+
+ @Override
+ public boolean isWriteable(Class<?> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType) {
+ return Backup.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public long getSize(Backup t, Class<?> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType) {
+ return -1;
+ }
+
+ @Override
+ public void writeTo(Backup t, Class<?> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream) throws IOException,
WebApplicationException {
+ writeBackup(entityStream);
+ }
+}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java?rev=926100&r1=926099&r2=926100&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.web/org.apache.clerezza.rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupTest.java
Mon Mar 22 14:22:49 2010
@@ -68,12 +68,12 @@ public class BackupTest {
private static UriRef uri1 = new
UriRef("http://localhost/test1/testuri";);
private static String backupContentFileName = "triplecollections.nt";
- private static Backup backup;
+ private static BackupMessageBodyWriter backup;
private static JenaParserProvider parser = new JenaParserProvider();
@Before
public void setUp() {
- backup = new Backup();
+ backup = new BackupMessageBodyWriter();
backup.tcManager = new TestTcManager();
backup.serializer = Serializer.getInstance();
backup.serializer.bindSerializingProvider(
