Skip to content

Removed JSON deprecation warnings #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2014
Merged

Removed JSON deprecation warnings #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/scala/scala/util/parsing/json/JSON.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ package util.parsing.json
*
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This object will be removed.", "2.11.0")
object JSON extends Parser {

/**
* This method converts ''raw'' results back into the original, deprecated
* form.
* This method converts ''raw'' results back into the original form.
*/
private def unRaw (in : Any) : Any = in match {
case JSONObject(obj) => obj.map({ case (k,v) => (k,unRaw(v))}).toList
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/scala/util/parsing/json/Lexer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import scala.util.parsing.input.CharArrayReader.EofCh
/**
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This class will be removed.", "2.11.0")
class Lexer extends StdLexical with ImplicitConversions {

override def token: Parser[Token] =
Expand Down
5 changes: 0 additions & 5 deletions src/main/scala/scala/util/parsing/json/Parser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import scala.util.parsing.combinator.syntactical._
*
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This class will be removed.", "2.11.0")
sealed abstract class JSONType {
/**
* This version of toString allows you to provide your own value
Expand All @@ -41,7 +40,6 @@ sealed abstract class JSONType {
*
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This object will be removed.", "2.11.0")
object JSONFormat {
/**
* This type defines a function that can be used to
Expand Down Expand Up @@ -93,7 +91,6 @@ object JSONFormat {
*
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This class will be removed.", "2.11.0")
case class JSONObject (obj : Map[String,Any]) extends JSONType {
def toString (formatter : JSONFormat.ValueFormatter) =
"{" + obj.map({ case (k,v) => formatter(k.toString) + " : " + formatter(v) }).mkString(", ") + "}"
Expand All @@ -103,7 +100,6 @@ case class JSONObject (obj : Map[String,Any]) extends JSONType {
* Represents a JSON Array (list).
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This class will be removed.", "2.11.0")
case class JSONArray (list : List[Any]) extends JSONType {
def toString (formatter : JSONFormat.ValueFormatter) =
"[" + list.map(formatter).mkString(", ") + "]"
Expand All @@ -114,7 +110,6 @@ case class JSONArray (list : List[Any]) extends JSONType {
*
* @author Derek Chen-Becker <"java"+@+"chen-becker"+"."+"org">
*/
@deprecated("This class will be removed.", "2.11.0")
class Parser extends StdTokenParsers with ImplicitConversions {
// Fill in abstract defs
type Tokens = Lexer
Expand Down