diff --git a/caosdb-proto b/caosdb-proto index c3783d64c31f8ee3495c28746dfb0bf23abfc20a..af178772ef43ded290168f33852ef3d85583b20a 160000 --- a/caosdb-proto +++ b/caosdb-proto @@ -1 +1 @@ -Subproject commit c3783d64c31f8ee3495c28746dfb0bf23abfc20a +Subproject commit af178772ef43ded290168f33852ef3d85583b20a diff --git a/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java b/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java index dc1da0d63f338799f80c7f45c650c98f2893586a..c1598f30d98e224a24705c2196fbcaf81be39fca 100644 --- a/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java +++ b/src/main/java/org/caosdb/server/grpc/DownloadBuffer.java @@ -1,5 +1,6 @@ package org.caosdb.server.grpc; +import com.google.protobuf.ByteString; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -10,7 +11,6 @@ import org.caosdb.api.entity.v1alpha1.FileChunk; import org.caosdb.api.entity.v1alpha1.FileDownloadResponse; import org.caosdb.api.entity.v1alpha1.TransmissionStatus; import org.caosdb.server.entity.FileProperties; -import com.google.protobuf.ByteString; public class DownloadBuffer { @@ -36,8 +36,7 @@ public class DownloadBuffer { final long unread_bytes = fileChannel.size() - position; final long next_chunk_size = Math.min(unread_bytes, getChunkSize()); - final MappedByteBuffer map = - fileChannel.map(MapMode.READ_ONLY, position, next_chunk_size); + final MappedByteBuffer map = fileChannel.map(MapMode.READ_ONLY, position, next_chunk_size); final FileChunk.Builder builder = FileChunk.newBuilder(); builder.setData(ByteString.copyFrom(map)); diff --git a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java index 6eed746a9ef5d520a65aa9458c3c12d89c0d2f8c..f704e4359071d3836206fe476ceeef49975855f3 100644 --- a/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java +++ b/src/main/java/org/caosdb/server/grpc/EntityTransactionServiceImpl.java @@ -1,5 +1,6 @@ package org.caosdb.server.grpc; +import io.grpc.stub.StreamObserver; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -50,7 +51,6 @@ import org.caosdb.server.transaction.Retrieve; import org.caosdb.server.transaction.WriteTransaction; import org.caosdb.server.utils.EntityStatus; import org.caosdb.server.utils.ServerMessages; -import io.grpc.stub.StreamObserver; public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBase { @@ -194,35 +194,35 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa final PropertyContainer from) { final Iterator<org.caosdb.server.entity.wrapper.Property> iterator = from.iterator(); return () -> - new Iterator<>() { + new Iterator<>() { - @Override - public boolean hasNext() { - return iterator.hasNext(); - } + @Override + public boolean hasNext() { + return iterator.hasNext(); + } - @Override - public org.caosdb.api.entity.v1alpha1.Property next() { - return convert(iterator.next()); - } - }; + @Override + public org.caosdb.api.entity.v1alpha1.Property next() { + return convert(iterator.next()); + } + }; } public Iterable<? extends Parent> convert(final ParentContainer from) { final Iterator<org.caosdb.server.entity.wrapper.Parent> iterator = from.iterator(); return () -> - new Iterator<>() { + new Iterator<>() { - @Override - public boolean hasNext() { - return iterator.hasNext(); - } + @Override + public boolean hasNext() { + return iterator.hasNext(); + } - @Override - public Parent next() { - return convert(iterator.next()); - } - }; + @Override + public Parent next() { + return convert(iterator.next()); + } + }; } public Integer getId(final String id) { @@ -266,8 +266,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa if (container.getFlags().containsKey("query_count_result")) { final int count = Integer.parseInt(container.getFlags().get("query_count_result")); builder - .addResponsesBuilder() - .setRetrieveResponse(RetrieveResponse.newBuilder().setCountResult(count)); + .addResponsesBuilder() + .setRetrieveResponse(RetrieveResponse.newBuilder().setCountResult(count)); } else { final boolean download_files_container = container.getFlags().containsKey("download_files"); for (final EntityInterface entity : container) { @@ -283,8 +283,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa file_download.getId(), entity.getFileProperties())); } builder - .addResponsesBuilder() - .setRetrieveResponse(RetrieveResponse.newBuilder().setEntityResponse(entityResponse)); + .addResponsesBuilder() + .setRetrieveResponse(RetrieveResponse.newBuilder().setEntityResponse(entityResponse)); } } @@ -300,8 +300,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa // exist. builder.addResponses( TransactionResponse.newBuilder() - .setRetrieveResponse( - RetrieveResponse.newBuilder().setEntityResponse(entityDoesNotExist(id)))); + .setRetrieveResponse( + RetrieveResponse.newBuilder().setEntityResponse(entityDoesNotExist(id)))); } } } @@ -386,8 +386,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa appendMessages(entity, idResponse); builder - .addResponsesBuilder() - .setDeleteResponse(DeleteResponse.newBuilder().setIdResponse(idResponse)); + .addResponsesBuilder() + .setDeleteResponse(DeleteResponse.newBuilder().setIdResponse(idResponse)); } // Add those entities which have not been retrieved because the have a string id @@ -403,7 +403,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa idResponse.addErrors(convert(ServerMessages.ENTITY_DOES_NOT_EXIST)); builder.addResponses( TransactionResponse.newBuilder() - .setDeleteResponse(DeleteResponse.newBuilder().setIdResponse(idResponse))); + .setDeleteResponse(DeleteResponse.newBuilder().setIdResponse(idResponse))); } } } @@ -416,7 +416,7 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa final InsertEntity entity = new InsertEntity( insertEntity.getName().isEmpty() ? null : insertEntity.getName(), - Role.parse(insertEntity.getRole())); + Role.parse(insertEntity.getRole())); return InsertResponse.newBuilder() .setIdResponse(write(convert(insertEntity, entity), entityRequest)) @@ -440,8 +440,8 @@ public class EntityTransactionServiceImpl extends EntityTransactionServiceImplBa return UpdateResponse.newBuilder() .setIdResponse( IdResponse.newBuilder() - .setId(id) - .addErrors(convert(ServerMessages.ENTITY_DOES_NOT_EXIST))) + .setId(id) + .addErrors(convert(ServerMessages.ENTITY_DOES_NOT_EXIST))) .build(); } }