lib & contrib: update imports

Signed-off-by: Alexis Laferrière <[email protected]>

benchmarks/json/scripts/nitcc_parser.nit

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
+import json::static
 
 var text = args.first.to_path.read_all
 var json = text.parse_json

contrib/benitlux/src/client/base.nit

@@ -19,7 +19,7 @@ import app::ui
 import app::data_store
 import app::http_request
 import android::aware
-import json::serialization
+import json
 
 import benitlux_model
 import translations

contrib/benitlux/src/server/benitlux_controller.nit

@@ -19,7 +19,7 @@ module benitlux_controller
 
 import nitcorn
 import nitcorn::restful
-private import json::serialization
+private import json
 
 import benitlux_model
 import benitlux_db

contrib/neo_doxygen/src/model/descriptions.nit

@@ -16,6 +16,7 @@
 module model::descriptions
 
 import json::static
+import json
 
 # Documentation associated to an entity.
 #

contrib/neo_doxygen/src/model/location.nit

@@ -16,6 +16,7 @@
 module location
 
 import json::static
+import json
 
 # A location inside a source file.
 class Location

contrib/refund/src/refund_json.nit

@@ -19,6 +19,7 @@ module refund_json
 
 import refund_base
 import json::static
+import json
 
 redef class RefundProcessor
 

contrib/shibuqam/examples/shibuqamoauth.nit

@@ -172,7 +172,7 @@ module shibuqamoauth
 
 import popcorn
 import shibuqam
-import json::serialization
+import json
 
 redef class HttpRequest
 	# percent decoded get or post parameter.

contrib/tinks/src/client/linux_client.nit

@@ -17,7 +17,7 @@ module linux_client
 
 import mnit::linux
 import linux::audio
-import json::serialization
+import json
 
 import client
 

contrib/tnitter/src/action.nit

@@ -18,7 +18,7 @@
 module action
 
 import nitcorn
-import json::serialization
+import json
 
 import model
 import database

contrib/tnitter/src/push.nit

@@ -16,7 +16,7 @@
 module push
 
 import nitcorn
-import json::serialization
+import json
 
 import model
 import database

contrib/tnitter/src/tnitter_app.nit

@@ -31,7 +31,7 @@ import app::ui
 import app::http_request
 import app::data_store
 import android::aware
-import json::serialization
+import json
 
 import model
 

examples/rosettacode/json_output.nit

@@ -7,6 +7,7 @@
 # SEE: <http://rosettacode.org/wiki/JSON>
 module json_output
 
+import json::static
 import json
 
 var str = """{

lib/android/bundle/bundle.nit

@@ -19,7 +19,7 @@
 module bundle
 
 import serialization
-import json::serialization
+import json
 
 import platform
 import activities

lib/android/intent/intent_api10.nit

@@ -21,7 +21,7 @@ module intent_api10
 import dalvik
 import android::bundle
 import serialization
-private import json::serialization
+private import json
 
 in "Java" `{
 	import android.content.Intent;

lib/android/shared_preferences/shared_preferences_api10.nit

@@ -19,7 +19,7 @@ module shared_preferences_api10
 
 import dalvik
 import serialization
-private import json::serialization
+private import json
 
 in "Java" `{
 	import android.content.SharedPreferences;

lib/app/http_request.nit

@@ -17,7 +17,7 @@ module http_request
 
 import app_base
 import pthreads
-import json::serialization
+import json
 
 import linux::http_request is conditional(linux)
 import android::http_request is conditional(android)

lib/github/api.nit

@@ -20,7 +20,7 @@
 module api
 
 import github_curl
-intrude import json::serialization
+intrude import json::serialization_read
 
 # Client to Github API
 #

lib/github/events.nit

@@ -18,7 +18,7 @@
 module events
 
 import api
-intrude import json::serialization
+intrude import json
 
 # Github event stub.
 class GithubEvent

lib/github/github_curl.nit

@@ -18,6 +18,7 @@ module github_curl
 
 import curl
 import json::static
+import json
 
 # Specific Curl that know hot to talk to the github API
 class GithubCurl

lib/ios/data_store.nit

@@ -17,7 +17,7 @@ module data_store
 
 import app::data_store
 import cocoa::foundation
-private import json::serialization
+private import json
 
 redef class App
 	redef var data_store = new UserDefaultView

lib/json/store.nit

@@ -90,6 +90,7 @@
 module store
 
 import static
+import json
 
 # A JsonStore can save and load json data from file system.
 class JsonStore

lib/linux/data_store.nit

@@ -20,7 +20,7 @@ module data_store
 import app::data_store
 private import xdg_basedir
 private import sqlite3
-private import json::serialization
+private import json
 
 redef class App
 	redef var data_store = new LinuxStore

lib/mongodb/mongodb.nit

@@ -42,6 +42,7 @@
 # ~~~
 module mongodb
 
+import json::static
 import json
 private import native_mongodb
 

lib/mpi/mpi.nit

@@ -33,7 +33,7 @@ end
 import c
 intrude import core::text::flat
 import serialization
-private import json::serialization
+private import json
 
 in "C Header" `{
 	#include <mpi.h>

lib/neo4j/curl_json.nit

@@ -16,6 +16,7 @@
 module curl_json
 
 import json::static
+import json
 intrude import curl
 
 # An abstract request that defines most of the standard options for Neo4j REST API

lib/neo4j/error.nit

@@ -12,6 +12,7 @@
 module neo4j::error
 
 import json::static
+import json
 
 # An error thrown by the `neo4j` API.
 #

lib/nitcorn/restful.nit

@@ -16,7 +16,7 @@
 module restful is new_annotation(restful)
 
 import nitcorn
-import json::serialization
+import json
 
 # Action with `restful` methods
 class RestfulAction

lib/popcorn/pop_handlers.nit

@@ -18,6 +18,7 @@
 module pop_handlers
 
 import pop_routes
+import json::static
 import json
 
 # Class handler for a route.

lib/popcorn/pop_repos.nit

@@ -120,7 +120,7 @@ module pop_repos
 
 import popcorn::pop_config
 import serialization
-import json::serialization
+import json
 import mongodb::queries
 
 redef class AppConfig

lib/popcorn/pop_validation.nit

@@ -70,7 +70,7 @@
 # ~~~
 module pop_validation
 
-import json
+import json::static
 
 # The base class of all validators
 abstract class DocumentValidator

lib/serialization/README.md

@@ -234,7 +234,7 @@ The main implementations of these services are `JsonSerializer` and `JsonDeseria
 from the `json_serialization` module.
 
 ~~~
-import json_serialization
+import json
 import user_credentials
 
 # Data to be serialized and deserialized

src/doc/doc_phases/doc_indexing.nit

@@ -18,6 +18,7 @@ module doc_indexing
 import doc_base
 import html_templates::html_model # FIXME maybe this phase should depend on `html_render`
 private import json::static
+private import json
 
 # Generate the index for then Nitdoc QuickSearch field.
 #

src/doc/html_templates/html_components.nit

@@ -18,7 +18,7 @@ module html_components
 
 import doc_base
 import html::bootstrap
-import json::static
+import json
 
 # A label with a text content.
 class DocHTMLLabel

src/examples/nitwebcrawl.nit

@@ -15,7 +15,7 @@
 # Crawler on the nitweb web API
 module nitwebcrawl
 
-import json
+import json::static
 
 # Download a HTTP resource
 fun curl(url: String): String do

src/model/model_json.nit

@@ -25,6 +25,7 @@
 module model_json
 
 import model::model_collect
+import json::static
 import json
 import loader
 

tests/test_json_deserialization.nit

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import test_deserialization
-import json::serialization
+import json
 #alt1# import test_deserialization_serial
 #alt3# import test_deserialization_serial
 

tests/test_json_deserialization_heuristic.nit

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json::serialization
+import json
 import json::static
 
 class MyData

tests/test_json_deserialization_plain.nit

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json::serialization
+import json
 import json::static
 
 class MyClass

tests/test_json_unicode.nit

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json::static
 import json
 
 var str = """{

tests/test_serialization.nit

@@ -17,7 +17,7 @@
 #alt2#module test_serialization_alt2 is serialize
 
 import serialization
-import json::serialization
+import json
 
 # Simple class
 class A