15 can you please add support to decompress to zipoutputstream

.gitignore

@@ -109,4 +109,8 @@ buildNumber.properties
 .mvn/wrapper/maven-wrapper.jar
 .flattened-pom.xml
 
-# End of https://www.gitignore.io/api/java,maven,eclipse
+# End of https://www.gitignore.io/api/java,maven,eclipse
+
+.vscode
+
+.editorconfig

README.md

@@ -15,6 +15,15 @@ IBM Mainframe files on any workstation or laptop etc. that supports Java.
 
 ## Updates ##
 
+**Version 5.0.2: March 2024**
+
+- Added support to decompress then recompress into a gzip file if output-file name ends in ".gz"
+- Updated pom.xml to have Maven compile using Java 17, and shade the jar.
+
+**Version 5.0.1: July 2023**
+
+- allow user to specify only <input file> for text files. Resulting <output file> will be <input file>.txt
+
 **Version 5: March 2021**
 
 - Support for variable length binary records. Variable length records processed in binary mode will be prefixed with a 4 byte field in the same format as the IBM RDW i.e. 2 byte record length field (including RDW length, big-endian) followed by 2 bytes of zeros.
@@ -25,7 +34,7 @@ For execution, TerseDecompress needs a JVM runtime environment.
 
 Usage:
 
-```java -jar tersedecompress-5.0.0.jar [-b] tersed-file output-file```
+```java -jar tersedecompress-5.0.2.jar [-b] tersed-file output-file```
 
 Default mode is text mode, which will attempt EBCDIC -> ASCII conversion.
 

pom.xml

@@ -5,31 +5,35 @@
 
 	<groupId>org.openmainframeproject.tersedecompress</groupId>
 	<artifactId>tersedecompress</artifactId>
-	<version>5.0.0</version>
+	<version>5.0.2</version>
 	<packaging>jar</packaging>
 
 	<name>tersedecompress</name>
 	<url>https://github.com/openmainframeproject/tersedecompress-testdata</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jdk-release>17</jdk-release>
+		<junit-version>4.13.2</junit-version>
+        <maven-compiler-version>3.12.1</maven-compiler-version>
+		<maven-jar-version>3.2.0</maven-jar-version>
+        <maven-shade-version>3.5.1</maven-shade-version>
 		<skipTests>true</skipTests>	
 	</properties>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>${maven-compiler-version}</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<release>${jdk-release}</release>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>${maven-jar-version}</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -39,13 +43,49 @@
 					</archive>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-shade-plugin</artifactId>
+                <version>${maven-shade-version}</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <minimizeJar>true</minimizeJar>
+                            <entryPoints>
+                                <entryPoint>org.openmainframeproject.tersedecompress.TerseDecompress</entryPoint>
+                            </entryPoints>
+                            <transformers>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Main-Class>org.openmainframeproject.tersedecompress.TerseDecompress</Main-Class>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>${junit-version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/org/openmainframeproject/tersedecompress/TerseDecompress.java

@@ -36,17 +36,28 @@
 /*****************************************************************************/
 
 import java.io.*;
+import java.util.zip.GZIPOutputStream;
 
 class TerseDecompress {
 
     private static final String DetailedHelp = new String(
             "Usage: \"TerseDecompress <input file> <output file> [-b]\"\n\n"
            +"Java TerseDecompress will decompress a file compressed using the terse program on z/OS\n"
            +"Default mode is text mode, which will attempt EBCDIC -> ASCII conversion\n"
-           +"The -b flag turns on binary mode, no conversion will be attempted\n"
+           +"If no <output file> is provided, it will default to either\n"
+           +" 1) if <input file.trs> then <input file>\n"
+           +" 2) if <input file> and text mode, then <input file.txt>\n"
+           +" 3) if <input file> and binary mode, then <input file.bin>\n"
+           +"Options:\n"
+           +"-b flag turns on binary mode, no conversion will be attempted\n"
+           +"-h or --help prints this message\n"
           );
-
-    private static final String Version = new String ("Version 5, March 2021");
+
+    private static final String Version = new String ("Version 5, May 2024");
+    private String inputFileName = null;
+    private String outputFileName = null;
+    private boolean isHelpRequested = false;
+    private boolean textMode = true;
 
 	private void printUsageAndExit() {
 		System.out.println(DetailedHelp);
@@ -55,58 +66,72 @@ private void printUsageAndExit() {
 	}	
 
     private void process (String args[]) throws Exception {
-
-    	String inputFileName = null;
-    	String outputFileName = null;
-    	boolean textMode = true;   	
-
-    	if (args.length == 0) 
-        {
-            printUsageAndExit();
-        }
+		parseArgs(args);
 
-    	for (int i=0; i < args.length; i++)
-    	{
-    		if (args[i].equals("-h") || args[i].equals("--help"))
-    		{
-                printUsageAndExit();
-    		}
-    		else if (args[i].equals("-b"))
-    		{
-    			textMode = false;
-    		}
-    		// first non-flag argument is the input file name 
-    		else if (inputFileName == null)
-    		{
-    			inputFileName = args[i];
-    		}
-    		// second non-flag argument is the input file name 
-    		else if (outputFileName == null)
-    		{
-    			outputFileName = args[i];
-    		}
-    		else // we have more args than we know what to do with
-    		{
-                printUsageAndExit();   		
-    		}
-    	}
-    	if (inputFileName == null || outputFileName == null)
-    	{
+        if (isHelpRequested == true) 
+            printUsageAndExit();	
+
+    	if (inputFileName == null)
     		printUsageAndExit();
-    	}
 
+        if (outputFileName == null) {
+            if (inputFileName.toLowerCase().endsWith(".trs") )
+                outputFileName = inputFileName.substring(0, inputFileName.length() - 4);
+            else {
+                if (textMode)
+                    outputFileName = inputFileName.concat(".txt");
+                else
+                    outputFileName = inputFileName.concat(".bin");
+            }
+        }
+
+        System.out.println("Attempting to decompress input file (" + inputFileName + ") to output file (" + outputFileName + ")");
+
+        TerseDecompresser outputWriter = null;
+        try {
+            if (outputFileName.endsWith(".gz"))
+                outputWriter = TerseDecompresser.create(new FileInputStream(inputFileName), new GZIPOutputStream(new FileOutputStream(outputFileName), 8192, true));
+            else 
+                outputWriter = TerseDecompresser.create(new FileInputStream(inputFileName), new FileOutputStream(outputFileName)); 
+
+			outputWriter.TextFlag = textMode;
+			outputWriter.decode();
+		}
+        catch( IOException e) {
+            System.out.println("Got exception while decompressing input file (" + inputFileName + ").\nError message:\n" + e.toString());
+        }
+        finally {
+            if (outputWriter != null)
+                outputWriter.close();
+        }
 
-        try (TerseDecompresser outputWriter 
-        		= TerseDecompresser.create(new FileInputStream(inputFileName), new FileOutputStream(outputFileName)))
-        {	 
-        	outputWriter.TextFlag = textMode;
-	        System.out.println("Attempting to decompress input file (" + inputFileName +") to output file (" + outputFileName +")");
-	        outputWriter.decode();
-        }	
-
         System.out.println("Processing completed");
     }
 
+    private void parseArgs(String args[]) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].equals("-h") || args[i].equals("--help")) {
+                isHelpRequested = true;
+            }
+            else if (textMode && args[i].equals("-b")) {
+                textMode = false;
+            }
+            // first non-flag argument is the input file name
+            else if (inputFileName == null) {
+                inputFileName = args[i];
+            }
+            // second non-flag argument is the output file name
+            else if (outputFileName == null) {
+                outputFileName = args[i];
+            }
+            else // we have more args than we know what to do with
+            {
+                isHelpRequested = true;
+                break;
+            }
+        }
+    }
+
     public static void main (String args[]) throws Exception {
 
         TerseDecompress tersed = new TerseDecompress();