TrueCloudLab/frostfs-sdk-java
18
0
Fork 3
Code Issues 4 Pull requests Releases Packages Activity Actions

[#29] Provide a InputStream for the putObject method #30

Merged
orikik merged 1 commit from orikik/frostfs-sdk-java:feature/putObject into master 2024-11-22 11:01:08 +00:00
Conversation 0 Commits 1 Files changed 2 +9 -9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/src/main/java/info/frostfs/sdk/jdo/PutObjectParameters.java
View file

@ -6,7 +6,7 @@ import info.frostfs.sdk.dto.session.SessionToken;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.FileInputStream; import java.io.InputStream;
@Getter @Getter
@Setter @Setter
@ -16,7 +16,7 @@ public class PutObjectParameters {
private ObjectHeader header; private ObjectHeader header;
@NotNull @NotNull
private FileInputStream payload; private InputStream payload;
private boolean clientCut; private boolean clientCut;
private int bufferMaxSize; private int bufferMaxSize;
@ -26,14 +26,14 @@ public class PutObjectParameters {
private long currentStreamPosition; private long currentStreamPosition;
private long fullLength; private long fullLength;
public PutObjectParameters(ObjectHeader header, FileInputStream payload, boolean clientCut, int bufferMaxSize) { public PutObjectParameters(ObjectHeader header, InputStream payload, boolean clientCut, int bufferMaxSize) {
this.header = header; this.header = header;
this.payload = payload; this.payload = payload;
this.clientCut = clientCut; this.clientCut = clientCut;
this.bufferMaxSize = bufferMaxSize; this.bufferMaxSize = bufferMaxSize;
} }
public PutObjectParameters(ObjectHeader header, FileInputStream payload) { public PutObjectParameters(ObjectHeader header, InputStream payload) {
this.header = header; this.header = header;
this.payload = payload; this.payload = payload;
} }

10
client/src/main/java/info/frostfs/sdk/services/impl/ObjectClientImpl.java
View file

@ -31,8 +31,8 @@ import info.frostfs.sdk.tools.Verifier;
import info.frostfs.sdk.utils.Validator; import info.frostfs.sdk.utils.Validator;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -329,17 +329,17 @@ public class ObjectClientImpl extends ContextAccessor implements ObjectClient {
return new SearchReader(objectServiceBlockingClient.search(initRequest)); return new SearchReader(objectServiceBlockingClient.search(initRequest));
} }
private int readNBytes(FileInputStream fileInputStream, byte[] buffer, int size) { private int readNBytes(InputStream inputStream, byte[] buffer, int size) {
try { try {
return fileInputStream.readNBytes(buffer, 0, size); return inputStream.readNBytes(buffer, 0, size);
} catch (IOException exp) { } catch (IOException exp) {
throw new ProcessFrostFSException(exp.getMessage()); throw new ProcessFrostFSException(exp.getMessage());
} }
} }
private long getStreamSize(FileInputStream fileInputStream) { private long getStreamSize(InputStream inputStream) {
try { try {
return fileInputStream.getChannel().size(); return inputStream.available();
} catch (IOException exp) { } catch (IOException exp) {
throw new ProcessFrostFSException(exp.getMessage()); throw new ProcessFrostFSException(exp.getMessage());
} }