rename: StringIO -> IOStrings

assira/src/main/java/net/ranides/assira/annotations/javac/JavaCompilationFM.java

@@ -24,7 +24,7 @@ import javax.tools.StandardLocation;
 import net.ranides.assira.collection.maps.LazyMap;
 import net.ranides.assira.io.IOStreams;
 import net.ranides.assira.io.ResourceUtils;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import net.ranides.assira.text.StringUtils;
 
 final class JavaCompilationFM extends ForwardingJavaFileManager<JavaFileManager> {
@@ -178,7 +178,7 @@ final class JavaCompilationFM extends ForwardingJavaFileManager<JavaFileManager>
         @Override
         public CharSequence getCharContent(boolean ignoreEncodingErrors)
                 throws IOException {
-            return StringIO.read(url.openStream(), Charset.defaultCharset());
+            return IOStrings.read(url.openStream(), Charset.defaultCharset());
         }
 
         @Override

assira/src/main/java/net/ranides/assira/reflection/util/ReflectUtils.java

@@ -12,7 +12,7 @@ import java.io.InputStream;
 import java.lang.reflect.AccessibleObject;
 import net.ranides.assira.system.RuntimeUtils;
 import net.ranides.assira.text.Charsets;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 
 /**
  *
@@ -76,18 +76,18 @@ public final class ReflectUtils {
         String name = classname.replace('.', '/').replaceAll("\\$.+", "") + ".java";
         InputStream istream = loader.getResourceAsStream(name);
         if(istream != null) {
-            return StringIO.read(istream, Charsets.UTF8);
+            return IOStrings.read(istream, Charsets.UTF8);
         }
 
         File file;        
         if((file = new File(name)).exists()) {
-            return StringIO.read(file, Charsets.UTF8);
+            return IOStrings.read(file, Charsets.UTF8);
         }
         if((file = new File("src/test/java/" + name)).exists()) {
-            return StringIO.read(file, Charsets.UTF8);
+            return IOStrings.read(file, Charsets.UTF8);
         }
         if((file = new File("src/main/java/" + name)).exists()) {
-            return StringIO.read(file, Charsets.UTF8);
+            return IOStrings.read(file, Charsets.UTF8);
         }
         throw new IOException("unknown location of file: " + name);
     }

assira/src/main/java/net/ranides/assira/text/StringIO.java

@@ -27,9 +27,9 @@ import net.ranides.assira.collection.arrays.ArrayAllocator;
  *
  * @author ranides
  */
-public final class StringIO {
+public final class IOStrings {
     
-    private StringIO() { }
+    private IOStrings() { }
 
 	public static void write(Writer writer, String content) throws IOException {
 		try {
@@ -67,7 +67,7 @@ public final class StringIO {
 
     public static String read(InputStream istream, Charset charset) throws IOException {
         try {
-            return StringIO.read(new InputStreamReader(istream, charset));
+            return IOStrings.read(new InputStreamReader(istream, charset));
         } finally {
             istream.close();
         }

assira/src/test/java/net/ranides/assira/annotations/JavaServiceProcessorTest.java

@@ -14,7 +14,7 @@ import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 import net.ranides.assira.annotations.javac.JavaCompilation;
 import net.ranides.assira.annotations.javac.JavaCompilationResult;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
@@ -61,7 +61,7 @@ public class JavaServiceProcessorTest {
         assertTrue(re.success());
         
         JavaFileObject file1 = re.file(StandardLocation.CLASS_OUTPUT, "", "META-INF/services/net.ranides.assira.events.Event");
-        assertEquals("net.ranides.at.HelloWorld\r\n", StringIO.read(file1.openReader(false)));
+        assertEquals("net.ranides.at.HelloWorld\r\n", IOStrings.read(file1.openReader(false)));
     }
     
     @Test
@@ -81,10 +81,10 @@ public class JavaServiceProcessorTest {
         assertTrue(re.success());
         
         JavaFileObject file1 = re.file(StandardLocation.CLASS_OUTPUT, "", "META-INF/services/net.ranides.assira.events.Event");
-        assertEquals("net.ranides.at.HelloWorld\r\nnet.ranides.at.ImpS2\r\n", StringIO.read(file1.openReader(false)));
+        assertEquals("net.ranides.at.HelloWorld\r\nnet.ranides.at.ImpS2\r\n", IOStrings.read(file1.openReader(false)));
         
         JavaFileObject file2 = re.file(StandardLocation.CLASS_OUTPUT, "", "META-INF/services/java.nio.charset.spi.CharsetProvider");
-        assertEquals("net.ranides.at.CPService\r\n", StringIO.read(file2.openReader(false)));
+        assertEquals("net.ranides.at.CPService\r\n", IOStrings.read(file2.openReader(false)));
     }
     
     @Test
@@ -106,10 +106,10 @@ public class JavaServiceProcessorTest {
         assertTrue(re.success());
         
         JavaFileObject file1 = re.file(StandardLocation.CLASS_OUTPUT, "", "META-INF/services/net.ranides.assira.events.Event");
-        assertEquals("net.ranides.at.HelloWorld\r\nnet.ranides.at.ImpS2\r\n", StringIO.read(file1.openReader(false)));
+        assertEquals("net.ranides.at.HelloWorld\r\nnet.ranides.at.ImpS2\r\n", IOStrings.read(file1.openReader(false)));
         
         JavaFileObject file2 = re.file(StandardLocation.CLASS_OUTPUT, "", "META-INF/services/java.nio.charset.spi.CharsetProvider");
-        assertEquals("net.ranides.at.CPService\r\nnet.ranides.assira.text.MazoviaCharset\r\n", StringIO.read(file2.openReader(false)));
+        assertEquals("net.ranides.at.CPService\r\nnet.ranides.assira.text.MazoviaCharset\r\n", IOStrings.read(file2.openReader(false)));
     }
     
     @Test

assira/src/test/java/net/ranides/assira/io/FileUtilsTest.java

@@ -11,7 +11,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import net.ranides.assira.text.Charsets;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import org.junit.Test;
 import static net.ranides.assira.junit.NewAssert.*;
 
@@ -93,7 +93,7 @@ public class FileUtilsTest {
 	public void testReadContent() throws IOException {
 		String text = "hello world";
 		File file = File.createTempFile("FileUtilsC1", ".txt");
-		StringIO.write(file, text, Charsets.US_ASCII);
+		IOStrings.write(file, text, Charsets.US_ASCII);
 		
 		assertArrayEquals(text.getBytes(Charsets.US_ASCII), FileUtils.content(file));
 	}
@@ -105,10 +105,10 @@ public class FileUtilsTest {
 		File file3 = File.createTempFile("FileUtilsE3", ".txt");
 		File file4 = File.createTempFile("FileUtilsE3", ".txt");
 		
-		StringIO.write(file1, "hello world", Charsets.US_ASCII);
-		StringIO.write(file2, "hello world", Charsets.US_ASCII);
-		StringIO.write(file3, "hello WORLD", Charsets.US_ASCII);
-		StringIO.write(file4, "hello ", Charsets.US_ASCII);
+		IOStrings.write(file1, "hello world", Charsets.US_ASCII);
+		IOStrings.write(file2, "hello world", Charsets.US_ASCII);
+		IOStrings.write(file3, "hello WORLD", Charsets.US_ASCII);
+		IOStrings.write(file4, "hello ", Charsets.US_ASCII);
 		
 		assertTrue(FileUtils.equivalent(file1, file2));
 		assertFalse(FileUtils.equivalent(file1, file3));

assira/src/test/java/net/ranides/assira/io/IOStreamsTest.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Random;
 import net.ranides.assira.generic.CompareUtils;
 import net.ranides.assira.text.Charsets;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import net.ranides.assira.text.StringUtils;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -118,7 +118,7 @@ public class IOStreamsTest {
     private void assertRead(String text, Charset cs) throws IOException {
         Reader reader = new StringReader(text);
         InputStream istream = IOStreams.stream(reader, cs);
-        assertEquals(text, StringIO.read(istream, cs));
+        assertEquals(text, IOStrings.read(istream, cs));
     }
     
     public static void main(String[] args) {

assira/src/test/java/net/ranides/assira/io/ResourceUtilsTest.java

@@ -13,7 +13,7 @@ import java.io.Reader;
 import net.ranides.assira.ContractTesters;
 import net.ranides.assira.reflection.util.ClassUtils;
 import net.ranides.assira.text.Charsets;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import org.junit.Test;
 import static net.ranides.assira.junit.NewAssert.*;
 
@@ -28,7 +28,7 @@ public class ResourceUtilsTest {
         ClassLoader loader = ClassUtils.loader(ClassUtils.loader(), ContractTesters.JAR_TEST);
         
         Reader reader1 = ResourceUtils.reader(loader, "text/info.txt", Charsets.UTF8);
-        assertEquals("Hello world", StringIO.read(reader1));
+        assertEquals("Hello world", IOStrings.read(reader1));
         
         assertThrows(IOException.class, ()->{
             ResourceUtils.reader("text/info.txt", Charsets.UTF8);
@@ -37,7 +37,7 @@ public class ResourceUtilsTest {
         ClassLoader prev = replace(loader);
         try {
             Reader reader2 = ResourceUtils.reader("text/info.txt", Charsets.UTF8);
-            assertEquals("Hello world", StringIO.read(reader2));
+            assertEquals("Hello world", IOStrings.read(reader2));
         } finally {
             replace(prev);
         }
@@ -48,7 +48,7 @@ public class ResourceUtilsTest {
         ClassLoader loader = ClassUtils.loader(ClassUtils.loader(), ContractTesters.JAR_TEST);
         
         InputStream istream1 = ResourceUtils.stream(loader, "text/info.txt");
-        assertEquals("Hello world", StringIO.read(istream1, Charsets.UTF8));
+        assertEquals("Hello world", IOStrings.read(istream1, Charsets.UTF8));
         
         assertThrows(IOException.class, ()->{
             ResourceUtils.stream("text/info.txt");
@@ -57,7 +57,7 @@ public class ResourceUtilsTest {
         ClassLoader prev = replace(loader);
         try {
             InputStream istream2 = ResourceUtils.stream("text/info.txt");
-            assertEquals("Hello world", StringIO.read(istream2, Charsets.UTF8));
+            assertEquals("Hello world", IOStrings.read(istream2, Charsets.UTF8));
         } finally {
             replace(prev);
         }
@@ -69,7 +69,7 @@ public class ResourceUtilsTest {
         
         File out1 = File.createTempFile("assira.ResourceUtils", ".txt");
         ResourceUtils.extract(loader, "text/info.txt", out1);
-        assertEquals("Hello world", StringIO.read(out1, Charsets.UTF8));
+        assertEquals("Hello world", IOStrings.read(out1, Charsets.UTF8));
         
         assertThrows(IOException.class, ()->{
             ResourceUtils.extract("text/info.txt", out1);
@@ -79,7 +79,7 @@ public class ResourceUtilsTest {
         try {
             File out2 = File.createTempFile("assira.ResourceUtils", ".txt");
             ResourceUtils.extract("text/info.txt", out2);
-            assertEquals("Hello world", StringIO.read(out2, Charsets.UTF8));
+            assertEquals("Hello world", IOStrings.read(out2, Charsets.UTF8));
         } finally {
             replace(prev);
         }

assira/src/test/java/net/ranides/assira/text/StringIOTest.java

@@ -22,18 +22,18 @@ import static org.junit.Assert.*;
  *
  * @author Ranides Atterwim <ranides@gmail.com>
  */
-public class StringIOTest {
+public class IOStringsTest {
     
 	private static final String TEXT = "źrebię skacze po łące patrząc na słońce";
 
     @Test
     public void testFromReader() throws IOException {
         String inp1 = "Hello world";
-        String out1 = StringIO.read(new StringReader(inp1));
+        String out1 = IOStrings.read(new StringReader(inp1));
         assertEquals(inp1, out1);
         
         String inp2 = random(10247) ;
-        String out2 = StringIO.read(new StringReader(inp2));
+        String out2 = IOStrings.read(new StringReader(inp2));
         assertEquals(inp2, out2);
     }
     
@@ -42,13 +42,13 @@ public class StringIOTest {
         ByteArrayInputStream istream1 = new ByteArrayInputStream(TEXT.getBytes(Charsets.UTF8));
         ByteArrayInputStream istream2 = new ByteArrayInputStream(TEXT.getBytes(Charsets.PL_WINDOWS));
         
-        assertNotEquals(TEXT, StringIO.read(istream1, Charsets.PL_WINDOWS));
+        assertNotEquals(TEXT, IOStrings.read(istream1, Charsets.PL_WINDOWS));
         istream1.reset();
-        assertEquals(TEXT, StringIO.read(istream1, Charsets.UTF8));
+        assertEquals(TEXT, IOStrings.read(istream1, Charsets.UTF8));
         
-        assertNotEquals(TEXT, StringIO.read(istream2, Charsets.UTF8));
+        assertNotEquals(TEXT, IOStrings.read(istream2, Charsets.UTF8));
         istream2.reset();
-        assertEquals(TEXT, StringIO.read(istream2, Charsets.PL_WINDOWS));
+        assertEquals(TEXT, IOStrings.read(istream2, Charsets.PL_WINDOWS));
     }
     
     @Test
@@ -57,8 +57,8 @@ public class StringIOTest {
         String c2 = "1\n2\n3\n4\n5\n";
         List<String> expected = Arrays.asList("1","2", "3", "4", "5");
         
-        assertEquals(expected, StringIO.readLines(new StringReader(c1)));
-        assertEquals(expected, StringIO.readLines(new StringReader(c2)));
+        assertEquals(expected, IOStrings.readLines(new StringReader(c1)));
+        assertEquals(expected, IOStrings.readLines(new StringReader(c2)));
     }
     
     @Test
@@ -67,8 +67,8 @@ public class StringIOTest {
         ByteArrayInputStream s2 = new ByteArrayInputStream("słońce\nźrebię\nłąka\ndom\n".getBytes(Charsets.UTF8));
         List<String> expected = Arrays.asList("słońce", "źrebię", "łąka", "dom");
         
-        assertEquals(expected, StringIO.readLines(s1, Charsets.UTF8));
-        assertEquals(expected, StringIO.readLines(s2, Charsets.UTF8));
+        assertEquals(expected, IOStrings.readLines(s1, Charsets.UTF8));
+        assertEquals(expected, IOStrings.readLines(s2, Charsets.UTF8));
     }
     
     @Test
@@ -77,8 +77,8 @@ public class StringIOTest {
         ByteArrayInputStream s2 = new ByteArrayInputStream("słońce\nźrebię\nłąka\ndom\n".getBytes(Charsets.PL_DOS));
         List<String> expected = Arrays.asList("słońce", "źrebię", "łąka", "dom");
         
-        assertEquals(expected, StringIO.readLines(s1, Charsets.PL_DOS));
-        assertEquals(expected, StringIO.readLines(s2, Charsets.PL_DOS));
+        assertEquals(expected, IOStrings.readLines(s1, Charsets.PL_DOS));
+        assertEquals(expected, IOStrings.readLines(s2, Charsets.PL_DOS));
     }
 	
 	@Test
@@ -86,46 +86,46 @@ public class StringIOTest {
 		File file1 = File.createTempFile("StringIO.LFF1", ".txt");
 		File file2 = File.createTempFile("StringIO.LFF1", ".txt");
 		
-		StringIO.write(file1, "słońce\nźrebię\nłąka\ndom", Charsets.PL_DOS);
-		StringIO.write(file2, "słońce\nźrebię\nłąka\ndom\n", Charsets.PL_DOS);
+		IOStrings.write(file1, "słońce\nźrebię\nłąka\ndom", Charsets.PL_DOS);
+		IOStrings.write(file2, "słońce\nźrebię\nłąka\ndom\n", Charsets.PL_DOS);
 		
         List<String> expected = Arrays.asList("słońce", "źrebię", "łąka", "dom");
         
-        assertEquals(expected, StringIO.readLines(file1, Charsets.PL_DOS));
-        assertEquals(expected, StringIO.readLines(file2, Charsets.PL_DOS));
+        assertEquals(expected, IOStrings.readLines(file1, Charsets.PL_DOS));
+        assertEquals(expected, IOStrings.readLines(file2, Charsets.PL_DOS));
     }
 	
 	@Test
 	public void testToWriter() throws IOException {
 		StringWriter writer = new StringWriter();
-		StringIO.write(writer, TEXT);
+		IOStrings.write(writer, TEXT);
 		assertEquals(TEXT, writer.toString());
 	}
 	
 	@Test
 	public void testToStream() throws IOException {
 		ByteArrayOutputStream ostream1 = new ByteArrayOutputStream();
-		StringIO.write(ostream1, TEXT, Charsets.PL_DOS);
+		IOStrings.write(ostream1, TEXT, Charsets.PL_DOS);
 		assertArrayEquals(ostream1.toByteArray(), TEXT.getBytes(Charsets.PL_DOS));
 		
 		ByteArrayOutputStream ostream2 = new ByteArrayOutputStream();
-		StringIO.write(ostream2, TEXT, Charsets.PL_ISO);
+		IOStrings.write(ostream2, TEXT, Charsets.PL_ISO);
 		assertArrayEquals(ostream2.toByteArray(), TEXT.getBytes(Charsets.PL_ISO));
 	}
 	
 	@Test
 	public void testToFile() throws IOException {
 		File file1 = File.createTempFile("StringIOF1", ".txt");
-		StringIO.write(file1, TEXT, Charsets.PL_DOS);
+		IOStrings.write(file1, TEXT, Charsets.PL_DOS);
 		
-		assertNotEquals(TEXT, StringIO.read(file1, Charsets.PL_ISO));
-		assertEquals(TEXT, StringIO.read(file1, Charsets.PL_DOS));
+		assertNotEquals(TEXT, IOStrings.read(file1, Charsets.PL_ISO));
+		assertEquals(TEXT, IOStrings.read(file1, Charsets.PL_DOS));
 		
 		File file2 = File.createTempFile("StringIOF1", ".txt");
-		StringIO.write(file2, TEXT, Charsets.PL_ISO);
+		IOStrings.write(file2, TEXT, Charsets.PL_ISO);
 		
-		assertNotEquals(TEXT, StringIO.read(file2, Charsets.PL_DOS));
-		assertEquals(TEXT, StringIO.read(file2, Charsets.PL_ISO));
+		assertNotEquals(TEXT, IOStrings.read(file2, Charsets.PL_DOS));
+		assertEquals(TEXT, IOStrings.read(file2, Charsets.PL_ISO));
 	}
 	
     private String random(int size) {

assira/src/test/java/net/ranides/assira/xml/XMLWriterTest.java

@@ -10,10 +10,11 @@ import net.ranides.assira.TestFiles;
 import java.io.IOException;
 import net.ranides.assira.io.StringOutput;
 import net.ranides.assira.text.Charsets;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static net.ranides.assira.xml.XMLQuery.$;
+import static net.ranides.assira.xml.XMLQuery.$;
 
 /**
  *
@@ -54,11 +55,11 @@ public class XMLWriterTest {
 //        System.out.printf("%n%s%n", out3.toString(Charsets.UTF8));
 //        System.out.printf("%n%s%n", out4);
 
-        assertEquals(StringIO.read(TestFiles.XML_1, Charsets.UTF8), out1);
-        assertEquals(StringIO.read(TestFiles.XML_2, Charsets.UTF8), out2);
-        assertEquals(StringIO.read(TestFiles.XML_3, Charsets.UTF8), out3.toString(Charsets.UTF8));
-        assertEquals(StringIO.read(TestFiles.XML_3, Charsets.PL_WINDOWS), out3.toString(Charsets.PL_WINDOWS));
-        assertEquals(StringIO.read(TestFiles.XML_4, Charsets.UTF8), out4);
+        assertEquals(IOStrings.read(TestFiles.XML_1, Charsets.UTF8), out1);
+        assertEquals(IOStrings.read(TestFiles.XML_2, Charsets.UTF8), out2);
+        assertEquals(IOStrings.read(TestFiles.XML_3, Charsets.UTF8), out3.toString(Charsets.UTF8));
+        assertEquals(IOStrings.read(TestFiles.XML_3, Charsets.PL_WINDOWS), out3.toString(Charsets.PL_WINDOWS));
+        assertEquals(IOStrings.read(TestFiles.XML_4, Charsets.UTF8), out4);
         
         assertTrue(true);
     }

assira/src/test/java/net/ranides/assira/xml/impl/CElementsTest.java

@@ -22,13 +22,14 @@ import static net.ranides.assira.junit.NewAssert.*;
 import net.ranides.assira.text.StringUtils;
 import net.ranides.assira.TestFiles;
 import net.ranides.assira.text.Charsets;
-import net.ranides.assira.text.StringIO;
+import net.ranides.assira.text.IOStrings;
 import net.ranides.assira.xml.XMLDocument;
 import net.ranides.assira.xml.XMLElements;
 import org.junit.Test;
 import net.ranides.assira.xml.XMLSelector;
 import net.ranides.assira.xml.XMLWriter;
 import static net.ranides.assira.xml.XMLQuery.$;
+import static net.ranides.assira.xml.XMLQuery.$;
 
 /**
  *
@@ -339,7 +340,7 @@ public class CElementsTest {
         
         String out = new XMLWriter().indent(4).toString(doc);
 //        System.out.printf("%s%n", out);
-        assertEquals(StringIO.read(TestFiles.XML_ELEMENTS, Charsets.UTF8), out);
+        assertEquals(IOStrings.read(TestFiles.XML_ELEMENTS, Charsets.UTF8), out);
     }
     
     private void debug(String format, List<String> list) {