diff --git a/ITEM-IDs.md b/ITEM-IDs.md new file mode 100644 index 0000000..2940838 --- /dev/null +++ b/ITEM-IDs.md @@ -0,0 +1,219 @@ + +## Block IDs: + + - **`1` Stone** + - **`2` Grass** + - **`3` Dirt** + - **`4` Cobblestone** + - **`5` Planks** + - **`6` Sapling** + - **`7` Bedrock** + - **`8` Water** + - **`9` Water Moving** + - **`10` Lava** + - **`11` Lava Moving** + - **`12` Sand** + - **`13` Gravel** + - **`14` Gold Ore** + - **`15` Iron Ore** + - **`16` Coal Ore** + - **`17` Log** + - **`18` Leaves** + - **`19` Sponge** + - **`20` Glass** + - **`21` Lapis Ore** + - **`22` Lapis Block** + - **`23` Dispenser** + - **`24` Sandstone** + - **`25` Note Block** + - **`26` Bed (Block)** + - **`35` Wool Block** + - **`37` Yellow Flower** + - **`38` Rose** + - **`39` Brown Mushroom** + - **`40` Red Mushroom** + - **`41` Gold Block** + - **`42` Iron Block** + - **`43` Double Slab** + - **`44` Single Slab** + - **`45` Brick Block** + - **`46` TNT Block** + - **`47` Bookshelf** + - **`48` Mossy Cobblestone** + - **`49` Obsidian** + - **`50` Torch** + - **`51` Fire Block** + - **`52` Mob Spawner** + - **`53` Wood Stairs** + - **`54` Chest Block** + - **`55` Redstone Wire (Block)** + - **`56` Diamond Ore** + - **`57` Diamond Block** + - **`58` Crafting Table** + - **`59` Wheat Crops (Block)** + - **`60` Farmland** + - **`61` Furnace Block** + - **`62` Furnace Block (Active)** + - **`63` Sign Post (Block)** + - **`64` Wooden Door (Block)** + - **`65` Ladder** + - **`66` Rails** + - **`67` Cobblestone Stairs** + - **`68` Wall Sign (Block)** + - **`69` Lever** + - **`70` Stone Pressure Plate** + - **`71` Iron Door (Block)** + - **`72` Wooden Pressure Plate** + - **`73` Redstone Ore** + - **`74` Redstone Ore (Glowing)** + - **`75` Redstone Torch (Off)** + - **`76` Redstone Torch (On)** + - **`77` Stone Button** + - **`78` Snow Layer** + - **`79` Ice Block** + - **`80` Snow Block** + - **`81` Cactus** + - **`82` Clay Block** + - **`83` Sugar Canes (Block)** + - **`84` Jukebox** + - **`85` Fence** + - **`86` Pumpkin** + - **`87` Netherrack** + - **`88` Soul Sand** + - **`89` Glowstone** + - **`90` Nether Portal** + - **`91` Jack 'o' Lantern** + - **`92` Cake (Block)** + - **`93` Redstone Repeater (Block, Off)** + - **`94` Redstone Repeater (Block, On)** + - **`95` Cobblestone** + +## Item IDs: + + - **`256`** *(0)* **Iron Shovel** + - **`257`** *(1)* **Iron Pickaxe** + - **`258`** *(2)* **Iron Axe** + - **`259`** *(3)* **Flint and Steel** + - **`260`** *(4)* **Apple** + - **`261`** *(5)* **Bow** + - **`262`** *(6)* **Arrow** + - **`263`** *(7)* **Coal** + - **`264`** *(8)* **Diamond** + - **`265`** *(9)* **Iron Ingot** + - **`266`** *(10)* **Gold Ingot** + - **`267`** *(11)* **Iron Sword** + - **`268`** *(12)* **Wood Sword** + - **`269`** *(13)* **Wood Shovel** + - **`270`** *(14)* **Wood Pickaxe** + - **`271`** *(15)* **Wood Axe** + - **`272`** *(16)* **Stone Sword** + - **`273`** *(17)* **Stone Shovel** + - **`274`** *(18)* **Stone Pickaxe** + - **`275`** *(19)* **Stone Axe** + - **`276`** *(20)* **Diamond Sword** + - **`277`** *(21)* **Diamond Shovel** + - **`278`** *(22)* **Diamond Pickaxe** + - **`279`** *(23)* **Diamond Axe** + - **`280`** *(24)* **Stick** + - **`281`** *(25)* **Bowl Empty** + - **`282`** *(26)* **Bowl Mushroom Soup** + - **`283`** *(27)* **Gold Sword** + - **`284`** *(28)* **Gold Shovel** + - **`285`** *(29)* **Gold Pickaxe** + - **`286`** *(30)* **Gold Axe** + - **`287`** *(31)* **String** + - **`288`** *(32)* **Feather** + - **`289`** *(33)* **Gunpowder** + - **`290`** *(34)* **Wood Hoe** + - **`291`** *(35)* **Stone Hoe** + - **`292`** *(36)* **Iron Hoe** + - **`293`** *(37)* **Diamond Hoe** + - **`294`** *(38)* **Gold Hoe** + - **`295`** *(39)* **Seeds** + - **`296`** *(40)* **Wheat** + - **`297`** *(41)* **Bread** + - **`298`** *(42)* **Leather Helmet** + - **`299`** *(43)* **Leather Chestplate** + - **`300`** *(44)* **Leather Leggings** + - **`301`** *(45)* **Leather Boots** + - **`302`** *(46)* **Chain Helmet** + - **`303`** *(47)* **Chain Chestplate** + - **`304`** *(48)* **Chain Leggings** + - **`305`** *(49)* **Chain Boots** + - **`306`** *(50)* **Iron Helmet** + - **`307`** *(51)* **Iron Chestplate** + - **`308`** *(52)* **Iron Leggings** + - **`309`** *(53)* **Iron Boots** + - **`310`** *(54)* **Diamond Helmet** + - **`311`** *(55)* **Diamond Chestplate** + - **`312`** *(56)* **Diamond Leggings** + - **`313`** *(57)* **Diamond Boots** + - **`314`** *(58)* **Gold Helmet** + - **`315`** *(59)* **Gold Chestplate** + - **`316`** *(60)* **Gold Leggings** + - **`317`** *(61)* **Gold Boots** + - **`318`** *(62)* **Flint** + - **`319`** *(63)* **Raw Pork** + - **`320`** *(64)* **Cooked Pork** + - **`321`** *(65)* **Painting** + - **`322`** *(66)* **Golden Apple** + - **`323`** *(67)* **Sign (Item)** + - **`324`** *(68)* **Wooden Door** + - **`325`** *(69)* **Empty Bucket** + - **`326`** *(70)* **Water Bucket** + - **`327`** *(71)* **Lava Bucket** + - **`328`** *(72)* **Minecart (Item)** + - **`329`** *(73)* **Saddle** + - **`330`** *(74)* **Iron Door (Item)** + - **`331`** *(75)* **Redstone (Item)** + - **`332`** *(76)* **Snowball** + - **`333`** *(77)* **Boat (Item)** + - **`334`** *(78)* **Leather** + - **`335`** *(79)* **Milk Bucket** + - **`336`** *(80)* **Brick (Item)** + - **`337`** *(81)* **Clay (Item)** + - **`338`** *(82)* **Sugar Canes (Item)** + - **`339`** *(83)* **Paper** + - **`340`** *(84)* **Book** + - **`341`** *(85)* **Slime Ball** + - **`342`** *(86)* **Minecart with Chest (Item)** + - **`343`** *(87)* **Minecart with Furnace (Item)** + - **`344`** *(88)* **Egg** + - **`345`** *(89)* **Compass** + - **`346`** *(90)* **Fishing Rod** + - **`347`** *(91)* **Clock** + - **`348`** *(92)* **Glowstone Dust** + - **`349`** *(93)* **Raw Fish** + - **`350`** *(94)* **Cooked Fish** + - **`351`** *(95)* **Dye powder** + - **`352`** *(96)* **Bone** + - **`353`** *(97)* **Sugar** + - **`354`** *(98)* **Cake (Item)** + - **`355`** *(99)* **Bed (Item)** + - **`356`** *(100)* **Redstone Repeater (Item)** + - **`2256`** *(2000)* **Record - 13** + - **`2257`** *(2001)* **Record - Cat** + +## Entity IDs: + + - **`1`** `Item` **item dropped by a mob/player** + - **`9`** `Painting` **painting on a wall** + - **`10`** `Arrow` **arrow from a bow/skeleton** + - **`11`** `Snowball` **thrown snowball or egg** + - **`20`** `PrimedTnt` **lit TNT block** + - **`21`** `FallingSand` **falling sand block** + - **`40`** `Minecart` **minecart in the world** + - **`41`** `Boat` **boat in the world** + - **`50`** `Creeper` **creeper mob** + - **`51`** `Skeleton` **skeleton mob** + - **`52`** `Spider` **spider mob** + - **`53`** `Giant` **giant zombie** + - **`54`** `Zombie` **zombie mob** + - **`55`** `Slime` **slime mob** + - **`56`** `Ghast` **ghast mob** + - **`57`** `PigZombie` **zombie pigman** + - **`90`** `Pig` **pig mob** + - **`91`** `Sheep` **sheep mob** + - **`92`** `Cow` **cow mob** + - **`93`** `Chicken` **chicken mob** + - **`94`** `Squid` **squid mob** \ No newline at end of file diff --git a/lwjgl-rundir/resources/sounds/mob/chicken1.mp3 b/lwjgl-rundir/resources/sounds/mob/chicken1.mp3 index 8d3b1f4..dfecea1 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/chicken1.mp3 and b/lwjgl-rundir/resources/sounds/mob/chicken1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/chicken2.mp3 b/lwjgl-rundir/resources/sounds/mob/chicken2.mp3 index 0dc93d4..115a995 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/chicken2.mp3 and b/lwjgl-rundir/resources/sounds/mob/chicken2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/chicken3.mp3 b/lwjgl-rundir/resources/sounds/mob/chicken3.mp3 index 35b54c9..226c525 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/chicken3.mp3 and b/lwjgl-rundir/resources/sounds/mob/chicken3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/chickenhurt1.mp3 b/lwjgl-rundir/resources/sounds/mob/chickenhurt1.mp3 index c7c8821..b7fcc82 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/chickenhurt1.mp3 and b/lwjgl-rundir/resources/sounds/mob/chickenhurt1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/chickenhurt2.mp3 b/lwjgl-rundir/resources/sounds/mob/chickenhurt2.mp3 index 35b140f..912e11c 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/chickenhurt2.mp3 and b/lwjgl-rundir/resources/sounds/mob/chickenhurt2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/chickenplop.mp3 b/lwjgl-rundir/resources/sounds/mob/chickenplop.mp3 index 543b2b8..884203e 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/chickenplop.mp3 and b/lwjgl-rundir/resources/sounds/mob/chickenplop.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cow1.mp3 b/lwjgl-rundir/resources/sounds/mob/cow1.mp3 index 7aef286..9ff91e7 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cow1.mp3 and b/lwjgl-rundir/resources/sounds/mob/cow1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cow2.mp3 b/lwjgl-rundir/resources/sounds/mob/cow2.mp3 index 1013374..8974003 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cow2.mp3 and b/lwjgl-rundir/resources/sounds/mob/cow2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cow3.mp3 b/lwjgl-rundir/resources/sounds/mob/cow3.mp3 index e898765..fcb19c1 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cow3.mp3 and b/lwjgl-rundir/resources/sounds/mob/cow3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cow4.mp3 b/lwjgl-rundir/resources/sounds/mob/cow4.mp3 index 8c1518c..253d89a 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cow4.mp3 and b/lwjgl-rundir/resources/sounds/mob/cow4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cowhurt1.mp3 b/lwjgl-rundir/resources/sounds/mob/cowhurt1.mp3 index c6e5d70..268f429 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cowhurt1.mp3 and b/lwjgl-rundir/resources/sounds/mob/cowhurt1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cowhurt2.mp3 b/lwjgl-rundir/resources/sounds/mob/cowhurt2.mp3 index 038a5ff..6644e41 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cowhurt2.mp3 and b/lwjgl-rundir/resources/sounds/mob/cowhurt2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/cowhurt3.mp3 b/lwjgl-rundir/resources/sounds/mob/cowhurt3.mp3 index f5a2882..daf4f57 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/cowhurt3.mp3 and b/lwjgl-rundir/resources/sounds/mob/cowhurt3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/creeper1.mp3 b/lwjgl-rundir/resources/sounds/mob/creeper1.mp3 index 2dbd086..9645ad7 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/creeper1.mp3 and b/lwjgl-rundir/resources/sounds/mob/creeper1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/creeper2.mp3 b/lwjgl-rundir/resources/sounds/mob/creeper2.mp3 index 07df60f..28ab5bf 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/creeper2.mp3 and b/lwjgl-rundir/resources/sounds/mob/creeper2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/creeper3.mp3 b/lwjgl-rundir/resources/sounds/mob/creeper3.mp3 index f07f2b1..2774f81 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/creeper3.mp3 and b/lwjgl-rundir/resources/sounds/mob/creeper3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/creeper4.mp3 b/lwjgl-rundir/resources/sounds/mob/creeper4.mp3 index 9072673..ae56eef 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/creeper4.mp3 and b/lwjgl-rundir/resources/sounds/mob/creeper4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/creeperdeath.mp3 b/lwjgl-rundir/resources/sounds/mob/creeperdeath.mp3 index cd4533f..6eab4a3 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/creeperdeath.mp3 and b/lwjgl-rundir/resources/sounds/mob/creeperdeath.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/charge.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/charge.mp3 index c8e6c4b..7bcd794 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/charge.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/charge.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/death.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/death.mp3 index bc40b39..1707c12 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/death.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/death.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/fireball.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/fireball.mp3 index 0410c1b..5b3dab6 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/fireball.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/fireball.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan1.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan1.mp3 index 1e0be52..b3e20cc 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan1.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan2.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan2.mp3 index 8ac78be..ac0a6dd 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan2.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan3.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan3.mp3 index 4719c3d..3bae645 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan3.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan4.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan4.mp3 index 4bfe422..4ac6bcd 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan4.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan5.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan5.mp3 index 0f3e1a2..03ccba6 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan5.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan5.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan6.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan6.mp3 index 35192c3..2f29b6c 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan6.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan6.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/moan7.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/moan7.mp3 index ac0895c..80f9d71 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/moan7.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/moan7.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/scream1.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/scream1.mp3 index cb78fe1..850ee73 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/scream1.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/scream1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/scream2.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/scream2.mp3 index f927de9..f0e2119 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/scream2.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/scream2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/scream3.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/scream3.mp3 index f8e1564..634ec44 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/scream3.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/scream3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/scream4.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/scream4.mp3 index ba33260..e63182f 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/scream4.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/scream4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/ghast/scream5.mp3 b/lwjgl-rundir/resources/sounds/mob/ghast/scream5.mp3 index 82cf4d9..3ec6a9f 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/ghast/scream5.mp3 and b/lwjgl-rundir/resources/sounds/mob/ghast/scream5.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/pig1.mp3 b/lwjgl-rundir/resources/sounds/mob/pig1.mp3 index c090746..94e5529 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/pig1.mp3 and b/lwjgl-rundir/resources/sounds/mob/pig1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/pig2.mp3 b/lwjgl-rundir/resources/sounds/mob/pig2.mp3 index 387ad59..b4f4846 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/pig2.mp3 and b/lwjgl-rundir/resources/sounds/mob/pig2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/pig3.mp3 b/lwjgl-rundir/resources/sounds/mob/pig3.mp3 index 4a8352d..3b326e8 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/pig3.mp3 and b/lwjgl-rundir/resources/sounds/mob/pig3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/pigdeath.mp3 b/lwjgl-rundir/resources/sounds/mob/pigdeath.mp3 index 13c4aec..35c7c0b 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/pigdeath.mp3 and b/lwjgl-rundir/resources/sounds/mob/pigdeath.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/sheep1.mp3 b/lwjgl-rundir/resources/sounds/mob/sheep1.mp3 index 7d7d2b9..6ad17dd 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/sheep1.mp3 and b/lwjgl-rundir/resources/sounds/mob/sheep1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/sheep2.mp3 b/lwjgl-rundir/resources/sounds/mob/sheep2.mp3 index 01d4b6b..8a83519 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/sheep2.mp3 and b/lwjgl-rundir/resources/sounds/mob/sheep2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/sheep3.mp3 b/lwjgl-rundir/resources/sounds/mob/sheep3.mp3 index 66b88f8..fd587c8 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/sheep3.mp3 and b/lwjgl-rundir/resources/sounds/mob/sheep3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeleton1.mp3 b/lwjgl-rundir/resources/sounds/mob/skeleton1.mp3 index 34d64e5..fd712b7 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeleton1.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeleton1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeleton2.mp3 b/lwjgl-rundir/resources/sounds/mob/skeleton2.mp3 index 6fe15b8..84319d6 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeleton2.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeleton2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeleton3.mp3 b/lwjgl-rundir/resources/sounds/mob/skeleton3.mp3 index e69e4fb..0a436fa 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeleton3.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeleton3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeletondeath.mp3 b/lwjgl-rundir/resources/sounds/mob/skeletondeath.mp3 index 760f9a3..64427ae 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeletondeath.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeletondeath.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeletonhurt1.mp3 b/lwjgl-rundir/resources/sounds/mob/skeletonhurt1.mp3 index 4b9ab85..ae380e9 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeletonhurt1.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeletonhurt1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeletonhurt2.mp3 b/lwjgl-rundir/resources/sounds/mob/skeletonhurt2.mp3 index 2911bb3..ec0115c 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeletonhurt2.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeletonhurt2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeletonhurt3.mp3 b/lwjgl-rundir/resources/sounds/mob/skeletonhurt3.mp3 index 34e215d..1875d65 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeletonhurt3.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeletonhurt3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/skeletonhurt4.mp3 b/lwjgl-rundir/resources/sounds/mob/skeletonhurt4.mp3 index f3e396a..7bb72a7 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/skeletonhurt4.mp3 and b/lwjgl-rundir/resources/sounds/mob/skeletonhurt4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slime1.mp3 b/lwjgl-rundir/resources/sounds/mob/slime1.mp3 index 20093f2..734c56a 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slime1.mp3 and b/lwjgl-rundir/resources/sounds/mob/slime1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slime2.mp3 b/lwjgl-rundir/resources/sounds/mob/slime2.mp3 index 99b121b..d4d4bff 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slime2.mp3 and b/lwjgl-rundir/resources/sounds/mob/slime2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slime3.mp3 b/lwjgl-rundir/resources/sounds/mob/slime3.mp3 index 47981b0..fb336ae 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slime3.mp3 and b/lwjgl-rundir/resources/sounds/mob/slime3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slime4.mp3 b/lwjgl-rundir/resources/sounds/mob/slime4.mp3 index 91ddff0..b0b27c1 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slime4.mp3 and b/lwjgl-rundir/resources/sounds/mob/slime4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slime5.mp3 b/lwjgl-rundir/resources/sounds/mob/slime5.mp3 index 37e34fb..28c2cc8 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slime5.mp3 and b/lwjgl-rundir/resources/sounds/mob/slime5.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slimeattack1.mp3 b/lwjgl-rundir/resources/sounds/mob/slimeattack1.mp3 index 83b3e0e..cdd2874 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slimeattack1.mp3 and b/lwjgl-rundir/resources/sounds/mob/slimeattack1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/slimeattack2.mp3 b/lwjgl-rundir/resources/sounds/mob/slimeattack2.mp3 index b7110fd..5c15f0e 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/slimeattack2.mp3 and b/lwjgl-rundir/resources/sounds/mob/slimeattack2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/spider1.mp3 b/lwjgl-rundir/resources/sounds/mob/spider1.mp3 index 0d32bcd..23f9ac5 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/spider1.mp3 and b/lwjgl-rundir/resources/sounds/mob/spider1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/spider2.mp3 b/lwjgl-rundir/resources/sounds/mob/spider2.mp3 index 7d60c51..f910c99 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/spider2.mp3 and b/lwjgl-rundir/resources/sounds/mob/spider2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/spider3.mp3 b/lwjgl-rundir/resources/sounds/mob/spider3.mp3 index 7dd8b56..ec370f5 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/spider3.mp3 and b/lwjgl-rundir/resources/sounds/mob/spider3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/spider4.mp3 b/lwjgl-rundir/resources/sounds/mob/spider4.mp3 index f5d78b6..3533ed4 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/spider4.mp3 and b/lwjgl-rundir/resources/sounds/mob/spider4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/spiderdeath.mp3 b/lwjgl-rundir/resources/sounds/mob/spiderdeath.mp3 index 596f9e5..eb24d71 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/spiderdeath.mp3 and b/lwjgl-rundir/resources/sounds/mob/spiderdeath.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombie1.mp3 b/lwjgl-rundir/resources/sounds/mob/zombie1.mp3 index 3d87085..49bf1d8 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombie1.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombie1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombie2.mp3 b/lwjgl-rundir/resources/sounds/mob/zombie2.mp3 index bdd4b2e..d0b28f8 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombie2.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombie2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombie3.mp3 b/lwjgl-rundir/resources/sounds/mob/zombie3.mp3 index 84bcf11..aad4de2 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombie3.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombie3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiedeath.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiedeath.mp3 index 14e894e..0252ba9 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiedeath.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiedeath.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiehurt1.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiehurt1.mp3 index eefe2a1..c03f9f8 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiehurt1.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiehurt1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiehurt2.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiehurt2.mp3 index acd87a1..e84e275 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiehurt2.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiehurt2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig1.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig1.mp3 index 4f7a35c..5d96849 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig1.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig2.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig2.mp3 index 61de2a4..343c178 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig2.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig3.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig3.mp3 index 13dcf01..0b33d72 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig3.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig4.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig4.mp3 index be8d426..d5d64d5 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig4.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpig4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry1.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry1.mp3 index 0ea229e..0dc9db5 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry1.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry2.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry2.mp3 index 5cb7883..32dffbe 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry2.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry3.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry3.mp3 index 94ac0b8..7b2d78d 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry3.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry4.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry4.mp3 index fdaec74..ca81faa 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry4.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigangry4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigdeath.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigdeath.mp3 index 6217bff..203dd29 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigdeath.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpigdeath.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt1.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt1.mp3 index 20dbeeb..c32ed8b 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt1.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt2.mp3 b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt2.mp3 index 6889cc7..2210ac7 100644 Binary files a/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt2.mp3 and b/lwjgl-rundir/resources/sounds/mob/zombiepig/zpighurt2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/portal/travel.mp3 b/lwjgl-rundir/resources/sounds/portal/travel.mp3 new file mode 100644 index 0000000..31e792d Binary files /dev/null and b/lwjgl-rundir/resources/sounds/portal/travel.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/bow.mp3 b/lwjgl-rundir/resources/sounds/random/bow.mp3 index b274274..12479b0 100644 Binary files a/lwjgl-rundir/resources/sounds/random/bow.mp3 and b/lwjgl-rundir/resources/sounds/random/bow.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/break.mp3 b/lwjgl-rundir/resources/sounds/random/break.mp3 index db1bfb6..d6a06bf 100644 Binary files a/lwjgl-rundir/resources/sounds/random/break.mp3 and b/lwjgl-rundir/resources/sounds/random/break.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/click.mp3 b/lwjgl-rundir/resources/sounds/random/click.mp3 index 5daf85a..b9643be 100644 Binary files a/lwjgl-rundir/resources/sounds/random/click.mp3 and b/lwjgl-rundir/resources/sounds/random/click.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/door_close.mp3 b/lwjgl-rundir/resources/sounds/random/door_close.mp3 index 0762664..2f534a8 100644 Binary files a/lwjgl-rundir/resources/sounds/random/door_close.mp3 and b/lwjgl-rundir/resources/sounds/random/door_close.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/door_open.mp3 b/lwjgl-rundir/resources/sounds/random/door_open.mp3 index 3aa9868..4f3da23 100644 Binary files a/lwjgl-rundir/resources/sounds/random/door_open.mp3 and b/lwjgl-rundir/resources/sounds/random/door_open.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/drr.mp3 b/lwjgl-rundir/resources/sounds/random/drr.mp3 index 9a361cd..a89a605 100644 Binary files a/lwjgl-rundir/resources/sounds/random/drr.mp3 and b/lwjgl-rundir/resources/sounds/random/drr.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/explode.mp3 b/lwjgl-rundir/resources/sounds/random/explode.mp3 index f341777..f41671f 100644 Binary files a/lwjgl-rundir/resources/sounds/random/explode.mp3 and b/lwjgl-rundir/resources/sounds/random/explode.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/fizz.mp3 b/lwjgl-rundir/resources/sounds/random/fizz.mp3 index 00a10de..b4720b5 100644 Binary files a/lwjgl-rundir/resources/sounds/random/fizz.mp3 and b/lwjgl-rundir/resources/sounds/random/fizz.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/fuse.mp3 b/lwjgl-rundir/resources/sounds/random/fuse.mp3 index 6a5c332..3a89926 100644 Binary files a/lwjgl-rundir/resources/sounds/random/fuse.mp3 and b/lwjgl-rundir/resources/sounds/random/fuse.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/glass1.mp3 b/lwjgl-rundir/resources/sounds/random/glass1.mp3 index cdbac26..ca426dc 100644 Binary files a/lwjgl-rundir/resources/sounds/random/glass1.mp3 and b/lwjgl-rundir/resources/sounds/random/glass1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/glass2.mp3 b/lwjgl-rundir/resources/sounds/random/glass2.mp3 index 5ab8e32..7d409fe 100644 Binary files a/lwjgl-rundir/resources/sounds/random/glass2.mp3 and b/lwjgl-rundir/resources/sounds/random/glass2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/glass3.mp3 b/lwjgl-rundir/resources/sounds/random/glass3.mp3 index f6f9316..f8f414e 100644 Binary files a/lwjgl-rundir/resources/sounds/random/glass3.mp3 and b/lwjgl-rundir/resources/sounds/random/glass3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/hurt.mp3 b/lwjgl-rundir/resources/sounds/random/hurt.mp3 index 4dc7964..7f3b0e2 100644 Binary files a/lwjgl-rundir/resources/sounds/random/hurt.mp3 and b/lwjgl-rundir/resources/sounds/random/hurt.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/pop.mp3 b/lwjgl-rundir/resources/sounds/random/pop.mp3 index e8cb350..b01be5a 100644 Binary files a/lwjgl-rundir/resources/sounds/random/pop.mp3 and b/lwjgl-rundir/resources/sounds/random/pop.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/random/splash.mp3 b/lwjgl-rundir/resources/sounds/random/splash.mp3 index fb5125b..adefdf0 100644 Binary files a/lwjgl-rundir/resources/sounds/random/splash.mp3 and b/lwjgl-rundir/resources/sounds/random/splash.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/sounds.dat b/lwjgl-rundir/resources/sounds/sounds.dat index 300d9e9..1de7f45 100644 Binary files a/lwjgl-rundir/resources/sounds/sounds.dat and b/lwjgl-rundir/resources/sounds/sounds.dat differ diff --git a/lwjgl-rundir/resources/sounds/step/cloth1.mp3 b/lwjgl-rundir/resources/sounds/step/cloth1.mp3 index 8b4da68..3437e45 100644 Binary files a/lwjgl-rundir/resources/sounds/step/cloth1.mp3 and b/lwjgl-rundir/resources/sounds/step/cloth1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/cloth2.mp3 b/lwjgl-rundir/resources/sounds/step/cloth2.mp3 index 7792347..2e4afd6 100644 Binary files a/lwjgl-rundir/resources/sounds/step/cloth2.mp3 and b/lwjgl-rundir/resources/sounds/step/cloth2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/cloth3.mp3 b/lwjgl-rundir/resources/sounds/step/cloth3.mp3 index e0a632f..0a67aa2 100644 Binary files a/lwjgl-rundir/resources/sounds/step/cloth3.mp3 and b/lwjgl-rundir/resources/sounds/step/cloth3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/cloth4.mp3 b/lwjgl-rundir/resources/sounds/step/cloth4.mp3 index ca7fb32..1d99a59 100644 Binary files a/lwjgl-rundir/resources/sounds/step/cloth4.mp3 and b/lwjgl-rundir/resources/sounds/step/cloth4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/grass1.mp3 b/lwjgl-rundir/resources/sounds/step/grass1.mp3 index 63cbed3..b86a155 100644 Binary files a/lwjgl-rundir/resources/sounds/step/grass1.mp3 and b/lwjgl-rundir/resources/sounds/step/grass1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/grass2.mp3 b/lwjgl-rundir/resources/sounds/step/grass2.mp3 index 8565154..24256d9 100644 Binary files a/lwjgl-rundir/resources/sounds/step/grass2.mp3 and b/lwjgl-rundir/resources/sounds/step/grass2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/grass3.mp3 b/lwjgl-rundir/resources/sounds/step/grass3.mp3 index a7ff585..5c2485b 100644 Binary files a/lwjgl-rundir/resources/sounds/step/grass3.mp3 and b/lwjgl-rundir/resources/sounds/step/grass3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/grass4.mp3 b/lwjgl-rundir/resources/sounds/step/grass4.mp3 index d10eb8b..bbd4e6f 100644 Binary files a/lwjgl-rundir/resources/sounds/step/grass4.mp3 and b/lwjgl-rundir/resources/sounds/step/grass4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/gravel1.mp3 b/lwjgl-rundir/resources/sounds/step/gravel1.mp3 index b6f0876..41c4cf9 100644 Binary files a/lwjgl-rundir/resources/sounds/step/gravel1.mp3 and b/lwjgl-rundir/resources/sounds/step/gravel1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/gravel2.mp3 b/lwjgl-rundir/resources/sounds/step/gravel2.mp3 index f927f4b..313cd8b 100644 Binary files a/lwjgl-rundir/resources/sounds/step/gravel2.mp3 and b/lwjgl-rundir/resources/sounds/step/gravel2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/gravel3.mp3 b/lwjgl-rundir/resources/sounds/step/gravel3.mp3 index de0e706..3bc516d 100644 Binary files a/lwjgl-rundir/resources/sounds/step/gravel3.mp3 and b/lwjgl-rundir/resources/sounds/step/gravel3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/gravel4.mp3 b/lwjgl-rundir/resources/sounds/step/gravel4.mp3 index e0dd87c..bcf0243 100644 Binary files a/lwjgl-rundir/resources/sounds/step/gravel4.mp3 and b/lwjgl-rundir/resources/sounds/step/gravel4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/sand1.mp3 b/lwjgl-rundir/resources/sounds/step/sand1.mp3 index fa24a98..76eb51f 100644 Binary files a/lwjgl-rundir/resources/sounds/step/sand1.mp3 and b/lwjgl-rundir/resources/sounds/step/sand1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/sand2.mp3 b/lwjgl-rundir/resources/sounds/step/sand2.mp3 index a7d7ab4..825e676 100644 Binary files a/lwjgl-rundir/resources/sounds/step/sand2.mp3 and b/lwjgl-rundir/resources/sounds/step/sand2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/sand3.mp3 b/lwjgl-rundir/resources/sounds/step/sand3.mp3 index 5d52a59..dd961fd 100644 Binary files a/lwjgl-rundir/resources/sounds/step/sand3.mp3 and b/lwjgl-rundir/resources/sounds/step/sand3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/sand4.mp3 b/lwjgl-rundir/resources/sounds/step/sand4.mp3 index 5d4369f..6237152 100644 Binary files a/lwjgl-rundir/resources/sounds/step/sand4.mp3 and b/lwjgl-rundir/resources/sounds/step/sand4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/snow1.mp3 b/lwjgl-rundir/resources/sounds/step/snow1.mp3 index 3f43031..64c4e92 100644 Binary files a/lwjgl-rundir/resources/sounds/step/snow1.mp3 and b/lwjgl-rundir/resources/sounds/step/snow1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/snow2.mp3 b/lwjgl-rundir/resources/sounds/step/snow2.mp3 index 6357517..73e8415 100644 Binary files a/lwjgl-rundir/resources/sounds/step/snow2.mp3 and b/lwjgl-rundir/resources/sounds/step/snow2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/snow3.mp3 b/lwjgl-rundir/resources/sounds/step/snow3.mp3 index b180ad0..d1938c3 100644 Binary files a/lwjgl-rundir/resources/sounds/step/snow3.mp3 and b/lwjgl-rundir/resources/sounds/step/snow3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/snow4.mp3 b/lwjgl-rundir/resources/sounds/step/snow4.mp3 index 02f9548..fc93425 100644 Binary files a/lwjgl-rundir/resources/sounds/step/snow4.mp3 and b/lwjgl-rundir/resources/sounds/step/snow4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/stone1.mp3 b/lwjgl-rundir/resources/sounds/step/stone1.mp3 index 743b88f..f463f96 100644 Binary files a/lwjgl-rundir/resources/sounds/step/stone1.mp3 and b/lwjgl-rundir/resources/sounds/step/stone1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/stone2.mp3 b/lwjgl-rundir/resources/sounds/step/stone2.mp3 index 1c7a47e..c411fae 100644 Binary files a/lwjgl-rundir/resources/sounds/step/stone2.mp3 and b/lwjgl-rundir/resources/sounds/step/stone2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/stone3.mp3 b/lwjgl-rundir/resources/sounds/step/stone3.mp3 index 84fe2e3..565d611 100644 Binary files a/lwjgl-rundir/resources/sounds/step/stone3.mp3 and b/lwjgl-rundir/resources/sounds/step/stone3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/stone4.mp3 b/lwjgl-rundir/resources/sounds/step/stone4.mp3 index f26a832..a702f9a 100644 Binary files a/lwjgl-rundir/resources/sounds/step/stone4.mp3 and b/lwjgl-rundir/resources/sounds/step/stone4.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/wood1.mp3 b/lwjgl-rundir/resources/sounds/step/wood1.mp3 index 6ab2bd7..8d33c7e 100644 Binary files a/lwjgl-rundir/resources/sounds/step/wood1.mp3 and b/lwjgl-rundir/resources/sounds/step/wood1.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/wood2.mp3 b/lwjgl-rundir/resources/sounds/step/wood2.mp3 index f3f5f45..cf89ff0 100644 Binary files a/lwjgl-rundir/resources/sounds/step/wood2.mp3 and b/lwjgl-rundir/resources/sounds/step/wood2.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/wood3.mp3 b/lwjgl-rundir/resources/sounds/step/wood3.mp3 index bf822ee..69b0a63 100644 Binary files a/lwjgl-rundir/resources/sounds/step/wood3.mp3 and b/lwjgl-rundir/resources/sounds/step/wood3.mp3 differ diff --git a/lwjgl-rundir/resources/sounds/step/wood4.mp3 b/lwjgl-rundir/resources/sounds/step/wood4.mp3 index caf3495..4760697 100644 Binary files a/lwjgl-rundir/resources/sounds/step/wood4.mp3 and b/lwjgl-rundir/resources/sounds/step/wood4.mp3 differ diff --git a/src/lwjgl/java/de/cuina/fireandfuel/CodecJLayerMP3.java b/src/lwjgl/java/de/cuina/fireandfuel/CodecJLayerMP3.java index e262211..402a218 100644 --- a/src/lwjgl/java/de/cuina/fireandfuel/CodecJLayerMP3.java +++ b/src/lwjgl/java/de/cuina/fireandfuel/CodecJLayerMP3.java @@ -142,8 +142,8 @@ public class CodecJLayerMP3 implements ICodec { myAudioInputStream = new DecodedMpegAudioInputStream(myAudioFormat, new AudioInputStream(new BufferedInputStream(url.openStream()), mpegAudioFormat, -1)); - myAudioInputStream.skip((int) (myAudioInputStream.getFormat().getFrameRate() * 0.018f) - * myAudioInputStream.getFormat().getFrameSize()); + //myAudioInputStream.skip((int) (myAudioInputStream.getFormat().getFrameRate() * 0.018f) + // * myAudioInputStream.getFormat().getFrameSize()); } catch (Exception e) { errorMessage("Unable to set up input streams in method " + "'initialize'"); printStackTrace(e); diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java b/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java index df4f31f..052bc03 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java @@ -41,7 +41,6 @@ import javax.swing.filechooser.FileFilter; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; -import org.json.JSONObject; import org.lwjgl.LWJGLException; import org.lwjgl.Sys; import org.lwjgl.input.Keyboard; @@ -66,7 +65,6 @@ import org.lwjgl.util.glu.GLU; import de.cuina.fireandfuel.CodecJLayerMP3; import net.lax1dude.eaglercraft.AssetRepository; import net.lax1dude.eaglercraft.EarlyLoadScreen; -import net.lax1dude.eaglercraft.ServerQuery; import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.ProgramGL; import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RateLimit; import net.lax1dude.eaglercraft.adapter.lwjgl.GameWindowListener; @@ -1332,7 +1330,12 @@ public class EaglerAdapterImpl2 { return s; } + private static float soundX = 0f; + private static float soundY = 0f; + private static float soundZ = 0f; + public static final void setListenerPos(float x, float y, float z, float vx, float vy, float vz, float pitch, float yaw) { + soundX = x; soundY = y; soundZ = z; float var2 = MathHelper.cos(-yaw * 0.017453292F); float var3 = MathHelper.sin(-yaw * 0.017453292F); float var4 = -MathHelper.cos(pitch * 0.017453292F); @@ -1373,7 +1376,7 @@ public class EaglerAdapterImpl2 { URL loc = null; if ((loc = getResourceURL(fileName)) != null) { String name = "sound_" + id; - ss.newSource(false, name, loc, fileName, false, 0f, 0f, 0f, 0, 0f); + ss.newSource(false, name, loc, fileName, false, soundX, soundY, soundZ, 0, 0f); ss.setTemporary(name, true); ss.setPitch(name, pitch); ss.setVolume(name, volume); @@ -1537,145 +1540,6 @@ public class EaglerAdapterImpl2 { } - private static class ServerQueryImpl extends WebSocketClient implements ServerQuery { - - private final LinkedList queryResponses = new LinkedList(); - private final LinkedList queryResponsesBytes = new LinkedList(); - private final String type; - private boolean open; - private boolean alive; - private String serverUri; - - private ServerQueryImpl(String type, URI serverUri, String serverUriString) throws IOException { - super(serverUri); - this.serverUri = serverUriString; - this.type = type; - this.open = true; - this.alive = false; - this.setConnectionLostTimeout(5); - this.setTcpNoDelay(true); - this.connect(); - } - - @Override - public int responseAvailable() { - synchronized (queryResponses) { - return queryResponses.size(); - } - } - - @Override - public int responseBinaryAvailable() { - synchronized (queryResponsesBytes) { - return queryResponsesBytes.size(); - } - } - - @Override - public QueryResponse getResponse() { - synchronized (queryResponses) { - return queryResponses.size() > 0 ? queryResponses.remove(0) : null; - } - } - - @Override - public byte[] getBinaryResponse() { - synchronized (queryResponsesBytes) { - return queryResponsesBytes.size() > 0 ? queryResponsesBytes.remove(0) : null; - } - } - - @Override - public void onClose(int arg0, String arg1, boolean arg2) { - open = false; - if (!alive) { - synchronized (socketSync) { - if (EaglerAdapterImpl2.blockedAddresses.contains(serverUri)) { - queryResponses.add(new QueryResponse(true)); - } else if (EaglerAdapterImpl2.rateLimitedAddresses.contains(serverUri)) { - queryResponses.add(new QueryResponse(false)); - } - } - } - } - - @Override - public void onError(Exception arg0) { - System.err.println("WebSocket query error: " + arg0.toString()); - open = false; - this.close(); - } - - @Override - public void onMessage(String arg0) { - this.alive = true; - synchronized (queryResponses) { - if (arg0.equalsIgnoreCase("BLOCKED")) { - synchronized (socketSync) { - EaglerAdapterImpl2.rateLimitedAddresses.add(serverUri); - queryResponses.add(new QueryResponse(false)); - } - this.close(); - return; - } else if (arg0.equalsIgnoreCase("LOCKED")) { - synchronized (socketSync) { - EaglerAdapterImpl2.blockedAddresses.add(serverUri); - queryResponses.add(new QueryResponse(true)); - } - this.close(); - return; - } else { - try { - QueryResponse q = new QueryResponse(new JSONObject(arg0)); - if (q.rateLimitStatus != null) { - synchronized (socketSync) { - if (q.rateLimitStatus == RateLimit.BLOCKED) { - EaglerAdapterImpl2.rateLimitedAddresses.add(serverUri); - } else if (q.rateLimitStatus == RateLimit.LOCKED) { - EaglerAdapterImpl2.blockedAddresses.add(serverUri); - } - } - this.close(); - } - queryResponses.add(q); - } catch (Throwable t) { - System.err.println("Query response parse error: " + t.toString()); - } - } - } - } - - @Override - public void onMessage(ByteBuffer arg0) { - this.alive = true; - synchronized (queryResponsesBytes) { - byte[] pkt = new byte[arg0.limit()]; - arg0.get(pkt); - queryResponsesBytes.add(pkt); - } - } - - @Override - public void onOpen(ServerHandshake arg0) { - send("Accept: " + type); - } - - @Override - public boolean isQueryOpen() { - return open; - } - - } - - public static final ServerQuery openQuery(String type, String uri) { - try { - return new ServerQueryImpl(type, new URI(uri), uri); - } catch (Throwable t) { - System.err.println("WebSocket query error: " + t.toString()); - return null; - } - } - private static String serverToJoinOnLaunch = null; public static final void setServerToJoinOnLaunch(String s) { @@ -1685,5 +1549,7 @@ public class EaglerAdapterImpl2 { public static final String getServerToJoinOnLaunch() { return serverToJoinOnLaunch; } + + } diff --git a/src/main/java/net/lax1dude/eaglercraft/ServerQuery.java b/src/main/java/net/lax1dude/eaglercraft/ServerQuery.java deleted file mode 100644 index 166341e..0000000 --- a/src/main/java/net/lax1dude/eaglercraft/ServerQuery.java +++ /dev/null @@ -1,147 +0,0 @@ -package net.lax1dude.eaglercraft; - -import org.json.JSONObject; - -import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.RateLimit; - -public interface ServerQuery { - - public static final long defaultTimeout = 10000l; - - public static class QueryResponse { - public final String responseType; - private final Object responseData; - public final String serverVersion; - public final String serverBrand; - public final String serverName; - public final long serverTime; - public final long clientTime; - public final boolean serverCracked; - public final RateLimit rateLimitStatus; - public final boolean rateLimitIsTCP; - - public QueryResponse(JSONObject obj) { - this.responseType = obj.getString("type").toLowerCase(); - if (this.responseType.equals("blocked") || this.responseType.equals("locked")) { - this.responseData = null; - this.serverVersion = "Unknown"; - this.serverBrand = "Unknown"; - this.serverName = "Unknown"; - this.serverTime = 0l; - this.clientTime = System.currentTimeMillis(); - this.serverCracked = false; - this.rateLimitStatus = this.responseType.equals("locked") ? RateLimit.LOCKED : RateLimit.BLOCKED; - this.rateLimitIsTCP = false; - } else { - this.responseData = obj.get("data"); - this.serverVersion = obj.getString("vers"); - this.serverBrand = obj.getString("brand"); - this.serverName = obj.getString("name"); - this.serverTime = obj.getLong("time"); - this.clientTime = System.currentTimeMillis(); - this.serverCracked = obj.optBoolean("cracked", false); - this.rateLimitStatus = null; - this.rateLimitIsTCP = false; - } - } - - public QueryResponse(boolean lockedNotBlocked) { - this.responseType = lockedNotBlocked ? "locked" : "blocked"; - this.responseData = null; - this.serverVersion = "Unknown"; - this.serverBrand = "Unknown"; - this.serverName = "Unknown"; - this.serverTime = 0l; - this.clientTime = System.currentTimeMillis(); - this.serverCracked = false; - this.rateLimitStatus = lockedNotBlocked ? RateLimit.LOCKED : RateLimit.BLOCKED; - this.rateLimitIsTCP = true; - } - - public boolean isResponseString() { - return responseData instanceof String; - } - - public boolean isResponseJSON() { - return responseData instanceof JSONObject; - } - - public String getResponseString() { - return (String) responseData; - } - - public JSONObject getResponseJSON() { - return (JSONObject) responseData; - } - } - - public boolean isQueryOpen(); - - public void close(); - - public void send(String str); - - public default void send(JSONObject obj) { - send(obj.toString()); - } - - public int responseAvailable(); - - public int responseBinaryAvailable(); - - public QueryResponse getResponse(); - - public byte[] getBinaryResponse(); - - // normally I wouldn't resort to race conditions but TeaVM has no - // java.util.concurrent classes for semaphore-like behavior - - public default boolean awaitResponseAvailable(long timeout) { - long start = System.currentTimeMillis(); - while (isQueryOpen() && responseAvailable() <= 0 - && (timeout <= 0l || System.currentTimeMillis() - start < timeout)) { - try { - Thread.sleep(0l, 250000); - } catch (InterruptedException e) { - } - } - return responseAvailable() > 0; - } - - public default boolean awaitResponseAvailable() { - return awaitResponseAvailable(defaultTimeout); - } - - public default boolean awaitResponseBinaryAvailable(long timeout) { - long start = System.currentTimeMillis(); - while (isQueryOpen() && responseBinaryAvailable() <= 0 - && (timeout <= 0l || System.currentTimeMillis() - start < timeout)) { - try { - Thread.sleep(0l, 250000); - } catch (InterruptedException e) { - } - } - return responseBinaryAvailable() > 0; - } - - public default boolean awaitResponseBinaryAvailable() { - return awaitResponseBinaryAvailable(defaultTimeout); - } - - public default QueryResponse awaitResponse(long timeout) { - return awaitResponseAvailable(timeout) ? getResponse() : null; - } - - public default QueryResponse awaitResponse() { - return awaitResponseAvailable() ? getResponse() : null; - } - - public default byte[] awaitResponseBinary(long timeout) { - return awaitResponseBinaryAvailable(timeout) ? getBinaryResponse() : null; - } - - public default byte[] awaitResponseBinary() { - return awaitResponseBinaryAvailable() ? getBinaryResponse() : null; - } - -} diff --git a/src/main/java/net/lax1dude/eaglercraft/beta/SingleplayerCommands.java b/src/main/java/net/lax1dude/eaglercraft/beta/SingleplayerCommands.java new file mode 100644 index 0000000..8ee0620 --- /dev/null +++ b/src/main/java/net/lax1dude/eaglercraft/beta/SingleplayerCommands.java @@ -0,0 +1,146 @@ +package net.lax1dude.eaglercraft.beta; + +import java.util.HashMap; +import java.util.Map.Entry; + +import net.minecraft.client.Minecraft; +import net.minecraft.src.Block; +import net.minecraft.src.Entity; +import net.minecraft.src.EntityList; +import net.minecraft.src.FontRenderer; +import net.minecraft.src.Item; +import net.minecraft.src.ItemStack; +import net.minecraft.src.MathHelper; + +public class SingleplayerCommands { + + public static final HashMap singleplayerCommands; + + static { + singleplayerCommands = new HashMap(); + singleplayerCommands.put("help", new CommandHelp()); + singleplayerCommands.put("give", new CommandGiveItem()); + singleplayerCommands.put("summon", new CommandSummon()); + } + + public static interface Command { + void processCommand(Minecraft mc, String[] args) throws Throwable; + String getDescription(); + } + + public static class CommandException extends RuntimeException { + public CommandException() { super(); } + public CommandException(String message, Throwable cause) { super(message, cause); } + public CommandException(String message) { super(message); } + } + + public static void processCommand(Minecraft mc, String cmd) { + String[] args = cmd.split("\\s+"); + if(args.length > 0) { + Command command = singleplayerCommands.get(args[0]); + if(command != null) { + String[] passArgs = new String[args.length - 1]; + System.arraycopy(args, 1, passArgs, 0, passArgs.length); + try { + command.processCommand(mc, passArgs); + }catch(CommandException t) { + mc.displayErrorChat("Command Error: " + FontRenderer.formatChar + "r" + t.getMessage() + (t.getCause() != null ? " (caused by: " + t.getCause().toString() + ")" : "")); + t.printStackTrace(); + }catch(Throwable t) { + mc.displayErrorChat("Command Error: " + FontRenderer.formatChar + "r" + t.toString()); + t.printStackTrace(); + } + }else { + mc.displayErrorChat("Command '" + args[0] + "' does not exist"); + } + } + } + + public static class CommandHelp implements Command { + + @Override + public void processCommand(Minecraft mc, String[] args) { + mc.displayChat(FontRenderer.formatChar + "aAvailable Singleplayer Commands:"); + for(Entry cmd : singleplayerCommands.entrySet()) { + mc.displayChat(" " + FontRenderer.formatChar + "e/" + cmd.getKey() + FontRenderer.formatChar + "r - " + cmd.getValue().getDescription()); + } + } + + @Override + public String getDescription() { + return "list all available commands"; + } + + } + + public static class CommandGiveItem implements Command { + + @Override + public void processCommand(Minecraft mc, String[] args) throws Throwable { + if(args.length != 1 && args.length != 2 && args.length != 3) { + throw new CommandException("arguments must be: [count] [damage]"); + } + int id = Integer.parseInt(args[0]); + boolean exists = id < 256 ? Block.blocksList[id] != null : Item.itemsList[id] != null; + if(exists) { + ItemStack stack = new ItemStack(id, args.length == 2 ? Integer.parseInt(args[1]) : 1, args.length == 3 ? Integer.parseInt(args[2]) : 0); + mc.thePlayer.inventory.addItemStackToInventory(stack); + if(id < 256) { + mc.displayChat("Gave player block '" + id + "'"); + }else { + mc.displayChat("Gave player item '" + id + "'"); + } + }else { + mc.displayErrorChat("Item/Block id #" + id + " does not exist!"); + } + } + + @Override + public String getDescription() { + return "give item [count]"; + } + + } + + public static class CommandSummon implements Command { + + @Override + public void processCommand(Minecraft mc, String[] args) throws Throwable { + if(args.length != 1 && args.length != 4) { + throw new CommandException("arguments must be: [x] [y] [z]"); + } + Entity e; + try { + int id = Integer.parseInt(args[0]); + e = EntityList.createEntity(id, mc.theWorld); + }catch(NumberFormatException ex) { + e = EntityList.createEntityInWorld(args[0], mc.theWorld); + } + if(e == null) { + throw new CommandException("Entity id '" + args[0] + "' is not registered"); + } + int x, y, z; + if(args.length == 4) { + x = Integer.parseInt(args[1]); + y = Integer.parseInt(args[2]); + z = Integer.parseInt(args[3]); + while(y > 0 && !mc.theWorld.isBlockOpaqueCube(x, y - 1, z)) { + --y; + } + }else { + x = MathHelper.floor_double(mc.thePlayer.posX); + y = MathHelper.floor_double(mc.thePlayer.posY); + z = MathHelper.floor_double(mc.thePlayer.posZ); + } + e.setLocationAndAngles(x, y, z, 0.0f, 0.0f); + mc.theWorld.entityJoinedWorld(e); + } + + @Override + public String getDescription() { + return "spawn an entity [x] [y] [z]"; + } + + } + +} diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java index 3be74d0..74606b6 100644 --- a/src/main/java/net/minecraft/client/Minecraft.java +++ b/src/main/java/net/minecraft/client/Minecraft.java @@ -9,6 +9,7 @@ import java.io.*; import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; +import net.lax1dude.eaglercraft.beta.SingleplayerCommands; import net.minecraft.src.*; // Referenced classes of package net.minecraft.client: @@ -210,7 +211,6 @@ public class Minecraft implements Runnable { GLAllocation.deleteTexturesAndDisplayLists(); } catch (Throwable throwable1) { } - sndManager.closeMinecraft(); EaglerAdapter.destroyContext(); System.exit(0); } @@ -282,7 +282,9 @@ public class Minecraft implements Runnable { Thread.sleep(10L); } if (gameSettings.showDebugInfo) { - displayDebugInfo(l2); + if(!(currentScreen instanceof GuiChat)) { + displayDebugInfo(l2); + } } else { prevFrameTime = System.nanoTime(); } @@ -753,6 +755,14 @@ public class Minecraft implements Runnable { public boolean isMultiplayerWorld() { return theWorld != null && theWorld.multiplayerWorld; } + + public void displayChat(String s) { + this.ingameGUI.addChatMessage(s); + } + + public void displayErrorChat(String s) { + this.ingameGUI.addChatMessage(FontRenderer.formatChar + "c" + s); + } public void startWorld(String s, String s1, long l) { changeWorld1(null); @@ -910,23 +920,6 @@ public class Minecraft implements Runnable { theWorld.func_656_j(); } - public void installResource(String s, File file) { - int i = s.indexOf("/"); - String s1 = s.substring(0, i); - s = s.substring(i + 1); - if (s1.equalsIgnoreCase("sound")) { - sndManager.addSound(s, file); - } else if (s1.equalsIgnoreCase("newsound")) { - sndManager.addSound(s, file); - } else if (s1.equalsIgnoreCase("streaming")) { - sndManager.addStreaming(s, file); - } else if (s1.equalsIgnoreCase("music")) { - sndManager.addMusic(s, file); - } else if (s1.equalsIgnoreCase("newmusic")) { - sndManager.addMusic(s, file); - } - } - public OpenGlCapsChecker func_6251_l() { return glCapabilities; } @@ -1007,8 +1000,8 @@ public class Minecraft implements Runnable { } public boolean func_22003_b(String s) { - if (s.startsWith("/")) { - + if (!this.isMultiplayerWorld() && s.startsWith("/")) { + SingleplayerCommands.processCommand(this, s.substring(1)); return true; } return false; diff --git a/src/main/java/net/minecraft/src/BlockPumpkin.java b/src/main/java/net/minecraft/src/BlockPumpkin.java index 6b7424d..36b9a76 100644 --- a/src/main/java/net/minecraft/src/BlockPumpkin.java +++ b/src/main/java/net/minecraft/src/BlockPumpkin.java @@ -5,6 +5,8 @@ package net.minecraft.src; // Decompiler options: packimports(3) braces deadcode public class BlockPumpkin extends Block { + + public static boolean flipFix = false; protected BlockPumpkin(int i, int j, boolean flag) { super(i, Material.pumpkin); @@ -24,13 +26,13 @@ public class BlockPumpkin extends Block { if (blockType) { k++; } - if (j == 0 && i == 2) { + if (j == 0 && i == (flipFix ? 3 : 2)) { return k; } if (j == 1 && i == 5) { return k; } - if (j == 2 && i == 3) { + if (j == 2 && i == (flipFix ? 2 : 3)) { return k; } if (j == 3 && i == 4) { diff --git a/src/main/java/net/minecraft/src/EntitySorter.java b/src/main/java/net/minecraft/src/EntitySorter.java index 8c3133b..01d6072 100644 --- a/src/main/java/net/minecraft/src/EntitySorter.java +++ b/src/main/java/net/minecraft/src/EntitySorter.java @@ -13,7 +13,9 @@ public class EntitySorter implements Comparator { } public int func_1063_a(WorldRenderer worldrenderer, WorldRenderer worldrenderer1) { - return worldrenderer.distanceToEntity(field_1594_a) >= worldrenderer1.distanceToEntity(field_1594_a) ? 1 : -1; + float f = worldrenderer.distanceToEntity(field_1594_a); + float f1 = worldrenderer1.distanceToEntity(field_1594_a) ; + return f == f1 ? 0 : f >= f1 ? 1 : -1; } public int compare(Object obj, Object obj1) { diff --git a/src/main/java/net/minecraft/src/FontRenderer.java b/src/main/java/net/minecraft/src/FontRenderer.java index ceafbd5..58c7098 100644 --- a/src/main/java/net/minecraft/src/FontRenderer.java +++ b/src/main/java/net/minecraft/src/FontRenderer.java @@ -132,8 +132,9 @@ public class FontRenderer { if (j1 < 0 || j1 > 15) { j1 = 15; } - EaglerAdapter.glCallList(fontDisplayLists + 256 + j1 + (flag ? 16 : 0)); - EaglerAdapter.glTranslatef(charWidth[256 + j1 + (flag ? 16 : 0)] * 0.5f, 0.0F, 0.0F); + continue; + //EaglerAdapter.glCallList(fontDisplayLists + 256 + j1 + (flag ? 16 : 0)); + //EaglerAdapter.glTranslatef(charWidth[256 + j1 + (flag ? 16 : 0)] * 0.5f, 0.0F, 0.0F); } if (i1 < s.length()) { @@ -171,4 +172,6 @@ public class FontRenderer { public int fontTextureName; private int fontDisplayLists; private IntBuffer buffer; + + public static final char formatChar = '\247'; } diff --git a/src/main/java/net/minecraft/src/GameSettings.java b/src/main/java/net/minecraft/src/GameSettings.java index acdb0c9..4d679fb 100644 --- a/src/main/java/net/minecraft/src/GameSettings.java +++ b/src/main/java/net/minecraft/src/GameSettings.java @@ -60,8 +60,8 @@ public class GameSettings { viewBobbing = true; anaglyph = false; limitFramerate = false; - fancyGraphics = true; - field_22278_j = true; + fancyGraphics = false; + field_22278_j = false; antialiasing = 1; skin = "Default"; keyBindForward = new KeyBinding("key.forward", 17); diff --git a/src/main/java/net/minecraft/src/GuiChat.java b/src/main/java/net/minecraft/src/GuiChat.java index a021c1d..ac4ae01 100644 --- a/src/main/java/net/minecraft/src/GuiChat.java +++ b/src/main/java/net/minecraft/src/GuiChat.java @@ -70,4 +70,8 @@ public class GuiChat extends GuiScreen { } } } + + public boolean doesGuiPauseGame() { + return false; + } } diff --git a/src/main/java/net/minecraft/src/GuiEditSign.java b/src/main/java/net/minecraft/src/GuiEditSign.java index d3187bf..f844968 100644 --- a/src/main/java/net/minecraft/src/GuiEditSign.java +++ b/src/main/java/net/minecraft/src/GuiEditSign.java @@ -15,13 +15,13 @@ public class GuiEditSign extends GuiScreen { this.field_1002_h = tileEntitySign; } - public void func_6448_a() { + public void initGui() { this.controlList.clear(); EaglerAdapter.enableRepeatEvents(true); this.controlList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120, "Done")); } - public void func_6449_h() { + public void onGuiClosed() { EaglerAdapter.enableRepeatEvents(false); if (this.mc.theWorld.multiplayerWorld) { this.mc.func_20001_q().addToSendQueue(new Packet130(this.field_1002_h.xCoord, this.field_1002_h.yCoord, @@ -29,11 +29,11 @@ public class GuiEditSign extends GuiScreen { } } - public void func_570_g() { + public void updateScreen() { ++this.field_4189_i; } - protected void func_572_a(GuiButton guiButton) { + protected void actionPerformed(GuiButton guiButton) { if (!guiButton.enabled) { return; } @@ -43,7 +43,7 @@ public class GuiEditSign extends GuiScreen { } } - protected void func_580_a(char c, int n) { + protected void keyTyped(char c, int n) { if (n == 200) { this.field_1000_j = this.field_1000_j - 1 & 3; } @@ -60,7 +60,7 @@ public class GuiEditSign extends GuiScreen { } } - public void func_571_a(int n, int n2, float f) { + public void drawScreen(int n, int n2, float f) { this.drawDefaultBackground(); this.drawCenteredString(this.fontRenderer, this.field_999_a, this.width / 2, 40, 0xFFFFFF); EaglerAdapter.glPushMatrix(); diff --git a/src/main/java/net/minecraft/src/GuiIngame.java b/src/main/java/net/minecraft/src/GuiIngame.java index 9c27992..9ae2f2e 100644 --- a/src/main/java/net/minecraft/src/GuiIngame.java +++ b/src/main/java/net/minecraft/src/GuiIngame.java @@ -128,12 +128,23 @@ public class GuiIngame extends Gui { EaglerAdapter.glRotatef(180F, 1.0F, 0.0F, 0.0F); RenderHelper.enableStandardItemLighting(); EaglerAdapter.glPopMatrix(); + boolean hasTransformHack = false; for (int l1 = 0; l1 < 9; l1++) { + if(!hasTransformHack) { + ItemStack s = mc.thePlayer.inventory.mainInventory[l1]; + if(s != null) { + if(s.itemID < 256 && RenderBlocks.func_1219_a(Block.blocksList[s.itemID].getRenderType())) { + // stupid hack to fix upside down block + itemRenderer.renderItemIntoGUI(mc.fontRenderer, mc.renderEngine, new ItemStack(Item.coal), -100, -100); + } + hasTransformHack = true; + } + } int i3 = (k / 2 - 90) + l1 * 20 + 2; int i4 = l - 16 - 3; renderInventorySlot(l1, i3, i4, f); } - + RenderHelper.disableStandardItemLighting(); EaglerAdapter.glDisable(32826 /* GL_RESCALE_NORMAL_EXT */); if (mc.thePlayer.func_22060_M() > 0) { diff --git a/src/main/java/net/minecraft/src/RenderBlocks.java b/src/main/java/net/minecraft/src/RenderBlocks.java index 4aaeb1c..a54293e 100644 --- a/src/main/java/net/minecraft/src/RenderBlocks.java +++ b/src/main/java/net/minecraft/src/RenderBlocks.java @@ -1,6 +1,7 @@ package net.minecraft.src; // Decompiled by Jad v1.5.8g. Copyright 2001 Pavel Kouznetsov. +import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.adapter.Tessellator; // Jad home page: http://www.kpdus.com/jad.html @@ -2324,6 +2325,11 @@ public class RenderBlocks { Tessellator tessellator = Tessellator.instance; int j = block.getRenderType(); if (j == 0) { + //EaglerAdapter.glPushMatrix(); + //EaglerAdapter.glScalef(-1.0f, 1.0f, -1.0f); + if(block instanceof BlockPumpkin) { + BlockPumpkin.flipFix = true; + } block.func_237_e(); tessellator.setTranslationF(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); @@ -2351,6 +2357,10 @@ public class RenderBlocks { renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, i)); tessellator.draw(); tessellator.setTranslationF(0.5F, 0.5F, 0.5F); + //EaglerAdapter.glPopMatrix(); + if(block instanceof BlockPumpkin) { + BlockPumpkin.flipFix = false; + } } else if (j == 1) { tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); diff --git a/src/main/java/net/minecraft/src/RenderGhast.java b/src/main/java/net/minecraft/src/RenderGhast.java index 77271e0..eebb3d1 100644 --- a/src/main/java/net/minecraft/src/RenderGhast.java +++ b/src/main/java/net/minecraft/src/RenderGhast.java @@ -22,7 +22,7 @@ public class RenderGhast extends RenderLiving { EntityGhast entityghast1 = entityghast; float f1 = ((float) entityghast1.prevAttackCounter + (float) (entityghast1.attackCounter - entityghast1.prevAttackCounter) * f) / 20F; - if(f1 <= 10) { + if(f1 <= 0.5f) { ghastTexture.bindTexture(); }else { ghastFireTexture.bindTexture(); diff --git a/src/main/java/net/minecraft/src/RenderItem.java b/src/main/java/net/minecraft/src/RenderItem.java index 9323314..7b23752 100644 --- a/src/main/java/net/minecraft/src/RenderItem.java +++ b/src/main/java/net/minecraft/src/RenderItem.java @@ -127,6 +127,7 @@ public class RenderItem extends Render { } else { itemsTexture.bindTexture(); } + EaglerAdapter.glClear(EaglerAdapter.GL_DEPTH_BUFFER_BIT); renderTexturedQuad(i, j, (itemstack.getIconIndex() % 16) * 16, (itemstack.getIconIndex() / 16) * 16, 16, 16); EaglerAdapter.glEnable(2896 /* GL_LIGHTING */); diff --git a/src/main/java/net/minecraft/src/SoundManager.java b/src/main/java/net/minecraft/src/SoundManager.java index 22527bb..cad221a 100644 --- a/src/main/java/net/minecraft/src/SoundManager.java +++ b/src/main/java/net/minecraft/src/SoundManager.java @@ -4,29 +4,39 @@ package net.minecraft.src; // Jad home page: http://www.kpdus.com/jad.html // Decompiler options: packimports(3) braces deadcode -import java.io.File; -import java.io.PrintStream; -import java.util.Random; -import paulscode.sound.SoundSystem; -import paulscode.sound.SoundSystemConfig; -import paulscode.sound.libraries.LibraryLWJGLOpenAL; +import java.io.IOException; +import java.util.HashMap; + +import net.lax1dude.eaglercraft.EaglerAdapter; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class SoundManager { + private GameSettings options; + private HashMap sounddefinitions; + private EaglercraftRandom soundrandom; + public SoundManager() { - soundPoolSounds = new SoundPool(); - soundPoolStreaming = new SoundPool(); - soundPoolMusic = new SoundPool(); - field_587_e = 0; - rand = new Random(); - ticksBeforeMusic = rand.nextInt(12000); + this.sounddefinitions = null; + this.soundrandom = new EaglercraftRandom(); } public void loadSoundSettings(GameSettings gamesettings) { - soundPoolStreaming.field_1657_b = false; - options = gamesettings; - if (!loaded && (gamesettings == null || gamesettings.soundVolume != 0.0F || gamesettings.musicVolume != 0.0F)) { - tryToSetLibraryAndCodecs(); + this.options = gamesettings; + if(this.sounddefinitions == null) { + this.sounddefinitions = new HashMap(); + try { + NBTTagCompound file = CompressedStreamTools.func_1138_a(EaglerAdapter.loadResource("/sounds/sounds.dat")); + EaglerAdapter.setPlaybackOffsetDelay(file.hasKey("playbackOffset") ? file.getFloat("playbackOffset") : 0.03f); + NBTTagList l = file.getTagList("sounds"); + int c = l.tagCount(); + for(int i = 0; i < c; i++) { + NBTTagCompound cc = (NBTTagCompound)l.tagAt(i); + this.sounddefinitions.put(cc.getString("e"), (int)cc.getByte("c") & 0xFF); + } + } catch (IOException e) { + e.printStackTrace(); + } } } @@ -44,159 +54,75 @@ public class SoundManager { * catch(Throwable throwable) { throwable.printStackTrace(); * System.err.println("error linking with the LibraryJavaSound plug-in"); } */ - loaded = false; } public void onSoundOptionsChanged() { - if (!loaded && (options.soundVolume != 0.0F || options.musicVolume != 0.0F)) { - tryToSetLibraryAndCodecs(); - } - if (loaded) { - if (options.musicVolume == 0.0F) { - sndSystem.stop("BgMusic"); - } else { - sndSystem.setVolume("BgMusic", options.musicVolume); - } - } - } - - public void closeMinecraft() { - if (loaded) { - sndSystem.cleanup(); - } - } - - public void addSound(String s, File file) { - soundPoolSounds.addSound(s, file); - } - - public void addStreaming(String s, File file) { - soundPoolStreaming.addSound(s, file); - } - - public void addMusic(String s, File file) { - soundPoolMusic.addSound(s, file); + } public void playRandomMusicIfReady() { - if (!loaded || options.musicVolume == 0.0F) { - return; - } - if (!sndSystem.playing("BgMusic") && !sndSystem.playing("streaming")) { - if (ticksBeforeMusic > 0) { - ticksBeforeMusic--; - return; - } - SoundPoolEntry soundpoolentry = soundPoolMusic.getRandomSound(); - if (soundpoolentry != null) { - ticksBeforeMusic = rand.nextInt(12000) + 12000; - sndSystem.backgroundMusic("BgMusic", soundpoolentry.soundUrl, soundpoolentry.soundName, false); - sndSystem.setVolume("BgMusic", options.musicVolume); - sndSystem.play("BgMusic"); - } - } + } - public void func_338_a(EntityLiving entityliving, float f) { - if (!loaded || options.soundVolume == 0.0F) { - return; - } - if (entityliving == null) { - return; - } else { - float f1 = entityliving.prevRotationYaw + (entityliving.rotationYaw - entityliving.prevRotationYaw) * f; - double d = entityliving.prevPosX + (entityliving.posX - entityliving.prevPosX) * (double) f; - double d1 = entityliving.prevPosY + (entityliving.posY - entityliving.prevPosY) * (double) f; - double d2 = entityliving.prevPosZ + (entityliving.posZ - entityliving.prevPosZ) * (double) f; - float f2 = MathHelper.cos(-f1 * 0.01745329F - 3.141593F); - float f3 = MathHelper.sin(-f1 * 0.01745329F - 3.141593F); - float f4 = -f3; - float f5 = 0.0F; - float f6 = -f2; - float f7 = 0.0F; - float f8 = 1.0F; - float f9 = 0.0F; - sndSystem.setListenerPosition((float) d, (float) d1, (float) d2); - sndSystem.setListenerOrientation(f4, f5, f6, f7, f8, f9); - return; + public void func_338_a(EntityLiving par1EntityLiving, float f) { + if(par1EntityLiving == null) { + EaglerAdapter.setListenerPos(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f); + }else { + double x = par1EntityLiving.prevPosX + (par1EntityLiving.posX - par1EntityLiving.prevPosX) * f; + double y = par1EntityLiving.prevPosY + (par1EntityLiving.posY - par1EntityLiving.prevPosY) * f; + double z = par1EntityLiving.prevPosZ + (par1EntityLiving.posZ - par1EntityLiving.prevPosZ) * f; + double pitch = par1EntityLiving.prevRotationPitch + (par1EntityLiving.rotationPitch - par1EntityLiving.prevRotationPitch) * f; + double yaw = par1EntityLiving.prevRotationYaw + (par1EntityLiving.rotationYaw - par1EntityLiving.prevRotationYaw) * f; + + try { + EaglerAdapter.setListenerPos((float)x, (float)y, (float)z, (float)par1EntityLiving.motionX, (float)par1EntityLiving.motionY, (float)par1EntityLiving.motionZ, (float)pitch, (float)yaw); + }catch(Throwable t) { + System.err.println("AudioListener f***ed up again"); + } } } public void func_331_a(String s, float f, float f1, float f2, float f3, float f4) { - if (!loaded || options.soundVolume == 0.0F) { - return; - } - String s1 = "streaming"; - if (sndSystem.playing("streaming")) { - sndSystem.stop("streaming"); - } - if (s == null) { - return; - } - SoundPoolEntry soundpoolentry = soundPoolStreaming.getRandomSoundFromSoundPool(s); - if (soundpoolentry != null && f3 > 0.0F) { - if (sndSystem.playing("BgMusic")) { - sndSystem.stop("BgMusic"); + playSound(s, f, f1, f2, f3, f4); + } + + public void playSound(String s, float par2, float par3, float par4, float par5, float par6) { + float v = par5 * this.options.soundVolume; + if(v > 0.0F) { + Integer ct = this.sounddefinitions.get(s); + if(ct != null) { + int c = ct.intValue(); + String path; + if(c <= 1) { + path = "/sounds/"+s.replace('.', '/')+".mp3"; + }else { + int r = soundrandom.nextInt(c) + 1; + path = "/sounds/"+s.replace('.', '/')+r+".mp3"; + } + EaglerAdapter.beginPlayback(path, par2, par3, par4, v, par6); + }else { + System.err.println("unregistered sound effect: "+s); } - float f5 = 16F; - sndSystem.newStreamingSource(true, s1, soundpoolentry.soundUrl, soundpoolentry.soundName, false, f, f1, f2, - 2, f5 * 4F); - sndSystem.setVolume(s1, 0.5F * options.soundVolume); - sndSystem.play(s1); } } - public void playSound(String s, float f, float f1, float f2, float f3, float f4) { - if (!loaded || options.soundVolume == 0.0F) { - return; - } - SoundPoolEntry soundpoolentry = soundPoolSounds.getRandomSoundFromSoundPool(s); - if (soundpoolentry != null && f3 > 0.0F) { - field_587_e = (field_587_e + 1) % 256; - String s1 = (new StringBuilder()).append("sound_").append(field_587_e).toString(); - float f5 = 16F; - if (f3 > 1.0F) { - f5 *= f3; + public void func_337_a(String par1Str, float par2, float par3) { + float v = par3 * this.options.soundVolume; + if(v > 0.0F) { + Integer ct = this.sounddefinitions.get(par1Str); + if(ct != null) { + int c = ct.intValue(); + String path; + if(c <= 1) { + path = "/sounds/"+par1Str.replace('.', '/')+".mp3"; + }else { + int r = soundrandom.nextInt(c) + 1; + path = "/sounds/"+par1Str.replace('.', '/')+r+".mp3"; + } + EaglerAdapter.beginPlaybackStatic(path, v, par3); + }else { + System.err.println("unregistered sound effect: "+par1Str); } - sndSystem.newSource(f3 > 1.0F, s1, soundpoolentry.soundUrl, soundpoolentry.soundName, false, f, f1, f2, 2, - f5); - sndSystem.setPitch(s1, f4); - if (f3 > 1.0F) { - f3 = 1.0F; - } - sndSystem.setVolume(s1, f3 * options.soundVolume); - sndSystem.play(s1); } } - - public void func_337_a(String s, float f, float f1) { - if (!loaded || options.soundVolume == 0.0F) { - return; - } - SoundPoolEntry soundpoolentry = soundPoolSounds.getRandomSoundFromSoundPool(s); - if (soundpoolentry != null) { - field_587_e = (field_587_e + 1) % 256; - String s1 = (new StringBuilder()).append("sound_").append(field_587_e).toString(); - sndSystem.newSource(false, s1, soundpoolentry.soundUrl, soundpoolentry.soundName, false, 0.0F, 0.0F, 0.0F, - 0, 0.0F); - if (f > 1.0F) { - f = 1.0F; - } - f *= 0.25F; - sndSystem.setPitch(s1, f1); - sndSystem.setVolume(s1, f * options.soundVolume); - sndSystem.play(s1); - } - } - - private static SoundSystem sndSystem; - private SoundPool soundPoolSounds; - private SoundPool soundPoolStreaming; - private SoundPool soundPoolMusic; - private int field_587_e; - private GameSettings options; - private static boolean loaded = false; - private Random rand; - private int ticksBeforeMusic; - } diff --git a/src/main/java/net/minecraft/src/WorldProvider.java b/src/main/java/net/minecraft/src/WorldProvider.java index 63958c5..d044cd9 100644 --- a/src/main/java/net/minecraft/src/WorldProvider.java +++ b/src/main/java/net/minecraft/src/WorldProvider.java @@ -22,7 +22,7 @@ public class WorldProvider { } protected void generateLightBrightnessTable() { - float f = 0.05F; + float f = 0.2F; for (int i = 0; i <= 15; i++) { float f1 = 1.0F - (float) i / 15F; lightBrightnessTable[i] = ((1.0F - f1) / (f1 * 3F + 1.0F)) * (1.0F - f) + f; diff --git a/src/main/java/org/json/CDL.java b/src/main/java/org/json/CDL.java deleted file mode 100644 index d9f3fb2..0000000 --- a/src/main/java/org/json/CDL.java +++ /dev/null @@ -1,287 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - */ - -/** - * This provides static methods to convert comma delimited text into a - * JSONArray, and to convert a JSONArray into comma delimited text. Comma - * delimited text is a very popular format for data interchange. It is - * understood by most database, spreadsheet, and organizer programs. - *

- * Each row of text represents a row in a table or a data record. Each row ends - * with a NEWLINE character. Each row contains one or more values. Values are - * separated by commas. A value can contain any character except for comma, - * unless is is wrapped in single quotes or double quotes. - *

- * The first row usually contains the names of the columns. - *

- * A comma delimited list can be converted into a JSONArray of JSONObjects. The - * names for the elements in the JSONObjects can be taken from the names in the - * first row. - * - * @author JSON.org - * @version 2016-05-01 - */ -public class CDL { - - /** - * Get the next value. The value can be wrapped in quotes. The value can be - * empty. - * - * @param x A JSONTokener of the source text. - * @return The value string, or null if empty. - * @throws JSONException if the quoted string is badly formed. - */ - private static String getValue(JSONTokener x) throws JSONException { - char c; - char q; - StringBuilder sb; - do { - c = x.next(); - } while (c == ' ' || c == '\t'); - switch (c) { - case 0: - return null; - case '"': - case '\'': - q = c; - sb = new StringBuilder(); - for (;;) { - c = x.next(); - if (c == q) { - // Handle escaped double-quote - char nextC = x.next(); - if (nextC != '\"') { - // if our quote was the end of the file, don't step - if (nextC > 0) { - x.back(); - } - break; - } - } - if (c == 0 || c == '\n' || c == '\r') { - throw x.syntaxError("Missing close quote '" + q + "'."); - } - sb.append(c); - } - return sb.toString(); - case ',': - x.back(); - return ""; - default: - x.back(); - return x.nextTo(','); - } - } - - /** - * Produce a JSONArray of strings from a row of comma delimited values. - * - * @param x A JSONTokener of the source text. - * @return A JSONArray of strings. - * @throws JSONException if a called function fails - */ - public static JSONArray rowToJSONArray(JSONTokener x) throws JSONException { - JSONArray ja = new JSONArray(); - for (;;) { - String value = getValue(x); - char c = x.next(); - if (value == null || (ja.length() == 0 && value.length() == 0 && c != ',')) { - return null; - } - ja.put(value); - for (;;) { - if (c == ',') { - break; - } - if (c != ' ') { - if (c == '\n' || c == '\r' || c == 0) { - return ja; - } - throw x.syntaxError("Bad character '" + c + "' (" + (int) c + ")."); - } - c = x.next(); - } - } - } - - /** - * Produce a JSONObject from a row of comma delimited text, using a parallel - * JSONArray of strings to provides the names of the elements. - * - * @param names A JSONArray of names. This is commonly obtained from the first - * row of a comma delimited text file using the rowToJSONArray - * method. - * @param x A JSONTokener of the source text. - * @return A JSONObject combining the names and values. - * @throws JSONException if a called function fails - */ - public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x) throws JSONException { - JSONArray ja = rowToJSONArray(x); - return ja != null ? ja.toJSONObject(names) : null; - } - - /** - * Produce a comma delimited text row from a JSONArray. Values containing the - * comma character will be quoted. Troublesome characters may be removed. - * - * @param ja A JSONArray of strings. - * @return A string ending in NEWLINE. - */ - public static String rowToString(JSONArray ja) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < ja.length(); i += 1) { - if (i > 0) { - sb.append(','); - } - Object object = ja.opt(i); - if (object != null) { - String string = object.toString(); - if (string.length() > 0 && (string.indexOf(',') >= 0 || string.indexOf('\n') >= 0 - || string.indexOf('\r') >= 0 || string.indexOf(0) >= 0 || string.charAt(0) == '"')) { - sb.append('"'); - int length = string.length(); - for (int j = 0; j < length; j += 1) { - char c = string.charAt(j); - if (c >= ' ' && c != '"') { - sb.append(c); - } - } - sb.append('"'); - } else { - sb.append(string); - } - } - } - sb.append('\n'); - return sb.toString(); - } - - /** - * Produce a JSONArray of JSONObjects from a comma delimited text string, using - * the first row as a source of names. - * - * @param string The comma delimited text. - * @return A JSONArray of JSONObjects. - * @throws JSONException if a called function fails - */ - public static JSONArray toJSONArray(String string) throws JSONException { - return toJSONArray(new JSONTokener(string)); - } - - /** - * Produce a JSONArray of JSONObjects from a comma delimited text string, using - * the first row as a source of names. - * - * @param x The JSONTokener containing the comma delimited text. - * @return A JSONArray of JSONObjects. - * @throws JSONException if a called function fails - */ - public static JSONArray toJSONArray(JSONTokener x) throws JSONException { - return toJSONArray(rowToJSONArray(x), x); - } - - /** - * Produce a JSONArray of JSONObjects from a comma delimited text string using a - * supplied JSONArray as the source of element names. - * - * @param names A JSONArray of strings. - * @param string The comma delimited text. - * @return A JSONArray of JSONObjects. - * @throws JSONException if a called function fails - */ - public static JSONArray toJSONArray(JSONArray names, String string) throws JSONException { - return toJSONArray(names, new JSONTokener(string)); - } - - /** - * Produce a JSONArray of JSONObjects from a comma delimited text string using a - * supplied JSONArray as the source of element names. - * - * @param names A JSONArray of strings. - * @param x A JSONTokener of the source text. - * @return A JSONArray of JSONObjects. - * @throws JSONException if a called function fails - */ - public static JSONArray toJSONArray(JSONArray names, JSONTokener x) throws JSONException { - if (names == null || names.length() == 0) { - return null; - } - JSONArray ja = new JSONArray(); - for (;;) { - JSONObject jo = rowToJSONObject(names, x); - if (jo == null) { - break; - } - ja.put(jo); - } - if (ja.length() == 0) { - return null; - } - return ja; - } - - /** - * Produce a comma delimited text from a JSONArray of JSONObjects. The first row - * will be a list of names obtained by inspecting the first JSONObject. - * - * @param ja A JSONArray of JSONObjects. - * @return A comma delimited text. - * @throws JSONException if a called function fails - */ - public static String toString(JSONArray ja) throws JSONException { - JSONObject jo = ja.optJSONObject(0); - if (jo != null) { - JSONArray names = jo.names(); - if (names != null) { - return rowToString(names) + toString(names, ja); - } - } - return null; - } - - /** - * Produce a comma delimited text from a JSONArray of JSONObjects using a - * provided list of names. The list of names is not included in the output. - * - * @param names A JSONArray of strings. - * @param ja A JSONArray of JSONObjects. - * @return A comma delimited text. - * @throws JSONException if a called function fails - */ - public static String toString(JSONArray names, JSONArray ja) throws JSONException { - if (names == null || names.length() == 0) { - return null; - } - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < ja.length(); i += 1) { - JSONObject jo = ja.optJSONObject(i); - if (jo != null) { - sb.append(rowToString(jo.toJSONArray(names))); - } - } - return sb.toString(); - } -} diff --git a/src/main/java/org/json/Cookie.java b/src/main/java/org/json/Cookie.java deleted file mode 100644 index c3efbfb..0000000 --- a/src/main/java/org/json/Cookie.java +++ /dev/null @@ -1,221 +0,0 @@ -package org.json; - -import java.util.Locale; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * Convert a web browser cookie specification to a JSONObject and back. JSON and - * Cookies are both notations for name/value pairs. See also: https://tools.ietf.org/html/rfc6265 - * - * @author JSON.org - * @version 2015-12-09 - */ -public class Cookie { - - /** - * Produce a copy of a string in which the characters '+', '%', '=', ';' and - * control characters are replaced with "%hh". This is a gentle form of URL - * encoding, attempting to cause as little distortion to the string as possible. - * The characters '=' and ';' are meta characters in cookies. By convention, - * they are escaped using the URL-encoding. This is only a convention, not a - * standard. Often, cookies are expected to have encoded values. We encode '=' - * and ';' because we must. We encode '%' and '+' because they are meta - * characters in URL encoding. - * - * @param string The source string. - * @return The escaped result. - */ - public static String escape(String string) { - char c; - String s = string.trim(); - int length = s.length(); - StringBuilder sb = new StringBuilder(length); - for (int i = 0; i < length; i += 1) { - c = s.charAt(i); - if (c < ' ' || c == '+' || c == '%' || c == '=' || c == ';') { - sb.append('%'); - sb.append(Character.forDigit((char) ((c >>> 4) & 0x0f), 16)); - sb.append(Character.forDigit((char) (c & 0x0f), 16)); - } else { - sb.append(c); - } - } - return sb.toString(); - } - - /** - * Convert a cookie specification string into a JSONObject. The string must - * contain a name value pair separated by '='. The name and the value will be - * unescaped, possibly converting '+' and '%' sequences. The cookie properties - * may follow, separated by ';', also represented as name=value (except the - * Attribute properties like "Secure" or "HttpOnly", which do not have a value. - * The value {@link Boolean#TRUE} will be used for these). The name will be - * stored under the key "name", and the value will be stored under the key - * "value". This method does not do checking or validation of the parameters. It - * only converts the cookie string into a JSONObject. All attribute names are - * converted to lower case keys in the JSONObject (HttpOnly => httponly). If - * an attribute is specified more than once, only the value found closer to the - * end of the cookie-string is kept. - * - * @param string The cookie specification string. - * @return A JSONObject containing "name", "value", and possibly other members. - * @throws JSONException If there is an error parsing the Cookie String. Cookie - * strings must have at least one '=' character and the - * 'name' portion of the cookie must not be blank. - */ - public static JSONObject toJSONObject(String string) { - final JSONObject jo = new JSONObject(); - String name; - Object value; - - JSONTokener x = new JSONTokener(string); - - name = unescape(x.nextTo('=').trim()); - // per RFC6265, if the name is blank, the cookie should be ignored. - if ("".equals(name)) { - throw new JSONException("Cookies must have a 'name'"); - } - jo.put("name", name); - // per RFC6265, if there is no '=', the cookie should be ignored. - // the 'next' call here throws an exception if the '=' is not found. - x.next('='); - jo.put("value", unescape(x.nextTo(';')).trim()); - // discard the ';' - x.next(); - // parse the remaining cookie attributes - while (x.more()) { - name = unescape(x.nextTo("=;")).trim().toLowerCase(Locale.ROOT); - // don't allow a cookies attributes to overwrite its name or value. - if ("name".equalsIgnoreCase(name)) { - throw new JSONException("Illegal attribute name: 'name'"); - } - if ("value".equalsIgnoreCase(name)) { - throw new JSONException("Illegal attribute name: 'value'"); - } - // check to see if it's a flag property - if (x.next() != '=') { - value = Boolean.TRUE; - } else { - value = unescape(x.nextTo(';')).trim(); - x.next(); - } - // only store non-blank attributes - if (!"".equals(name) && !"".equals(value)) { - jo.put(name, value); - } - } - return jo; - } - - /** - * Convert a JSONObject into a cookie specification string. The JSONObject must - * contain "name" and "value" members (case insensitive). If the JSONObject - * contains other members, they will be appended to the cookie specification - * string. User-Agents are instructed to ignore unknown attributes, so ensure - * your JSONObject is using only known attributes. See also: https://tools.ietf.org/html/rfc6265 - * - * @param jo A JSONObject - * @return A cookie specification string - * @throws JSONException thrown if the cookie has no name. - */ - public static String toString(JSONObject jo) throws JSONException { - StringBuilder sb = new StringBuilder(); - - String name = null; - Object value = null; - for (String key : jo.keySet()) { - if ("name".equalsIgnoreCase(key)) { - name = jo.getString(key).trim(); - } - if ("value".equalsIgnoreCase(key)) { - value = jo.getString(key).trim(); - } - if (name != null && value != null) { - break; - } - } - - if (name == null || "".equals(name.trim())) { - throw new JSONException("Cookie does not have a name"); - } - if (value == null) { - value = ""; - } - - sb.append(escape(name)); - sb.append("="); - sb.append(escape((String) value)); - - for (String key : jo.keySet()) { - if ("name".equalsIgnoreCase(key) || "value".equalsIgnoreCase(key)) { - // already processed above - continue; - } - value = jo.opt(key); - if (value instanceof Boolean) { - if (Boolean.TRUE.equals(value)) { - sb.append(';').append(escape(key)); - } - // don't emit false values - } else { - sb.append(';').append(escape(key)).append('=').append(escape(value.toString())); - } - } - - return sb.toString(); - } - - /** - * Convert %hh sequences to single characters, and convert - * plus to space. - * - * @param string A string that may contain - * + (plus) and - * %hh sequences. - * @return The unescaped string. - */ - public static String unescape(String string) { - int length = string.length(); - StringBuilder sb = new StringBuilder(length); - for (int i = 0; i < length; ++i) { - char c = string.charAt(i); - if (c == '+') { - c = ' '; - } else if (c == '%' && i + 2 < length) { - int d = JSONTokener.dehexchar(string.charAt(i + 1)); - int e = JSONTokener.dehexchar(string.charAt(i + 2)); - if (d >= 0 && e >= 0) { - c = (char) (d * 16 + e); - i += 2; - } - } - sb.append(c); - } - return sb.toString(); - } -} diff --git a/src/main/java/org/json/CookieList.java b/src/main/java/org/json/CookieList.java deleted file mode 100644 index 0100df8..0000000 --- a/src/main/java/org/json/CookieList.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - */ - -/** - * Convert a web browser cookie list string to a JSONObject and back. - * - * @author JSON.org - * @version 2015-12-09 - */ -public class CookieList { - - /** - * Convert a cookie list into a JSONObject. A cookie list is a sequence of - * name/value pairs. The names are separated from the values by '='. The pairs - * are separated by ';'. The names and the values will be unescaped, possibly - * converting '+' and '%' sequences. - * - * To add a cookie to a cookie list, - * cookielistJSONObject.put(cookieJSONObject.getString("name"), - * cookieJSONObject.getString("value")); - * - * @param string A cookie list string - * @return A JSONObject - * @throws JSONException if a called function fails - */ - public static JSONObject toJSONObject(String string) throws JSONException { - JSONObject jo = new JSONObject(); - JSONTokener x = new JSONTokener(string); - while (x.more()) { - String name = Cookie.unescape(x.nextTo('=')); - x.next('='); - jo.put(name, Cookie.unescape(x.nextTo(';'))); - x.next(); - } - return jo; - } - - /** - * Convert a JSONObject into a cookie list. A cookie list is a sequence of - * name/value pairs. The names are separated from the values by '='. The pairs - * are separated by ';'. The characters '%', '+', '=', and ';' in the names and - * values are replaced by "%hh". - * - * @param jo A JSONObject - * @return A cookie list string - * @throws JSONException if a called function fails - */ - public static String toString(JSONObject jo) throws JSONException { - boolean b = false; - final StringBuilder sb = new StringBuilder(); - // Don't use the new entrySet API to maintain Android support - for (final String key : jo.keySet()) { - final Object value = jo.opt(key); - if (!JSONObject.NULL.equals(value)) { - if (b) { - sb.append(';'); - } - sb.append(Cookie.escape(key)); - sb.append("="); - sb.append(Cookie.escape(value.toString())); - b = true; - } - } - return sb.toString(); - } -} diff --git a/src/main/java/org/json/HTTP.java b/src/main/java/org/json/HTTP.java deleted file mode 100644 index cb15499..0000000 --- a/src/main/java/org/json/HTTP.java +++ /dev/null @@ -1,187 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.util.Locale; - -/** - * Convert an HTTP header to a JSONObject and back. - * - * @author JSON.org - * @version 2015-12-09 - */ -public class HTTP { - - /** Carriage return/line feed. */ - public static final String CRLF = "\r\n"; - - /** - * Convert an HTTP header string into a JSONObject. It can be a request header - * or a response header. A request header will contain - * - * 

-	 * {
-	 *    Method: "POST" (for example),
-	 *    "Request-URI": "/" (for example),
-	 *    "HTTP-Version": "HTTP/1.1" (for example)
-	 * }
-	 *
- * - * A response header will contain - * - * 
-	 * {
-	 *    "HTTP-Version": "HTTP/1.1" (for example),
-	 *    "Status-Code": "200" (for example),
-	 *    "Reason-Phrase": "OK" (for example)
-	 * }
-	 *
- * - * In addition, the other parameters in the header will be captured, using the - * HTTP field names as JSON names, so that - * - * 
-	 * {@code
-	 *    Date: Sun, 26 May 2002 18:06:04 GMT
-	 *    Cookie: Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s
-	 *    Cache-Control: no-cache}
-	 *
- * - * become - * - * 
-	 * {@code
-	 *    Date: "Sun, 26 May 2002 18:06:04 GMT",
-	 *    Cookie: "Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s",
-	 *    "Cache-Control": "no-cache",
-	 * ...}
-	 *
- * - * It does no further checking or conversion. It does not parse dates. It does - * not do '%' transforms on URLs. - * - * @param string An HTTP header string. - * @return A JSONObject containing the elements and attributes of the XML - * string. - * @throws JSONException if a called function fails - */ - public static JSONObject toJSONObject(String string) throws JSONException { - JSONObject jo = new JSONObject(); - HTTPTokener x = new HTTPTokener(string); - String token; - - token = x.nextToken(); - if (token.toUpperCase(Locale.ROOT).startsWith("HTTP")) { - -// Response - - jo.put("HTTP-Version", token); - jo.put("Status-Code", x.nextToken()); - jo.put("Reason-Phrase", x.nextTo('\0')); - x.next(); - - } else { - -// Request - - jo.put("Method", token); - jo.put("Request-URI", x.nextToken()); - jo.put("HTTP-Version", x.nextToken()); - } - -// Fields - - while (x.more()) { - String name = x.nextTo(':'); - x.next(':'); - jo.put(name, x.nextTo('\0')); - x.next(); - } - return jo; - } - - /** - * Convert a JSONObject into an HTTP header. A request header must contain - * - * 
-	 * {
-	 *    Method: "POST" (for example),
-	 *    "Request-URI": "/" (for example),
-	 *    "HTTP-Version": "HTTP/1.1" (for example)
-	 * }
-	 *
- * - * A response header must contain - * - * 
-	 * {
-	 *    "HTTP-Version": "HTTP/1.1" (for example),
-	 *    "Status-Code": "200" (for example),
-	 *    "Reason-Phrase": "OK" (for example)
-	 * }
-	 *
- * - * Any other members of the JSONObject will be output as HTTP fields. The result - * will end with two CRLF pairs. - * - * @param jo A JSONObject - * @return An HTTP header string. - * @throws JSONException if the object does not contain enough information. - */ - public static String toString(JSONObject jo) throws JSONException { - StringBuilder sb = new StringBuilder(); - if (jo.has("Status-Code") && jo.has("Reason-Phrase")) { - sb.append(jo.getString("HTTP-Version")); - sb.append(' '); - sb.append(jo.getString("Status-Code")); - sb.append(' '); - sb.append(jo.getString("Reason-Phrase")); - } else if (jo.has("Method") && jo.has("Request-URI")) { - sb.append(jo.getString("Method")); - sb.append(' '); - sb.append('"'); - sb.append(jo.getString("Request-URI")); - sb.append('"'); - sb.append(' '); - sb.append(jo.getString("HTTP-Version")); - } else { - throw new JSONException("Not enough material for an HTTP header."); - } - sb.append(CRLF); - // Don't use the new entrySet API to maintain Android support - for (final String key : jo.keySet()) { - String value = jo.optString(key); - if (!"HTTP-Version".equals(key) && !"Status-Code".equals(key) && !"Reason-Phrase".equals(key) - && !"Method".equals(key) && !"Request-URI".equals(key) && !JSONObject.NULL.equals(value)) { - sb.append(key); - sb.append(": "); - sb.append(jo.optString(key)); - sb.append(CRLF); - } - } - sb.append(CRLF); - return sb.toString(); - } -} diff --git a/src/main/java/org/json/HTTPTokener.java b/src/main/java/org/json/HTTPTokener.java deleted file mode 100644 index b000bf7..0000000 --- a/src/main/java/org/json/HTTPTokener.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * The HTTPTokener extends the JSONTokener to provide additional methods for the - * parsing of HTTP headers. - * - * @author JSON.org - * @version 2015-12-09 - */ -public class HTTPTokener extends JSONTokener { - - /** - * Construct an HTTPTokener from a string. - * - * @param string A source string. - */ - public HTTPTokener(String string) { - super(string); - } - - /** - * Get the next token or string. This is used in parsing HTTP headers. - * - * @return A String. - * @throws JSONException if a syntax error occurs - */ - public String nextToken() throws JSONException { - char c; - char q; - StringBuilder sb = new StringBuilder(); - do { - c = next(); - } while (Character.isWhitespace(c)); - if (c == '"' || c == '\'') { - q = c; - for (;;) { - c = next(); - if (c < ' ') { - throw syntaxError("Unterminated string."); - } - if (c == q) { - return sb.toString(); - } - sb.append(c); - } - } - for (;;) { - if (c == 0 || Character.isWhitespace(c)) { - return sb.toString(); - } - sb.append(c); - c = next(); - } - } -} diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java deleted file mode 100644 index 784e920..0000000 --- a/src/main/java/org/json/JSONArray.java +++ /dev/null @@ -1,1585 +0,0 @@ -package org.json; - -/* - Copyright (c) 2002 JSON.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - The Software shall be used for Good, not Evil. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - */ - -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.reflect.Array; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * A JSONArray is an ordered sequence of values. Its external text form is a - * string wrapped in square brackets with commas separating the values. The - * internal form is an object having get and opt - * methods for accessing the values by index, and put methods for - * adding or replacing values. The values can be any of these types: - * Boolean, JSONArray, JSONObject, - * Number, String, or the - * JSONObject.NULL object. - *

- * The constructor can convert a JSON text into a Java object. The - * toString method converts to JSON text. - *

- * A get method returns a value if one can be found, and throws an - * exception if one cannot be found. An opt method returns a - * default value instead of throwing an exception, and so is useful for - * obtaining optional values. - *

- * The generic get() and opt() methods return an - * object which you can cast or query for type. There are also typed - * get and opt methods that do type checking and type - * coercion for you. - *

- * The texts produced by the toString methods strictly conform to - * JSON syntax rules. The constructors are more forgiving in the texts they will - * accept: - *

    - *
  • An extra , (comma) may appear just - * before the closing bracket.
    • - *
  • The null value will be inserted when there is , - *  (comma) elision.
    • - *
  • Strings may be quoted with ' (single - * quote).
    • - *
  • Strings do not need to be quoted at all if they do not begin with a quote - * or single quote, and if they do not contain leading or trailing spaces, and - * if they do not contain any of these characters: - * { } [ ] / \ : , # and if they do not look like numbers and if - * they are not the reserved words true, false, or - * null.
    • - *
- * - * @author JSON.org - * @version 2016-08/15 - */ -public class JSONArray implements Iterable { - - /** - * The arrayList where the JSONArray's properties are kept. - */ - private final ArrayList myArrayList; - - /** - * Construct an empty JSONArray. - */ - public JSONArray() { - this.myArrayList = new ArrayList(); - } - - /** - * Construct a JSONArray from a JSONTokener. - * - * @param x A JSONTokener - * @throws JSONException If there is a syntax error. - */ - public JSONArray(JSONTokener x) throws JSONException { - this(); - if (x.nextClean() != '[') { - throw x.syntaxError("A JSONArray text must start with '['"); - } - - char nextChar = x.nextClean(); - if (nextChar == 0) { - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - } - if (nextChar != ']') { - x.back(); - for (;;) { - if (x.nextClean() == ',') { - x.back(); - this.myArrayList.add(JSONObject.NULL); - } else { - x.back(); - this.myArrayList.add(x.nextValue()); - } - switch (x.nextClean()) { - case 0: - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - case ',': - nextChar = x.nextClean(); - if (nextChar == 0) { - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - } - if (nextChar == ']') { - return; - } - x.back(); - break; - case ']': - return; - default: - throw x.syntaxError("Expected a ',' or ']'"); - } - } - } - } - - /** - * Construct a JSONArray from a source JSON text. - * - * @param source A string that begins with [ (left - * bracket) and ends with ] - *  (right bracket). - * @throws JSONException If there is a syntax error. - */ - public JSONArray(String source) throws JSONException { - this(new JSONTokener(source)); - } - - /** - * Construct a JSONArray from a Collection. - * - * @param collection A Collection. - */ - public JSONArray(Collection collection) { - if (collection == null) { - this.myArrayList = new ArrayList(); - } else { - this.myArrayList = new ArrayList(collection.size()); - this.addAll(collection, true); - } - } - - /** - * Construct a JSONArray from an Iterable. This is a shallow copy. - * - * @param iter A Iterable collection. - */ - public JSONArray(Iterable iter) { - this(); - if (iter == null) { - return; - } - this.addAll(iter, true); - } - - /** - * Construct a JSONArray from another JSONArray. This is a shallow copy. - * - * @param array A array. - */ - public JSONArray(JSONArray array) { - if (array == null) { - this.myArrayList = new ArrayList(); - } else { - // shallow copy directly the internal array lists as any wrapping - // should have been done already in the original JSONArray - this.myArrayList = new ArrayList(array.myArrayList); - } - } - - /** - * Construct a JSONArray from an array. - * - * @param array Array. If the parameter passed is null, or not an array, an - * exception will be thrown. - * - * @throws JSONException If not an array or if an array value is - * non-finite number. - * @throws NullPointerException Thrown if the array parameter is null. - */ - public JSONArray(Object array) throws JSONException { - this(); - if (!array.getClass().isArray()) { - throw new JSONException("JSONArray initial value should be a string or collection or array."); - } - this.addAll(array, true); - } - - /** - * Construct a JSONArray with the specified initial capacity. - * - * @param initialCapacity the initial capacity of the JSONArray. - * @throws JSONException If the initial capacity is negative. - */ - public JSONArray(int initialCapacity) throws JSONException { - if (initialCapacity < 0) { - throw new JSONException("JSONArray initial capacity cannot be negative."); - } - this.myArrayList = new ArrayList(initialCapacity); - } - - @Override - public Iterator iterator() { - return this.myArrayList.iterator(); - } - - /** - * Get the object value associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return An object value. - * @throws JSONException If there is no value for the index. - */ - public Object get(int index) throws JSONException { - Object object = this.opt(index); - if (object == null) { - throw new JSONException("JSONArray[" + index + "] not found."); - } - return object; - } - - /** - * Get the boolean value associated with an index. The string values "true" and - * "false" are converted to boolean. - * - * @param index The index must be between 0 and length() - 1. - * @return The truth. - * @throws JSONException If there is no value for the index or if the value is - * not convertible to boolean. - */ - public boolean getBoolean(int index) throws JSONException { - Object object = this.get(index); - if (object.equals(Boolean.FALSE) || (object instanceof String && ((String) object).equalsIgnoreCase("false"))) { - return false; - } else if (object.equals(Boolean.TRUE) - || (object instanceof String && ((String) object).equalsIgnoreCase("true"))) { - return true; - } - throw wrongValueFormatException(index, "boolean", null); - } - - /** - * Get the double value associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - * @throws JSONException If the key is not found or if the value cannot be - * converted to a number. - */ - public double getDouble(int index) throws JSONException { - final Object object = this.get(index); - if (object instanceof Number) { - return ((Number) object).doubleValue(); - } - try { - return Double.parseDouble(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(index, "double", e); - } - } - - /** - * Get the float value associated with a key. - * - * @param index The index must be between 0 and length() - 1. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value is not a Number - * object and cannot be converted to a number. - */ - public float getFloat(int index) throws JSONException { - final Object object = this.get(index); - if (object instanceof Number) { - return ((Number) object).floatValue(); - } - try { - return Float.parseFloat(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(index, "float", e); - } - } - - /** - * Get the Number value associated with a key. - * - * @param index The index must be between 0 and length() - 1. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value is not a Number - * object and cannot be converted to a number. - */ - public Number getNumber(int index) throws JSONException { - Object object = this.get(index); - try { - if (object instanceof Number) { - return (Number) object; - } - return JSONObject.stringToNumber(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(index, "number", e); - } - } - - /** - * Get the enum value associated with an index. - * - * @param Enum Type - * @param clazz The type of enum to retrieve. - * @param index The index must be between 0 and length() - 1. - * @return The enum value at the index location - * @throws JSONException if the key is not found or if the value cannot be - * converted to an enum. - */ - public > E getEnum(Class clazz, int index) throws JSONException { - E val = optEnum(clazz, index); - if (val == null) { - // JSONException should really take a throwable argument. - // If it did, I would re-implement this with the Enum.valueOf - // method and place any thrown exception in the JSONException - throw wrongValueFormatException(index, "enum of type " + JSONObject.quote(clazz.getSimpleName()), null); - } - return val; - } - - /** - * Get the BigDecimal value associated with an index. If the value is float or - * double, the {@link BigDecimal#BigDecimal(double)} constructor will be used. - * See notes on the constructor for conversion issues that may arise. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - * @throws JSONException If the key is not found or if the value cannot be - * converted to a BigDecimal. - */ - public BigDecimal getBigDecimal(int index) throws JSONException { - Object object = this.get(index); - BigDecimal val = JSONObject.objectToBigDecimal(object, null); - if (val == null) { - throw wrongValueFormatException(index, "BigDecimal", object, null); - } - return val; - } - - /** - * Get the BigInteger value associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - * @throws JSONException If the key is not found or if the value cannot be - * converted to a BigInteger. - */ - public BigInteger getBigInteger(int index) throws JSONException { - Object object = this.get(index); - BigInteger val = JSONObject.objectToBigInteger(object, null); - if (val == null) { - throw wrongValueFormatException(index, "BigInteger", object, null); - } - return val; - } - - /** - * Get the int value associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - * @throws JSONException If the key is not found or if the value is not a - * number. - */ - public int getInt(int index) throws JSONException { - final Object object = this.get(index); - if (object instanceof Number) { - return ((Number) object).intValue(); - } - try { - return Integer.parseInt(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(index, "int", e); - } - } - - /** - * Get the JSONArray associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return A JSONArray value. - * @throws JSONException If there is no value for the index. or if the value is - * not a JSONArray - */ - public JSONArray getJSONArray(int index) throws JSONException { - Object object = this.get(index); - if (object instanceof JSONArray) { - return (JSONArray) object; - } - throw wrongValueFormatException(index, "JSONArray", null); - } - - /** - * Get the JSONObject associated with an index. - * - * @param index subscript - * @return A JSONObject value. - * @throws JSONException If there is no value for the index or if the value is - * not a JSONObject - */ - public JSONObject getJSONObject(int index) throws JSONException { - Object object = this.get(index); - if (object instanceof JSONObject) { - return (JSONObject) object; - } - throw wrongValueFormatException(index, "JSONObject", null); - } - - /** - * Get the long value associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - * @throws JSONException If the key is not found or if the value cannot be - * converted to a number. - */ - public long getLong(int index) throws JSONException { - final Object object = this.get(index); - if (object instanceof Number) { - return ((Number) object).longValue(); - } - try { - return Long.parseLong(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(index, "long", e); - } - } - - /** - * Get the string associated with an index. - * - * @param index The index must be between 0 and length() - 1. - * @return A string value. - * @throws JSONException If there is no string value for the index. - */ - public String getString(int index) throws JSONException { - Object object = this.get(index); - if (object instanceof String) { - return (String) object; - } - throw wrongValueFormatException(index, "String", null); - } - - /** - * Determine if the value is null. - * - * @param index The index must be between 0 and length() - 1. - * @return true if the value at the index is null, or if there is - * no value. - */ - public boolean isNull(int index) { - return JSONObject.NULL.equals(this.opt(index)); - } - - /** - * Make a string from the contents of this JSONArray. The separator - * string is inserted between each element. Warning: This method assumes that - * the data structure is acyclical. - * - * @param separator A string that will be inserted between the elements. - * @return a string. - * @throws JSONException If the array contains an invalid number. - */ - public String join(String separator) throws JSONException { - int len = this.length(); - if (len == 0) { - return ""; - } - - StringBuilder sb = new StringBuilder(JSONObject.valueToString(this.myArrayList.get(0))); - - for (int i = 1; i < len; i++) { - sb.append(separator).append(JSONObject.valueToString(this.myArrayList.get(i))); - } - return sb.toString(); - } - - /** - * Get the number of elements in the JSONArray, included nulls. - * - * @return The length (or size). - */ - public int length() { - return this.myArrayList.size(); - } - - /** - * Removes all of the elements from this JSONArray. The JSONArray will be empty - * after this call returns. - */ - public void clear() { - this.myArrayList.clear(); - } - - /** - * Get the optional object value associated with an index. - * - * @param index The index must be between 0 and length() - 1. If not, null is - * returned. - * @return An object value, or null if there is no object at that index. - */ - public Object opt(int index) { - return (index < 0 || index >= this.length()) ? null : this.myArrayList.get(index); - } - - /** - * Get the optional boolean value associated with an index. It returns false if - * there is no value at that index, or if the value is not Boolean.TRUE or the - * String "true". - * - * @param index The index must be between 0 and length() - 1. - * @return The truth. - */ - public boolean optBoolean(int index) { - return this.optBoolean(index, false); - } - - /** - * Get the optional boolean value associated with an index. It returns the - * defaultValue if there is no value at that index or if it is not a Boolean or - * the String "true" or "false" (case insensitive). - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue A boolean default. - * @return The truth. - */ - public boolean optBoolean(int index, boolean defaultValue) { - try { - return this.getBoolean(index); - } catch (Exception e) { - return defaultValue; - } - } - - /** - * Get the optional double value associated with an index. NaN is returned if - * there is no value for the index, or if the value is not a number and cannot - * be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - */ - public double optDouble(int index) { - return this.optDouble(index, Double.NaN); - } - - /** - * Get the optional double value associated with an index. The defaultValue is - * returned if there is no value for the index, or if the value is not a number - * and cannot be converted to a number. - * - * @param index subscript - * @param defaultValue The default value. - * @return The value. - */ - public double optDouble(int index, double defaultValue) { - final Number val = this.optNumber(index, null); - if (val == null) { - return defaultValue; - } - final double doubleValue = val.doubleValue(); - // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) { - // return defaultValue; - // } - return doubleValue; - } - - /** - * Get the optional float value associated with an index. NaN is returned if - * there is no value for the index, or if the value is not a number and cannot - * be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - */ - public float optFloat(int index) { - return this.optFloat(index, Float.NaN); - } - - /** - * Get the optional float value associated with an index. The defaultValue is - * returned if there is no value for the index, or if the value is not a number - * and cannot be converted to a number. - * - * @param index subscript - * @param defaultValue The default value. - * @return The value. - */ - public float optFloat(int index, float defaultValue) { - final Number val = this.optNumber(index, null); - if (val == null) { - return defaultValue; - } - final float floatValue = val.floatValue(); - // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) { - // return floatValue; - // } - return floatValue; - } - - /** - * Get the optional int value associated with an index. Zero is returned if - * there is no value for the index, or if the value is not a number and cannot - * be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - */ - public int optInt(int index) { - return this.optInt(index, 0); - } - - /** - * Get the optional int value associated with an index. The defaultValue is - * returned if there is no value for the index, or if the value is not a number - * and cannot be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default value. - * @return The value. - */ - public int optInt(int index, int defaultValue) { - final Number val = this.optNumber(index, null); - if (val == null) { - return defaultValue; - } - return val.intValue(); - } - - /** - * Get the enum value associated with a key. - * - * @param Enum Type - * @param clazz The type of enum to retrieve. - * @param index The index must be between 0 and length() - 1. - * @return The enum value at the index location or null if not found - */ - public > E optEnum(Class clazz, int index) { - return this.optEnum(clazz, index, null); - } - - /** - * Get the enum value associated with a key. - * - * @param Enum Type - * @param clazz The type of enum to retrieve. - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default in case the value is not found - * @return The enum value at the index location or defaultValue if the value is - * not found or cannot be assigned to clazz - */ - public > E optEnum(Class clazz, int index, E defaultValue) { - try { - Object val = this.opt(index); - if (JSONObject.NULL.equals(val)) { - return defaultValue; - } - if (clazz.isAssignableFrom(val.getClass())) { - // we just checked it! - @SuppressWarnings("unchecked") - E myE = (E) val; - return myE; - } - return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException e) { - return defaultValue; - } catch (NullPointerException e) { - return defaultValue; - } - } - - /** - * Get the optional BigInteger value associated with an index. The defaultValue - * is returned if there is no value for the index, or if the value is not a - * number and cannot be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default value. - * @return The value. - */ - public BigInteger optBigInteger(int index, BigInteger defaultValue) { - Object val = this.opt(index); - return JSONObject.objectToBigInteger(val, defaultValue); - } - - /** - * Get the optional BigDecimal value associated with an index. The defaultValue - * is returned if there is no value for the index, or if the value is not a - * number and cannot be converted to a number. If the value is float or double, - * the {@link BigDecimal#BigDecimal(double)} constructor will be used. See notes - * on the constructor for conversion issues that may arise. - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default value. - * @return The value. - */ - public BigDecimal optBigDecimal(int index, BigDecimal defaultValue) { - Object val = this.opt(index); - return JSONObject.objectToBigDecimal(val, defaultValue); - } - - /** - * Get the optional JSONArray associated with an index. - * - * @param index subscript - * @return A JSONArray value, or null if the index has no value, or if the value - * is not a JSONArray. - */ - public JSONArray optJSONArray(int index) { - Object o = this.opt(index); - return o instanceof JSONArray ? (JSONArray) o : null; - } - - /** - * Get the optional JSONObject associated with an index. Null is returned if the - * key is not found, or null if the index has no value, or if the value is not a - * JSONObject. - * - * @param index The index must be between 0 and length() - 1. - * @return A JSONObject value. - */ - public JSONObject optJSONObject(int index) { - Object o = this.opt(index); - return o instanceof JSONObject ? (JSONObject) o : null; - } - - /** - * Get the optional long value associated with an index. Zero is returned if - * there is no value for the index, or if the value is not a number and cannot - * be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @return The value. - */ - public long optLong(int index) { - return this.optLong(index, 0); - } - - /** - * Get the optional long value associated with an index. The defaultValue is - * returned if there is no value for the index, or if the value is not a number - * and cannot be converted to a number. - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default value. - * @return The value. - */ - public long optLong(int index, long defaultValue) { - final Number val = this.optNumber(index, null); - if (val == null) { - return defaultValue; - } - return val.longValue(); - } - - /** - * Get an optional {@link Number} value associated with a key, or - * null if there is no such key or if the value is not a number. If - * the value is a string, an attempt will be made to evaluate it as a number - * ({@link BigDecimal}). This method would be used in cases where type coercion - * of the number value is unwanted. - * - * @param index The index must be between 0 and length() - 1. - * @return An object which is the value. - */ - public Number optNumber(int index) { - return this.optNumber(index, null); - } - - /** - * Get an optional {@link Number} value associated with a key, or the default if - * there is no such key or if the value is not a number. If the value is a - * string, an attempt will be made to evaluate it as a number - * ({@link BigDecimal}). This method would be used in cases where type coercion - * of the number value is unwanted. - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default. - * @return An object which is the value. - */ - public Number optNumber(int index, Number defaultValue) { - Object val = this.opt(index); - if (JSONObject.NULL.equals(val)) { - return defaultValue; - } - if (val instanceof Number) { - return (Number) val; - } - - if (val instanceof String) { - try { - return JSONObject.stringToNumber((String) val); - } catch (Exception e) { - return defaultValue; - } - } - return defaultValue; - } - - /** - * Get the optional string value associated with an index. It returns an empty - * string if there is no value at that index. If the value is not a string and - * is not null, then it is converted to a string. - * - * @param index The index must be between 0 and length() - 1. - * @return A String value. - */ - public String optString(int index) { - return this.optString(index, ""); - } - - /** - * Get the optional string associated with an index. The defaultValue is - * returned if the key is not found. - * - * @param index The index must be between 0 and length() - 1. - * @param defaultValue The default value. - * @return A String value. - */ - public String optString(int index, String defaultValue) { - Object object = this.opt(index); - return JSONObject.NULL.equals(object) ? defaultValue : object.toString(); - } - - /** - * Append a boolean value. This increases the array's length by one. - * - * @param value A boolean value. - * @return this. - */ - public JSONArray put(boolean value) { - return this.put(value ? Boolean.TRUE : Boolean.FALSE); - } - - /** - * Put a value in the JSONArray, where the value will be a JSONArray which is - * produced from a Collection. - * - * @param value A Collection value. - * @return this. - * @throws JSONException If the value is non-finite number. - */ - public JSONArray put(Collection value) { - return this.put(new JSONArray(value)); - } - - /** - * Append a double value. This increases the array's length by one. - * - * @param value A double value. - * @return this. - * @throws JSONException if the value is not finite. - */ - public JSONArray put(double value) throws JSONException { - return this.put(Double.valueOf(value)); - } - - /** - * Append a float value. This increases the array's length by one. - * - * @param value A float value. - * @return this. - * @throws JSONException if the value is not finite. - */ - public JSONArray put(float value) throws JSONException { - return this.put(Float.valueOf(value)); - } - - /** - * Append an int value. This increases the array's length by one. - * - * @param value An int value. - * @return this. - */ - public JSONArray put(int value) { - return this.put(Integer.valueOf(value)); - } - - /** - * Append an long value. This increases the array's length by one. - * - * @param value A long value. - * @return this. - */ - public JSONArray put(long value) { - return this.put(Long.valueOf(value)); - } - - /** - * Put a value in the JSONArray, where the value will be a JSONObject which is - * produced from a Map. - * - * @param value A Map value. - * @return this. - * @throws JSONException If a value in the map is non-finite number. - * @throws NullPointerException If a key in the map is null - */ - public JSONArray put(Map value) { - return this.put(new JSONObject(value)); - } - - /** - * Append an object value. This increases the array's length by one. - * - * @param value An object value. The value should be a Boolean, Double, Integer, - * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL - * object. - * @return this. - * @throws JSONException If the value is non-finite number. - */ - public JSONArray put(Object value) { - JSONObject.testValidity(value); - this.myArrayList.add(value); - return this; - } - - /** - * Put or replace a boolean value in the JSONArray. If the index is greater than - * the length of the JSONArray, then null elements will be added as necessary to - * pad it out. - * - * @param index The subscript. - * @param value A boolean value. - * @return this. - * @throws JSONException If the index is negative. - */ - public JSONArray put(int index, boolean value) throws JSONException { - return this.put(index, value ? Boolean.TRUE : Boolean.FALSE); - } - - /** - * Put a value in the JSONArray, where the value will be a JSONArray which is - * produced from a Collection. - * - * @param index The subscript. - * @param value A Collection value. - * @return this. - * @throws JSONException If the index is negative or if the value is non-finite. - */ - public JSONArray put(int index, Collection value) throws JSONException { - return this.put(index, new JSONArray(value)); - } - - /** - * Put or replace a double value. If the index is greater than the length of the - * JSONArray, then null elements will be added as necessary to pad it out. - * - * @param index The subscript. - * @param value A double value. - * @return this. - * @throws JSONException If the index is negative or if the value is non-finite. - */ - public JSONArray put(int index, double value) throws JSONException { - return this.put(index, Double.valueOf(value)); - } - - /** - * Put or replace a float value. If the index is greater than the length of the - * JSONArray, then null elements will be added as necessary to pad it out. - * - * @param index The subscript. - * @param value A float value. - * @return this. - * @throws JSONException If the index is negative or if the value is non-finite. - */ - public JSONArray put(int index, float value) throws JSONException { - return this.put(index, Float.valueOf(value)); - } - - /** - * Put or replace an int value. If the index is greater than the length of the - * JSONArray, then null elements will be added as necessary to pad it out. - * - * @param index The subscript. - * @param value An int value. - * @return this. - * @throws JSONException If the index is negative. - */ - public JSONArray put(int index, int value) throws JSONException { - return this.put(index, Integer.valueOf(value)); - } - - /** - * Put or replace a long value. If the index is greater than the length of the - * JSONArray, then null elements will be added as necessary to pad it out. - * - * @param index The subscript. - * @param value A long value. - * @return this. - * @throws JSONException If the index is negative. - */ - public JSONArray put(int index, long value) throws JSONException { - return this.put(index, Long.valueOf(value)); - } - - /** - * Put a value in the JSONArray, where the value will be a JSONObject that is - * produced from a Map. - * - * @param index The subscript. - * @param value The Map value. - * @return this. - * @throws JSONException If the index is negative or if the value is an - * invalid number. - * @throws NullPointerException If a key in the map is null - */ - public JSONArray put(int index, Map value) throws JSONException { - this.put(index, new JSONObject(value)); - return this; - } - - /** - * Put or replace an object value in the JSONArray. If the index is greater than - * the length of the JSONArray, then null elements will be added as necessary to - * pad it out. - * - * @param index The subscript. - * @param value The value to put into the array. The value should be a Boolean, - * Double, Integer, JSONArray, JSONObject, Long, or String, or the - * JSONObject.NULL object. - * @return this. - * @throws JSONException If the index is negative or if the value is an invalid - * number. - */ - public JSONArray put(int index, Object value) throws JSONException { - if (index < 0) { - throw new JSONException("JSONArray[" + index + "] not found."); - } - if (index < this.length()) { - JSONObject.testValidity(value); - this.myArrayList.set(index, value); - return this; - } - if (index == this.length()) { - // simple append - return this.put(value); - } - // if we are inserting past the length, we want to grow the array all at once - // instead of incrementally. - this.myArrayList.ensureCapacity(index + 1); - while (index != this.length()) { - // we don't need to test validity of NULL objects - this.myArrayList.add(JSONObject.NULL); - } - return this.put(value); - } - - /** - * Put a collection's elements in to the JSONArray. - * - * @param collection A Collection. - * @return this. - */ - public JSONArray putAll(Collection collection) { - this.addAll(collection, false); - return this; - } - - /** - * Put an Iterable's elements in to the JSONArray. - * - * @param iter An Iterable. - * @return this. - */ - public JSONArray putAll(Iterable iter) { - this.addAll(iter, false); - return this; - } - - /** - * Put a JSONArray's elements in to the JSONArray. - * - * @param array A JSONArray. - * @return this. - */ - public JSONArray putAll(JSONArray array) { - // directly copy the elements from the source array to this one - // as all wrapping should have been done already in the source. - this.myArrayList.addAll(array.myArrayList); - return this; - } - - /** - * Put an array's elements in to the JSONArray. - * - * @param array Array. If the parameter passed is null, or not an array or - * Iterable, an exception will be thrown. - * @return this. - * - * @throws JSONException If not an array, JSONArray, Iterable or if an - * value is non-finite number. - * @throws NullPointerException Thrown if the array parameter is null. - */ - public JSONArray putAll(Object array) throws JSONException { - this.addAll(array, false); - return this; - } - - /** - * Creates a JSONPointer using an initialization string and tries to match it to - * an item within this JSONArray. For example, given a JSONArray initialized - * with this document: - * - * 
-	 * [
-	 *     {"b":"c"}
-	 * ]
-	 *
- * - * and this JSONPointer string: - * - * 
-	 * "/0/b"
-	 *
- * - * Then this method will return the String "c" A JSONPointerException may be - * thrown from code called by this method. - * - * @param jsonPointer string that can be used to create a JSONPointer - * @return the item matched by the JSONPointer, otherwise null - */ - public Object query(String jsonPointer) { - return query(new JSONPointer(jsonPointer)); - } - - /** - * Uses a user initialized JSONPointer and tries to match it to an item within - * this JSONArray. For example, given a JSONArray initialized with this - * document: - * - * 
-	 * [
-	 *     {"b":"c"}
-	 * ]
-	 *
- * - * and this JSONPointer: - * - * 
-	 * "/0/b"
-	 *
- * - * Then this method will return the String "c" A JSONPointerException may be - * thrown from code called by this method. - * - * @param jsonPointer string that can be used to create a JSONPointer - * @return the item matched by the JSONPointer, otherwise null - */ - public Object query(JSONPointer jsonPointer) { - return jsonPointer.queryFrom(this); - } - - /** - * Queries and returns a value from this object using {@code jsonPointer}, or - * returns null if the query fails due to a missing key. - * - * @param jsonPointer the string representation of the JSON pointer - * @return the queried value or {@code null} - * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax - */ - public Object optQuery(String jsonPointer) { - return optQuery(new JSONPointer(jsonPointer)); - } - - /** - * Queries and returns a value from this object using {@code jsonPointer}, or - * returns null if the query fails due to a missing key. - * - * @param jsonPointer The JSON pointer - * @return the queried value or {@code null} - * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax - */ - public Object optQuery(JSONPointer jsonPointer) { - try { - return jsonPointer.queryFrom(this); - } catch (JSONPointerException e) { - return null; - } - } - - /** - * Remove an index and close the hole. - * - * @param index The index of the element to be removed. - * @return The value that was associated with the index, or null if there was no - * value. - */ - public Object remove(int index) { - return index >= 0 && index < this.length() ? this.myArrayList.remove(index) : null; - } - - /** - * Determine if two JSONArrays are similar. They must contain similar sequences. - * - * @param other The other JSONArray - * @return true if they are equal - */ - public boolean similar(Object other) { - if (!(other instanceof JSONArray)) { - return false; - } - int len = this.length(); - if (len != ((JSONArray) other).length()) { - return false; - } - for (int i = 0; i < len; i += 1) { - Object valueThis = this.myArrayList.get(i); - Object valueOther = ((JSONArray) other).myArrayList.get(i); - if (valueThis == valueOther) { - continue; - } - if (valueThis == null) { - return false; - } - if (valueThis instanceof JSONObject) { - if (!((JSONObject) valueThis).similar(valueOther)) { - return false; - } - } else if (valueThis instanceof JSONArray) { - if (!((JSONArray) valueThis).similar(valueOther)) { - return false; - } - } else if (valueThis instanceof Number && valueOther instanceof Number) { - if (!JSONObject.isNumberSimilar((Number) valueThis, (Number) valueOther)) { - return false; - } - } else if (!valueThis.equals(valueOther)) { - return false; - } - } - return true; - } - - /** - * Produce a JSONObject by combining a JSONArray of names with the values of - * this JSONArray. - * - * @param names A JSONArray containing a list of key strings. These will be - * paired with the values. - * @return A JSONObject, or null if there are no names or if this JSONArray has - * no values. - * @throws JSONException If any of the names are null. - */ - public JSONObject toJSONObject(JSONArray names) throws JSONException { - if (names == null || names.isEmpty() || this.isEmpty()) { - return null; - } - JSONObject jo = new JSONObject(names.length()); - for (int i = 0; i < names.length(); i += 1) { - jo.put(names.getString(i), this.opt(i)); - } - return jo; - } - - /** - * Make a JSON text of this JSONArray. For compactness, no unnecessary - * whitespace is added. If it is not possible to produce a syntactically correct - * JSON text then null will be returned instead. This could occur if the array - * contains an invalid number. - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @return a printable, displayable, transmittable representation of the array. - */ - @Override - public String toString() { - try { - return this.toString(0); - } catch (Exception e) { - return null; - } - } - - /** - * Make a pretty-printed JSON text of this JSONArray. - * - *

- * If - * - * 

-	 *  {@code indentFactor > 0}
-	 *
- * - * and the {@link JSONArray} has only one element, then the array will be output - * on a single line: - * - * 
-	 * {@code [1]}
-	 *
- * - *

- * If an array has 2 or more elements, then it will be output across multiple - * lines: - * - * 

-	 * {@code
-	 * [
-	 * 1,
-	 * "value 2",
-	 * 3
-	 * ]
-	 * }
-	 *
- *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param indentFactor The number of spaces to add to each level of indentation. - * @return a printable, displayable, transmittable representation of the object, - * beginning with [ (left bracket) and - * ending with ]  (right bracket). - * @throws JSONException if a called function fails - */ - public String toString(int indentFactor) throws JSONException { - StringWriter sw = new StringWriter(); - synchronized (sw.getBuffer()) { - return this.write(sw, indentFactor, 0).toString(); - } - } - - /** - * Write the contents of the JSONArray as JSON text to a writer. For - * compactness, no whitespace is added. - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param writer the writer object - * @return The writer. - * @throws JSONException if a called function fails - */ - public Writer write(Writer writer) throws JSONException { - return this.write(writer, 0, 0); - } - - /** - * Write the contents of the JSONArray as JSON text to a writer. - * - *

- * If - * - * 

-	 * {@code indentFactor > 0}
-	 *
- * - * and the {@link JSONArray} has only one element, then the array will be output - * on a single line: - * - * 
-	 * {@code [1]}
-	 *
- * - *

- * If an array has 2 or more elements, then it will be output across multiple - * lines: - * - * 

-	 * {@code
-	 * [
-	 * 1,
-	 * "value 2",
-	 * 3
-	 * ]
-	 * }
-	 *
- *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param writer Writes the serialized JSON - * @param indentFactor The number of spaces to add to each level of indentation. - * @param indent The indentation of the top level. - * @return The writer. - * @throws JSONException if a called function fails or unable to write - */ - public Writer write(Writer writer, int indentFactor, int indent) throws JSONException { - try { - boolean needsComma = false; - int length = this.length(); - writer.write('['); - - if (length == 1) { - try { - JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent); - } catch (Exception e) { - throw new JSONException("Unable to write JSONArray value at index: 0", e); - } - } else if (length != 0) { - final int newIndent = indent + indentFactor; - - for (int i = 0; i < length; i += 1) { - if (needsComma) { - writer.write(','); - } - if (indentFactor > 0) { - writer.write('\n'); - } - JSONObject.indent(writer, newIndent); - try { - JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newIndent); - } catch (Exception e) { - throw new JSONException("Unable to write JSONArray value at index: " + i, e); - } - needsComma = true; - } - if (indentFactor > 0) { - writer.write('\n'); - } - JSONObject.indent(writer, indent); - } - writer.write(']'); - return writer; - } catch (IOException e) { - throw new JSONException(e); - } - } - - /** - * Returns a java.util.List containing all of the elements in this array. If an - * element in the array is a JSONArray or JSONObject it will also be converted - * to a List and a Map respectively. - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @return a java.util.List containing the elements of this array - */ - public List toList() { - List results = new ArrayList(this.myArrayList.size()); - for (Object element : this.myArrayList) { - if (element == null || JSONObject.NULL.equals(element)) { - results.add(null); - } else if (element instanceof JSONArray) { - results.add(((JSONArray) element).toList()); - } else if (element instanceof JSONObject) { - results.add(((JSONObject) element).toMap()); - } else { - results.add(element); - } - } - return results; - } - - /** - * Check if JSONArray is empty. - * - * @return true if JSONArray is empty, otherwise false. - */ - public boolean isEmpty() { - return this.myArrayList.isEmpty(); - } - - /** - * Add a collection's elements to the JSONArray. - * - * @param collection A Collection. - * @param wrap {@code true} to call {@link JSONObject#wrap(Object)} for - * each item, {@code false} to add the items directly - * - */ - private void addAll(Collection collection, boolean wrap) { - this.myArrayList.ensureCapacity(this.myArrayList.size() + collection.size()); - if (wrap) { - for (Object o : collection) { - this.put(JSONObject.wrap(o)); - } - } else { - for (Object o : collection) { - this.put(o); - } - } - } - - /** - * Add an Iterable's elements to the JSONArray. - * - * @param iter An Iterable. - * @param wrap {@code true} to call {@link JSONObject#wrap(Object)} for each - * item, {@code false} to add the items directly - */ - private void addAll(Iterable iter, boolean wrap) { - if (wrap) { - for (Object o : iter) { - this.put(JSONObject.wrap(o)); - } - } else { - for (Object o : iter) { - this.put(o); - } - } - } - - /** - * Add an array's elements to the JSONArray. - * - * @param array Array. If the parameter passed is null, or not an array, - * JSONArray, Collection, or Iterable, an exception will be thrown. - * @param wrap {@code true} to call {@link JSONObject#wrap(Object)} for each - * item, {@code false} to add the items directly - * - * @throws JSONException If not an array or if an array value is - * non-finite number. - * @throws NullPointerException Thrown if the array parameter is null. - */ - private void addAll(Object array, boolean wrap) throws JSONException { - if (array.getClass().isArray()) { - int length = Array.getLength(array); - this.myArrayList.ensureCapacity(this.myArrayList.size() + length); - if (wrap) { - for (int i = 0; i < length; i += 1) { - this.put(JSONObject.wrap(Array.get(array, i))); - } - } else { - for (int i = 0; i < length; i += 1) { - this.put(Array.get(array, i)); - } - } - } else if (array instanceof JSONArray) { - // use the built in array list `addAll` as all object - // wrapping should have been completed in the original - // JSONArray - this.myArrayList.addAll(((JSONArray) array).myArrayList); - } else if (array instanceof Collection) { - this.addAll((Collection) array, wrap); - } else if (array instanceof Iterable) { - this.addAll((Iterable) array, wrap); - } else { - throw new JSONException("JSONArray initial value should be a string or collection or array."); - } - } - - /** - * Create a new JSONException in a common format for incorrect conversions. - * - * @param idx index of the item - * @param valueType the type of value being coerced to - * @param cause optional cause of the coercion failure - * @return JSONException that can be thrown. - */ - private static JSONException wrongValueFormatException(int idx, String valueType, Throwable cause) { - return new JSONException("JSONArray[" + idx + "] is not a " + valueType + ".", cause); - } - - /** - * Create a new JSONException in a common format for incorrect conversions. - * - * @param idx index of the item - * @param valueType the type of value being coerced to - * @param cause optional cause of the coercion failure - * @return JSONException that can be thrown. - */ - private static JSONException wrongValueFormatException(int idx, String valueType, Object value, Throwable cause) { - return new JSONException("JSONArray[" + idx + "] is not a " + valueType + " (" + value + ").", cause); - } - -} diff --git a/src/main/java/org/json/JSONException.java b/src/main/java/org/json/JSONException.java deleted file mode 100644 index 92ff2e9..0000000 --- a/src/main/java/org/json/JSONException.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - */ - -/** - * The JSONException is thrown by the JSON.org classes when things are amiss. - * - * @author JSON.org - * @version 2015-12-09 - */ -public class JSONException extends RuntimeException { - /** Serialization ID */ - private static final long serialVersionUID = 0; - - /** - * Constructs a JSONException with an explanatory message. - * - * @param message Detail about the reason for the exception. - */ - public JSONException(final String message) { - super(message); - } - - /** - * Constructs a JSONException with an explanatory message and cause. - * - * @param message Detail about the reason for the exception. - * @param cause The cause. - */ - public JSONException(final String message, final Throwable cause) { - super(message, cause); - } - - /** - * Constructs a new JSONException with the specified cause. - * - * @param cause The cause. - */ - public JSONException(final Throwable cause) { - super(cause.getMessage(), cause); - } - -} diff --git a/src/main/java/org/json/JSONML.java b/src/main/java/org/json/JSONML.java deleted file mode 100644 index 6ee7b54..0000000 --- a/src/main/java/org/json/JSONML.java +++ /dev/null @@ -1,580 +0,0 @@ -package org.json; - -/* -Copyright (c) 2008 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * This provides static methods to convert an XML text into a JSONArray or - * JSONObject, and to covert a JSONArray or JSONObject into an XML text using - * the JsonML transform. - * - * @author JSON.org - * @version 2016-01-30 - */ -public class JSONML { - /** - * Parse XML values and store them in a JSONArray. - * - * @param x The XMLTokener containing the source string. - * @param arrayForm true if array form, false if object form. - * @param ja The JSONArray that is containing the current tag or null - * if we are at the outermost level. - * @param keepStrings Don't type-convert text nodes and attribute values - * @return A JSONArray if the value is the outermost tag, otherwise null. - * @throws JSONException if a parsing error occurs - */ - private static Object parse(XMLTokener x, boolean arrayForm, JSONArray ja, boolean keepStrings) - throws JSONException { - String attribute; - char c; - String closeTag = null; - int i; - JSONArray newja = null; - JSONObject newjo = null; - Object token; - String tagName = null; - -// Test for and skip past these forms: -// -// -// -// - - while (true) { - if (!x.more()) { - throw x.syntaxError("Bad XML"); - } - token = x.nextContent(); - if (token == XML.LT) { - token = x.nextToken(); - if (token instanceof Character) { - if (token == XML.SLASH) { - -// Close tag "); - } else { - x.back(); - } - } else if (c == '[') { - token = x.nextToken(); - if (token.equals("CDATA") && x.next() == '[') { - if (ja != null) { - ja.put(x.nextCDATA()); - } - } else { - throw x.syntaxError("Expected 'CDATA['"); - } - } else { - i = 1; - do { - token = x.nextMeta(); - if (token == null) { - throw x.syntaxError("Missing '>' after ' 0); - } - } else if (token == XML.QUEST) { - -// "); - } else { - throw x.syntaxError("Misshaped tag"); - } - -// Open tag < - - } else { - if (!(token instanceof String)) { - throw x.syntaxError("Bad tagName '" + token + "'."); - } - tagName = (String) token; - newja = new JSONArray(); - newjo = new JSONObject(); - if (arrayForm) { - newja.put(tagName); - if (ja != null) { - ja.put(newja); - } - } else { - newjo.put("tagName", tagName); - if (ja != null) { - ja.put(newjo); - } - } - token = null; - for (;;) { - if (token == null) { - token = x.nextToken(); - } - if (token == null) { - throw x.syntaxError("Misshaped tag"); - } - if (!(token instanceof String)) { - break; - } - -// attribute = value - - attribute = (String) token; - if (!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute))) { - throw x.syntaxError("Reserved attribute."); - } - token = x.nextToken(); - if (token == XML.EQ) { - token = x.nextToken(); - if (!(token instanceof String)) { - throw x.syntaxError("Missing value"); - } - newjo.accumulate(attribute, - keepStrings ? ((String) token) : XML.stringToValue((String) token)); - token = null; - } else { - newjo.accumulate(attribute, ""); - } - } - if (arrayForm && newjo.length() > 0) { - newja.put(newjo); - } - -// Empty tag <.../> - - if (token == XML.SLASH) { - if (x.nextToken() != XML.GT) { - throw x.syntaxError("Misshaped tag"); - } - if (ja == null) { - if (arrayForm) { - return newja; - } - return newjo; - } - -// Content, between <...> and - - } else { - if (token != XML.GT) { - throw x.syntaxError("Misshaped tag"); - } - closeTag = (String) parse(x, arrayForm, newja, keepStrings); - if (closeTag != null) { - if (!closeTag.equals(tagName)) { - throw x.syntaxError("Mismatched '" + tagName + "' and '" + closeTag + "'"); - } - tagName = null; - if (!arrayForm && newja.length() > 0) { - newjo.put("childNodes", newja); - } - if (ja == null) { - if (arrayForm) { - return newja; - } - return newjo; - } - } - } - } - } else { - if (ja != null) { - ja.put(token instanceof String - ? keepStrings ? XML.unescape((String) token) : XML.stringToValue((String) token) - : token); - } - } - } - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a JSONArray - * using the JsonML transform. Each XML tag is represented as a JSONArray in - * which the first element is the tag name. If the tag has attributes, then the - * second element will be JSONObject containing the name/value pairs. If the tag - * contains children, then strings and JSONArrays will represent the child tags. - * Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param string The source string. - * @return A JSONArray containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONArray - */ - public static JSONArray toJSONArray(String string) throws JSONException { - return (JSONArray) parse(new XMLTokener(string), true, null, false); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a JSONArray - * using the JsonML transform. Each XML tag is represented as a JSONArray in - * which the first element is the tag name. If the tag has attributes, then the - * second element will be JSONObject containing the name/value pairs. If the tag - * contains children, then strings and JSONArrays will represent the child tags. - * As opposed to toJSONArray this method does not attempt to convert any text - * node or attribute value to any type but just leaves it as a string. Comments, - * prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param string The source string. - * @param keepStrings If true, then values will not be coerced into boolean or - * numeric values and will instead be left as strings - * @return A JSONArray containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONArray - */ - public static JSONArray toJSONArray(String string, boolean keepStrings) throws JSONException { - return (JSONArray) parse(new XMLTokener(string), true, null, keepStrings); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a JSONArray - * using the JsonML transform. Each XML tag is represented as a JSONArray in - * which the first element is the tag name. If the tag has attributes, then the - * second element will be JSONObject containing the name/value pairs. If the tag - * contains children, then strings and JSONArrays will represent the child - * content and tags. As opposed to toJSONArray this method does not attempt to - * convert any text node or attribute value to any type but just leaves it as a - * string. Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param x An XMLTokener. - * @param keepStrings If true, then values will not be coerced into boolean or - * numeric values and will instead be left as strings - * @return A JSONArray containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONArray - */ - public static JSONArray toJSONArray(XMLTokener x, boolean keepStrings) throws JSONException { - return (JSONArray) parse(x, true, null, keepStrings); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a JSONArray - * using the JsonML transform. Each XML tag is represented as a JSONArray in - * which the first element is the tag name. If the tag has attributes, then the - * second element will be JSONObject containing the name/value pairs. If the tag - * contains children, then strings and JSONArrays will represent the child - * content and tags. Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param x An XMLTokener. - * @return A JSONArray containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONArray - */ - public static JSONArray toJSONArray(XMLTokener x) throws JSONException { - return (JSONArray) parse(x, true, null, false); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject using the JsonML transform. Each XML tag is represented as a - * JSONObject with a "tagName" property. If the tag has attributes, then the - * attributes will be in the JSONObject as properties. If the tag contains - * children, the object will have a "childNodes" property which will be an array - * of strings and JsonML JSONObjects. - * - * Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param string The XML source text. - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONObject - */ - public static JSONObject toJSONObject(String string) throws JSONException { - return (JSONObject) parse(new XMLTokener(string), false, null, false); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject using the JsonML transform. Each XML tag is represented as a - * JSONObject with a "tagName" property. If the tag has attributes, then the - * attributes will be in the JSONObject as properties. If the tag contains - * children, the object will have a "childNodes" property which will be an array - * of strings and JsonML JSONObjects. - * - * Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param string The XML source text. - * @param keepStrings If true, then values will not be coerced into boolean or - * numeric values and will instead be left as strings - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONObject - */ - public static JSONObject toJSONObject(String string, boolean keepStrings) throws JSONException { - return (JSONObject) parse(new XMLTokener(string), false, null, keepStrings); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject using the JsonML transform. Each XML tag is represented as a - * JSONObject with a "tagName" property. If the tag has attributes, then the - * attributes will be in the JSONObject as properties. If the tag contains - * children, the object will have a "childNodes" property which will be an array - * of strings and JsonML JSONObjects. - * - * Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param x An XMLTokener of the XML source text. - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONObject - */ - public static JSONObject toJSONObject(XMLTokener x) throws JSONException { - return (JSONObject) parse(x, false, null, false); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject using the JsonML transform. Each XML tag is represented as a - * JSONObject with a "tagName" property. If the tag has attributes, then the - * attributes will be in the JSONObject as properties. If the tag contains - * children, the object will have a "childNodes" property which will be an array - * of strings and JsonML JSONObjects. - * - * Comments, prologs, DTDs, and - * - * 
-	 * {@code <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param x An XMLTokener of the XML source text. - * @param keepStrings If true, then values will not be coerced into boolean or - * numeric values and will instead be left as strings - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown on error converting to a JSONObject - */ - public static JSONObject toJSONObject(XMLTokener x, boolean keepStrings) throws JSONException { - return (JSONObject) parse(x, false, null, keepStrings); - } - - /** - * Reverse the JSONML transformation, making an XML text from a JSONArray. - * - * @param ja A JSONArray. - * @return An XML string. - * @throws JSONException Thrown on error converting to a string - */ - public static String toString(JSONArray ja) throws JSONException { - int i; - JSONObject jo; - int length; - Object object; - StringBuilder sb = new StringBuilder(); - String tagName; - -// Emit = length) { - sb.append('/'); - sb.append('>'); - } else { - sb.append('>'); - do { - object = ja.get(i); - i += 1; - if (object != null) { - if (object instanceof String) { - sb.append(XML.escape(object.toString())); - } else if (object instanceof JSONObject) { - sb.append(toString((JSONObject) object)); - } else if (object instanceof JSONArray) { - sb.append(toString((JSONArray) object)); - } else { - sb.append(object.toString()); - } - } - } while (i < length); - sb.append('<'); - sb.append('/'); - sb.append(tagName); - sb.append('>'); - } - return sb.toString(); - } - - /** - * Reverse the JSONML transformation, making an XML text from a JSONObject. The - * JSONObject must contain a "tagName" property. If it has children, then it - * must have a "childNodes" property containing an array of objects. The other - * properties are attributes with string values. - * - * @param jo A JSONObject. - * @return An XML string. - * @throws JSONException Thrown on error converting to a string - */ - public static String toString(JSONObject jo) throws JSONException { - StringBuilder sb = new StringBuilder(); - int i; - JSONArray ja; - int length; - Object object; - String tagName; - Object value; - -//Emit '); - } else { - sb.append('>'); - length = ja.length(); - for (i = 0; i < length; i += 1) { - object = ja.get(i); - if (object != null) { - if (object instanceof String) { - sb.append(XML.escape(object.toString())); - } else if (object instanceof JSONObject) { - sb.append(toString((JSONObject) object)); - } else if (object instanceof JSONArray) { - sb.append(toString((JSONArray) object)); - } else { - sb.append(object.toString()); - } - } - } - sb.append('<'); - sb.append('/'); - sb.append(tagName); - sb.append('>'); - } - return sb.toString(); - } -} diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java deleted file mode 100644 index b8bfd51..0000000 --- a/src/main/java/org/json/JSONObject.java +++ /dev/null @@ -1,2599 +0,0 @@ -package org.json; - -import java.io.Closeable; - -/* - Copyright (c) 2002 JSON.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - The Software shall be used for Good, not Evil. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - */ - -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.ResourceBundle; -import java.util.Set; -import java.util.regex.Pattern; - -/** - * A JSONObject is an unordered collection of name/value pairs. Its external - * form is a string wrapped in curly braces with colons between the names and - * values, and commas between the values and names. The internal form is an - * object having get and opt methods for accessing the - * values by name, and put methods for adding or replacing values - * by name. The values can be any of these types: Boolean, - * JSONArray, JSONObject, Number, - * String, or the JSONObject.NULL object. A JSONObject - * constructor can be used to convert an external form JSON text into an - * internal form whose values can be retrieved with the get and - * opt methods, or to convert values into a JSON text using the - * put and toString methods. A get method - * returns a value if one can be found, and throws an exception if one cannot be - * found. An opt method returns a default value instead of throwing - * an exception, and so is useful for obtaining optional values. - *

- * The generic get() and opt() methods return an - * object, which you can cast or query for type. There are also typed - * get and opt methods that do type checking and type - * coercion for you. The opt methods differ from the get methods in that they do - * not throw. Instead, they return a specified value, such as null. - *

- * The put methods add or replace values in an object. For example, - * - * 

- * myString = new JSONObject().put("JSON", "Hello, World!").toString();
- *
- * - * produces the string {"JSON": "Hello, World"}. - *

- * The texts produced by the toString methods strictly conform to - * the JSON syntax rules. The constructors are more forgiving in the texts they - * will accept: - *

    - *
  • An extra , (comma) may appear just - * before the closing brace.
    • - *
  • Strings may be quoted with ' (single - * quote).
    • - *
  • Strings do not need to be quoted at all if they do not begin with a quote - * or single quote, and if they do not contain leading or trailing spaces, and - * if they do not contain any of these characters: - * { } [ ] / \ : , # and if they do not look like numbers and if - * they are not the reserved words true, false, or - * null.
    • - *
- * - * @author JSON.org - * @version 2016-08-15 - */ -public class JSONObject { - /** - * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst - * Java's null is equivalent to the value that JavaScript calls undefined. - */ - private static final class Null { - - /** - * There is only intended to be a single instance of the NULL object, so the - * clone method returns itself. - * - * @return NULL. - */ - @Override - protected final Object clone() { - return this; - } - - /** - * A Null object is equal to the null value and to itself. - * - * @param object An object to test for nullness. - * @return true if the object parameter is the JSONObject.NULL object or null. - */ - @Override - @SuppressWarnings("lgtm[java/unchecked-cast-in-equals]") - public boolean equals(Object object) { - return object == null || object == this; - } - - /** - * A Null object is equal to the null value and to itself. - * - * @return always returns 0. - */ - @Override - public int hashCode() { - return 0; - } - - /** - * Get the "null" string value. - * - * @return The string "null". - */ - @Override - public String toString() { - return "null"; - } - } - - /** - * Regular Expression Pattern that matches JSON Numbers. This is primarily used - * for output to guarantee that we are always writing valid JSON. - */ - static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?"); - - /** - * The map where the JSONObject's properties are kept. - */ - private final Map map; - - /** - * It is sometimes more convenient and less ambiguous to have a - * NULL object than to use Java's null value. - * JSONObject.NULL.equals(null) returns true. - * JSONObject.NULL.toString() returns "null". - */ - public static final Object NULL = new Null(); - - /** - * Construct an empty JSONObject. - */ - public JSONObject() { - // HashMap is used on purpose to ensure that elements are unordered by - // the specification. - // JSON tends to be a portable transfer format to allows the container - // implementations to rearrange their items for a faster element - // retrieval based on associative access. - // Therefore, an implementation mustn't rely on the order of the item. - this.map = new HashMap(); - } - - /** - * Construct a JSONObject from a subset of another JSONObject. An array of - * strings is used to identify the keys that should be copied. Missing keys are - * ignored. - * - * @param jo A JSONObject. - * @param names An array of strings. - */ - public JSONObject(JSONObject jo, String... names) { - this(names.length); - for (int i = 0; i < names.length; i += 1) { - try { - this.putOnce(names[i], jo.opt(names[i])); - } catch (Exception ignore) { - } - } - } - - /** - * Construct a JSONObject from a JSONTokener. - * - * @param x A JSONTokener object containing the source string. - * @throws JSONException If there is a syntax error in the source string or a - * duplicated key. - */ - public JSONObject(JSONTokener x) throws JSONException { - this(); - char c; - String key; - - if (x.nextClean() != '{') { - throw x.syntaxError("A JSONObject text must begin with '{'"); - } - for (;;) { - char prev = x.getPrevious(); - c = x.nextClean(); - switch (c) { - case 0: - throw x.syntaxError("A JSONObject text must end with '}'"); - case '}': - return; - case '{': - case '[': - if (prev == '{') { - throw x.syntaxError("A JSON Object can not directly nest another JSON Object or JSON Array."); - } - // fall through - default: - x.back(); - key = x.nextValue().toString(); - } - - // The key is followed by ':'. - - c = x.nextClean(); - if (c != ':') { - throw x.syntaxError("Expected a ':' after a key"); - } - - // Use syntaxError(..) to include error location - - if (key != null) { - // Check if key exists - if (this.opt(key) != null) { - // key already exists - throw x.syntaxError("Duplicate key \"" + key + "\""); - } - // Only add value if non-null - Object value = x.nextValue(); - if (value != null) { - this.put(key, value); - } - } - - // Pairs are separated by ','. - - switch (x.nextClean()) { - case ';': - case ',': - if (x.nextClean() == '}') { - return; - } - x.back(); - break; - case '}': - return; - default: - throw x.syntaxError("Expected a ',' or '}'"); - } - } - } - - /** - * Construct a JSONObject from a Map. - * - * @param m A map object that can be used to initialize the contents of the - * JSONObject. - * @throws JSONException If a value in the map is non-finite number. - * @throws NullPointerException If a key in the map is null - */ - public JSONObject(Map m) { - if (m == null) { - this.map = new HashMap(); - } else { - this.map = new HashMap(m.size()); - for (final Entry e : m.entrySet()) { - if (e.getKey() == null) { - throw new NullPointerException("Null key."); - } - final Object value = e.getValue(); - if (value != null) { - this.map.put(String.valueOf(e.getKey()), wrap(value)); - } - } - } - } - - /** - * Construct a JSONObject from an Object using bean getters. It reflects on all - * of the public methods of the object. For each of the methods with no - * parameters and a name starting with "get" or "is" - * followed by an uppercase letter, the method is invoked, and a key and the - * value returned from the getter method are put into the new JSONObject. - *

- * The key is formed by removing the "get" or "is" - * prefix. If the second remaining character is not upper case, then the first - * character is converted to lower case. - *

- * Methods that are static, return void, have - * parameters, or are "bridge" methods, are ignored. - *

- * For example, if an object has a method named "getName", and if - * the result of calling object.getName() is - * "Larry Fine", then the JSONObject will contain - * "name": "Larry Fine". - *

- * The {@link JSONPropertyName} annotation can be used on a bean getter to - * override key name used in the JSONObject. For example, using the object above - * with the getName method, if we annotated it with: - * - * 

-	 * @JSONPropertyName("FullName")
-	 * public String getName() {
-	 * 	return this.name;
-	 * }
-	 *
- * - * The resulting JSON object would contain "FullName": "Larry Fine" - *

- * Similarly, the {@link JSONPropertyName} annotation can be used on non- - * get and is methods. We can also override key name - * used in the JSONObject as seen below even though the field would normally be - * ignored: - * - * 

-	 * @JSONPropertyName("FullName")
-	 * public String fullName() {
-	 * 	return this.name;
-	 * }
-	 *
- * - * The resulting JSON object would contain "FullName": "Larry Fine" - *

- * The {@link JSONPropertyIgnore} annotation can be used to force the bean - * property to not be serialized into JSON. If both {@link JSONPropertyIgnore} - * and {@link JSONPropertyName} are defined on the same method, a depth - * comparison is performed and the one closest to the concrete class being - * serialized is used. If both annotations are at the same level, then the - * {@link JSONPropertyIgnore} annotation takes precedent and the field is not - * serialized. For example, the following declaration would prevent the - * getName method from being serialized: - * - * 

-	 * @JSONPropertyName("FullName")
-	 * @JSONPropertyIgnore
-	 * public String getName() {
-	 * 	return this.name;
-	 * }
-	 *
- *

- * - * @param bean An object that has getter methods that should be used to make a - * JSONObject. - */ - public JSONObject(Object bean) { - this(); - this.populateMap(bean); - } - - private JSONObject(Object bean, Set objectsRecord) { - this(); - this.populateMap(bean, objectsRecord); - } - - /** - * Construct a JSONObject from an Object, using reflection to find the public - * members. The resulting JSONObject's keys will be the strings from the names - * array, and the values will be the field values associated with those keys in - * the object. If a key is not found or not visible, then it will not be copied - * into the new JSONObject. - * - * @param object An object that has fields that should be used to make a - * JSONObject. - * @param names An array of strings, the names of the fields to be obtained - * from the object. - */ - public JSONObject(Object object, String... names) { - this(names.length); - Class c = object.getClass(); - for (int i = 0; i < names.length; i += 1) { - String name = names[i]; - try { - this.putOpt(name, c.getField(name).get(object)); - } catch (Exception ignore) { - } - } - } - - /** - * Construct a JSONObject from a source JSON text string. This is the most - * commonly used JSONObject constructor. - * - * @param source A string beginning with { (left - * brace) and ending with } - *  (right brace). - * @exception JSONException If there is a syntax error in the source string or a - * duplicated key. - */ - public JSONObject(String source) throws JSONException { - this(new JSONTokener(source)); - } - - /** - * Construct a JSONObject from a ResourceBundle. - * - * @param baseName The ResourceBundle base name. - * @param locale The Locale to load the ResourceBundle for. - * @throws JSONException If any JSONExceptions are detected. - */ - public JSONObject(String baseName, Locale locale) throws JSONException { - this(); - ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, - Thread.currentThread().getContextClassLoader()); - -// Iterate through the keys in the bundle. - - Enumeration keys = bundle.getKeys(); - while (keys.hasMoreElements()) { - Object key = keys.nextElement(); - if (key != null) { - -// Go through the path, ensuring that there is a nested JSONObject for each -// segment except the last. Add the value using the last segment's name into -// the deepest nested JSONObject. - - String[] path = ((String) key).split("\\."); - int last = path.length - 1; - JSONObject target = this; - for (int i = 0; i < last; i += 1) { - String segment = path[i]; - JSONObject nextTarget = target.optJSONObject(segment); - if (nextTarget == null) { - nextTarget = new JSONObject(); - target.put(segment, nextTarget); - } - target = nextTarget; - } - target.put(path[last], bundle.getString((String) key)); - } - } - } - - /** - * Constructor to specify an initial capacity of the internal map. Useful for - * library internal calls where we know, or at least can best guess, how big - * this JSONObject will be. - * - * @param initialCapacity initial capacity of the internal map. - */ - protected JSONObject(int initialCapacity) { - this.map = new HashMap(initialCapacity); - } - - /** - * Accumulate values under a key. It is similar to the put method except that if - * there is already an object stored under the key then a JSONArray is stored - * under the key to hold all of the accumulated values. If there is already a - * JSONArray, then the new value is appended to it. In contrast, the put method - * replaces the previous value. - * - * If only one value is accumulated that is not a JSONArray, then the result - * will be the same as using put. But if multiple values are accumulated, then - * the result will be like append. - * - * @param key A key string. - * @param value An object to be accumulated under the key. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject accumulate(String key, Object value) throws JSONException { - testValidity(value); - Object object = this.opt(key); - if (object == null) { - this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value); - } else if (object instanceof JSONArray) { - ((JSONArray) object).put(value); - } else { - this.put(key, new JSONArray().put(object).put(value)); - } - return this; - } - - /** - * Append values to the array under a key. If the key does not exist in the - * JSONObject, then the key is put in the JSONObject with its value being a - * JSONArray containing the value parameter. If the key was already associated - * with a JSONArray, then the value parameter is appended to it. - * - * @param key A key string. - * @param value An object to be accumulated under the key. - * @return this. - * @throws JSONException If the value is non-finite number or if the - * current value associated with the key is not a - * JSONArray. - * @throws NullPointerException If the key is null. - */ - public JSONObject append(String key, Object value) throws JSONException { - testValidity(value); - Object object = this.opt(key); - if (object == null) { - this.put(key, new JSONArray().put(value)); - } else if (object instanceof JSONArray) { - this.put(key, ((JSONArray) object).put(value)); - } else { - throw wrongValueFormatException(key, "JSONArray", null, null); - } - return this; - } - - /** - * Produce a string from a double. The string "null" will be returned if the - * number is not finite. - * - * @param d A double. - * @return A String. - */ - public static String doubleToString(double d) { - if (Double.isInfinite(d) || Double.isNaN(d)) { - return "null"; - } - -// Shave off trailing zeros and decimal point, if possible. - - String string = Double.toString(d); - if (string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) { - while (string.endsWith("0")) { - string = string.substring(0, string.length() - 1); - } - if (string.endsWith(".")) { - string = string.substring(0, string.length() - 1); - } - } - return string; - } - - /** - * Get the value object associated with a key. - * - * @param key A key string. - * @return The object associated with the key. - * @throws JSONException if the key is not found. - */ - public Object get(String key) throws JSONException { - if (key == null) { - throw new JSONException("Null key."); - } - Object object = this.opt(key); - if (object == null) { - throw new JSONException("JSONObject[" + quote(key) + "] not found."); - } - return object; - } - - /** - * Get the enum value associated with a key. - * - * @param Enum Type - * @param clazz The type of enum to retrieve. - * @param key A key string. - * @return The enum value associated with the key - * @throws JSONException if the key is not found or if the value cannot be - * converted to an enum. - */ - public > E getEnum(Class clazz, String key) throws JSONException { - E val = optEnum(clazz, key); - if (val == null) { - // JSONException should really take a throwable argument. - // If it did, I would re-implement this with the Enum.valueOf - // method and place any thrown exception in the JSONException - throw wrongValueFormatException(key, "enum of type " + quote(clazz.getSimpleName()), null); - } - return val; - } - - /** - * Get the boolean value associated with a key. - * - * @param key A key string. - * @return The truth. - * @throws JSONException if the value is not a Boolean or the String "true" or - * "false". - */ - public boolean getBoolean(String key) throws JSONException { - Object object = this.get(key); - if (object.equals(Boolean.FALSE) || (object instanceof String && ((String) object).equalsIgnoreCase("false"))) { - return false; - } else if (object.equals(Boolean.TRUE) - || (object instanceof String && ((String) object).equalsIgnoreCase("true"))) { - return true; - } - throw wrongValueFormatException(key, "Boolean", null); - } - - /** - * Get the BigInteger value associated with a key. - * - * @param key A key string. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value cannot be - * converted to BigInteger. - */ - public BigInteger getBigInteger(String key) throws JSONException { - Object object = this.get(key); - BigInteger ret = objectToBigInteger(object, null); - if (ret != null) { - return ret; - } - throw wrongValueFormatException(key, "BigInteger", object, null); - } - - /** - * Get the BigDecimal value associated with a key. If the value is float or - * double, the {@link BigDecimal#BigDecimal(double)} constructor will be used. - * See notes on the constructor for conversion issues that may arise. - * - * @param key A key string. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value cannot be - * converted to BigDecimal. - */ - public BigDecimal getBigDecimal(String key) throws JSONException { - Object object = this.get(key); - BigDecimal ret = objectToBigDecimal(object, null); - if (ret != null) { - return ret; - } - throw wrongValueFormatException(key, "BigDecimal", object, null); - } - - /** - * Get the double value associated with a key. - * - * @param key A key string. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value is not a Number - * object and cannot be converted to a number. - */ - public double getDouble(String key) throws JSONException { - final Object object = this.get(key); - if (object instanceof Number) { - return ((Number) object).doubleValue(); - } - try { - return Double.parseDouble(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(key, "double", e); - } - } - - /** - * Get the float value associated with a key. - * - * @param key A key string. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value is not a Number - * object and cannot be converted to a number. - */ - public float getFloat(String key) throws JSONException { - final Object object = this.get(key); - if (object instanceof Number) { - return ((Number) object).floatValue(); - } - try { - return Float.parseFloat(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(key, "float", e); - } - } - - /** - * Get the Number value associated with a key. - * - * @param key A key string. - * @return The numeric value. - * @throws JSONException if the key is not found or if the value is not a Number - * object and cannot be converted to a number. - */ - public Number getNumber(String key) throws JSONException { - Object object = this.get(key); - try { - if (object instanceof Number) { - return (Number) object; - } - return stringToNumber(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(key, "number", e); - } - } - - /** - * Get the int value associated with a key. - * - * @param key A key string. - * @return The integer value. - * @throws JSONException if the key is not found or if the value cannot be - * converted to an integer. - */ - public int getInt(String key) throws JSONException { - final Object object = this.get(key); - if (object instanceof Number) { - return ((Number) object).intValue(); - } - try { - return Integer.parseInt(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(key, "int", e); - } - } - - /** - * Get the JSONArray value associated with a key. - * - * @param key A key string. - * @return A JSONArray which is the value. - * @throws JSONException if the key is not found or if the value is not a - * JSONArray. - */ - public JSONArray getJSONArray(String key) throws JSONException { - Object object = this.get(key); - if (object instanceof JSONArray) { - return (JSONArray) object; - } - throw wrongValueFormatException(key, "JSONArray", null); - } - - /** - * Get the JSONObject value associated with a key. - * - * @param key A key string. - * @return A JSONObject which is the value. - * @throws JSONException if the key is not found or if the value is not a - * JSONObject. - */ - public JSONObject getJSONObject(String key) throws JSONException { - Object object = this.get(key); - if (object instanceof JSONObject) { - return (JSONObject) object; - } - throw wrongValueFormatException(key, "JSONObject", null); - } - - /** - * Get the long value associated with a key. - * - * @param key A key string. - * @return The long value. - * @throws JSONException if the key is not found or if the value cannot be - * converted to a long. - */ - public long getLong(String key) throws JSONException { - final Object object = this.get(key); - if (object instanceof Number) { - return ((Number) object).longValue(); - } - try { - return Long.parseLong(object.toString()); - } catch (Exception e) { - throw wrongValueFormatException(key, "long", e); - } - } - - /** - * Get an array of field names from a JSONObject. - * - * @param jo JSON object - * @return An array of field names, or null if there are no names. - */ - public static String[] getNames(JSONObject jo) { - if (jo.isEmpty()) { - return null; - } - return jo.keySet().toArray(new String[jo.length()]); - } - - /** - * Get an array of public field names from an Object. - * - * @param object object to read - * @return An array of field names, or null if there are no names. - */ - public static String[] getNames(Object object) { - if (object == null) { - return null; - } - Class klass = object.getClass(); - Field[] fields = klass.getFields(); - int length = fields.length; - if (length == 0) { - return null; - } - String[] names = new String[length]; - for (int i = 0; i < length; i += 1) { - names[i] = fields[i].getName(); - } - return names; - } - - /** - * Get the string associated with a key. - * - * @param key A key string. - * @return A string which is the value. - * @throws JSONException if there is no string value for the key. - */ - public String getString(String key) throws JSONException { - Object object = this.get(key); - if (object instanceof String) { - return (String) object; - } - throw wrongValueFormatException(key, "string", null); - } - - /** - * Determine if the JSONObject contains a specific key. - * - * @param key A key string. - * @return true if the key exists in the JSONObject. - */ - public boolean has(String key) { - return this.map.containsKey(key); - } - - /** - * Increment a property of a JSONObject. If there is no such property, create - * one with a value of 1 (Integer). If there is such a property, and if it is an - * Integer, Long, Double, Float, BigInteger, or BigDecimal then add one to it. - * No overflow bounds checking is performed, so callers should initialize the - * key prior to this call with an appropriate type that can handle the maximum - * expected value. - * - * @param key A key string. - * @return this. - * @throws JSONException If there is already a property with this name that is - * not an Integer, Long, Double, or Float. - */ - public JSONObject increment(String key) throws JSONException { - Object value = this.opt(key); - if (value == null) { - this.put(key, 1); - } else if (value instanceof Integer) { - this.put(key, ((Integer) value).intValue() + 1); - } else if (value instanceof Long) { - this.put(key, ((Long) value).longValue() + 1L); - } else if (value instanceof BigInteger) { - this.put(key, ((BigInteger) value).add(BigInteger.ONE)); - } else if (value instanceof Float) { - this.put(key, ((Float) value).floatValue() + 1.0f); - } else if (value instanceof Double) { - this.put(key, ((Double) value).doubleValue() + 1.0d); - } else if (value instanceof BigDecimal) { - this.put(key, ((BigDecimal) value).add(BigDecimal.ONE)); - } else { - throw new JSONException("Unable to increment [" + quote(key) + "]."); - } - return this; - } - - /** - * Determine if the value associated with the key is null or if - * there is no value. - * - * @param key A key string. - * @return true if there is no value associated with the key or if the value is - * the JSONObject.NULL object. - */ - public boolean isNull(String key) { - return JSONObject.NULL.equals(this.opt(key)); - } - - /** - * Get an enumeration of the keys of the JSONObject. Modifying this key Set will - * also modify the JSONObject. Use with caution. - * - * @see Set#iterator() - * - * @return An iterator of the keys. - */ - public Iterator keys() { - return this.keySet().iterator(); - } - - /** - * Get a set of keys of the JSONObject. Modifying this key Set will also modify - * the JSONObject. Use with caution. - * - * @see Map#keySet() - * - * @return A keySet. - */ - public Set keySet() { - return this.map.keySet(); - } - - /** - * Get a set of entries of the JSONObject. These are raw values and may not - * match what is returned by the JSONObject get* and opt* functions. Modifying - * the returned EntrySet or the Entry objects contained therein will modify the - * backing JSONObject. This does not return a clone or a read-only view. - * - * Use with caution. - * - * @see Map#entrySet() - * - * @return An Entry Set - */ - protected Set> entrySet() { - return this.map.entrySet(); - } - - /** - * Get the number of keys stored in the JSONObject. - * - * @return The number of keys in the JSONObject. - */ - public int length() { - return this.map.size(); - } - - /** - * Removes all of the elements from this JSONObject. The JSONObject will be - * empty after this call returns. - */ - public void clear() { - this.map.clear(); - } - - /** - * Check if JSONObject is empty. - * - * @return true if JSONObject is empty, otherwise false. - */ - public boolean isEmpty() { - return this.map.isEmpty(); - } - - /** - * Produce a JSONArray containing the names of the elements of this JSONObject. - * - * @return A JSONArray containing the key strings, or null if the JSONObject is - * empty. - */ - public JSONArray names() { - if (this.map.isEmpty()) { - return null; - } - return new JSONArray(this.map.keySet()); - } - - /** - * Produce a string from a Number. - * - * @param number A Number - * @return A String. - * @throws JSONException If n is a non-finite number. - */ - public static String numberToString(Number number) throws JSONException { - if (number == null) { - throw new JSONException("Null pointer"); - } - testValidity(number); - - // Shave off trailing zeros and decimal point, if possible. - - String string = number.toString(); - if (string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) { - while (string.endsWith("0")) { - string = string.substring(0, string.length() - 1); - } - if (string.endsWith(".")) { - string = string.substring(0, string.length() - 1); - } - } - return string; - } - - /** - * Get an optional value associated with a key. - * - * @param key A key string. - * @return An object which is the value, or null if there is no value. - */ - public Object opt(String key) { - return key == null ? null : this.map.get(key); - } - - /** - * Get the enum value associated with a key. - * - * @param Enum Type - * @param clazz The type of enum to retrieve. - * @param key A key string. - * @return The enum value associated with the key or null if not found - */ - public > E optEnum(Class clazz, String key) { - return this.optEnum(clazz, key, null); - } - - /** - * Get the enum value associated with a key. - * - * @param Enum Type - * @param clazz The type of enum to retrieve. - * @param key A key string. - * @param defaultValue The default in case the value is not found - * @return The enum value associated with the key or defaultValue if the value - * is not found or cannot be assigned to clazz - */ - public > E optEnum(Class clazz, String key, E defaultValue) { - try { - Object val = this.opt(key); - if (NULL.equals(val)) { - return defaultValue; - } - if (clazz.isAssignableFrom(val.getClass())) { - // we just checked it! - @SuppressWarnings("unchecked") - E myE = (E) val; - return myE; - } - return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException e) { - return defaultValue; - } catch (NullPointerException e) { - return defaultValue; - } - } - - /** - * Get an optional boolean associated with a key. It returns false if there is - * no such key, or if the value is not Boolean.TRUE or the String "true". - * - * @param key A key string. - * @return The truth. - */ - public boolean optBoolean(String key) { - return this.optBoolean(key, false); - } - - /** - * Get an optional boolean associated with a key. It returns the defaultValue if - * there is no such key, or if it is not a Boolean or the String "true" or - * "false" (case insensitive). - * - * @param key A key string. - * @param defaultValue The default. - * @return The truth. - */ - public boolean optBoolean(String key, boolean defaultValue) { - Object val = this.opt(key); - if (NULL.equals(val)) { - return defaultValue; - } - if (val instanceof Boolean) { - return ((Boolean) val).booleanValue(); - } - try { - // we'll use the get anyway because it does string conversion. - return this.getBoolean(key); - } catch (Exception e) { - return defaultValue; - } - } - - /** - * Get an optional BigDecimal associated with a key, or the defaultValue if - * there is no such key or if its value is not a number. If the value is a - * string, an attempt will be made to evaluate it as a number. If the value is - * float or double, then the {@link BigDecimal#BigDecimal(double)} constructor - * will be used. See notes on the constructor for conversion issues that may - * arise. - * - * @param key A key string. - * @param defaultValue The default. - * @return An object which is the value. - */ - public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) { - Object val = this.opt(key); - return objectToBigDecimal(val, defaultValue); - } - - /** - * @param val value to convert - * @param defaultValue default value to return is the conversion doesn't work or - * is null. - * @return BigDecimal conversion of the original value, or the defaultValue if - * unable to convert. - */ - static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue) { - return objectToBigDecimal(val, defaultValue, true); - } - - /** - * @param val value to convert - * @param defaultValue default value to return is the conversion doesn't work or - * is null. - * @param exact When true, then {@link Double} and - * {@link Float} values will be converted exactly. When - * false, they will be converted to - * {@link String} values before converting to - * {@link BigDecimal}. - * @return BigDecimal conversion of the original value, or the defaultValue if - * unable to convert. - */ - static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue, boolean exact) { - if (NULL.equals(val)) { - return defaultValue; - } - if (val instanceof BigDecimal) { - return (BigDecimal) val; - } - if (val instanceof BigInteger) { - return new BigDecimal((BigInteger) val); - } - if (val instanceof Double || val instanceof Float) { - if (!numberIsFinite((Number) val)) { - return defaultValue; - } - if (exact) { - return new BigDecimal(((Number) val).doubleValue()); - } else { - // use the string constructor so that we maintain "nice" values for doubles and - // floats - // the double constructor will translate doubles to "exact" values instead of - // the likely - // intended representation - return new BigDecimal(val.toString()); - } - } - if (val instanceof Long || val instanceof Integer || val instanceof Short || val instanceof Byte) { - return new BigDecimal(((Number) val).longValue()); - } - // don't check if it's a string in case of unchecked Number subclasses - try { - return new BigDecimal(val.toString()); - } catch (Exception e) { - return defaultValue; - } - } - - /** - * Get an optional BigInteger associated with a key, or the defaultValue if - * there is no such key or if its value is not a number. If the value is a - * string, an attempt will be made to evaluate it as a number. - * - * @param key A key string. - * @param defaultValue The default. - * @return An object which is the value. - */ - public BigInteger optBigInteger(String key, BigInteger defaultValue) { - Object val = this.opt(key); - return objectToBigInteger(val, defaultValue); - } - - /** - * @param val value to convert - * @param defaultValue default value to return is the conversion doesn't work or - * is null. - * @return BigInteger conversion of the original value, or the defaultValue if - * unable to convert. - */ - static BigInteger objectToBigInteger(Object val, BigInteger defaultValue) { - if (NULL.equals(val)) { - return defaultValue; - } - if (val instanceof BigInteger) { - return (BigInteger) val; - } - if (val instanceof BigDecimal) { - return ((BigDecimal) val).toBigInteger(); - } - if (val instanceof Double || val instanceof Float) { - if (!numberIsFinite((Number) val)) { - return defaultValue; - } - return new BigDecimal(((Number) val).doubleValue()).toBigInteger(); - } - if (val instanceof Long || val instanceof Integer || val instanceof Short || val instanceof Byte) { - return BigInteger.valueOf(((Number) val).longValue()); - } - // don't check if it's a string in case of unchecked Number subclasses - try { - // the other opt functions handle implicit conversions, i.e. - // jo.put("double",1.1d); - // jo.optInt("double"); -- will return 1, not an error - // this conversion to BigDecimal then to BigInteger is to maintain - // that type cast support that may truncate the decimal. - final String valStr = val.toString(); - if (isDecimalNotation(valStr)) { - return new BigDecimal(valStr).toBigInteger(); - } - return new BigInteger(valStr); - } catch (Exception e) { - return defaultValue; - } - } - - /** - * Get an optional double associated with a key, or NaN if there is no such key - * or if its value is not a number. If the value is a string, an attempt will be - * made to evaluate it as a number. - * - * @param key A string which is the key. - * @return An object which is the value. - */ - public double optDouble(String key) { - return this.optDouble(key, Double.NaN); - } - - /** - * Get an optional double associated with a key, or the defaultValue if there is - * no such key or if its value is not a number. If the value is a string, an - * attempt will be made to evaluate it as a number. - * - * @param key A key string. - * @param defaultValue The default. - * @return An object which is the value. - */ - public double optDouble(String key, double defaultValue) { - Number val = this.optNumber(key); - if (val == null) { - return defaultValue; - } - final double doubleValue = val.doubleValue(); - // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) { - // return defaultValue; - // } - return doubleValue; - } - - /** - * Get the optional double value associated with an index. NaN is returned if - * there is no value for the index, or if the value is not a number and cannot - * be converted to a number. - * - * @param key A key string. - * @return The value. - */ - public float optFloat(String key) { - return this.optFloat(key, Float.NaN); - } - - /** - * Get the optional double value associated with an index. The defaultValue is - * returned if there is no value for the index, or if the value is not a number - * and cannot be converted to a number. - * - * @param key A key string. - * @param defaultValue The default value. - * @return The value. - */ - public float optFloat(String key, float defaultValue) { - Number val = this.optNumber(key); - if (val == null) { - return defaultValue; - } - final float floatValue = val.floatValue(); - // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) { - // return defaultValue; - // } - return floatValue; - } - - /** - * Get an optional int value associated with a key, or zero if there is no such - * key or if the value is not a number. If the value is a string, an attempt - * will be made to evaluate it as a number. - * - * @param key A key string. - * @return An object which is the value. - */ - public int optInt(String key) { - return this.optInt(key, 0); - } - - /** - * Get an optional int value associated with a key, or the default if there is - * no such key or if the value is not a number. If the value is a string, an - * attempt will be made to evaluate it as a number. - * - * @param key A key string. - * @param defaultValue The default. - * @return An object which is the value. - */ - public int optInt(String key, int defaultValue) { - final Number val = this.optNumber(key, null); - if (val == null) { - return defaultValue; - } - return val.intValue(); - } - - /** - * Get an optional JSONArray associated with a key. It returns null if there is - * no such key, or if its value is not a JSONArray. - * - * @param key A key string. - * @return A JSONArray which is the value. - */ - public JSONArray optJSONArray(String key) { - Object o = this.opt(key); - return o instanceof JSONArray ? (JSONArray) o : null; - } - - /** - * Get an optional JSONObject associated with a key. It returns null if there is - * no such key, or if its value is not a JSONObject. - * - * @param key A key string. - * @return A JSONObject which is the value. - */ - public JSONObject optJSONObject(String key) { - return this.optJSONObject(key, null); - } - - /** - * Get an optional JSONObject associated with a key, or the default if there is - * no such key or if the value is not a JSONObject. - * - * @param key A key string. - * @param defaultValue The default. - * @return An JSONObject which is the value. - */ - public JSONObject optJSONObject(String key, JSONObject defaultValue) { - Object object = this.opt(key); - return object instanceof JSONObject ? (JSONObject) object : defaultValue; - } - - /** - * Get an optional long value associated with a key, or zero if there is no such - * key or if the value is not a number. If the value is a string, an attempt - * will be made to evaluate it as a number. - * - * @param key A key string. - * @return An object which is the value. - */ - public long optLong(String key) { - return this.optLong(key, 0); - } - - /** - * Get an optional long value associated with a key, or the default if there is - * no such key or if the value is not a number. If the value is a string, an - * attempt will be made to evaluate it as a number. - * - * @param key A key string. - * @param defaultValue The default. - * @return An object which is the value. - */ - public long optLong(String key, long defaultValue) { - final Number val = this.optNumber(key, null); - if (val == null) { - return defaultValue; - } - - return val.longValue(); - } - - /** - * Get an optional {@link Number} value associated with a key, or - * null if there is no such key or if the value is not a number. If - * the value is a string, an attempt will be made to evaluate it as a number - * ({@link BigDecimal}). This method would be used in cases where type coercion - * of the number value is unwanted. - * - * @param key A key string. - * @return An object which is the value. - */ - public Number optNumber(String key) { - return this.optNumber(key, null); - } - - /** - * Get an optional {@link Number} value associated with a key, or the default if - * there is no such key or if the value is not a number. If the value is a - * string, an attempt will be made to evaluate it as a number. This method would - * be used in cases where type coercion of the number value is unwanted. - * - * @param key A key string. - * @param defaultValue The default. - * @return An object which is the value. - */ - public Number optNumber(String key, Number defaultValue) { - Object val = this.opt(key); - if (NULL.equals(val)) { - return defaultValue; - } - if (val instanceof Number) { - return (Number) val; - } - - try { - return stringToNumber(val.toString()); - } catch (Exception e) { - return defaultValue; - } - } - - /** - * Get an optional string associated with a key. It returns an empty string if - * there is no such key. If the value is not a string and is not null, then it - * is converted to a string. - * - * @param key A key string. - * @return A string which is the value. - */ - public String optString(String key) { - return this.optString(key, ""); - } - - /** - * Get an optional string associated with a key. It returns the defaultValue if - * there is no such key. - * - * @param key A key string. - * @param defaultValue The default. - * @return A string which is the value. - */ - public String optString(String key, String defaultValue) { - Object object = this.opt(key); - return NULL.equals(object) ? defaultValue : object.toString(); - } - - /** - * Populates the internal map of the JSONObject with the bean properties. The - * bean can not be recursive. - * - * @see JSONObject#JSONObject(Object) - * - * @param bean the bean - */ - private void populateMap(Object bean) { - populateMap(bean, Collections.newSetFromMap(new IdentityHashMap())); - } - - private void populateMap(Object bean, Set objectsRecord) { - Class klass = bean.getClass(); - - // If klass is a System class then set includeSuperClass to false. - - boolean includeSuperClass = klass.getClassLoader() != null; - - Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods(); - for (final Method method : methods) { - final int modifiers = method.getModifiers(); - if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers) && method.getParameterTypes().length == 0 - && !method.isBridge() && method.getReturnType() != Void.TYPE - && isValidMethodName(method.getName())) { - final String key = getKeyNameFromMethod(method); - if (key != null && !key.isEmpty()) { - try { - final Object result = method.invoke(bean); - if (result != null) { - // check cyclic dependency and throw error if needed - // the wrap and populateMap combination method is - // itself DFS recursive - if (objectsRecord.contains(result)) { - throw recursivelyDefinedObjectException(key); - } - - objectsRecord.add(result); - - this.map.put(key, wrap(result, objectsRecord)); - - objectsRecord.remove(result); - - // we don't use the result anywhere outside of wrap - // if it's a resource we should be sure to close it - // after calling toString - if (result instanceof Closeable) { - try { - ((Closeable) result).close(); - } catch (IOException ignore) { - } - } - } - } catch (IllegalAccessException ignore) { - } catch (IllegalArgumentException ignore) { - } catch (InvocationTargetException ignore) { - } - } - } - } - } - - private static boolean isValidMethodName(String name) { - return !"getClass".equals(name) && !"getDeclaringClass".equals(name); - } - - private static String getKeyNameFromMethod(Method method) { - final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class); - if (ignoreDepth > 0) { - final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class); - if (forcedNameDepth < 0 || ignoreDepth <= forcedNameDepth) { - // the hierarchy asked to ignore, and the nearest name override - // was higher or non-existent - return null; - } - } - JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class); - if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) { - return annotation.value(); - } - String key; - final String name = method.getName(); - if (name.startsWith("get") && name.length() > 3) { - key = name.substring(3); - } else if (name.startsWith("is") && name.length() > 2) { - key = name.substring(2); - } else { - return null; - } - // if the first letter in the key is not uppercase, then skip. - // This is to maintain backwards compatibility before PR406 - // (https://github.com/stleary/JSON-java/pull/406/) - if (key.length() == 0 || Character.isLowerCase(key.charAt(0))) { - return null; - } - if (key.length() == 1) { - key = key.toLowerCase(Locale.ROOT); - } else if (!Character.isUpperCase(key.charAt(1))) { - key = key.substring(0, 1).toLowerCase(Locale.ROOT) + key.substring(1); - } - return key; - } - - /** - * Searches the class hierarchy to see if the method or it's super - * implementations and interfaces has the annotation. - * - * @param type of the annotation - * - * @param m method to check - * @param annotationClass annotation to look for - * @return the {@link Annotation} if the annotation exists on the current method - * or one of its super class definitions - */ - private static A getAnnotation(final Method m, final Class annotationClass) { - // if we have invalid data the result is null - if (m == null || annotationClass == null) { - return null; - } - - if (m.isAnnotationPresent(annotationClass)) { - return m.getAnnotation(annotationClass); - } - - // if we've already reached the Object class, return null; - Class c = m.getDeclaringClass(); - if (c.getSuperclass() == null) { - return null; - } - - // check directly implemented interfaces for the method being checked - for (Class i : c.getInterfaces()) { - try { - Method im = i.getMethod(m.getName(), m.getParameterTypes()); - return getAnnotation(im, annotationClass); - } catch (final SecurityException ex) { - continue; - } catch (final NoSuchMethodException ex) { - continue; - } - } - - try { - return getAnnotation(c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()), annotationClass); - } catch (final SecurityException ex) { - return null; - } catch (final NoSuchMethodException ex) { - return null; - } - } - - /** - * Searches the class hierarchy to see if the method or it's super - * implementations and interfaces has the annotation. Returns the depth of the - * annotation in the hierarchy. - * - * @param m method to check - * @param annotationClass annotation to look for - * @return Depth of the annotation or -1 if the annotation is not on the method. - */ - private static int getAnnotationDepth(final Method m, final Class annotationClass) { - // if we have invalid data the result is -1 - if (m == null || annotationClass == null) { - return -1; - } - - if (m.isAnnotationPresent(annotationClass)) { - return 1; - } - - // if we've already reached the Object class, return -1; - Class c = m.getDeclaringClass(); - if (c.getSuperclass() == null) { - return -1; - } - - // check directly implemented interfaces for the method being checked - for (Class i : c.getInterfaces()) { - try { - Method im = i.getMethod(m.getName(), m.getParameterTypes()); - int d = getAnnotationDepth(im, annotationClass); - if (d > 0) { - // since the annotation was on the interface, add 1 - return d + 1; - } - } catch (final SecurityException ex) { - continue; - } catch (final NoSuchMethodException ex) { - continue; - } - } - - try { - int d = getAnnotationDepth(c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()), - annotationClass); - if (d > 0) { - // since the annotation was on the superclass, add 1 - return d + 1; - } - return -1; - } catch (final SecurityException ex) { - return -1; - } catch (final NoSuchMethodException ex) { - return -1; - } - } - - /** - * Put a key/boolean pair in the JSONObject. - * - * @param key A key string. - * @param value A boolean which is the value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, boolean value) throws JSONException { - return this.put(key, value ? Boolean.TRUE : Boolean.FALSE); - } - - /** - * Put a key/value pair in the JSONObject, where the value will be a JSONArray - * which is produced from a Collection. - * - * @param key A key string. - * @param value A Collection value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, Collection value) throws JSONException { - return this.put(key, new JSONArray(value)); - } - - /** - * Put a key/double pair in the JSONObject. - * - * @param key A key string. - * @param value A double which is the value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, double value) throws JSONException { - return this.put(key, Double.valueOf(value)); - } - - /** - * Put a key/float pair in the JSONObject. - * - * @param key A key string. - * @param value A float which is the value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, float value) throws JSONException { - return this.put(key, Float.valueOf(value)); - } - - /** - * Put a key/int pair in the JSONObject. - * - * @param key A key string. - * @param value An int which is the value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, int value) throws JSONException { - return this.put(key, Integer.valueOf(value)); - } - - /** - * Put a key/long pair in the JSONObject. - * - * @param key A key string. - * @param value A long which is the value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, long value) throws JSONException { - return this.put(key, Long.valueOf(value)); - } - - /** - * Put a key/value pair in the JSONObject, where the value will be a JSONObject - * which is produced from a Map. - * - * @param key A key string. - * @param value A Map value. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, Map value) throws JSONException { - return this.put(key, new JSONObject(value)); - } - - /** - * Put a key/value pair in the JSONObject. If the value is null, - * then the key will be removed from the JSONObject if it is present. - * - * @param key A key string. - * @param value An object which is the value. It should be of one of these - * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, - * String, or the JSONObject.NULL object. - * @return this. - * @throws JSONException If the value is non-finite number. - * @throws NullPointerException If the key is null. - */ - public JSONObject put(String key, Object value) throws JSONException { - if (key == null) { - throw new NullPointerException("Null key."); - } - if (value != null) { - testValidity(value); - this.map.put(key, value); - } else { - this.remove(key); - } - return this; - } - - /** - * Put a key/value pair in the JSONObject, but only if the key and the value are - * both non-null, and only if there is not already a member with that name. - * - * @param key key to insert into - * @param value value to insert - * @return this. - * @throws JSONException if the key is a duplicate - */ - public JSONObject putOnce(String key, Object value) throws JSONException { - if (key != null && value != null) { - if (this.opt(key) != null) { - throw new JSONException("Duplicate key \"" + key + "\""); - } - return this.put(key, value); - } - return this; - } - - /** - * Put a key/value pair in the JSONObject, but only if the key and the value are - * both non-null. - * - * @param key A key string. - * @param value An object which is the value. It should be of one of these - * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, - * String, or the JSONObject.NULL object. - * @return this. - * @throws JSONException If the value is a non-finite number. - */ - public JSONObject putOpt(String key, Object value) throws JSONException { - if (key != null && value != null) { - return this.put(key, value); - } - return this; - } - - /** - * Creates a JSONPointer using an initialization string and tries to match it to - * an item within this JSONObject. For example, given a JSONObject initialized - * with this document: - * - * 
-	 * {
-	 *     "a":{"b":"c"}
-	 * }
-	 *
- * - * and this JSONPointer string: - * - * 
-	 * "/a/b"
-	 *
- * - * Then this method will return the String "c". A JSONPointerException may be - * thrown from code called by this method. - * - * @param jsonPointer string that can be used to create a JSONPointer - * @return the item matched by the JSONPointer, otherwise null - */ - public Object query(String jsonPointer) { - return query(new JSONPointer(jsonPointer)); - } - - /** - * Uses a user initialized JSONPointer and tries to match it to an item within - * this JSONObject. For example, given a JSONObject initialized with this - * document: - * - * 
-	 * {
-	 *     "a":{"b":"c"}
-	 * }
-	 *
- * - * and this JSONPointer: - * - * 
-	 * "/a/b"
-	 *
- * - * Then this method will return the String "c". A JSONPointerException may be - * thrown from code called by this method. - * - * @param jsonPointer string that can be used to create a JSONPointer - * @return the item matched by the JSONPointer, otherwise null - */ - public Object query(JSONPointer jsonPointer) { - return jsonPointer.queryFrom(this); - } - - /** - * Queries and returns a value from this object using {@code jsonPointer}, or - * returns null if the query fails due to a missing key. - * - * @param jsonPointer the string representation of the JSON pointer - * @return the queried value or {@code null} - * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax - */ - public Object optQuery(String jsonPointer) { - return optQuery(new JSONPointer(jsonPointer)); - } - - /** - * Queries and returns a value from this object using {@code jsonPointer}, or - * returns null if the query fails due to a missing key. - * - * @param jsonPointer The JSON pointer - * @return the queried value or {@code null} - * @throws IllegalArgumentException if {@code jsonPointer} has invalid syntax - */ - public Object optQuery(JSONPointer jsonPointer) { - try { - return jsonPointer.queryFrom(this); - } catch (JSONPointerException e) { - return null; - } - } - - /** - * Produce a string in double quotes with backslash sequences in all the right - * places. A backslash will be inserted within </, producing <\/, allowing - * JSON text to be delivered in HTML. In JSON text, a string cannot contain a - * control character or an unescaped quote or backslash. - * - * @param string A String - * @return A String correctly formatted for insertion in a JSON text. - */ - public static String quote(String string) { - StringWriter sw = new StringWriter(); - synchronized (sw.getBuffer()) { - try { - return quote(string, sw).toString(); - } catch (IOException ignored) { - // will never happen - we are writing to a string writer - return ""; - } - } - } - - public static Writer quote(String string, Writer w) throws IOException { - if (string == null || string.isEmpty()) { - w.write("\"\""); - return w; - } - - char b; - char c = 0; - String hhhh; - int i; - int len = string.length(); - - w.write('"'); - for (i = 0; i < len; i += 1) { - b = c; - c = string.charAt(i); - switch (c) { - case '\\': - case '"': - w.write('\\'); - w.write(c); - break; - case '/': - if (b == '<') { - w.write('\\'); - } - w.write(c); - break; - case '\b': - w.write("\\b"); - break; - case '\t': - w.write("\\t"); - break; - case '\n': - w.write("\\n"); - break; - case '\f': - w.write("\\f"); - break; - case '\r': - w.write("\\r"); - break; - default: - if (c < ' ' || (c >= '\u0080' && c < '\u00a0') || (c >= '\u2000' && c < '\u2100')) { - w.write("\\u"); - hhhh = Integer.toHexString(c); - w.write("0000", 0, 4 - hhhh.length()); - w.write(hhhh); - } else { - w.write(c); - } - } - } - w.write('"'); - return w; - } - - /** - * Remove a name and its value, if present. - * - * @param key The name to be removed. - * @return The value that was associated with the name, or null if there was no - * value. - */ - public Object remove(String key) { - return this.map.remove(key); - } - - /** - * Determine if two JSONObjects are similar. They must contain the same set of - * names which must be associated with similar values. - * - * @param other The other JSONObject - * @return true if they are equal - */ - public boolean similar(Object other) { - try { - if (!(other instanceof JSONObject)) { - return false; - } - if (!this.keySet().equals(((JSONObject) other).keySet())) { - return false; - } - for (final Entry entry : this.entrySet()) { - String name = entry.getKey(); - Object valueThis = entry.getValue(); - Object valueOther = ((JSONObject) other).get(name); - if (valueThis == valueOther) { - continue; - } - if (valueThis == null) { - return false; - } - if (valueThis instanceof JSONObject) { - if (!((JSONObject) valueThis).similar(valueOther)) { - return false; - } - } else if (valueThis instanceof JSONArray) { - if (!((JSONArray) valueThis).similar(valueOther)) { - return false; - } - } else if (valueThis instanceof Number && valueOther instanceof Number) { - if (!isNumberSimilar((Number) valueThis, (Number) valueOther)) { - return false; - } - ; - } else if (!valueThis.equals(valueOther)) { - return false; - } - } - return true; - } catch (Throwable exception) { - return false; - } - } - - /** - * Compares two numbers to see if they are similar. - * - * If either of the numbers are Double or Float instances, then they are checked - * to have a finite value. If either value is not finite (NaN or - * ±infinity), then this function will always return false. If both numbers - * are finite, they are first checked to be the same type and implement - * {@link Comparable}. If they do, then the actual - * {@link Comparable#compareTo(Object)} is called. If they are not the same - * type, or don't implement Comparable, then they are converted to - * {@link BigDecimal}s. Finally the BigDecimal values are compared using - * {@link BigDecimal#compareTo(BigDecimal)}. - * - * @param l the Left value to compare. Can not be null. - * @param r the right value to compare. Can not be null. - * @return true if the numbers are similar, false otherwise. - */ - static boolean isNumberSimilar(Number l, Number r) { - if (!numberIsFinite(l) || !numberIsFinite(r)) { - // non-finite numbers are never similar - return false; - } - - // if the classes are the same and implement Comparable - // then use the built in compare first. - if (l.getClass().equals(r.getClass()) && l instanceof Comparable) { - @SuppressWarnings({ "rawtypes", "unchecked" }) - int compareTo = ((Comparable) l).compareTo(r); - return compareTo == 0; - } - - // BigDecimal should be able to handle all of our number types that we support - // through - // documentation. Convert to BigDecimal first, then use the Compare method to - // decide equality. - final BigDecimal lBigDecimal = objectToBigDecimal(l, null, false); - final BigDecimal rBigDecimal = objectToBigDecimal(r, null, false); - if (lBigDecimal == null || rBigDecimal == null) { - return false; - } - return lBigDecimal.compareTo(rBigDecimal) == 0; - } - - private static boolean numberIsFinite(Number n) { - if (n instanceof Double && (((Double) n).isInfinite() || ((Double) n).isNaN())) { - return false; - } else if (n instanceof Float && (((Float) n).isInfinite() || ((Float) n).isNaN())) { - return false; - } - return true; - } - - /** - * Tests if the value should be tried as a decimal. It makes no test if there - * are actual digits. - * - * @param val value to test - * @return true if the string is "-0" or if it contains '.', 'e', or 'E', false - * otherwise. - */ - protected static boolean isDecimalNotation(final String val) { - return val.indexOf('.') > -1 || val.indexOf('e') > -1 || val.indexOf('E') > -1 || "-0".equals(val); - } - - /** - * Converts a string to a number using the narrowest possible type. Possible - * returns for this function are BigDecimal, Double, BigInteger, Long, and - * Integer. When a Double is returned, it should always be a valid Double and - * not NaN or +-infinity. - * - * @param val value to convert - * @return Number representation of the value. - * @throws NumberFormatException thrown if the value is not a valid number. A - * public caller should catch this and wrap it in - * a {@link JSONException} if applicable. - */ - protected static Number stringToNumber(final String val) throws NumberFormatException { - char initial = val.charAt(0); - if ((initial >= '0' && initial <= '9') || initial == '-') { - // decimal representation - if (isDecimalNotation(val)) { - // Use a BigDecimal all the time so we keep the original - // representation. BigDecimal doesn't support -0.0, ensure we - // keep that by forcing a decimal. - try { - BigDecimal bd = new BigDecimal(val); - if (initial == '-' && BigDecimal.ZERO.compareTo(bd) == 0) { - return Double.valueOf(-0.0); - } - return bd; - } catch (NumberFormatException retryAsDouble) { - // this is to support "Hex Floats" like this: 0x1.0P-1074 - try { - Double d = Double.valueOf(val); - if (d.isNaN() || d.isInfinite()) { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - return d; - } catch (NumberFormatException ignore) { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - } - } - // block items like 00 01 etc. Java number parsers treat these as Octal. - if (initial == '0' && val.length() > 1) { - char at1 = val.charAt(1); - if (at1 >= '0' && at1 <= '9') { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - } else if (initial == '-' && val.length() > 2) { - char at1 = val.charAt(1); - char at2 = val.charAt(2); - if (at1 == '0' && at2 >= '0' && at2 <= '9') { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - } - // integer representation. - // This will narrow any values to the smallest reasonable Object representation - // (Integer, Long, or BigInteger) - - // BigInteger down conversion: We use a similar bitLength compare as - // BigInteger#intValueExact uses. Increases GC, but objects hold - // only what they need. i.e. Less runtime overhead if the value is - // long lived. - BigInteger bi = new BigInteger(val); - if (bi.bitLength() <= 31) { - return Integer.valueOf(bi.intValue()); - } - if (bi.bitLength() <= 63) { - return Long.valueOf(bi.longValue()); - } - return bi; - } - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - - /** - * Try to convert a string into a number, boolean, or null. If the string can't - * be converted, return the string. - * - * @param string A String. can not be null. - * @return A simple JSON value. - * @throws NullPointerException Thrown if the string is null. - */ - // Changes to this method must be copied to the corresponding method in - // the XML class to keep full support for Android - public static Object stringToValue(String string) { - if ("".equals(string)) { - return string; - } - - // check JSON key words true/false/null - if ("true".equalsIgnoreCase(string)) { - return Boolean.TRUE; - } - if ("false".equalsIgnoreCase(string)) { - return Boolean.FALSE; - } - if ("null".equalsIgnoreCase(string)) { - return JSONObject.NULL; - } - - /* - * If it might be a number, try converting it. If a number cannot be produced, - * then the value will just be a string. - */ - - char initial = string.charAt(0); - if ((initial >= '0' && initial <= '9') || initial == '-') { - try { - return stringToNumber(string); - } catch (Exception ignore) { - } - } - return string; - } - - /** - * Throw an exception if the object is a NaN or infinite number. - * - * @param o The object to test. - * @throws JSONException If o is a non-finite number. - */ - public static void testValidity(Object o) throws JSONException { - if (o instanceof Number && !numberIsFinite((Number) o)) { - throw new JSONException("JSON does not allow non-finite numbers."); - } - } - - /** - * Produce a JSONArray containing the values of the members of this JSONObject. - * - * @param names A JSONArray containing a list of key strings. This determines - * the sequence of the values in the result. - * @return A JSONArray of values. - * @throws JSONException If any of the values are non-finite numbers. - */ - public JSONArray toJSONArray(JSONArray names) throws JSONException { - if (names == null || names.isEmpty()) { - return null; - } - JSONArray ja = new JSONArray(); - for (int i = 0; i < names.length(); i += 1) { - ja.put(this.opt(names.getString(i))); - } - return ja; - } - - /** - * Make a JSON text of this JSONObject. For compactness, no whitespace is added. - * If this would not result in a syntactically correct JSON text, then null will - * be returned instead. - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @return a printable, displayable, portable, transmittable representation of - * the object, beginning with { (left - * brace) and ending with } (right - * brace). - */ - @Override - public String toString() { - try { - return this.toString(0); - } catch (Exception e) { - return null; - } - } - - /** - * Make a pretty-printed JSON text of this JSONObject. - * - *

- * If - * - * 

-	 * {@code indentFactor > 0}
-	 *
- * - * and the {@link JSONObject} has only one key, then the object will be output - * on a single line: - * - * 
-	 * {@code {"key": 1}}
-	 *
- * - *

- * If an object has 2 or more keys, then it will be output across multiple - * lines: - * - * 

-	 * {@code {
-	 *  "key1": 1,
-	 *  "key2": "value 2",
-	 *  "key3": 3
-	 * }}
-	 *
- *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param indentFactor The number of spaces to add to each level of indentation. - * @return a printable, displayable, portable, transmittable representation of - * the object, beginning with { (left - * brace) and ending with } (right - * brace). - * @throws JSONException If the object contains an invalid number. - */ - public String toString(int indentFactor) throws JSONException { - StringWriter w = new StringWriter(); - synchronized (w.getBuffer()) { - return this.write(w, indentFactor, 0).toString(); - } - } - - /** - * Make a JSON text of an Object value. If the object has an - * value.toJSONString() method, then that method will be used to produce the - * JSON text. The method is required to produce a strictly conforming text. If - * the object does not contain a toJSONString method (which is the most common - * case), then a text will be produced by other means. If the value is an array - * or Collection, then a JSONArray will be made from it and its toJSONString - * method will be called. If the value is a MAP, then a JSONObject will be made - * from it and its toJSONString method will be called. Otherwise, the value's - * toString method will be called, and the result will be quoted. - * - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param value The value to be serialized. - * @return a printable, displayable, transmittable representation of the object, - * beginning with { (left brace) and - * ending with } (right brace). - * @throws JSONException If the value is or contains an invalid number. - */ - public static String valueToString(Object value) throws JSONException { - // moves the implementation to JSONWriter as: - // 1. It makes more sense to be part of the writer class - // 2. For Android support this method is not available. By implementing it in - // the Writer - // Android users can use the writer with the built in Android JSONObject - // implementation. - return JSONWriter.valueToString(value); - } - - /** - * Wrap an object, if necessary. If the object is null, return the - * NULL object. If it is an array or collection, wrap it in a JSONArray. If it - * is a map, wrap it in a JSONObject. If it is a standard property (Double, - * String, et al) then it is already wrapped. Otherwise, if it comes from one of - * the java packages, turn it into a string. And if it doesn't, try to wrap it - * in a JSONObject. If the wrapping fails, then null is returned. - * - * @param object The object to wrap - * @return The wrapped value - */ - public static Object wrap(Object object) { - return wrap(object, null); - } - - private static Object wrap(Object object, Set objectsRecord) { - try { - if (NULL.equals(object)) { - return NULL; - } - if (object instanceof JSONObject || object instanceof JSONArray || NULL.equals(object) - || object instanceof JSONString || object instanceof Byte || object instanceof Character - || object instanceof Short || object instanceof Integer || object instanceof Long - || object instanceof Boolean || object instanceof Float || object instanceof Double - || object instanceof String || object instanceof BigInteger || object instanceof BigDecimal - || object instanceof Enum) { - return object; - } - - if (object instanceof Collection) { - Collection coll = (Collection) object; - return new JSONArray(coll); - } - if (object.getClass().isArray()) { - return new JSONArray(object); - } - if (object instanceof Map) { - Map map = (Map) object; - return new JSONObject(map); - } - Package objectPackage = object.getClass().getPackage(); - String objectPackageName = objectPackage != null ? objectPackage.getName() : ""; - if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") - || object.getClass().getClassLoader() == null) { - return object.toString(); - } - if (objectsRecord != null) { - return new JSONObject(object, objectsRecord); - } else { - return new JSONObject(object); - } - } catch (JSONException exception) { - throw exception; - } catch (Exception exception) { - return null; - } - } - - /** - * Write the contents of the JSONObject as JSON text to a writer. For - * compactness, no whitespace is added. - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param writer the writer object - * @return The writer. - * @throws JSONException if a called function has an error - */ - public Writer write(Writer writer) throws JSONException { - return this.write(writer, 0, 0); - } - - static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent) - throws JSONException, IOException { - if (value == null || value.equals(null)) { - writer.write("null"); - } else if (value instanceof JSONString) { - Object o; - try { - o = ((JSONString) value).toJSONString(); - } catch (Exception e) { - throw new JSONException(e); - } - writer.write(o != null ? o.toString() : quote(value.toString())); - } else if (value instanceof Number) { - // not all Numbers may match actual JSON Numbers. i.e. fractions or Imaginary - final String numberAsString = numberToString((Number) value); - if (NUMBER_PATTERN.matcher(numberAsString).matches()) { - writer.write(numberAsString); - } else { - // The Number value is not a valid JSON number. - // Instead we will quote it as a string - quote(numberAsString, writer); - } - } else if (value instanceof Boolean) { - writer.write(value.toString()); - } else if (value instanceof Enum) { - writer.write(quote(((Enum) value).name())); - } else if (value instanceof JSONObject) { - ((JSONObject) value).write(writer, indentFactor, indent); - } else if (value instanceof JSONArray) { - ((JSONArray) value).write(writer, indentFactor, indent); - } else if (value instanceof Map) { - Map map = (Map) value; - new JSONObject(map).write(writer, indentFactor, indent); - } else if (value instanceof Collection) { - Collection coll = (Collection) value; - new JSONArray(coll).write(writer, indentFactor, indent); - } else if (value.getClass().isArray()) { - new JSONArray(value).write(writer, indentFactor, indent); - } else { - quote(value.toString(), writer); - } - return writer; - } - - static final void indent(Writer writer, int indent) throws IOException { - for (int i = 0; i < indent; i += 1) { - writer.write(' '); - } - } - - /** - * Write the contents of the JSONObject as JSON text to a writer. - * - *

- * If - * - * 

-	 * {@code indentFactor > 0}
-	 *
- * - * and the {@link JSONObject} has only one key, then the object will be output - * on a single line: - * - * 
-	 * {@code {"key": 1}}
-	 *
- * - *

- * If an object has 2 or more keys, then it will be output across multiple - * lines: - * - * 

-	 * {@code {
-	 *  "key1": 1,
-	 *  "key2": "value 2",
-	 *  "key3": 3
-	 * }}
-	 *
- *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param writer Writes the serialized JSON - * @param indentFactor The number of spaces to add to each level of indentation. - * @param indent The indentation of the top level. - * @return The writer. - * @throws JSONException if a called function has an error or a write error - * occurs - */ - public Writer write(Writer writer, int indentFactor, int indent) throws JSONException { - try { - boolean needsComma = false; - final int length = this.length(); - writer.write('{'); - - if (length == 1) { - final Entry entry = this.entrySet().iterator().next(); - final String key = entry.getKey(); - writer.write(quote(key)); - writer.write(':'); - if (indentFactor > 0) { - writer.write(' '); - } - try { - writeValue(writer, entry.getValue(), indentFactor, indent); - } catch (Exception e) { - throw new JSONException("Unable to write JSONObject value for key: " + key, e); - } - } else if (length != 0) { - final int newIndent = indent + indentFactor; - for (final Entry entry : this.entrySet()) { - if (needsComma) { - writer.write(','); - } - if (indentFactor > 0) { - writer.write('\n'); - } - indent(writer, newIndent); - final String key = entry.getKey(); - writer.write(quote(key)); - writer.write(':'); - if (indentFactor > 0) { - writer.write(' '); - } - try { - writeValue(writer, entry.getValue(), indentFactor, newIndent); - } catch (Exception e) { - throw new JSONException("Unable to write JSONObject value for key: " + key, e); - } - needsComma = true; - } - if (indentFactor > 0) { - writer.write('\n'); - } - indent(writer, indent); - } - writer.write('}'); - return writer; - } catch (IOException exception) { - throw new JSONException(exception); - } - } - - /** - * Returns a java.util.Map containing all of the entries in this object. If an - * entry in the object is a JSONArray or JSONObject it will also be converted. - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @return a java.util.Map containing the entries of this object - */ - public Map toMap() { - Map results = new HashMap(); - for (Entry entry : this.entrySet()) { - Object value; - if (entry.getValue() == null || NULL.equals(entry.getValue())) { - value = null; - } else if (entry.getValue() instanceof JSONObject) { - value = ((JSONObject) entry.getValue()).toMap(); - } else if (entry.getValue() instanceof JSONArray) { - value = ((JSONArray) entry.getValue()).toList(); - } else { - value = entry.getValue(); - } - results.put(entry.getKey(), value); - } - return results; - } - - /** - * Create a new JSONException in a common format for incorrect conversions. - * - * @param key name of the key - * @param valueType the type of value being coerced to - * @param cause optional cause of the coercion failure - * @return JSONException that can be thrown. - */ - private static JSONException wrongValueFormatException(String key, String valueType, Throwable cause) { - return new JSONException("JSONObject[" + quote(key) + "] is not a " + valueType + ".", cause); - } - - /** - * Create a new JSONException in a common format for incorrect conversions. - * - * @param key name of the key - * @param valueType the type of value being coerced to - * @param cause optional cause of the coercion failure - * @return JSONException that can be thrown. - */ - private static JSONException wrongValueFormatException(String key, String valueType, Object value, - Throwable cause) { - return new JSONException("JSONObject[" + quote(key) + "] is not a " + valueType + " (" + value + ").", cause); - } - - /** - * Create a new JSONException in a common format for recursive object - * definition. - * - * @param key name of the key - * @return JSONException that can be thrown. - */ - private static JSONException recursivelyDefinedObjectException(String key) { - return new JSONException("JavaBean object contains recursively defined member variable of key " + quote(key)); - } -} diff --git a/src/main/java/org/json/JSONPointer.java b/src/main/java/org/json/JSONPointer.java deleted file mode 100644 index c77db02..0000000 --- a/src/main/java/org/json/JSONPointer.java +++ /dev/null @@ -1,309 +0,0 @@ -package org.json; - -import static java.lang.String.format; - -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * A JSON Pointer is a simple query language defined for JSON documents by - * RFC 6901. - * - * In a nutshell, JSONPointer allows the user to navigate into a JSON document - * using strings, and retrieve targeted objects, like a simple form of XPATH. - * Path segments are separated by the '/' char, which signifies the root of the - * document when it appears as the first char of the string. Array elements are - * navigated using ordinals, counting from 0. JSONPointer strings may be - * extended to any arbitrary number of segments. If the navigation is - * successful, the matched item is returned. A matched item may be a JSONObject, - * a JSONArray, or a JSON value. If the JSONPointer string building fails, an - * appropriate exception is thrown. If the navigation fails to find a match, a - * JSONPointerException is thrown. - * - * @author JSON.org - * @version 2016-05-14 - */ -public class JSONPointer { - - // used for URL encoding and decoding - private static final String ENCODING = "utf-8"; - - /** - * This class allows the user to build a JSONPointer in steps, using exactly one - * segment in each step. - */ - public static class Builder { - - // Segments for the eventual JSONPointer string - private final List refTokens = new ArrayList(); - - /** - * Creates a {@code JSONPointer} instance using the tokens previously set using - * the {@link #append(String)} method calls. - * - * @return a JSONPointer object - */ - public JSONPointer build() { - return new JSONPointer(this.refTokens); - } - - /** - * Adds an arbitrary token to the list of reference tokens. It can be any - * non-null value. - * - * Unlike in the case of JSON string or URI fragment representation of JSON - * pointers, the argument of this method MUST NOT be escaped. If you want to - * query the property called {@code "a~b"} then you should simply pass the - * {@code "a~b"} string as-is, there is no need to escape it as {@code "a~0b"}. - * - * @param token the new token to be appended to the list - * @return {@code this} - * @throws NullPointerException if {@code token} is null - */ - public Builder append(String token) { - if (token == null) { - throw new NullPointerException("token cannot be null"); - } - this.refTokens.add(token); - return this; - } - - /** - * Adds an integer to the reference token list. Although not necessarily, mostly - * this token will denote an array index. - * - * @param arrayIndex the array index to be added to the token list - * @return {@code this} - */ - public Builder append(int arrayIndex) { - this.refTokens.add(String.valueOf(arrayIndex)); - return this; - } - } - - /** - * Static factory method for {@link Builder}. Example usage: - * - * 

-	 * 
-	 * JSONPointer pointer = JSONPointer.builder()
-	 *       .append("obj")
-	 *       .append("other~key").append("another/key")
-	 *       .append("\"")
-	 *       .append(0)
-	 *       .build();
-	 * 
-	 *
- * - * @return a builder instance which can be used to construct a - * {@code JSONPointer} instance by chained - * {@link Builder#append(String)} calls. - */ - public static Builder builder() { - return new Builder(); - } - - // Segments for the JSONPointer string - private final List refTokens; - - /** - * Pre-parses and initializes a new {@code JSONPointer} instance. If you want to - * evaluate the same JSON Pointer on different JSON documents then it is - * recommended to keep the {@code JSONPointer} instances due to performance - * considerations. - * - * @param pointer the JSON String or URI Fragment representation of the JSON - * pointer. - * @throws IllegalArgumentException if {@code pointer} is not a valid JSON - * pointer - */ - public JSONPointer(final String pointer) { - if (pointer == null) { - throw new NullPointerException("pointer cannot be null"); - } - if (pointer.isEmpty() || pointer.equals("#")) { - this.refTokens = Collections.emptyList(); - return; - } - String refs; - if (pointer.startsWith("#/")) { - refs = pointer.substring(2); - try { - refs = URLDecoder.decode(refs, ENCODING); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } else if (pointer.startsWith("/")) { - refs = pointer.substring(1); - } else { - throw new IllegalArgumentException("a JSON pointer should start with '/' or '#/'"); - } - this.refTokens = new ArrayList(); - int slashIdx = -1; - int prevSlashIdx = 0; - do { - prevSlashIdx = slashIdx + 1; - slashIdx = refs.indexOf('/', prevSlashIdx); - if (prevSlashIdx == slashIdx || prevSlashIdx == refs.length()) { - // found 2 slashes in a row ( obj//next ) - // or single slash at the end of a string ( obj/test/ ) - this.refTokens.add(""); - } else if (slashIdx >= 0) { - final String token = refs.substring(prevSlashIdx, slashIdx); - this.refTokens.add(unescape(token)); - } else { - // last item after separator, or no separator at all. - final String token = refs.substring(prevSlashIdx); - this.refTokens.add(unescape(token)); - } - } while (slashIdx >= 0); - // using split does not take into account consecutive separators or "ending - // nulls" - // for (String token : refs.split("/")) { - // this.refTokens.add(unescape(token)); - // } - } - - public JSONPointer(List refTokens) { - this.refTokens = new ArrayList(refTokens); - } - - /** - * @see rfc6901 section - * 3 - */ - private static String unescape(String token) { - return token.replace("~1", "/").replace("~0", "~"); - } - - /** - * Evaluates this JSON Pointer on the given {@code document}. The - * {@code document} is usually a {@link JSONObject} or a {@link JSONArray} - * instance, but the empty JSON Pointer ({@code ""}) can be evaluated on any - * JSON values and in such case the returned value will be {@code document} - * itself. - * - * @param document the JSON document which should be the subject of querying. - * @return the result of the evaluation - * @throws JSONPointerException if an error occurs during evaluation - */ - public Object queryFrom(Object document) throws JSONPointerException { - if (this.refTokens.isEmpty()) { - return document; - } - Object current = document; - for (String token : this.refTokens) { - if (current instanceof JSONObject) { - current = ((JSONObject) current).opt(unescape(token)); - } else if (current instanceof JSONArray) { - current = readByIndexToken(current, token); - } else { - throw new JSONPointerException( - format("value [%s] is not an array or object therefore its key %s cannot be resolved", current, - token)); - } - } - return current; - } - - /** - * Matches a JSONArray element by ordinal position - * - * @param current the JSONArray to be evaluated - * @param indexToken the array index in string form - * @return the matched object. If no matching item is found a - * @throws JSONPointerException is thrown if the index is out of bounds - */ - private static Object readByIndexToken(Object current, String indexToken) throws JSONPointerException { - try { - int index = Integer.parseInt(indexToken); - JSONArray currentArr = (JSONArray) current; - if (index >= currentArr.length()) { - throw new JSONPointerException(format("index %s is out of bounds - the array has %d elements", - indexToken, Integer.valueOf(currentArr.length()))); - } - try { - return currentArr.get(index); - } catch (JSONException e) { - throw new JSONPointerException("Error reading value at index position " + index, e); - } - } catch (NumberFormatException e) { - throw new JSONPointerException(format("%s is not an array index", indexToken), e); - } - } - - /** - * Returns a string representing the JSONPointer path value using string - * representation - */ - @Override - public String toString() { - StringBuilder rval = new StringBuilder(""); - for (String token : this.refTokens) { - rval.append('/').append(escape(token)); - } - return rval.toString(); - } - - /** - * Escapes path segment values to an unambiguous form. The escape char to be - * inserted is '~'. The chars to be escaped are ~, which maps to ~0, and /, - * which maps to ~1. - * - * @param token the JSONPointer segment value to be escaped - * @return the escaped value for the token - * - * @see rfc6901 section - * 3 - */ - private static String escape(String token) { - return token.replace("~", "~0").replace("/", "~1"); - } - - /** - * Returns a string representing the JSONPointer path value using URI fragment - * identifier representation - * - * @return a uri fragment string - */ - public String toURIFragment() { - try { - StringBuilder rval = new StringBuilder("#"); - for (String token : this.refTokens) { - rval.append('/').append(URLEncoder.encode(token, ENCODING)); - } - return rval.toString(); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } - -} diff --git a/src/main/java/org/json/JSONPointerException.java b/src/main/java/org/json/JSONPointerException.java deleted file mode 100644 index 0fa3c1e..0000000 --- a/src/main/java/org/json/JSONPointerException.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * The JSONPointerException is thrown by {@link JSONPointer} if an error occurs - * during evaluating a pointer. - * - * @author JSON.org - * @version 2016-05-13 - */ -public class JSONPointerException extends JSONException { - private static final long serialVersionUID = 8872944667561856751L; - - public JSONPointerException(String message) { - super(message); - } - - public JSONPointerException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/src/main/java/org/json/JSONPropertyIgnore.java b/src/main/java/org/json/JSONPropertyIgnore.java deleted file mode 100644 index 6471f2c..0000000 --- a/src/main/java/org/json/JSONPropertyIgnore.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.json; - -/* -Copyright (c) 2018 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Documented -@Retention(RUNTIME) -@Target({ METHOD }) -/** - * Use this annotation on a getter method to override the Bean name parser for - * Bean -> JSONObject mapping. If this annotation is present at any level in - * the class hierarchy, then the method will not be serialized from the bean - * into the JSONObject. - */ -public @interface JSONPropertyIgnore { -} diff --git a/src/main/java/org/json/JSONPropertyName.java b/src/main/java/org/json/JSONPropertyName.java deleted file mode 100644 index bec32cf..0000000 --- a/src/main/java/org/json/JSONPropertyName.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.json; - -/* -Copyright (c) 2018 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Documented -@Retention(RUNTIME) -@Target({ METHOD }) -/** - * Use this annotation on a getter method to override the Bean name parser for - * Bean -> JSONObject mapping. A value set to empty string "" - * will have the Bean parser fall back to the default field name processing. - */ -public @interface JSONPropertyName { - /** - * @return The name of the property as to be used in the JSON Object. - */ - String value(); -} diff --git a/src/main/java/org/json/JSONString.java b/src/main/java/org/json/JSONString.java deleted file mode 100644 index d6ef895..0000000 --- a/src/main/java/org/json/JSONString.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - */ - -/** - * The JSONString interface allows a toJSONString() - * method so that a class can change the behavior of - * JSONObject.toString(), JSONArray.toString(), and - * JSONWriter.value(Object). The - * toJSONString method will be used instead of the default behavior - * of using the Object's toString() method and quoting the result. - */ -public interface JSONString { - /** - * The toJSONString method allows a class to produce its own JSON - * serialization. - * - * @return A strictly syntactically correct JSON text. - */ - public String toJSONString(); -} diff --git a/src/main/java/org/json/JSONStringer.java b/src/main/java/org/json/JSONStringer.java deleted file mode 100644 index 0613f39..0000000 --- a/src/main/java/org/json/JSONStringer.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.json; - -/* -Copyright (c) 2006 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.io.StringWriter; - -/** - * JSONStringer provides a quick and convenient way of producing JSON text. The - * texts produced strictly conform to JSON syntax rules. No whitespace is added, - * so the results are ready for transmission or storage. Each instance of - * JSONStringer can produce one JSON text. - *

- * A JSONStringer instance provides a value method for appending - * values to the text, and a key method for adding keys before - * values in objects. There are array and endArray - * methods that make and bound array values, and object and - * endObject methods which make and bound object values. All of - * these methods return the JSONWriter instance, permitting cascade style. For - * example, - * - * 

- * myString = new JSONStringer().object().key("JSON").value("Hello, World!").endObject().toString();
- *
- * - * which produces the string - * - * 
- * {"JSON":"Hello, World!"}
- *
- *

- * The first method called must be array or object. - * There are no methods for adding commas or colons. JSONStringer adds them for - * you. Objects and arrays can be nested up to 200 levels deep. - *

- * This can sometimes be easier than using a JSONObject to build a string. - * - * @author JSON.org - * @version 2015-12-09 - */ -public class JSONStringer extends JSONWriter { - /** - * Make a fresh JSONStringer. It can be used to build one JSON text. - */ - public JSONStringer() { - super(new StringWriter()); - } - - /** - * Return the JSON text. This method is used to obtain the product of the - * JSONStringer instance. It will return null if there was a - * problem in the construction of the JSON text (such as the calls to - * array were not properly balanced with calls to - * endArray). - * - * @return The JSON text. - */ - @Override - public String toString() { - return this.mode == 'd' ? this.writer.toString() : null; - } -} diff --git a/src/main/java/org/json/JSONTokener.java b/src/main/java/org/json/JSONTokener.java deleted file mode 100644 index 6d97e2e..0000000 --- a/src/main/java/org/json/JSONTokener.java +++ /dev/null @@ -1,543 +0,0 @@ -package org.json; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - */ - -/** - * A JSONTokener takes a source string and extracts characters and tokens from - * it. It is used by the JSONObject and JSONArray constructors to parse JSON - * source strings. - * - * @author JSON.org - * @version 2014-05-03 - */ -public class JSONTokener { - /** current read character position on the current line. */ - private long character; - /** flag to indicate if the end of the input has been found. */ - private boolean eof; - /** current read index of the input. */ - private long index; - /** current line of the input. */ - private long line; - /** previous character read from the input. */ - private char previous; - /** Reader for the input. */ - private final Reader reader; - /** flag to indicate that a previous character was requested. */ - private boolean usePrevious; - /** the number of characters read in the previous line. */ - private long characterPreviousLine; - - /** - * Construct a JSONTokener from a Reader. The caller must close the Reader. - * - * @param reader A reader. - */ - public JSONTokener(Reader reader) { - this.reader = reader.markSupported() ? reader : new BufferedReader(reader); - this.eof = false; - this.usePrevious = false; - this.previous = 0; - this.index = 0; - this.character = 1; - this.characterPreviousLine = 0; - this.line = 1; - } - - /** - * Construct a JSONTokener from an InputStream. The caller must close the input - * stream. - * - * @param inputStream The source. - */ - public JSONTokener(InputStream inputStream) { - this(new InputStreamReader(inputStream)); - } - - /** - * Construct a JSONTokener from a string. - * - * @param s A source string. - */ - public JSONTokener(String s) { - this(new StringReader(s)); - } - - /** - * Back up one character. This provides a sort of lookahead capability, so that - * you can test for a digit or letter before attempting to parse the next number - * or identifier. - * - * @throws JSONException Thrown if trying to step back more than 1 step or if - * already at the start of the string - */ - public void back() throws JSONException { - if (this.usePrevious || this.index <= 0) { - throw new JSONException("Stepping back two steps is not supported"); - } - this.decrementIndexes(); - this.usePrevious = true; - this.eof = false; - } - - /** - * Decrements the indexes for the {@link #back()} method based on the previous - * character read. - */ - private void decrementIndexes() { - this.index--; - if (this.previous == '\r' || this.previous == '\n') { - this.line--; - this.character = this.characterPreviousLine; - } else if (this.character > 0) { - this.character--; - } - } - - /** - * Get the hex value of a character (base16). - * - * @param c A character between '0' and '9' or between 'A' and 'F' or between - * 'a' and 'f'. - * @return An int between 0 and 15, or -1 if c was not a hex digit. - */ - public static int dehexchar(char c) { - if (c >= '0' && c <= '9') { - return c - '0'; - } - if (c >= 'A' && c <= 'F') { - return c - ('A' - 10); - } - if (c >= 'a' && c <= 'f') { - return c - ('a' - 10); - } - return -1; - } - - /** - * Checks if the end of the input has been reached. - * - * @return true if at the end of the file and we didn't step back - */ - public boolean end() { - return this.eof && !this.usePrevious; - } - - /** - * Determine if the source string still contains characters that next() can - * consume. - * - * @return true if not yet at the end of the source. - * @throws JSONException thrown if there is an error stepping forward or - * backward while checking for more data. - */ - public boolean more() throws JSONException { - if (this.usePrevious) { - return true; - } - try { - this.reader.mark(1); - } catch (IOException e) { - throw new JSONException("Unable to preserve stream position", e); - } - try { - // -1 is EOF, but next() can not consume the null character '\0' - if (this.reader.read() <= 0) { - this.eof = true; - return false; - } - this.reader.reset(); - } catch (IOException e) { - throw new JSONException("Unable to read the next character from the stream", e); - } - return true; - } - - /** - * Get the next character in the source string. - * - * @return The next character, or 0 if past the end of the source string. - * @throws JSONException Thrown if there is an error reading the source string. - */ - public char next() throws JSONException { - int c; - if (this.usePrevious) { - this.usePrevious = false; - c = this.previous; - } else { - try { - c = this.reader.read(); - } catch (IOException exception) { - throw new JSONException(exception); - } - } - if (c <= 0) { // End of stream - this.eof = true; - return 0; - } - this.incrementIndexes(c); - this.previous = (char) c; - return this.previous; - } - - /** - * Get the last character read from the input or '\0' if nothing has been read - * yet. - * - * @return the last character read from the input. - */ - protected char getPrevious() { - return this.previous; - } - - /** - * Increments the internal indexes according to the previous character read and - * the character passed as the current character. - * - * @param c the current character read. - */ - private void incrementIndexes(int c) { - if (c > 0) { - this.index++; - if (c == '\r') { - this.line++; - this.characterPreviousLine = this.character; - this.character = 0; - } else if (c == '\n') { - if (this.previous != '\r') { - this.line++; - this.characterPreviousLine = this.character; - } - this.character = 0; - } else { - this.character++; - } - } - } - - /** - * Consume the next character, and check that it matches a specified character. - * - * @param c The character to match. - * @return The character. - * @throws JSONException if the character does not match. - */ - public char next(char c) throws JSONException { - char n = this.next(); - if (n != c) { - if (n > 0) { - throw this.syntaxError("Expected '" + c + "' and instead saw '" + n + "'"); - } - throw this.syntaxError("Expected '" + c + "' and instead saw ''"); - } - return n; - } - - /** - * Get the next n characters. - * - * @param n The number of characters to take. - * @return A string of n characters. - * @throws JSONException Substring bounds error if there are not n characters - * remaining in the source string. - */ - public String next(int n) throws JSONException { - if (n == 0) { - return ""; - } - - char[] chars = new char[n]; - int pos = 0; - - while (pos < n) { - chars[pos] = this.next(); - if (this.end()) { - throw this.syntaxError("Substring bounds error"); - } - pos += 1; - } - return new String(chars); - } - - /** - * Get the next char in the string, skipping whitespace. - * - * @throws JSONException Thrown if there is an error reading the source string. - * @return A character, or 0 if there are no more characters. - */ - public char nextClean() throws JSONException { - for (;;) { - char c = this.next(); - if (c == 0 || c > ' ') { - return c; - } - } - } - - /** - * Return the characters up to the next close quote character. Backslash - * processing is done. The formal JSON format does not allow strings in single - * quotes, but an implementation is allowed to accept them. - * - * @param quote The quoting character, either " (double - * quote) or ' (single - * quote). - * @return A String. - * @throws JSONException Unterminated string. - */ - public String nextString(char quote) throws JSONException { - char c; - StringBuilder sb = new StringBuilder(); - for (;;) { - c = this.next(); - switch (c) { - case 0: - case '\n': - case '\r': - throw this.syntaxError("Unterminated string"); - case '\\': - c = this.next(); - switch (c) { - case 'b': - sb.append('\b'); - break; - case 't': - sb.append('\t'); - break; - case 'n': - sb.append('\n'); - break; - case 'f': - sb.append('\f'); - break; - case 'r': - sb.append('\r'); - break; - case 'u': - try { - sb.append((char) Integer.parseInt(this.next(4), 16)); - } catch (NumberFormatException e) { - throw this.syntaxError("Illegal escape.", e); - } - break; - case '"': - case '\'': - case '\\': - case '/': - sb.append(c); - break; - default: - throw this.syntaxError("Illegal escape."); - } - break; - default: - if (c == quote) { - return sb.toString(); - } - sb.append(c); - } - } - } - - /** - * Get the text up but not including the specified character or the end of line, - * whichever comes first. - * - * @param delimiter A delimiter character. - * @return A string. - * @throws JSONException Thrown if there is an error while searching for the - * delimiter - */ - public String nextTo(char delimiter) throws JSONException { - StringBuilder sb = new StringBuilder(); - for (;;) { - char c = this.next(); - if (c == delimiter || c == 0 || c == '\n' || c == '\r') { - if (c != 0) { - this.back(); - } - return sb.toString().trim(); - } - sb.append(c); - } - } - - /** - * Get the text up but not including one of the specified delimiter characters - * or the end of line, whichever comes first. - * - * @param delimiters A set of delimiter characters. - * @return A string, trimmed. - * @throws JSONException Thrown if there is an error while searching for the - * delimiter - */ - public String nextTo(String delimiters) throws JSONException { - char c; - StringBuilder sb = new StringBuilder(); - for (;;) { - c = this.next(); - if (delimiters.indexOf(c) >= 0 || c == 0 || c == '\n' || c == '\r') { - if (c != 0) { - this.back(); - } - return sb.toString().trim(); - } - sb.append(c); - } - } - - /** - * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, - * JSONObject, Long, or String, or the JSONObject.NULL object. - * - * @throws JSONException If syntax error. - * - * @return An object. - */ - public Object nextValue() throws JSONException { - char c = this.nextClean(); - String string; - - switch (c) { - case '"': - case '\'': - return this.nextString(c); - case '{': - this.back(); - try { - return new JSONObject(this); - } catch (StackOverflowError e) { - throw new JSONException("JSON Array or Object depth too large to process.", e); - } - case '[': - this.back(); - try { - return new JSONArray(this); - } catch (StackOverflowError e) { - throw new JSONException("JSON Array or Object depth too large to process.", e); - } - } - - /* - * Handle unquoted text. This could be the values true, false, or null, or it - * can be a number. An implementation (such as this one) is allowed to also - * accept non-standard forms. - * - * Accumulate characters until we reach the end of the text or a formatting - * character. - */ - - StringBuilder sb = new StringBuilder(); - while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) { - sb.append(c); - c = this.next(); - } - if (!this.eof) { - this.back(); - } - - string = sb.toString().trim(); - if ("".equals(string)) { - throw this.syntaxError("Missing value"); - } - return JSONObject.stringToValue(string); - } - - /** - * Skip characters until the next character is the requested character. If the - * requested character is not found, no characters are skipped. - * - * @param to A character to skip to. - * @return The requested character, or zero if the requested character is not - * found. - * @throws JSONException Thrown if there is an error while searching for the to - * character - */ - public char skipTo(char to) throws JSONException { - char c; - try { - long startIndex = this.index; - long startCharacter = this.character; - long startLine = this.line; - this.reader.mark(1000000); - do { - c = this.next(); - if (c == 0) { - // in some readers, reset() may throw an exception if - // the remaining portion of the input is greater than - // the mark size (1,000,000 above). - this.reader.reset(); - this.index = startIndex; - this.character = startCharacter; - this.line = startLine; - return 0; - } - } while (c != to); - this.reader.mark(1); - } catch (IOException exception) { - throw new JSONException(exception); - } - this.back(); - return c; - } - - /** - * Make a JSONException to signal a syntax error. - * - * @param message The error message. - * @return A JSONException object, suitable for throwing - */ - public JSONException syntaxError(String message) { - return new JSONException(message + this.toString()); - } - - /** - * Make a JSONException to signal a syntax error. - * - * @param message The error message. - * @param causedBy The throwable that caused the error. - * @return A JSONException object, suitable for throwing - */ - public JSONException syntaxError(String message, Throwable causedBy) { - return new JSONException(message + this.toString(), causedBy); - } - - /** - * Make a printable string of this JSONTokener. - * - * @return " at {index} [character {character} line {line}]" - */ - @Override - public String toString() { - return " at " + this.index + " [character " + this.character + " line " + this.line + "]"; - } -} diff --git a/src/main/java/org/json/JSONWriter.java b/src/main/java/org/json/JSONWriter.java deleted file mode 100644 index 5050876..0000000 --- a/src/main/java/org/json/JSONWriter.java +++ /dev/null @@ -1,413 +0,0 @@ -package org.json; - -import java.io.IOException; -import java.util.Collection; -import java.util.Map; - -/* -Copyright (c) 2006 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * JSONWriter provides a quick and convenient way of producing JSON text. The - * texts produced strictly conform to JSON syntax rules. No whitespace is added, - * so the results are ready for transmission or storage. Each instance of - * JSONWriter can produce one JSON text. - *

- * A JSONWriter instance provides a value method for appending - * values to the text, and a key method for adding keys before - * values in objects. There are array and endArray - * methods that make and bound array values, and object and - * endObject methods which make and bound object values. All of - * these methods return the JSONWriter instance, permitting a cascade style. For - * example, - * - * 

- * new JSONWriter(myWriter).object().key("JSON").value("Hello, World!").endObject();
- *
- * - * which writes - * - * 
- * {"JSON":"Hello, World!"}
- *
- *

- * The first method called must be array or object. - * There are no methods for adding commas or colons. JSONWriter adds them for - * you. Objects and arrays can be nested up to 200 levels deep. - *

- * This can sometimes be easier than using a JSONObject to build a string. - * - * @author JSON.org - * @version 2016-08-08 - */ -public class JSONWriter { - private static final int maxdepth = 200; - - /** - * The comma flag determines if a comma should be output before the next value. - */ - private boolean comma; - - /** - * The current mode. Values: 'a' (array), 'd' (done), 'i' (initial), 'k' (key), - * 'o' (object). - */ - protected char mode; - - /** - * The object/array stack. - */ - private final JSONObject stack[]; - - /** - * The stack top index. A value of 0 indicates that the stack is empty. - */ - private int top; - - /** - * The writer that will receive the output. - */ - protected Appendable writer; - - /** - * Make a fresh JSONWriter. It can be used to build one JSON text. - * - * @param w an appendable object - */ - public JSONWriter(Appendable w) { - this.comma = false; - this.mode = 'i'; - this.stack = new JSONObject[maxdepth]; - this.top = 0; - this.writer = w; - } - - /** - * Append a value. - * - * @param string A string value. - * @return this - * @throws JSONException If the value is out of sequence. - */ - private JSONWriter append(String string) throws JSONException { - if (string == null) { - throw new JSONException("Null pointer"); - } - if (this.mode == 'o' || this.mode == 'a') { - try { - if (this.comma && this.mode == 'a') { - this.writer.append(','); - } - this.writer.append(string); - } catch (IOException e) { - // Android as of API 25 does not support this exception constructor - // however we won't worry about it. If an exception is happening here - // it will just throw a "Method not found" exception instead. - throw new JSONException(e); - } - if (this.mode == 'o') { - this.mode = 'k'; - } - this.comma = true; - return this; - } - throw new JSONException("Value out of sequence."); - } - - /** - * Begin appending a new array. All values until the balancing - * endArray will be appended to this array. The - * endArray method must be called to mark the array's end. - * - * @return this - * @throws JSONException If the nesting is too deep, or if the object is started - * in the wrong place (for example as a key or after the - * end of the outermost array or object). - */ - public JSONWriter array() throws JSONException { - if (this.mode == 'i' || this.mode == 'o' || this.mode == 'a') { - this.push(null); - this.append("["); - this.comma = false; - return this; - } - throw new JSONException("Misplaced array."); - } - - /** - * End something. - * - * @param m Mode - * @param c Closing character - * @return this - * @throws JSONException If unbalanced. - */ - private JSONWriter end(char m, char c) throws JSONException { - if (this.mode != m) { - throw new JSONException(m == 'a' ? "Misplaced endArray." : "Misplaced endObject."); - } - this.pop(m); - try { - this.writer.append(c); - } catch (IOException e) { - // Android as of API 25 does not support this exception constructor - // however we won't worry about it. If an exception is happening here - // it will just throw a "Method not found" exception instead. - throw new JSONException(e); - } - this.comma = true; - return this; - } - - /** - * End an array. This method most be called to balance calls to - * array. - * - * @return this - * @throws JSONException If incorrectly nested. - */ - public JSONWriter endArray() throws JSONException { - return this.end('a', ']'); - } - - /** - * End an object. This method most be called to balance calls to - * object. - * - * @return this - * @throws JSONException If incorrectly nested. - */ - public JSONWriter endObject() throws JSONException { - return this.end('k', '}'); - } - - /** - * Append a key. The key will be associated with the next value. In an object, - * every value must be preceded by a key. - * - * @param string A key string. - * @return this - * @throws JSONException If the key is out of place. For example, keys do not - * belong in arrays or if the key is null. - */ - public JSONWriter key(String string) throws JSONException { - if (string == null) { - throw new JSONException("Null key."); - } - if (this.mode == 'k') { - try { - JSONObject topObject = this.stack[this.top - 1]; - // don't use the built in putOnce method to maintain Android support - if (topObject.has(string)) { - throw new JSONException("Duplicate key \"" + string + "\""); - } - topObject.put(string, true); - if (this.comma) { - this.writer.append(','); - } - this.writer.append(JSONObject.quote(string)); - this.writer.append(':'); - this.comma = false; - this.mode = 'o'; - return this; - } catch (IOException e) { - // Android as of API 25 does not support this exception constructor - // however we won't worry about it. If an exception is happening here - // it will just throw a "Method not found" exception instead. - throw new JSONException(e); - } - } - throw new JSONException("Misplaced key."); - } - - /** - * Begin appending a new object. All keys and values until the balancing - * endObject will be appended to this object. The - * endObject method must be called to mark the object's end. - * - * @return this - * @throws JSONException If the nesting is too deep, or if the object is started - * in the wrong place (for example as a key or after the - * end of the outermost array or object). - */ - public JSONWriter object() throws JSONException { - if (this.mode == 'i') { - this.mode = 'o'; - } - if (this.mode == 'o' || this.mode == 'a') { - this.append("{"); - this.push(new JSONObject()); - this.comma = false; - return this; - } - throw new JSONException("Misplaced object."); - - } - - /** - * Pop an array or object scope. - * - * @param c The scope to close. - * @throws JSONException If nesting is wrong. - */ - private void pop(char c) throws JSONException { - if (this.top <= 0) { - throw new JSONException("Nesting error."); - } - char m = this.stack[this.top - 1] == null ? 'a' : 'k'; - if (m != c) { - throw new JSONException("Nesting error."); - } - this.top -= 1; - this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k'; - } - - /** - * Push an array or object scope. - * - * @param jo The scope to open. - * @throws JSONException If nesting is too deep. - */ - private void push(JSONObject jo) throws JSONException { - if (this.top >= maxdepth) { - throw new JSONException("Nesting too deep."); - } - this.stack[this.top] = jo; - this.mode = jo == null ? 'a' : 'k'; - this.top += 1; - } - - /** - * Make a JSON text of an Object value. If the object has an - * value.toJSONString() method, then that method will be used to produce the - * JSON text. The method is required to produce a strictly conforming text. If - * the object does not contain a toJSONString method (which is the most common - * case), then a text will be produced by other means. If the value is an array - * or Collection, then a JSONArray will be made from it and its toJSONString - * method will be called. If the value is a MAP, then a JSONObject will be made - * from it and its toJSONString method will be called. Otherwise, the value's - * toString method will be called, and the result will be quoted. - * - *

- * Warning: This method assumes that the data structure is acyclical. - * - * @param value The value to be serialized. - * @return a printable, displayable, transmittable representation of the object, - * beginning with { (left brace) and - * ending with } (right brace). - * @throws JSONException If the value is or contains an invalid number. - */ - public static String valueToString(Object value) throws JSONException { - if (value == null || value.equals(null)) { - return "null"; - } - if (value instanceof JSONString) { - String object; - try { - object = ((JSONString) value).toJSONString(); - } catch (Exception e) { - throw new JSONException(e); - } - if (object != null) { - return object; - } - throw new JSONException("Bad value from toJSONString: " + object); - } - if (value instanceof Number) { - // not all Numbers may match actual JSON Numbers. i.e. Fractions or Complex - final String numberAsString = JSONObject.numberToString((Number) value); - if (JSONObject.NUMBER_PATTERN.matcher(numberAsString).matches()) { - // Close enough to a JSON number that we will return it unquoted - return numberAsString; - } - // The Number value is not a valid JSON number. - // Instead we will quote it as a string - return JSONObject.quote(numberAsString); - } - if (value instanceof Boolean || value instanceof JSONObject || value instanceof JSONArray) { - return value.toString(); - } - if (value instanceof Map) { - Map map = (Map) value; - return new JSONObject(map).toString(); - } - if (value instanceof Collection) { - Collection coll = (Collection) value; - return new JSONArray(coll).toString(); - } - if (value.getClass().isArray()) { - return new JSONArray(value).toString(); - } - if (value instanceof Enum) { - return JSONObject.quote(((Enum) value).name()); - } - return JSONObject.quote(value.toString()); - } - - /** - * Append either the value true or the value false. - * - * @param b A boolean. - * @return this - * @throws JSONException if a called function has an error - */ - public JSONWriter value(boolean b) throws JSONException { - return this.append(b ? "true" : "false"); - } - - /** - * Append a double value. - * - * @param d A double. - * @return this - * @throws JSONException If the number is not finite. - */ - public JSONWriter value(double d) throws JSONException { - return this.value(Double.valueOf(d)); - } - - /** - * Append a long value. - * - * @param l A long. - * @return this - * @throws JSONException if a called function has an error - */ - public JSONWriter value(long l) throws JSONException { - return this.append(Long.toString(l)); - } - - /** - * Append an object value. - * - * @param object The object to append. It can be null, or a Boolean, Number, - * String, JSONObject, or JSONArray, or an object that implements - * JSONString. - * @return this - * @throws JSONException If the value is out of sequence. - */ - public JSONWriter value(Object object) throws JSONException { - return this.append(valueToString(object)); - } -} diff --git a/src/main/java/org/json/Property.java b/src/main/java/org/json/Property.java deleted file mode 100644 index a3c3ff9..0000000 --- a/src/main/java/org/json/Property.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.util.Enumeration; -import java.util.Properties; - -/** - * Converts a Property file data into JSONObject and back. - * - * @author JSON.org - * @version 2015-05-05 - */ -public class Property { - /** - * Converts a property file object into a JSONObject. The property file object - * is a table of name value pairs. - * - * @param properties java.util.Properties - * @return JSONObject - * @throws JSONException if a called function has an error - */ - public static JSONObject toJSONObject(java.util.Properties properties) throws JSONException { - // can't use the new constructor for Android support - // JSONObject jo = new JSONObject(properties == null ? 0 : properties.size()); - JSONObject jo = new JSONObject(); - if (properties != null && !properties.isEmpty()) { - Enumeration enumProperties = properties.propertyNames(); - while (enumProperties.hasMoreElements()) { - String name = (String) enumProperties.nextElement(); - jo.put(name, properties.getProperty(name)); - } - } - return jo; - } - - /** - * Converts the JSONObject into a property file object. - * - * @param jo JSONObject - * @return java.util.Properties - * @throws JSONException if a called function has an error - */ - public static Properties toProperties(JSONObject jo) throws JSONException { - Properties properties = new Properties(); - if (jo != null) { - // Don't use the new entrySet API to maintain Android support - for (final String key : jo.keySet()) { - Object value = jo.opt(key); - if (!JSONObject.NULL.equals(value)) { - properties.put(key, value.toString()); - } - } - } - return properties; - } -} diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java deleted file mode 100644 index 6342628..0000000 --- a/src/main/java/org/json/XML.java +++ /dev/null @@ -1,895 +0,0 @@ -package org.json; - -/* -Copyright (c) 2015 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.io.Reader; -import java.io.StringReader; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Iterator; - -/** - * This provides static methods to convert an XML text into a JSONObject, and to - * covert a JSONObject into an XML text. - * - * @author JSON.org - * @version 2016-08-10 - */ -@SuppressWarnings("boxing") -public class XML { - - /** The Character '&'. */ - public static final Character AMP = '&'; - - /** The Character '''. */ - public static final Character APOS = '\''; - - /** The Character '!'. */ - public static final Character BANG = '!'; - - /** The Character '='. */ - public static final Character EQ = '='; - - /** - * The Character - * - * 

-	 * {@code '>'. }
-	 *
- */ - public static final Character GT = '>'; - - /** The Character '<'. */ - public static final Character LT = '<'; - - /** The Character '?'. */ - public static final Character QUEST = '?'; - - /** The Character '"'. */ - public static final Character QUOT = '"'; - - /** The Character '/'. */ - public static final Character SLASH = '/'; - - /** - * Null attribute name - */ - public static final String NULL_ATTR = "xsi:nil"; - - public static final String TYPE_ATTR = "xsi:type"; - - /** - * Creates an iterator for navigating Code Points in a string instead of - * characters. Once Java7 support is dropped, this can be replaced with - * string.codePoints() - * which is available in Java8 and above. - * - * @see http://stackoverflow.com/a/21791059/6030888 - */ - private static Iterable codePointIterator(final String string) { - return new Iterable() { - @Override - public Iterator iterator() { - return new Iterator() { - private int nextIndex = 0; - private int length = string.length(); - - @Override - public boolean hasNext() { - return this.nextIndex < this.length; - } - - @Override - public Integer next() { - int result = string.codePointAt(this.nextIndex); - this.nextIndex += Character.charCount(result); - return result; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - }; - } - }; - } - - /** - * Replace special characters with XML escapes: - * - * 
-	 * {@code 
-	 * & (ampersand) is replaced by &amp;
-	 * < (less than) is replaced by &lt;
-	 * > (greater than) is replaced by &gt;
-	 * " (double quote) is replaced by &quot;
-	 * ' (single quote / apostrophe) is replaced by &apos;
-	 * }
-	 *
- * - * @param string The string to be escaped. - * @return The escaped string. - */ - public static String escape(String string) { - StringBuilder sb = new StringBuilder(string.length()); - for (final int cp : codePointIterator(string)) { - switch (cp) { - case '&': - sb.append("&"); - break; - case '<': - sb.append("<"); - break; - case '>': - sb.append(">"); - break; - case '"': - sb.append("""); - break; - case '\'': - sb.append("'"); - break; - default: - if (mustEscape(cp)) { - sb.append("&#x"); - sb.append(Integer.toHexString(cp)); - sb.append(';'); - } else { - sb.appendCodePoint(cp); - } - } - } - return sb.toString(); - } - - /** - * @param cp code point to test - * @return true if the code point is not valid for an XML - */ - private static boolean mustEscape(int cp) { - /* - * Valid range from https://www.w3.org/TR/REC-xml/#charsets - * - * #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] - * - * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF. - */ - // isISOControl is true when (cp >= 0 && cp <= 0x1F) || (cp >= 0x7F && cp <= - // 0x9F) - // all ISO control characters are out of range except tabs and new lines - return (Character.isISOControl(cp) && cp != 0x9 && cp != 0xA && cp != 0xD) || !( - // valid the range of acceptable characters that aren't control - (cp >= 0x20 && cp <= 0xD7FF) || (cp >= 0xE000 && cp <= 0xFFFD) || (cp >= 0x10000 && cp <= 0x10FFFF)); - } - - /** - * Removes XML escapes from the string. - * - * @param string string to remove escapes from - * @return string with converted entities - */ - public static String unescape(String string) { - StringBuilder sb = new StringBuilder(string.length()); - for (int i = 0, length = string.length(); i < length; i++) { - char c = string.charAt(i); - if (c == '&') { - final int semic = string.indexOf(';', i); - if (semic > i) { - final String entity = string.substring(i + 1, semic); - sb.append(XMLTokener.unescapeEntity(entity)); - // skip past the entity we just parsed. - i += entity.length() + 1; - } else { - // this shouldn't happen in most cases since the parser - // errors on unclosed entries. - sb.append(c); - } - } else { - // not part of an entity - sb.append(c); - } - } - return sb.toString(); - } - - /** - * Throw an exception if the string contains whitespace. Whitespace is not - * allowed in tagNames and attributes. - * - * @param string A string. - * @throws JSONException Thrown if the string contains whitespace or is empty. - */ - public static void noSpace(String string) throws JSONException { - int i, length = string.length(); - if (length == 0) { - throw new JSONException("Empty string."); - } - for (i = 0; i < length; i += 1) { - if (Character.isWhitespace(string.charAt(i))) { - throw new JSONException("'" + string + "' contains a space character."); - } - } - } - - /** - * Scan the content following the named tag, attaching it to the context. - * - * @param x The XMLTokener containing the source string. - * @param context The JSONObject that will include the new material. - * @param name The tag name. - * @return true if the close tag is processed. - * @throws JSONException - */ - private static boolean parse(XMLTokener x, JSONObject context, String name, XMLParserConfiguration config) - throws JSONException { - char c; - int i; - JSONObject jsonObject = null; - String string; - String tagName; - Object token; - XMLXsiTypeConverter xmlXsiTypeConverter; - - // Test for and skip past these forms: - // - // - // - // - // Report errors for these forms: - // <> - // <= - // << - - token = x.nextToken(); - - // "); - return false; - } - x.back(); - } else if (c == '[') { - token = x.nextToken(); - if ("CDATA".equals(token)) { - if (x.next() == '[') { - string = x.nextCDATA(); - if (string.length() > 0) { - context.accumulate(config.getcDataTagName(), string); - } - return false; - } - } - throw x.syntaxError("Expected 'CDATA['"); - } - i = 1; - do { - token = x.nextMeta(); - if (token == null) { - throw x.syntaxError("Missing '>' after ' 0); - return false; - } else if (token == QUEST) { - - // "); - return false; - } else if (token == SLASH) { - - // Close tag - if (x.nextToken() != GT) { - throw x.syntaxError("Misshaped tag"); - } - if (config.getForceList().contains(tagName)) { - // Force the value to be an array - if (nilAttributeFound) { - context.append(tagName, JSONObject.NULL); - } else if (jsonObject.length() > 0) { - context.append(tagName, jsonObject); - } else { - context.put(tagName, new JSONArray()); - } - } else { - if (nilAttributeFound) { - context.accumulate(tagName, JSONObject.NULL); - } else if (jsonObject.length() > 0) { - context.accumulate(tagName, jsonObject); - } else { - context.accumulate(tagName, ""); - } - } - return false; - - } else if (token == GT) { - // Content, between <...> and - for (;;) { - token = x.nextContent(); - if (token == null) { - if (tagName != null) { - throw x.syntaxError("Unclosed tag " + tagName); - } - return false; - } else if (token instanceof String) { - string = (String) token; - if (string.length() > 0) { - if (xmlXsiTypeConverter != null) { - jsonObject.accumulate(config.getcDataTagName(), - stringToValue(string, xmlXsiTypeConverter)); - } else { - jsonObject.accumulate(config.getcDataTagName(), - config.isKeepStrings() ? string : stringToValue(string)); - } - } - - } else if (token == LT) { - // Nested element - if (parse(x, jsonObject, tagName, config)) { - if (config.getForceList().contains(tagName)) { - // Force the value to be an array - if (jsonObject.length() == 0) { - context.put(tagName, new JSONArray()); - } else if (jsonObject.length() == 1 - && jsonObject.opt(config.getcDataTagName()) != null) { - context.append(tagName, jsonObject.opt(config.getcDataTagName())); - } else { - context.append(tagName, jsonObject); - } - } else { - if (jsonObject.length() == 0) { - context.accumulate(tagName, ""); - } else if (jsonObject.length() == 1 - && jsonObject.opt(config.getcDataTagName()) != null) { - context.accumulate(tagName, jsonObject.opt(config.getcDataTagName())); - } else { - context.accumulate(tagName, jsonObject); - } - } - - return false; - } - } - } - } else { - throw x.syntaxError("Misshaped tag"); - } - } - } - } - - /** - * This method tries to convert the given string value to the target object - * - * @param string String to convert - * @param typeConverter value converter to convert string to integer, boolean - * e.t.c - * @return JSON value of this string or the string - */ - public static Object stringToValue(String string, XMLXsiTypeConverter typeConverter) { - if (typeConverter != null) { - return typeConverter.convert(string); - } - return stringToValue(string); - } - - /** - * This method is the same as {@link JSONObject#stringToValue(String)}. - * - * @param string String to convert - * @return JSON value of this string or the string - */ - // To maintain compatibility with the Android API, this method is a direct copy - // of - // the one in JSONObject. Changes made here should be reflected there. - // This method should not make calls out of the XML object. - public static Object stringToValue(String string) { - if ("".equals(string)) { - return string; - } - - // check JSON key words true/false/null - if ("true".equalsIgnoreCase(string)) { - return Boolean.TRUE; - } - if ("false".equalsIgnoreCase(string)) { - return Boolean.FALSE; - } - if ("null".equalsIgnoreCase(string)) { - return JSONObject.NULL; - } - - /* - * If it might be a number, try converting it. If a number cannot be produced, - * then the value will just be a string. - */ - - char initial = string.charAt(0); - if ((initial >= '0' && initial <= '9') || initial == '-') { - try { - return stringToNumber(string); - } catch (Exception ignore) { - } - } - return string; - } - - /** - * direct copy of {@link JSONObject#stringToNumber(String)} to maintain Android - * support. - */ - private static Number stringToNumber(final String val) throws NumberFormatException { - char initial = val.charAt(0); - if ((initial >= '0' && initial <= '9') || initial == '-') { - // decimal representation - if (isDecimalNotation(val)) { - // Use a BigDecimal all the time so we keep the original - // representation. BigDecimal doesn't support -0.0, ensure we - // keep that by forcing a decimal. - try { - BigDecimal bd = new BigDecimal(val); - if (initial == '-' && BigDecimal.ZERO.compareTo(bd) == 0) { - return Double.valueOf(-0.0); - } - return bd; - } catch (NumberFormatException retryAsDouble) { - // this is to support "Hex Floats" like this: 0x1.0P-1074 - try { - Double d = Double.valueOf(val); - if (d.isNaN() || d.isInfinite()) { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - return d; - } catch (NumberFormatException ignore) { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - } - } - // block items like 00 01 etc. Java number parsers treat these as Octal. - if (initial == '0' && val.length() > 1) { - char at1 = val.charAt(1); - if (at1 >= '0' && at1 <= '9') { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - } else if (initial == '-' && val.length() > 2) { - char at1 = val.charAt(1); - char at2 = val.charAt(2); - if (at1 == '0' && at2 >= '0' && at2 <= '9') { - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - } - // integer representation. - // This will narrow any values to the smallest reasonable Object representation - // (Integer, Long, or BigInteger) - - // BigInteger down conversion: We use a similar bitLength compare as - // BigInteger#intValueExact uses. Increases GC, but objects hold - // only what they need. i.e. Less runtime overhead if the value is - // long lived. - BigInteger bi = new BigInteger(val); - if (bi.bitLength() <= 31) { - return Integer.valueOf(bi.intValue()); - } - if (bi.bitLength() <= 63) { - return Long.valueOf(bi.longValue()); - } - return bi; - } - throw new NumberFormatException("val [" + val + "] is not a valid number."); - } - - /** - * direct copy of {@link JSONObject#isDecimalNotation(String)} to maintain - * Android support. - */ - private static boolean isDecimalNotation(final String val) { - return val.indexOf('.') > -1 || val.indexOf('e') > -1 || val.indexOf('E') > -1 || "-0".equals(val); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject. Some information may be lost in this transformation because JSON - * is a data format and XML is a document format. XML uses elements, attributes, - * and content text, while JSON uses unordered collections of name/value pairs - * and arrays of values. JSON does not does not like to distinguish between - * elements and attributes. Sequences of similar elements are represented as - * JSONArrays. Content text may be placed in a "content" member. Comments, - * prologs, DTDs, and - * - * 
-	 * {@code 
-	 * <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param string The source string. - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown if there is an errors while parsing the string - */ - public static JSONObject toJSONObject(String string) throws JSONException { - return toJSONObject(string, XMLParserConfiguration.ORIGINAL); - } - - /** - * Convert a well-formed (but not necessarily valid) XML into a JSONObject. Some - * information may be lost in this transformation because JSON is a data format - * and XML is a document format. XML uses elements, attributes, and content - * text, while JSON uses unordered collections of name/value pairs and arrays of - * values. JSON does not does not like to distinguish between elements and - * attributes. Sequences of similar elements are represented as JSONArrays. - * Content text may be placed in a "content" member. Comments, prologs, DTDs, - * and - * - * 
-	 * {@code 
-	 * <[ [ ]]>}
-	 *
- * - * are ignored. - * - * @param reader The XML source reader. - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown if there is an errors while parsing the string - */ - public static JSONObject toJSONObject(Reader reader) throws JSONException { - return toJSONObject(reader, XMLParserConfiguration.ORIGINAL); - } - - /** - * Convert a well-formed (but not necessarily valid) XML into a JSONObject. Some - * information may be lost in this transformation because JSON is a data format - * and XML is a document format. XML uses elements, attributes, and content - * text, while JSON uses unordered collections of name/value pairs and arrays of - * values. JSON does not does not like to distinguish between elements and - * attributes. Sequences of similar elements are represented as JSONArrays. - * Content text may be placed in a "content" member. Comments, prologs, DTDs, - * and - * - * 
-	 * {@code
-	 * <[ [ ]]>}
-	 *
- * - * are ignored. - * - * All values are converted as strings, for 1, 01, 29.0 will not be coerced to - * numbers but will instead be the exact value as seen in the XML document. - * - * @param reader The XML source reader. - * @param keepStrings If true, then values will not be coerced into boolean or - * numeric values and will instead be left as strings - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown if there is an errors while parsing the string - */ - public static JSONObject toJSONObject(Reader reader, boolean keepStrings) throws JSONException { - if (keepStrings) { - return toJSONObject(reader, XMLParserConfiguration.KEEP_STRINGS); - } - return toJSONObject(reader, XMLParserConfiguration.ORIGINAL); - } - - /** - * Convert a well-formed (but not necessarily valid) XML into a JSONObject. Some - * information may be lost in this transformation because JSON is a data format - * and XML is a document format. XML uses elements, attributes, and content - * text, while JSON uses unordered collections of name/value pairs and arrays of - * values. JSON does not does not like to distinguish between elements and - * attributes. Sequences of similar elements are represented as JSONArrays. - * Content text may be placed in a "content" member. Comments, prologs, DTDs, - * and - * - * 
-	 * {@code
-	 * <[ [ ]]>}
-	 *
- * - * are ignored. - * - * All values are converted as strings, for 1, 01, 29.0 will not be coerced to - * numbers but will instead be the exact value as seen in the XML document. - * - * @param reader The XML source reader. - * @param config Configuration options for the parser - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown if there is an errors while parsing the string - */ - public static JSONObject toJSONObject(Reader reader, XMLParserConfiguration config) throws JSONException { - JSONObject jo = new JSONObject(); - XMLTokener x = new XMLTokener(reader); - while (x.more()) { - x.skipPast("<"); - if (x.more()) { - parse(x, jo, null, config); - } - } - return jo; - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject. Some information may be lost in this transformation because JSON - * is a data format and XML is a document format. XML uses elements, attributes, - * and content text, while JSON uses unordered collections of name/value pairs - * and arrays of values. JSON does not does not like to distinguish between - * elements and attributes. Sequences of similar elements are represented as - * JSONArrays. Content text may be placed in a "content" member. Comments, - * prologs, DTDs, and - * - * 
-	 * {@code 
-	 * <[ [ ]]>}
-	 *
- * - * are ignored. - * - * All values are converted as strings, for 1, 01, 29.0 will not be coerced to - * numbers but will instead be the exact value as seen in the XML document. - * - * @param string The source string. - * @param keepStrings If true, then values will not be coerced into boolean or - * numeric values and will instead be left as strings - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown if there is an errors while parsing the string - */ - public static JSONObject toJSONObject(String string, boolean keepStrings) throws JSONException { - return toJSONObject(new StringReader(string), keepStrings); - } - - /** - * Convert a well-formed (but not necessarily valid) XML string into a - * JSONObject. Some information may be lost in this transformation because JSON - * is a data format and XML is a document format. XML uses elements, attributes, - * and content text, while JSON uses unordered collections of name/value pairs - * and arrays of values. JSON does not does not like to distinguish between - * elements and attributes. Sequences of similar elements are represented as - * JSONArrays. Content text may be placed in a "content" member. Comments, - * prologs, DTDs, and - * - * 
-	 * {@code 
-	 * <[ [ ]]>}
-	 *
- * - * are ignored. - * - * All values are converted as strings, for 1, 01, 29.0 will not be coerced to - * numbers but will instead be the exact value as seen in the XML document. - * - * @param string The source string. - * @param config Configuration options for the parser. - * @return A JSONObject containing the structured data from the XML string. - * @throws JSONException Thrown if there is an errors while parsing the string - */ - public static JSONObject toJSONObject(String string, XMLParserConfiguration config) throws JSONException { - return toJSONObject(new StringReader(string), config); - } - - /** - * Convert a JSONObject into a well-formed, element-normal XML string. - * - * @param object A JSONObject. - * @return A string. - * @throws JSONException Thrown if there is an error parsing the string - */ - public static String toString(Object object) throws JSONException { - return toString(object, null, XMLParserConfiguration.ORIGINAL); - } - - /** - * Convert a JSONObject into a well-formed, element-normal XML string. - * - * @param object A JSONObject. - * @param tagName The optional name of the enclosing tag. - * @return A string. - * @throws JSONException Thrown if there is an error parsing the string - */ - public static String toString(final Object object, final String tagName) { - return toString(object, tagName, XMLParserConfiguration.ORIGINAL); - } - - /** - * Convert a JSONObject into a well-formed, element-normal XML string. - * - * @param object A JSONObject. - * @param tagName The optional name of the enclosing tag. - * @param config Configuration that can control output to XML. - * @return A string. - * @throws JSONException Thrown if there is an error parsing the string - */ - public static String toString(final Object object, final String tagName, final XMLParserConfiguration config) - throws JSONException { - StringBuilder sb = new StringBuilder(); - JSONArray ja; - JSONObject jo; - String string; - - if (object instanceof JSONObject) { - - // Emit - if (tagName != null) { - sb.append('<'); - sb.append(tagName); - sb.append('>'); - } - - // Loop thru the keys. - // don't use the new entrySet accessor to maintain Android Support - jo = (JSONObject) object; - for (final String key : jo.keySet()) { - Object value = jo.opt(key); - if (value == null) { - value = ""; - } else if (value.getClass().isArray()) { - value = new JSONArray(value); - } - - // Emit content in body - if (key.equals(config.getcDataTagName())) { - if (value instanceof JSONArray) { - ja = (JSONArray) value; - int jaLength = ja.length(); - // don't use the new iterator API to maintain support for Android - for (int i = 0; i < jaLength; i++) { - if (i > 0) { - sb.append('\n'); - } - Object val = ja.opt(i); - sb.append(escape(val.toString())); - } - } else { - sb.append(escape(value.toString())); - } - - // Emit an array of similar keys - - } else if (value instanceof JSONArray) { - ja = (JSONArray) value; - int jaLength = ja.length(); - // don't use the new iterator API to maintain support for Android - for (int i = 0; i < jaLength; i++) { - Object val = ja.opt(i); - if (val instanceof JSONArray) { - sb.append('<'); - sb.append(key); - sb.append('>'); - sb.append(toString(val, null, config)); - sb.append("'); - } else { - sb.append(toString(val, key, config)); - } - } - } else if ("".equals(value)) { - sb.append('<'); - sb.append(key); - sb.append("/>"); - - // Emit a new tag - - } else { - sb.append(toString(value, key, config)); - } - } - if (tagName != null) { - - // Emit the close tag - sb.append("'); - } - return sb.toString(); - - } - - if (object != null && (object instanceof JSONArray || object.getClass().isArray())) { - if (object.getClass().isArray()) { - ja = new JSONArray(object); - } else { - ja = (JSONArray) object; - } - int jaLength = ja.length(); - // don't use the new iterator API to maintain support for Android - for (int i = 0; i < jaLength; i++) { - Object val = ja.opt(i); - // XML does not have good support for arrays. If an array - // appears in a place where XML is lacking, synthesize an - // element. - sb.append(toString(val, tagName == null ? "array" : tagName, config)); - } - return sb.toString(); - } - - string = (object == null) ? "null" : escape(object.toString()); - return (tagName == null) ? "\"" + string + "\"" - : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName + ">" + string + ""; - - } -} diff --git a/src/main/java/org/json/XMLParserConfiguration.java b/src/main/java/org/json/XMLParserConfiguration.java deleted file mode 100644 index e30b741..0000000 --- a/src/main/java/org/json/XMLParserConfiguration.java +++ /dev/null @@ -1,360 +0,0 @@ -package org.json; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -/** - * Configuration object for the XML parser. The configuration is immutable. - * - * @author AylwardJ - */ -@SuppressWarnings({ "" }) -public class XMLParserConfiguration { - /** Original Configuration of the XML Parser. */ - public static final XMLParserConfiguration ORIGINAL = new XMLParserConfiguration(); - /** - * Original configuration of the XML Parser except that values are kept as - * strings. - */ - public static final XMLParserConfiguration KEEP_STRINGS = new XMLParserConfiguration().withKeepStrings(true); - - /** - * When parsing the XML into JSON, specifies if values should be kept as strings - * (true), or if they should try to be guessed into JSON values - * (numeric, boolean, string) - */ - private boolean keepStrings; - - /** - * The name of the key in a JSON Object that indicates a CDATA section. - * Historically this has been the value "content" but can be changed. Use - * null to indicate no CDATA processing. - */ - private String cDataTagName; - - /** - * When parsing the XML into JSON, specifies if values with attribute - * xsi:nil="true" should be kept as attribute(false), or they - * should be converted to null(true) - */ - private boolean convertNilAttributeToNull; - - /** - * This will allow type conversion for values in XML if xsi:type attribute is - * defined - */ - private Map> xsiTypeMap; - - /** - * When parsing the XML into JSON, specifies the tags whose values should be - * converted to arrays - */ - private Set forceList; - - /** - * Default parser configuration. Does not keep strings (tries to implicitly - * convert values), and the CDATA Tag Name is "content". - */ - public XMLParserConfiguration() { - this.keepStrings = false; - this.cDataTagName = "content"; - this.convertNilAttributeToNull = false; - this.xsiTypeMap = Collections.emptyMap(); - this.forceList = Collections.emptySet(); - } - - /** - * Configure the parser string processing and use the default CDATA Tag Name as - * "content". - * - * @param keepStrings true to parse all values as string. - * false to try and convert XML string values - * into a JSON value. - * @deprecated This constructor has been deprecated in favor of using the new - * builder pattern for the configuration. This constructor may be - * removed in a future release. - */ - @Deprecated - public XMLParserConfiguration(final boolean keepStrings) { - this(keepStrings, "content", false); - } - - /** - * Configure the parser string processing to try and convert XML values to JSON - * values and use the passed CDATA Tag Name the processing value. Pass - * null to disable CDATA processing - * - * @param cDataTagName null to disable CDATA processing. Any other - * value to use that value as the JSONObject key name to - * process as CDATA. - * @deprecated This constructor has been deprecated in favor of using the new - * builder pattern for the configuration. This constructor may be - * removed in a future release. - */ - @Deprecated - public XMLParserConfiguration(final String cDataTagName) { - this(false, cDataTagName, false); - } - - /** - * Configure the parser to use custom settings. - * - * @param keepStrings true to parse all values as string. - * false to try and convert XML string values - * into a JSON value. - * @param cDataTagName null to disable CDATA processing. Any other - * value to use that value as the JSONObject key name to - * process as CDATA. - * @deprecated This constructor has been deprecated in favor of using the new - * builder pattern for the configuration. This constructor may be - * removed in a future release. - */ - @Deprecated - public XMLParserConfiguration(final boolean keepStrings, final String cDataTagName) { - this.keepStrings = keepStrings; - this.cDataTagName = cDataTagName; - this.convertNilAttributeToNull = false; - } - - /** - * Configure the parser to use custom settings. - * - * @param keepStrings true to parse all values as - * string. false to try and - * convert XML string values into a JSON value. - * @param cDataTagName null to disable CDATA - * processing. Any other value to use that - * value as the JSONObject key name to process - * as CDATA. - * @param convertNilAttributeToNull true to parse values with - * attribute xsi:nil="true" as null. - * false to parse values with - * attribute xsi:nil="true" as - * {"xsi:nil":true}. - * @deprecated This constructor has been deprecated in favor of using the new - * builder pattern for the configuration. This constructor may be - * removed or marked private in a future release. - */ - @Deprecated - public XMLParserConfiguration(final boolean keepStrings, final String cDataTagName, - final boolean convertNilAttributeToNull) { - this.keepStrings = keepStrings; - this.cDataTagName = cDataTagName; - this.convertNilAttributeToNull = convertNilAttributeToNull; - } - - /** - * Configure the parser to use custom settings. - * - * @param keepStrings true to parse all values as - * string. false to try and - * convert XML string values into a JSON value. - * @param cDataTagName null to disable CDATA - * processing. Any other value to use that - * value as the JSONObject key name to process - * as CDATA. - * @param convertNilAttributeToNull true to parse values with - * attribute xsi:nil="true" as null. - * false to parse values with - * attribute xsi:nil="true" as - * {"xsi:nil":true}. - * @param xsiTypeMap new HashMap>() - * to parse values with attribute - * xsi:type="integer" as integer, - * xsi:type="string" as string - * @param forceList new HashSet() to parse - * the provided tags' values as arrays - */ - private XMLParserConfiguration(final boolean keepStrings, final String cDataTagName, - final boolean convertNilAttributeToNull, final Map> xsiTypeMap, - final Set forceList) { - this.keepStrings = keepStrings; - this.cDataTagName = cDataTagName; - this.convertNilAttributeToNull = convertNilAttributeToNull; - this.xsiTypeMap = Collections.unmodifiableMap(xsiTypeMap); - this.forceList = Collections.unmodifiableSet(forceList); - } - - /** - * Provides a new instance of the same configuration. - */ - @Override - protected XMLParserConfiguration clone() { - // future modifications to this method should always ensure a "deep" - // clone in the case of collections. i.e. if a Map is added as a configuration - // item, a new map instance should be created and if possible each value in the - // map should be cloned as well. If the values of the map are known to also - // be immutable, then a shallow clone of the map is acceptable. - return new XMLParserConfiguration(this.keepStrings, this.cDataTagName, this.convertNilAttributeToNull, - this.xsiTypeMap, this.forceList); - } - - /** - * When parsing the XML into JSON, specifies if values should be kept as strings - * (true), or if they should try to be guessed into JSON values - * (numeric, boolean, string) - * - * @return The keepStrings configuration value. - */ - public boolean isKeepStrings() { - return this.keepStrings; - } - - /** - * When parsing the XML into JSON, specifies if values should be kept as strings - * (true), or if they should try to be guessed into JSON values - * (numeric, boolean, string) - * - * @param newVal new value to use for the keepStrings configuration - * option. - * - * @return The existing configuration will not be modified. A new configuration - * is returned. - */ - public XMLParserConfiguration withKeepStrings(final boolean newVal) { - XMLParserConfiguration newConfig = this.clone(); - newConfig.keepStrings = newVal; - return newConfig; - } - - /** - * The name of the key in a JSON Object that indicates a CDATA section. - * Historically this has been the value "content" but can be changed. Use - * null to indicate no CDATA processing. - * - * @return The cDataTagName configuration value. - */ - public String getcDataTagName() { - return this.cDataTagName; - } - - /** - * The name of the key in a JSON Object that indicates a CDATA section. - * Historically this has been the value "content" but can be changed. Use - * null to indicate no CDATA processing. - * - * @param newVal new value to use for the cDataTagName - * configuration option. - * - * @return The existing configuration will not be modified. A new configuration - * is returned. - */ - public XMLParserConfiguration withcDataTagName(final String newVal) { - XMLParserConfiguration newConfig = this.clone(); - newConfig.cDataTagName = newVal; - return newConfig; - } - - /** - * When parsing the XML into JSON, specifies if values with attribute - * xsi:nil="true" should be kept as attribute(false), or they - * should be converted to null(true) - * - * @return The convertNilAttributeToNull configuration value. - */ - public boolean isConvertNilAttributeToNull() { - return this.convertNilAttributeToNull; - } - - /** - * When parsing the XML into JSON, specifies if values with attribute - * xsi:nil="true" should be kept as attribute(false), or they - * should be converted to null(true) - * - * @param newVal new value to use for the convertNilAttributeToNull - * configuration option. - * - * @return The existing configuration will not be modified. A new configuration - * is returned. - */ - public XMLParserConfiguration withConvertNilAttributeToNull(final boolean newVal) { - XMLParserConfiguration newConfig = this.clone(); - newConfig.convertNilAttributeToNull = newVal; - return newConfig; - } - - /** - * When parsing the XML into JSON, specifies that the values with attribute - * xsi:type will be converted to target type defined to client in this - * configuration {@code Map>} to parse values - * with attribute xsi:type="integer" as integer, xsi:type="string" as string - * - * @return xsiTypeMap unmodifiable configuration map. - */ - public Map> getXsiTypeMap() { - return this.xsiTypeMap; - } - - /** - * When parsing the XML into JSON, specifies that the values with attribute - * xsi:type will be converted to target type defined to client in this - * configuration {@code Map>} to parse values - * with attribute xsi:type="integer" as integer, xsi:type="string" as string - * - * @param xsiTypeMap {@code new HashMap>()} to - * parse values with attribute xsi:type="integer" as integer, - * xsi:type="string" as string - * @return The existing configuration will not be modified. A new configuration - * is returned. - */ - public XMLParserConfiguration withXsiTypeMap(final Map> xsiTypeMap) { - XMLParserConfiguration newConfig = this.clone(); - Map> cloneXsiTypeMap = new HashMap>(xsiTypeMap); - newConfig.xsiTypeMap = Collections.unmodifiableMap(cloneXsiTypeMap); - return newConfig; - } - - /** - * When parsing the XML into JSON, specifies that tags that will be converted to - * arrays in this configuration {@code Set} to parse the provided tags' - * values as arrays - * - * @return forceList unmodifiable configuration set. - */ - public Set getForceList() { - return this.forceList; - } - - /** - * When parsing the XML into JSON, specifies that tags that will be converted to - * arrays in this configuration {@code Set} to parse the provided tags' - * values as arrays - * - * @param forceList {@code new HashSet()} to parse the provided tags' - * values as arrays - * @return The existing configuration will not be modified. A new configuration - * is returned. - */ - public XMLParserConfiguration withForceList(final Set forceList) { - XMLParserConfiguration newConfig = this.clone(); - Set cloneForceList = new HashSet(forceList); - newConfig.forceList = Collections.unmodifiableSet(cloneForceList); - return newConfig; - } -} diff --git a/src/main/java/org/json/XMLTokener.java b/src/main/java/org/json/XMLTokener.java deleted file mode 100644 index baa8eb9..0000000 --- a/src/main/java/org/json/XMLTokener.java +++ /dev/null @@ -1,443 +0,0 @@ -package org.json; - -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -import java.io.Reader; - -/** - * The XMLTokener extends the JSONTokener to provide additional methods for the - * parsing of XML texts. - * - * @author JSON.org - * @version 2015-12-09 - */ -public class XMLTokener extends JSONTokener { - - /** - * The table of entity values. It initially contains Character values for amp, - * apos, gt, lt, quot. - */ - public static final java.util.HashMap entity; - - static { - entity = new java.util.HashMap(8); - entity.put("amp", XML.AMP); - entity.put("apos", XML.APOS); - entity.put("gt", XML.GT); - entity.put("lt", XML.LT); - entity.put("quot", XML.QUOT); - } - - /** - * Construct an XMLTokener from a Reader. - * - * @param r A source reader. - */ - public XMLTokener(Reader r) { - super(r); - } - - /** - * Construct an XMLTokener from a string. - * - * @param s A source string. - */ - public XMLTokener(String s) { - super(s); - } - - /** - * Get the text in the CDATA block. - * - * @return The string up to the ]]>. - * @throws JSONException If the ]]> is not found. - */ - public String nextCDATA() throws JSONException { - char c; - int i; - StringBuilder sb = new StringBuilder(); - while (more()) { - c = next(); - sb.append(c); - i = sb.length() - 3; - if (i >= 0 && sb.charAt(i) == ']' && sb.charAt(i + 1) == ']' && sb.charAt(i + 2) == '>') { - sb.setLength(i); - return sb.toString(); - } - } - throw syntaxError("Unclosed CDATA"); - } - - /** - * Get the next XML outer token, trimming whitespace. There are two kinds of - * tokens: the - * - * 
-	 * {@code '<' }
-	 *
- * - * character which begins a markup tag, and the content text between markup - * tags. - * - * @return A string, or a - * - * 
-	 * {@code '<' }
-	 *
- * - * Character, or null if there is no more source text. - * @throws JSONException if a called function has an error - */ - public Object nextContent() throws JSONException { - char c; - StringBuilder sb; - do { - c = next(); - } while (Character.isWhitespace(c)); - if (c == 0) { - return null; - } - if (c == '<') { - return XML.LT; - } - sb = new StringBuilder(); - for (;;) { - if (c == 0) { - return sb.toString().trim(); - } - if (c == '<') { - back(); - return sb.toString().trim(); - } - if (c == '&') { - sb.append(nextEntity(c)); - } else { - sb.append(c); - } - c = next(); - } - } - - /** - * 
-	 * {@code
-	 * Return the next entity. These entities are translated to Characters:
-	 *     &  '  >  <  ".
-	 * }
-	 *
- * - * @param ampersand An ampersand character. - * @return A Character or an entity String if the entity is not recognized. - * @throws JSONException If missing ';' in XML entity. - */ - public Object nextEntity(@SuppressWarnings("unused") char ampersand) throws JSONException { - StringBuilder sb = new StringBuilder(); - for (;;) { - char c = next(); - if (Character.isLetterOrDigit(c) || c == '#') { - sb.append(Character.toLowerCase(c)); - } else if (c == ';') { - break; - } else { - throw syntaxError("Missing ';' in XML entity: &" + sb); - } - } - String string = sb.toString(); - return unescapeEntity(string); - } - - /** - * Unescape an XML entity encoding; - * - * @param e entity (only the actual entity value, not the preceding & or ending - * ; - * @return - */ - static String unescapeEntity(String e) { - // validate - if (e == null || e.isEmpty()) { - return ""; - } - // if our entity is an encoded unicode point, parse it. - if (e.charAt(0) == '#') { - int cp; - if (e.charAt(1) == 'x' || e.charAt(1) == 'X') { - // hex encoded unicode - cp = Integer.parseInt(e.substring(2), 16); - } else { - // decimal encoded unicode - cp = Integer.parseInt(e.substring(1)); - } - return new String(new int[] { cp }, 0, 1); - } - Character knownEntity = entity.get(e); - if (knownEntity == null) { - // we don't know the entity so keep it encoded - return '&' + e + ';'; - } - return knownEntity.toString(); - } - - /** - * 
-	 * {@code 
-	 * Returns the next XML meta token. This is used for skipping over 
-	 * and  structures.
-	 *  }
-	 *
- * - * @return - * - * 
-	 * {@code Syntax characters (< > / = ! ?) are returned as
-	 *  Character, and strings and names are returned as Boolean. We don't care
-	 *  what the values actually are.
-	 *  }
-	 *
- * - * @throws JSONException If a string is not properly closed or if the XML is - * badly structured. - */ - public Object nextMeta() throws JSONException { - char c; - char q; - do { - c = next(); - } while (Character.isWhitespace(c)); - switch (c) { - case 0: - throw syntaxError("Misshaped meta tag"); - case '<': - return XML.LT; - case '>': - return XML.GT; - case '/': - return XML.SLASH; - case '=': - return XML.EQ; - case '!': - return XML.BANG; - case '?': - return XML.QUEST; - case '"': - case '\'': - q = c; - for (;;) { - c = next(); - if (c == 0) { - throw syntaxError("Unterminated string"); - } - if (c == q) { - return Boolean.TRUE; - } - } - default: - for (;;) { - c = next(); - if (Character.isWhitespace(c)) { - return Boolean.TRUE; - } - switch (c) { - case 0: - throw syntaxError("Unterminated string"); - case '<': - case '>': - case '/': - case '=': - case '!': - case '?': - case '"': - case '\'': - back(); - return Boolean.TRUE; - } - } - } - } - - /** - * 
-	 * {@code
-	 * Get the next XML Token. These tokens are found inside of angle
-	 * brackets. It may be one of these characters: / > = ! ? or it
-	 * may be a string wrapped in single quotes or double quotes, or it may be a
-	 * name.
-	 * }
-	 *
- * - * @return a String or a Character. - * @throws JSONException If the XML is not well formed. - */ - public Object nextToken() throws JSONException { - char c; - char q; - StringBuilder sb; - do { - c = next(); - } while (Character.isWhitespace(c)); - switch (c) { - case 0: - throw syntaxError("Misshaped element"); - case '<': - throw syntaxError("Misplaced '<'"); - case '>': - return XML.GT; - case '/': - return XML.SLASH; - case '=': - return XML.EQ; - case '!': - return XML.BANG; - case '?': - return XML.QUEST; - -// Quoted string - - case '"': - case '\'': - q = c; - sb = new StringBuilder(); - for (;;) { - c = next(); - if (c == 0) { - throw syntaxError("Unterminated string"); - } - if (c == q) { - return sb.toString(); - } - if (c == '&') { - sb.append(nextEntity(c)); - } else { - sb.append(c); - } - } - default: - -// Name - - sb = new StringBuilder(); - for (;;) { - sb.append(c); - c = next(); - if (Character.isWhitespace(c)) { - return sb.toString(); - } - switch (c) { - case 0: - return sb.toString(); - case '>': - case '/': - case '=': - case '!': - case '?': - case '[': - case ']': - back(); - return sb.toString(); - case '<': - case '"': - case '\'': - throw syntaxError("Bad character in a name"); - } - } - } - } - - /** - * Skip characters until past the requested string. If it is not found, we are - * left at the end of the source with a result of false. - * - * @param to A string to skip past. - */ - // The Android implementation of JSONTokener has a public method of public void - // skipPast(String to) - // even though ours does not have that method, to have API compatibility, our - // method in the subclass - // should match. - public void skipPast(String to) { - boolean b; - char c; - int i; - int j; - int offset = 0; - int length = to.length(); - char[] circle = new char[length]; - - /* - * First fill the circle buffer with as many characters as are in the to string. - * If we reach an early end, bail. - */ - - for (i = 0; i < length; i += 1) { - c = next(); - if (c == 0) { - return; - } - circle[i] = c; - } - - /* We will loop, possibly for all of the remaining characters. */ - - for (;;) { - j = offset; - b = true; - - /* Compare the circle buffer with the to string. */ - - for (i = 0; i < length; i += 1) { - if (circle[j] != to.charAt(i)) { - b = false; - break; - } - j += 1; - if (j >= length) { - j -= length; - } - } - - /* If we exit the loop with b intact, then victory is ours. */ - - if (b) { - return; - } - - /* Get the next character. If there isn't one, then defeat is ours. */ - - c = next(); - if (c == 0) { - return; - } - /* - * Shove the character in the circle buffer and advance the circle offset. The - * offset is mod n. - */ - circle[offset] = c; - offset += 1; - if (offset >= length) { - offset -= length; - } - } - } -} diff --git a/src/main/java/org/json/XMLXsiTypeConverter.java b/src/main/java/org/json/XMLXsiTypeConverter.java deleted file mode 100644 index 846a49a..0000000 --- a/src/main/java/org/json/XMLXsiTypeConverter.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.json; -/* -Copyright (c) 2002 JSON.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -The Software shall be used for Good, not Evil. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/** - * Type conversion configuration interface to be used with xsi:type attributes. - * - * 
- * XML Sample
- * {@code
- *      
- *          12345
- *          54321
- *      
- * }
- * JSON Output
- * {@code
- *     {
- *         "root" : {
- *             "asString" : "12345",
- *             "asInt": 54321
- *         }
- *     }
- * }
- *
- * Usage
- * {@code
- *      Map> xsiTypeMap = new HashMap>();
- *      xsiTypeMap.put("string", new XMLXsiTypeConverter() {
- *          @Override public String convert(final String value) {
- *              return value;
- *          }
- *      });
- *      xsiTypeMap.put("integer", new XMLXsiTypeConverter() {
- *          @Override public Integer convert(final String value) {
- *              return Integer.valueOf(value);
- *          }
- *      });
- * }
- *
- * - * @author kumar529 - * @param return type of convert method - */ -public interface XMLXsiTypeConverter { - T convert(String value); -}