Permalink
Browse files

moving all the staff to stream subpackage

  • Loading branch information...
ropalka committed Aug 28, 2012
1 parent 1865985 commit d37fdd28f287d8c5f5c5642e5bd694ad67721976
Showing with 91 additions and 91 deletions.
  1. +5 −5 api/pom.xml
  2. +1 −1 api/src/main/java/org/fossnova/json/{ → stream}/JsonBuilder.java
  3. +1 −1 api/src/main/java/org/fossnova/json/{ → stream}/JsonEvent.java
  4. +1 −1 api/src/main/java/org/fossnova/json/{ → stream}/JsonException.java
  5. +1 −1 api/src/main/java/org/fossnova/json/{ → stream}/JsonFactory.java
  6. +1 −1 api/src/main/java/org/fossnova/json/{ → stream}/JsonReader.java
  7. +1 −1 api/src/main/java/org/fossnova/json/{ → stream}/JsonWriter.java
  8. +2 −2 api/src/main/java/org/fossnova/json/{ → stream}/package-info.java
  9. +3 −3 impl/pom.xml
  10. +3 −3 impl/src/main/java/com/fossnova/json/{ → stream}/JsonBuilderImpl.java
  11. +1 −1 impl/src/main/java/com/fossnova/json/{ → stream}/JsonConstants.java
  12. +5 −5 impl/src/main/java/com/fossnova/json/{ → stream}/JsonFactoryImpl.java
  13. +13 −13 impl/src/main/java/com/fossnova/json/{ → stream}/JsonGrammarAnalyzer.java
  14. +1 −1 impl/src/main/java/com/fossnova/json/{ → stream}/JsonGrammarToken.java
  15. +5 −5 impl/src/main/java/com/fossnova/json/{ → stream}/JsonReaderImpl.java
  16. +18 −18 impl/src/main/java/com/fossnova/json/{ → stream}/JsonWriterImpl.java
  17. +0 −1 impl/src/main/resources/META-INF/services/org.fossnova.json.JsonFactory
  18. +1 −0 impl/src/main/resources/META-INF/services/org.fossnova.json.stream.JsonFactory
  19. +2 −2 pom.xml
  20. +3 −3 tests/pom.xml
  21. +13 −13 tests/src/test/java/test/fossnova/json/{ → stream}/AbstractJsonTestCase.java
  22. +2 −2 tests/src/test/java/test/fossnova/json/{ → stream}/InvalidJsonReaderTestCase.java
  23. +3 −3 tests/src/test/java/test/fossnova/json/{ → stream}/InvalidJsonWriterTestCase.java
  24. +2 −2 tests/src/test/java/test/fossnova/json/{ → stream}/ValidJsonReaderTestCase.java
  25. +3 −3 tests/src/test/java/test/fossnova/json/{ → stream}/ValidJsonWriterTestCase.java
View
@@ -31,9 +31,9 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>FOSS Nova JSON API</name>
+ <name>FOSS Nova JSON Streaming API</name>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-api</artifactId>
+ <artifactId>fossnova-json-stream-api</artifactId>
<dependencies>
<dependency>
@@ -50,9 +50,9 @@
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
<detectLinks>false</detectLinks>
- <doctitle><![CDATA[FOSS Nova JSON API ]]>${project.version}</doctitle>
- <header><![CDATA[FOSS Nova JSON API ]]>${project.version}</header>
- <footer><![CDATA[FOSS Nova JSON API ]]>${project.version}</footer>
+ <doctitle><![CDATA[FOSS Nova JSON Streaming API ]]>${project.version}</doctitle>
+ <header><![CDATA[FOSS Nova JSON Streaming API ]]>${project.version}</header>
+ <footer><![CDATA[FOSS Nova JSON Streaming API ]]>${project.version}</footer>
<bottom><![CDATA[<i>Copyright &#169;, 2012 FOSS Nova Software Foundation (FNSF)</i>]]></bottom>
</configuration>
</plugin>
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
import java.io.Closeable;
import java.io.IOException;
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
/**
* JSON encoding parsing events.
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
/**
* JSON encoding exception.
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
import java.io.Closeable;
import java.io.IOException;
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
import java.io.Closeable;
import java.io.IOException;
@@ -18,9 +18,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
/**
- * Provides API for writing and reading <A href="http://www.json.org/">JSON</A> encoded NIO channels and IO streams.
+ * Streaming API for writing and reading <A href="http://www.json.org/">JSON</A>.
*
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
*/
-package org.fossnova.json;
+package org.fossnova.json.stream;
View
@@ -31,14 +31,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>FOSS Nova JSON Impl</name>
+ <name>FOSS Nova JSON Streaming Implementation</name>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-impl</artifactId>
+ <artifactId>fossnova-json-stream-impl</artifactId>
<dependencies>
<dependency>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-api</artifactId>
+ <artifactId>fossnova-json-stream-api</artifactId>
</dependency>
</dependencies>
@@ -17,12 +17,12 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
+package com.fossnova.json.stream;
import java.io.IOException;
-import org.fossnova.json.JsonBuilder;
-import org.fossnova.json.JsonWriter;
+import org.fossnova.json.stream.JsonBuilder;
+import org.fossnova.json.stream.JsonWriter;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
+package com.fossnova.json.stream;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
+package com.fossnova.json.stream;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -28,10 +28,10 @@
import java.io.Writer;
import java.nio.charset.Charset;
-import org.fossnova.json.JsonBuilder;
-import org.fossnova.json.JsonFactory;
-import org.fossnova.json.JsonReader;
-import org.fossnova.json.JsonWriter;
+import org.fossnova.json.stream.JsonBuilder;
+import org.fossnova.json.stream.JsonFactory;
+import org.fossnova.json.stream.JsonReader;
+import org.fossnova.json.stream.JsonWriter;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,23 +17,23 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
+package com.fossnova.json.stream;
-import static com.fossnova.json.JsonGrammarToken.ARRAY_END;
-import static com.fossnova.json.JsonGrammarToken.ARRAY_START;
-import static com.fossnova.json.JsonGrammarToken.BOOLEAN;
-import static com.fossnova.json.JsonGrammarToken.COLON;
-import static com.fossnova.json.JsonGrammarToken.COMMA;
-import static com.fossnova.json.JsonGrammarToken.NULL;
-import static com.fossnova.json.JsonGrammarToken.NUMBER;
-import static com.fossnova.json.JsonGrammarToken.OBJECT_END;
-import static com.fossnova.json.JsonGrammarToken.OBJECT_START;
-import static com.fossnova.json.JsonGrammarToken.STRING;
+import static com.fossnova.json.stream.JsonGrammarToken.ARRAY_END;
+import static com.fossnova.json.stream.JsonGrammarToken.ARRAY_START;
+import static com.fossnova.json.stream.JsonGrammarToken.BOOLEAN;
+import static com.fossnova.json.stream.JsonGrammarToken.COLON;
+import static com.fossnova.json.stream.JsonGrammarToken.COMMA;
+import static com.fossnova.json.stream.JsonGrammarToken.NULL;
+import static com.fossnova.json.stream.JsonGrammarToken.NUMBER;
+import static com.fossnova.json.stream.JsonGrammarToken.OBJECT_END;
+import static com.fossnova.json.stream.JsonGrammarToken.OBJECT_START;
+import static com.fossnova.json.stream.JsonGrammarToken.STRING;
import java.util.LinkedList;
-import org.fossnova.json.JsonEvent;
-import org.fossnova.json.JsonException;
+import org.fossnova.json.stream.JsonEvent;
+import org.fossnova.json.stream.JsonException;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
+package com.fossnova.json.stream;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,19 +17,19 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
+package com.fossnova.json.stream;
-import static com.fossnova.json.JsonConstants.BACKSLASH;
+import static com.fossnova.json.stream.JsonConstants.BACKSLASH;
import java.io.IOException;
import java.io.PushbackReader;
import java.io.Reader;
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.fossnova.json.JsonEvent;
-import org.fossnova.json.JsonException;
-import org.fossnova.json.JsonReader;
+import org.fossnova.json.stream.JsonEvent;
+import org.fossnova.json.stream.JsonException;
+import org.fossnova.json.stream.JsonReader;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,30 +17,30 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package com.fossnova.json;
-
-import static com.fossnova.json.JsonConstants.ARRAY_END;
-import static com.fossnova.json.JsonConstants.ARRAY_START;
-import static com.fossnova.json.JsonConstants.BACKSLASH;
-import static com.fossnova.json.JsonConstants.BACKSPACE;
-import static com.fossnova.json.JsonConstants.COLON;
-import static com.fossnova.json.JsonConstants.COMMA;
-import static com.fossnova.json.JsonConstants.CR;
-import static com.fossnova.json.JsonConstants.FORMFEED;
-import static com.fossnova.json.JsonConstants.NL;
-import static com.fossnova.json.JsonConstants.NULL;
-import static com.fossnova.json.JsonConstants.OBJECT_END;
-import static com.fossnova.json.JsonConstants.OBJECT_START;
-import static com.fossnova.json.JsonConstants.QUOTE;
-import static com.fossnova.json.JsonConstants.SOLIDUS;
-import static com.fossnova.json.JsonConstants.TAB;
+package com.fossnova.json.stream;
+
+import static com.fossnova.json.stream.JsonConstants.ARRAY_END;
+import static com.fossnova.json.stream.JsonConstants.ARRAY_START;
+import static com.fossnova.json.stream.JsonConstants.BACKSLASH;
+import static com.fossnova.json.stream.JsonConstants.BACKSPACE;
+import static com.fossnova.json.stream.JsonConstants.COLON;
+import static com.fossnova.json.stream.JsonConstants.COMMA;
+import static com.fossnova.json.stream.JsonConstants.CR;
+import static com.fossnova.json.stream.JsonConstants.FORMFEED;
+import static com.fossnova.json.stream.JsonConstants.NL;
+import static com.fossnova.json.stream.JsonConstants.NULL;
+import static com.fossnova.json.stream.JsonConstants.OBJECT_END;
+import static com.fossnova.json.stream.JsonConstants.OBJECT_START;
+import static com.fossnova.json.stream.JsonConstants.QUOTE;
+import static com.fossnova.json.stream.JsonConstants.SOLIDUS;
+import static com.fossnova.json.stream.JsonConstants.TAB;
import java.io.IOException;
import java.io.Writer;
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.fossnova.json.JsonWriter;
+import org.fossnova.json.stream.JsonWriter;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -1 +0,0 @@
-com.fossnova.json.JsonFactoryImpl
@@ -0,0 +1 @@
+com.fossnova.json.stream.JsonFactoryImpl
View
@@ -54,12 +54,12 @@
</dependency>
<dependency>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-api</artifactId>
+ <artifactId>fossnova-json-stream-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-impl</artifactId>
+ <artifactId>fossnova-json-stream-impl</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
View
@@ -31,14 +31,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <name>FOSS Nova JSON Tests</name>
+ <name>FOSS Nova JSON Streaming Tests</name>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-tests</artifactId>
+ <artifactId>fossnova-json-stream-tests</artifactId>
<dependencies>
<dependency>
<groupId>org.fossnova</groupId>
- <artifactId>fossnova-json-impl</artifactId>
+ <artifactId>fossnova-json-stream-impl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -17,16 +17,16 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package test.fossnova.json;
+package test.fossnova.json.stream;
-import static org.fossnova.json.JsonEvent.ARRAY_END;
-import static org.fossnova.json.JsonEvent.ARRAY_START;
-import static org.fossnova.json.JsonEvent.BOOLEAN;
-import static org.fossnova.json.JsonEvent.NULL;
-import static org.fossnova.json.JsonEvent.NUMBER;
-import static org.fossnova.json.JsonEvent.OBJECT_END;
-import static org.fossnova.json.JsonEvent.OBJECT_START;
-import static org.fossnova.json.JsonEvent.STRING;
+import static org.fossnova.json.stream.JsonEvent.ARRAY_END;
+import static org.fossnova.json.stream.JsonEvent.ARRAY_START;
+import static org.fossnova.json.stream.JsonEvent.BOOLEAN;
+import static org.fossnova.json.stream.JsonEvent.NULL;
+import static org.fossnova.json.stream.JsonEvent.NUMBER;
+import static org.fossnova.json.stream.JsonEvent.OBJECT_END;
+import static org.fossnova.json.stream.JsonEvent.OBJECT_START;
+import static org.fossnova.json.stream.JsonEvent.STRING;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -38,10 +38,10 @@
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.fossnova.json.JsonException;
-import org.fossnova.json.JsonFactory;
-import org.fossnova.json.JsonReader;
-import org.fossnova.json.JsonWriter;
+import org.fossnova.json.stream.JsonException;
+import org.fossnova.json.stream.JsonFactory;
+import org.fossnova.json.stream.JsonReader;
+import org.fossnova.json.stream.JsonWriter;
/**
* @author <a href="mailto:opalka dot richard at gmail dot com">Richard Opalka</a>
@@ -17,13 +17,13 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package test.fossnova.json;
+package test.fossnova.json.stream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.fossnova.json.JsonReader;
+import org.fossnova.json.stream.JsonReader;
import org.junit.Test;
/**
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package test.fossnova.json;
+package test.fossnova.json.stream;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -26,8 +26,8 @@
import java.math.BigDecimal;
import java.math.BigInteger;
-import org.fossnova.json.JsonException;
-import org.fossnova.json.JsonWriter;
+import org.fossnova.json.stream.JsonException;
+import org.fossnova.json.stream.JsonWriter;
import org.junit.Test;
/**
Oops, something went wrong.

0 comments on commit d37fdd2

Please sign in to comment.