Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump spring-grpc.version from 2.3.0.RELEASE to 2.6.2.RELEASE #600

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion factcast-client-grpc-boot1/pom.xml
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
<version>2.1.0.RELEASE</version>
<version>1.4.2.RELEASE</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
Expand Up @@ -54,7 +54,6 @@ public Channel createChannel(String name) {

@Override
public void close() throws Exception {
af.close();
}
};
return new GrpcFactStore(f, credentials);
Expand Down
6 changes: 6 additions & 0 deletions factcast-client-grpc/pom.xml
Expand Up @@ -73,5 +73,11 @@
<artifactId>snappy-java</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Expand Up @@ -20,15 +20,16 @@
import java.io.IOException;
import java.io.OutputStream;

import org.apache.commons.compress.utils.IOUtils;

import io.grpc.Codec;
import io.grpc.internal.IoUtils;
import lombok.experimental.UtilityClass;

@UtilityClass
class CodecTestHelper {
byte[] fromByteArray(Codec uut, byte[] compressedBytes) throws IOException {
ByteArrayOutputStream os = new ByteArrayOutputStream();
IoUtils.copy(uut.decompress(new ByteArrayInputStream(
IOUtils.copy(uut.decompress(new ByteArrayInputStream(
compressedBytes)), os);
os.close();
return os.toByteArray();
Expand All @@ -37,7 +38,7 @@ byte[] fromByteArray(Codec uut, byte[] compressedBytes) throws IOException {
byte[] toByteArray(Codec uut, byte[] uncompressed) throws IOException {
ByteArrayOutputStream target = new ByteArrayOutputStream();
OutputStream compressedStream = uut.compress(target);
IoUtils.copy(new ByteArrayInputStream(uncompressed), compressedStream);
IOUtils.copy(new ByteArrayInputStream(uncompressed), compressedStream);
compressedStream.close();
return target.toByteArray();
}
Expand Down
@@ -1,3 +1,4 @@
grpc.client.factstore.negotiation-type=PLAINTEXT
# if this property is set with a value of the format 'username:password', basicauth will be used.
grpc.client.factstore.credentials=foo:bar
grpc.client.factstore.address=localhost:9090
@@ -1,5 +1,6 @@
grpc.client.factstore.negotiation-type=PLAINTEXT
grpc.client.factstore.enable-keep-alive=true
grpc.client.factstore.keep-alive-without-calls=true
grpc.client.factstore.address=localhost:9090

#spring.main.allow-bean-definition-overriding: true
2 changes: 1 addition & 1 deletion factcast-internal-dep-boot/pom.xml
Expand Up @@ -12,7 +12,7 @@
<properties>
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
<spring-grpc.version>2.3.0.RELEASE</spring-grpc.version>
<spring-grpc.version>2.6.2.RELEASE</spring-grpc.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion factcast-internal-dep/pom.xml
Expand Up @@ -10,7 +10,7 @@
<artifactId>factcast-internal-dep</artifactId>
<packaging>pom</packaging>
<properties>
<grpc.version>1.18.0</grpc.version>
<grpc.version>1.25.0</grpc.version>
<slf4j-api.version>1.7.30</slf4j-api.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
Expand Down
8 changes: 7 additions & 1 deletion factcast-server-grpc/pom.xml
Expand Up @@ -54,5 +54,11 @@
<artifactId>snappy-java</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.19</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
Expand Up @@ -20,15 +20,16 @@
import java.io.IOException;
import java.io.OutputStream;

import org.apache.commons.compress.utils.IOUtils;

import io.grpc.Codec;
import io.grpc.internal.IoUtils;
import lombok.experimental.UtilityClass;

@UtilityClass
public class CodecTestHelper {
byte[] fromByteArray(Codec uut, byte[] compressedBytes) throws IOException {
ByteArrayOutputStream os = new ByteArrayOutputStream();
IoUtils.copy(uut.decompress(new ByteArrayInputStream(
IOUtils.copy(uut.decompress(new ByteArrayInputStream(
compressedBytes)), os);
os.close();
return os.toByteArray();
Expand All @@ -37,7 +38,7 @@ byte[] fromByteArray(Codec uut, byte[] compressedBytes) throws IOException {
byte[] toByteArray(Codec uut, byte[] uncompressed) throws IOException {
ByteArrayOutputStream target = new ByteArrayOutputStream();
OutputStream compressedStream = uut.compress(target);
IoUtils.copy(new ByteArrayInputStream(uncompressed), compressedStream);
IOUtils.copy(new ByteArrayInputStream(uncompressed), compressedStream);
compressedStream.close();
return target.toByteArray();
}
Expand Down