api/compat: drop more compat imports from api_schema.rs

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

src/api2/access.rs

@@ -1,6 +1,5 @@
 use failure::*;
 
-use hyper::StatusCode;
 use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};

src/api2/backup/environment.rs

@@ -8,8 +8,8 @@ use proxmox::tools::{
     digest_to_hex,
     fs::file_set_contents,
 };
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
 
-use crate::api_schema::router::{RpcEnvironment, RpcEnvironmentType};
 use crate::server::WorkerTask;
 use crate::backup::*;
 use crate::server::formatter::*;

src/api2/backup/upload_chunk.rs

@@ -9,10 +9,10 @@ use hyper::http::request::Parts;
 use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};
+use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, RpcEnvironment};
+use proxmox::api::schema::*;
 
 use crate::api2::types::*;
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use crate::backup::*;
 use crate::tools;
 

src/api2/config/datastore.rs

@@ -1,12 +1,12 @@
-use failure::*;
-//use std::collections::HashMap;
-
-use crate::api_schema::*;
-use crate::api_schema::router::*;
-use crate::backup::*;
-use serde_json::{json, Value};
 use std::path::PathBuf;
 
+use failure::*;
+use serde_json::{json, Value};
+
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::*;
+
+use crate::backup::*;
 use crate::config::datastore;
 
 pub const GET: ApiMethod = ApiMethod::new(

src/api2/node/dns.rs

@@ -1,22 +1,19 @@
+use std::sync::{Arc, Mutex};
+
 use failure::*;
+use lazy_static::lazy_static;
+use openssl::sha;
+use regex::Regex;
+use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::*;
 use proxmox::tools::fs::{file_get_contents, file_set_contents};
 use proxmox::tools::*; // required to use IPRE!() macro ???
 
-use crate::api2::*;
-use crate::api_schema::*;
-//use crate::api_schema::router::*;
 use crate::api2::types::*;
 
-use lazy_static::lazy_static;
-
-use std::sync::{Arc, Mutex};
-use openssl::sha;
-use regex::Regex;
-
-use serde_json::{json, Value};
-
 static RESOLV_CONF_FN: &str = "/etc/resolv.conf";
 
 fn read_etc_resolv_conf() -> Result<Value, Error> {

src/api2/node/network.rs

@@ -1,10 +1,9 @@
 use failure::*;
-
-//use crate::tools;
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::ObjectSchema;
+
 use crate::api2::types::*;
 
 fn get_network_config(

src/api2/node/syslog.rs

@@ -1,14 +1,14 @@
+use std::process::{Command, Stdio};
+
 use failure::*;
+use serde_json::{json, Value};
 
 use proxmox::{sortable, identity};
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::*;
 
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use crate::api2::types::*;
 
-use serde_json::{json, Value};
-use std::process::{Command, Stdio};
-
 fn dump_journal(
     start: Option<u64>,
     limit: Option<u64>,

src/api2/reader/environment.rs

@@ -4,7 +4,8 @@ use std::collections::HashMap;
 
 use serde_json::Value;
 
-use crate::api_schema::router::{RpcEnvironment, RpcEnvironmentType};
+use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
+
 use crate::server::WorkerTask;
 use crate::backup::*;
 use crate::server::formatter::*;

src/api2/subscription.rs

@@ -1,10 +1,10 @@
 use failure::*;
-
-use crate::tools;
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::ObjectSchema;
+
+use crate::tools;
 
 fn get_subscription(
     _param: Value,

src/api2/version.rs

@@ -1,9 +1,9 @@
 use failure::*;
-
-use crate::api_schema::*;
-use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
+use proxmox::api::{ApiHandler, ApiMethod, Router, RpcEnvironment};
+use proxmox::api::schema::ObjectSchema;
+
 pub const PROXMOX_PKG_VERSION: &str =
     concat!(
         env!("CARGO_PKG_VERSION_MAJOR"),