Merging dev into master

ossimlabs · Feb 8, 2020 · a009a60 · a009a60
2 parents 2f5c884 + 80eaa56
commit a009a60
Showing 1 changed file with 4 additions and 20 deletions.
diff --git a/plugins/omar-core-plugin/src/main/groovy/omar/core/OmarWebUtils.groovy b/plugins/omar-core-plugin/src/main/groovy/omar/core/OmarWebUtils.groovy
@@ -7,36 +7,20 @@ import java.util.zip.GZIPOutputStream
 class OmarWebUtils
 {
 	static String GZIP_ENCODE_HEADER_PARAM = 'gzip'
-
+	
 	/**
 	 * Transform a string into a base64-encoded, gzipped string
 	 * @param buffer The input string
 	 * @return The encoded, gzipped string
 	 */
-	static String gzippify(String buffer, String charset = StandardCharsets.UTF_8.name()){
+	static ByteArrayOutputStream gzippify( String buffer, String charset = StandardCharsets.UTF_8.name() ){
 		ByteArrayOutputStream targetStream = new ByteArrayOutputStream()
 		GZIPOutputStream gzipStream = new GZIPOutputStream(targetStream)
-		gzipStream.write(buffer.getBytes(charset))
+		gzipStream.write(buffer.getBytes( charset ))
 		gzipStream.close()
 
-		byte[] zippedBytes = targetStream.toByteArray()
 		targetStream.close()
 
-		return zippedBytes.encodeBase64().toString()
-	}
-
-	/**
-	 * Gzippify an ArrayList by gzipping its toString
-	 * @param list
-	 * @return
-	 */
-	static String gzippify(ArrayList list, String charset = StandardCharsets.UTF_8.name()){
-		return gzippify(list.toString(), charset)
-	}
-
-	static String unGzippify(String buffer, String charset = StandardCharsets.UTF_8.name()) {
-		GZIPInputStream inflaterStream = new GZIPInputStream(new ByteArrayInputStream(buffer.decodeBase64()))
-		String uncompressedStr = inflaterStream.getText(charset)
-		return uncompressedStr
+		return targetStream
 	}
 }