diff --git a/telegrambots/pom.xml b/telegrambots/pom.xml index 0d8efb9a..0510e7cb 100644 --- a/telegrambots/pom.xml +++ b/telegrambots/pom.xml @@ -110,9 +110,9 @@ jackson-jaxrs-json-provider - com.angusmorton - brotli-interceptor - 1.0.0 + org.apache.commons + commons-compress + 1.21 com.fasterxml.jackson.module diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java new file mode 100644 index 00000000..48dfe30e --- /dev/null +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/CompressionEncoder.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package org.telegram.telegrambots.updatesreceivers; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import javax.annotation.Priority; +import javax.ws.rs.Priorities; +import javax.ws.rs.core.HttpHeaders; +import org.apache.commons.compress.compressors.CompressorException; +import org.apache.commons.compress.compressors.CompressorStreamFactory; +import org.glassfish.jersey.spi.ContentEncoder; + +/** + * BR encoding support. Interceptor that encodes the output or decodes the input if + * {@link HttpHeaders#CONTENT_ENCODING Content-Encoding header} value equals to {@code br} or {@code x-br}. + * + * @author Martin Matula + */ +@Priority(Priorities.ENTITY_CODER) +public class CompressionEncoder extends ContentEncoder { + /** + * Initialize BrEncoder. + */ + public CompressionEncoder() { + super("br", "x-br", "deflate", "deflate64", "gzip", "zstd", "lz4", "lzma"); + } + + private String translateEncoding(String contentEncoding) throws IOException { + switch (contentEncoding) { + case "br": + case "x-br": + return CompressorStreamFactory.BROTLI; + case "deflate": + return CompressorStreamFactory.DEFLATE; + case "deflate64": + return CompressorStreamFactory.DEFLATE64; + case "gzip": + return CompressorStreamFactory.GZIP; + case "zstd": + return CompressorStreamFactory.ZSTANDARD; + case "lz4": + return CompressorStreamFactory.LZ4_BLOCK; + case "lzma": + return CompressorStreamFactory.LZMA; + default: + throw new IOException("Unsupported encoding " + contentEncoding); + } + } + + @Override + public InputStream decode(String contentEncoding, InputStream encodedStream) + throws IOException { + try { + String enc = translateEncoding(contentEncoding); + return new CompressorStreamFactory().createCompressorInputStream(enc, encodedStream); + } catch (CompressorException e) { + throw new IOException(e); + } + } + + @Override + public OutputStream encode(String contentEncoding, OutputStream entityStream) + throws IOException { + try { + String enc = translateEncoding(contentEncoding); + return new CompressorStreamFactory().createCompressorOutputStream(enc, entityStream); + } catch (CompressorException e) { + throw new IOException(e); + } + } +} diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java index 0c212056..a418900a 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/RestApi.java @@ -11,7 +11,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; +import javax.ws.rs.ext.Provider; import lombok.extern.slf4j.Slf4j; +import org.glassfish.grizzly.compression.zip.GZipDecoder; import org.telegram.telegrambots.Constants; import org.telegram.telegrambots.meta.api.methods.BotApiMethod; import org.telegram.telegrambots.meta.api.objects.Update;