Compare commits

..

No commits in common. "master" and "bugfix/validation-error" have entirely different histories.

13 changed files with 17 additions and 44 deletions

View file

@ -1,3 +0,0 @@
.* @orikik
.forgejo/.* @potyarkin
Makefile @potyarkin

View file

@ -10,7 +10,6 @@
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="NewlineAtEndOfFile"/>
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@ -21,15 +20,6 @@
<module name="TreeWalker">
<property name="tabWidth" value="4"/>
<module name="Regexp">
<property name="message" value="Blank line at end of the block is not allowed"/>
<property name="format" value="^\s*$^\s*\}"/>
<property name="ignoreComments" value="true"/>
<property name="illegalPattern" value="true"/>
</module>
<module name="HideUtilityClassConstructor" />
<module name="SuppressWarningsHolder" />
<!-- Checks for Naming Conventions. -->

View file

@ -8,4 +8,4 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface NotNull {
}
}

View file

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

View file

@ -11,4 +11,4 @@ public interface ApeManagerClient {
void removeChain(Chain chain, ChainTarget chainTarget);
List<Chain> listChains(ChainTarget chainTarget);
}
}

View file

@ -10,4 +10,5 @@ public class ContextAccessor {
public ContextAccessor(ClientEnvironment context) {
this.context = context;
}
}

View file

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

View file

@ -23,4 +23,5 @@ public class SessionToolsImpl extends ContextAccessor implements SessionTools {
return SessionMapper.deserializeSessionToken(sessionToken.getToken());
}
}

View file

@ -9,21 +9,14 @@ import java.util.Collections;
import java.util.List;
public class Labels {
private Labels() {
}
/**
* Merges two string lists into an array, maintaining order of first list then second list.
*/
/** Merges two string lists into an array, maintaining order of first list then second list. */
static String[] asArray(List<String> firstList, List<String> secondList) {
List<String> list = new ArrayList<>(firstList);
list.addAll(secondList);
return list.toArray(new String[0]);
}
/**
* Converts a list of strings to a list of grpc metadata keys.
*/
/** Converts a list of strings to a list of grpc metadata keys. */
static List<Key<String>> metadataKeys(List<String> headerNames) {
List<Key<String>> keys = new ArrayList<>();
for (String name : headerNames) {
@ -48,9 +41,7 @@ public class Labels {
return Collections.unmodifiableList(labels);
}
/**
* Adds standard labels, as well as custom ones, in order, to a given collector.
*/
/** Adds standard labels, as well as custom ones, in order, to a given collector. */
static <T> T addLabels(SimpleCollector<T> collector, List<String> labels, GrpcMethod method) {
List<String> allLabels = new ArrayList<>();
allLabels.add(method.type());

View file

@ -119,4 +119,5 @@ public class RequestSigner {
MessageHelper.setField(verifyBuilder, ORIGIN_SIGNATURE_FIELD_NAME, signMessagePart(key, verifyOrigin));
MessageHelper.setField(request, VERIFY_HEADER_FIELD_NAME, verifyBuilder.build());
}
}

View file

@ -15,9 +15,6 @@ import static info.frostfs.sdk.constants.ErrorConst.FIELDS_DELIMITER_COMMA;
import static java.util.Objects.isNull;
public class Validator {
private Validator() {
}
public static <T> void validate(T object) {
StringBuilder errorMessage = new StringBuilder();
process(object, errorMessage);

View file

@ -1,8 +1,6 @@
package info.frostfs.sdk.utils;
public class WaitUtil {
private WaitUtil() {
}
public static void sleep(long ms) {
try {

View file

@ -46,7 +46,4 @@ public class FilterConst {
// FILTER_HEADER_PHY is a filter key to check if an object physically stored on a node.
public static final String FILTER_HEADER_PHY = HEADER_PREFIX + "PHY";
private FilterConst() {
}
}