save

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/PathRef.java

@@ -5,8 +5,11 @@
 
 public final class PathRef
 {
+
     private static final String SEPARATOR = "/";
 
+    private static final PathRef EMPTY_PATH_REF = new PathRef( "" );
+
     private final String path;
 
     private PathRef( final String path )
@@ -16,7 +19,7 @@ private PathRef( final String path )
 
     public static PathRef of()
     {
-        return new PathRef( "" );
+        return EMPTY_PATH_REF;
     }
 
     public static PathRef of( String root )

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/blobstore/BlobReference.java

@@ -6,7 +6,6 @@
 import com.enonic.xp.blob.Segment;
 
 public final class BlobReference
-    implements BlobContainer
 {
     private final Segment segment;
 
@@ -28,12 +27,6 @@ public BlobKey getKey()
         return key;
     }
 
-    @Override
-    public BlobReference getReference()
-    {
-        return this;
-    }
-
     @Override
     public boolean equals( final Object o )
     {
@@ -54,4 +47,10 @@ public int hashCode()
     {
         return Objects.hash( segment, key );
     }
+
+    @Override
+    public String toString()
+    {
+        return segment + ":" + key;
+    }
 }

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/blobstore/DumpBlobRecord.java

@@ -1,6 +1,7 @@
 package com.enonic.xp.repo.impl.dump.blobstore;
 
-import com.google.common.io.ByteSink;
+import java.io.IOException;
+
 import com.google.common.io.ByteSource;
 
 import com.enonic.xp.blob.BlobKey;
@@ -10,15 +11,15 @@ public class DumpBlobRecord
 {
     private final BlobReference reference;
 
-    private final AbstractDumpBlobStore dumpBlobStore;
+    private final FileDumpBlobStore dumpBlobStore;
 
-    public DumpBlobRecord( final Segment segment, final BlobKey key, final AbstractDumpBlobStore dumpBlobStore )
+    public DumpBlobRecord( final Segment segment, final BlobKey key, final FileDumpBlobStore dumpBlobStore )
     {
         this.reference = new BlobReference( segment, key );
         this.dumpBlobStore = dumpBlobStore;
     }
 
-    public final BlobKey getKey()
+    public BlobKey getKey()
     {
         return reference.getKey();
     }
@@ -28,8 +29,9 @@ public ByteSource getBytes()
         return dumpBlobStore.getBytes( reference );
     }
 
-    public ByteSink getByteSink()
+    public void override( final byte[] bytes )
+        throws IOException
     {
-        return dumpBlobStore.getByteSink( reference );
+        dumpBlobStore.overrideBlob( reference, bytes );
     }
 }

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/blobstore/DumpBlobStore.java

@@ -1,11 +1,10 @@
 package com.enonic.xp.repo.impl.dump.blobstore;
 
-import com.enonic.xp.blob.BlobKey;
-import com.enonic.xp.blob.Segment;
+import com.google.common.io.ByteSource;
 
 public interface DumpBlobStore
 {
-    DumpBlobRecord getRecord( Segment segment, BlobKey key );
+    ByteSource getBytes( BlobReference reference );
 
-    void addRecord( BlobContainer blobContainer );
+    void addRecord( BlobReference blobContainer );
 }

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/blobstore/DumpBlobStoreUtils.java

@@ -0,0 +1,29 @@
+package com.enonic.xp.repo.impl.dump.blobstore;
+
+import com.google.common.io.ByteSource;
+
+import com.enonic.xp.blob.BlobStore;
+import com.enonic.xp.repo.impl.dump.PathRef;
+import com.enonic.xp.repository.RepositorySegmentUtils;
+
+public final class DumpBlobStoreUtils
+{
+    private DumpBlobStoreUtils()
+    {
+    }
+
+    public static PathRef getBlobPathRef( final PathRef parent, final BlobReference reference )
+    {
+        final String id = reference.getKey().toString();
+        return parent.resolve( reference.getSegment().getLevel( RepositorySegmentUtils.BLOB_TYPE_LEVEL ).getValue() )
+            .resolve( id.substring( 0, 2 ) )
+            .resolve( id.substring( 2, 4 ) )
+            .resolve( id.substring( 4, 6 ) )
+            .resolve( id );
+    }
+
+    public static ByteSource getBytesByReference( final BlobStore sourceBlobStore, final BlobReference reference )
+    {
+        return sourceBlobStore.getRecord( reference.getSegment(), reference.getKey() ).getBytes();
+    }
+}

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/blobstore/FileDumpBlobStore.java

@@ -4,52 +4,82 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import com.google.common.io.ByteSink;
 import com.google.common.io.ByteSource;
 import com.google.common.io.MoreFiles;
 
+import com.enonic.xp.blob.BlobKey;
 import com.enonic.xp.blob.BlobStore;
 import com.enonic.xp.blob.BlobStoreException;
+import com.enonic.xp.blob.Segment;
 import com.enonic.xp.repo.impl.dump.PathRef;
 
 public class FileDumpBlobStore
-    extends AbstractDumpBlobStore
+    implements DumpBlobStore
 {
     private final Path baseDir;
 
-    public FileDumpBlobStore( final Path baseDir, BlobStore sourceBlobStore )
+    private final BlobStore sourceBlobStore;
+
+    public FileDumpBlobStore( final Path baseDir, final BlobStore sourceBlobStore )
     {
-        super( PathRef.of(), sourceBlobStore );
         this.baseDir = baseDir;
+        this.sourceBlobStore = sourceBlobStore;
     }
 
     @Override
-    protected ByteSource getBytes( final BlobReference reference )
+    public ByteSource getBytes( final BlobReference reference )
     {
-        return MoreFiles.asByteSource( getBlobPathRef( reference ).asPath( baseDir ) );
+        return MoreFiles.asByteSource( toPath( reference ) );
     }
 
     @Override
-    protected ByteSink getByteSink( final BlobReference reference )
+    public void addRecord( final BlobReference reference )
     {
-        return MoreFiles.asByteSink( getBlobPathRef( reference ).asPath( baseDir ) );
+        final ByteSource data = DumpBlobStoreUtils.getBytesByReference( sourceBlobStore, reference );
+        writeBlob( reference, data );
     }
 
-    @Override
-    public void addRecord( final BlobContainer blobContainer )
+    public BlobKey addRecord( final Segment segment, final ByteSource data )
+    {
+        final BlobReference reference = new BlobReference( segment, BlobKey.from( data ) );
+
+        writeBlob( reference, data );
+        return reference.getKey();
+    }
+
+    public DumpBlobRecord getRecord( final Segment segment, final BlobKey key )
+    {
+        return new DumpBlobRecord( segment, key, this );
+    }
+    void overrideBlob( final BlobReference reference, byte[] bytes )
+        throws IOException
     {
+        Files.write( toPath( reference ), bytes );
+    }
+
+    private void writeBlob( final BlobReference reference, final ByteSource data )
+    {
+        final Path path = toPath( reference );
         try
         {
-            final Path file = getBlobPathRef( blobContainer.getReference() ).asPath( baseDir );
-            if ( !Files.exists( file ) )
+            if ( !Files.exists( path ) )
             {
-                Files.createDirectories( file.getParent() );
-                copyBlob( blobContainer, Files.newOutputStream( file ) );
+                Files.createDirectories( path.getParent() );
+
+                try (var output = Files.newOutputStream( path ))
+                {
+                    data.copyTo( output );
+                }
             }
         }
         catch ( final IOException e )
         {
             throw new BlobStoreException( "Failed to add blob", e );
         }
     }
+
+    private Path toPath( final BlobReference reference )
+    {
+        return DumpBlobStoreUtils.getBlobPathRef( PathRef.of(), reference ).asPath( baseDir );
+    }
 }

modules/core/core-repo/src/main/java/com/enonic/xp/repo/impl/dump/blobstore/ZipDumpReadBlobStore.java

@@ -10,28 +10,35 @@
 import com.enonic.xp.repo.impl.dump.PathRef;
 
 public class ZipDumpReadBlobStore
-    extends AbstractDumpBlobStore
+    implements DumpBlobStore
 {
     private final ZipFile zipFile;
 
-    public ZipDumpReadBlobStore( ZipFile zipFile, PathRef basePath )
-    {
-        super( basePath, null );
+    private final PathRef basePath;
 
+    public ZipDumpReadBlobStore( final ZipFile zipFile, final PathRef basePath )
+    {
+        this.basePath = basePath;
         this.zipFile = zipFile;
     }
 
     @Override
-    protected ByteSource getBytes( final BlobReference reference )
+    public ByteSource getBytes( final BlobReference reference )
     {
         return new ByteSource()
         {
             @Override
             public InputStream openStream()
                 throws IOException
             {
-                return zipFile.getInputStream( zipFile.getEntry( getBlobPathRef( reference ).asString() ) );
+                return zipFile.getInputStream( zipFile.getEntry( DumpBlobStoreUtils.getBlobPathRef( basePath, reference ).asString() ) );
             }
         };
     }
+
+    @Override
+    public void addRecord( final BlobReference reference )
+    {
+        throw new UnsupportedOperationException();
+    }
 }