From aff418b46dbb3407b39145358fefc7d4caed0b67 Mon Sep 17 00:00:00 2001
From: rafaelsouzaf <rafaelsouzaf@gmail.com>
Date: Fri, 8 Dec 2017 21:07:53 -0300
Subject: [PATCH] Optimize imports.

---
 types/hapi/v17/definitions/plugin/plugin.d.ts |  3 +--
 .../definitions/request/request-route.d.ts    |  2 +-
 .../hapi/v17/definitions/request/request.d.ts |  9 +------
 .../definitions/response/response-object.d.ts |  6 +----
 .../response/response-toolkit.d.ts            |  3 +--
 .../route/route-options-payload.d.ts          |  2 +-
 .../route/route-options-response.d.ts         |  2 +-
 .../v17/definitions/route/route-options.d.ts  | 25 ++++++++++---------
 .../server/server-auth-scheme.d.ts            |  5 +---
 .../v17/definitions/server/server-auth.d.ts   |  5 +---
 .../v17/definitions/server/server-ext.d.ts    |  2 +-
 .../v17/definitions/server/server-inject.d.ts |  2 +-
 .../definitions/server/server-options.d.ts    |  3 +--
 .../v17/definitions/server/server-realm.d.ts  |  2 +-
 .../v17/definitions/server/server-route.d.ts  |  2 +-
 .../server/server-state-options.d.ts          |  2 +-
 .../v17/definitions/server/server-state.d.ts  |  1 -
 .../hapi/v17/definitions/util/lifecycle.d.ts  |  4 +--
 18 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/types/hapi/v17/definitions/plugin/plugin.d.ts b/types/hapi/v17/definitions/plugin/plugin.d.ts
index cda5c37f4a..cd499c5645 100644
--- a/types/hapi/v17/definitions/plugin/plugin.d.ts
+++ b/types/hapi/v17/definitions/plugin/plugin.d.ts
@@ -1,5 +1,4 @@
-import {Server} from "../server/server";
-import {ServerRegisterOptions} from "hapi";
+import {Server, ServerRegisterOptions} from "hapi";
 
 export interface PluginsStates {
     [pluginName: string]: any;
diff --git a/types/hapi/v17/definitions/request/request-route.d.ts b/types/hapi/v17/definitions/request/request-route.d.ts
index 2917c00606..fbafd033a6 100644
--- a/types/hapi/v17/definitions/request/request-route.d.ts
+++ b/types/hapi/v17/definitions/request/request-route.d.ts
@@ -1,4 +1,4 @@
-import {RouteOptions, ServerRealm, Util, Request} from "hapi";
+import {Request, RouteOptions, ServerRealm, Util} from "hapi";
 
 /**
  * The request route information object, where:
diff --git a/types/hapi/v17/definitions/request/request.d.ts b/types/hapi/v17/definitions/request/request.d.ts
index 7e7ec43e7c..e22d1ed391 100644
--- a/types/hapi/v17/definitions/request/request.d.ts
+++ b/types/hapi/v17/definitions/request/request.d.ts
@@ -1,15 +1,8 @@
 import * as stream from "stream";
 import * as url from "url";
 import * as http from "http";
-import {Server} from "../server/server";
-import {ResponseObject} from "../response/response-object";
-import {Util} from "../util/util";
-import {PluginsStates} from "../plugin/plugin";
-import {RequestRoute} from "./request-route";
-import {RequestAuth} from "./request-auth";
-import {RequestInfo} from "./request-info";
 import * as Podium from "podium";
-import {RequestEvents} from "hapi";
+import {PluginsStates, RequestAuth, RequestEvents, RequestInfo, RequestRoute, ResponseObject, Server, Util} from "hapi";
 
 /**
  * An object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.
diff --git a/types/hapi/v17/definitions/response/response-object.d.ts b/types/hapi/v17/definitions/response/response-object.d.ts
index 1cb2c27862..28afdbba0a 100644
--- a/types/hapi/v17/definitions/response/response-object.d.ts
+++ b/types/hapi/v17/definitions/response/response-object.d.ts
@@ -1,9 +1,5 @@
-import {PluginsStates} from "../plugin/plugin";
-import {ResponseSettings} from "./response-settings";
-import {ServerStateCookieOptions} from "../server/server-state-options";
 import * as Podium from "podium";
-import {Json, Lifecycle} from "hapi";
-import {ResponseEvents} from "./response-events";
+import {Json, Lifecycle, PluginsStates, ResponseEvents, ResponseSettings, ServerStateCookieOptions} from "hapi";
 
 /**
  * Object where:
diff --git a/types/hapi/v17/definitions/response/response-toolkit.d.ts b/types/hapi/v17/definitions/response/response-toolkit.d.ts
index 1157002f99..41fcf0d62a 100644
--- a/types/hapi/v17/definitions/response/response-toolkit.d.ts
+++ b/types/hapi/v17/definitions/response/response-toolkit.d.ts
@@ -1,5 +1,4 @@
-import {ServerRealm, ServerStateCookieOptions} from "hapi";
-import {ResponseObject} from "./response-object";
+import {ResponseObject, ServerRealm, ServerStateCookieOptions} from "hapi";
 
 /**
  * See more about Lifecycle
diff --git a/types/hapi/v17/definitions/route/route-options-payload.d.ts b/types/hapi/v17/definitions/route/route-options-payload.d.ts
index 79efc0d144..5213f2c230 100644
--- a/types/hapi/v17/definitions/route/route-options-payload.d.ts
+++ b/types/hapi/v17/definitions/route/route-options-payload.d.ts
@@ -1,4 +1,4 @@
-import {Util, Lifecycle} from "hapi";
+import {Lifecycle} from "hapi";
 
 /**
  * The value must be one of:
diff --git a/types/hapi/v17/definitions/route/route-options-response.d.ts b/types/hapi/v17/definitions/route/route-options-response.d.ts
index 16c2249e29..64318af3d9 100644
--- a/types/hapi/v17/definitions/route/route-options-response.d.ts
+++ b/types/hapi/v17/definitions/route/route-options-response.d.ts
@@ -1,4 +1,4 @@
-import {Lifecycle, Util} from "hapi";
+import {Lifecycle} from "hapi";
 import {ValidationOptions} from "joi";
 
 /**
diff --git a/types/hapi/v17/definitions/route/route-options.d.ts b/types/hapi/v17/definitions/route/route-options.d.ts
index 8284f9b21a..a1fc8814ec 100644
--- a/types/hapi/v17/definitions/route/route-options.d.ts
+++ b/types/hapi/v17/definitions/route/route-options.d.ts
@@ -1,15 +1,16 @@
-import {RouteOptionsAccess} from "./route-options-access";
-import {RouteOptionsCache} from "./route-options-cache";
-import {Util} from "../util/util";
-import {RouteOptionsCors} from "./route-options-cors";
-import {RouteOptionsResponse} from "./route-options-response";
-import {RouteOptionsPayload} from "./route-options-payload";
-import {RouteOptionsSecure} from "./route-options-secure";
-import {RouteOptionsValidate} from "./route-options-validate";
-import {PluginSpecificConfiguration} from "../plugin/plugin";
-import {Json} from "../util/json";
-import {RouteOptionsPreArray} from "./route-options-pre";
-import {Lifecycle} from "hapi";
+import {
+    Json,
+    Lifecycle,
+    PluginSpecificConfiguration,
+    RouteOptionsAccess,
+    RouteOptionsCache,
+    RouteOptionsCors,
+    RouteOptionsPayload,
+    RouteOptionsPreArray,
+    RouteOptionsResponse,
+    RouteOptionsSecure,
+    RouteOptionsValidate
+} from "hapi";
 
 /**
  * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscompression)
diff --git a/types/hapi/v17/definitions/server/server-auth-scheme.d.ts b/types/hapi/v17/definitions/server/server-auth-scheme.d.ts
index 55aa77eba1..e8a4d2adbe 100644
--- a/types/hapi/v17/definitions/server/server-auth-scheme.d.ts
+++ b/types/hapi/v17/definitions/server/server-auth-scheme.d.ts
@@ -1,7 +1,4 @@
-import {Server} from "./server";
-import {ResponseToolkit} from "../response/response-toolkit";
-import {Request} from "../request/request";
-import {Lifecycle} from "hapi";
+import {Lifecycle, Request, ResponseToolkit, Server} from "hapi";
 
 /**
  * The scheme options argument passed to server.auth.strategy() when instantiation a strategy.
diff --git a/types/hapi/v17/definitions/server/server-auth.d.ts b/types/hapi/v17/definitions/server/server-auth.d.ts
index 56e13edc8d..c52a0a3cda 100644
--- a/types/hapi/v17/definitions/server/server-auth.d.ts
+++ b/types/hapi/v17/definitions/server/server-auth.d.ts
@@ -1,7 +1,4 @@
-import {ServerAuthScheme} from "./server-auth-scheme";
-import {Request} from "../request/request";
-import {RouteOptionsAccess} from "hapi";
-import {Util} from "../util/util";
+import {Request, RouteOptionsAccess, ServerAuthScheme} from "hapi";
 
 /**
  * The authentication credentials object
diff --git a/types/hapi/v17/definitions/server/server-ext.d.ts b/types/hapi/v17/definitions/server/server-ext.d.ts
index ce73328b6c..02853a2888 100644
--- a/types/hapi/v17/definitions/server/server-ext.d.ts
+++ b/types/hapi/v17/definitions/server/server-ext.d.ts
@@ -1,4 +1,4 @@
-import {Server, Lifecycle} from "hapi";
+import {Lifecycle, Server} from "hapi";
 
 /**
  * The extension point event name. The available extension points include the request extension points as well as the following server extension points:
diff --git a/types/hapi/v17/definitions/server/server-inject.d.ts b/types/hapi/v17/definitions/server/server-inject.d.ts
index e398e1915e..ddb3c3e7b7 100644
--- a/types/hapi/v17/definitions/server/server-inject.d.ts
+++ b/types/hapi/v17/definitions/server/server-inject.d.ts
@@ -1,4 +1,4 @@
-import {Request, PluginsStates} from "hapi";
+import {PluginsStates, Request} from "hapi";
 import * as Shot from "shot";
 
 /**
diff --git a/types/hapi/v17/definitions/server/server-options.d.ts b/types/hapi/v17/definitions/server/server-options.d.ts
index 4273a01988..407ebfd1c4 100644
--- a/types/hapi/v17/definitions/server/server-options.d.ts
+++ b/types/hapi/v17/definitions/server/server-options.d.ts
@@ -1,9 +1,8 @@
-import {ServerOptionsCache} from "./server-options-cache";
 import * as http from "http";
 import * as https from "https";
 import * as catbox from "catbox";
 import {MimosOptions} from "mimos";
-import {PluginSpecificConfiguration, RouteOptions} from "hapi";
+import {PluginSpecificConfiguration, RouteOptions, ServerOptionsCache} from "hapi";
 
 /**
  * he server options control the behavior of the server object. Note that the options object is deeply cloned
diff --git a/types/hapi/v17/definitions/server/server-realm.d.ts b/types/hapi/v17/definitions/server/server-realm.d.ts
index ba60524ebd..cfab9b75b7 100644
--- a/types/hapi/v17/definitions/server/server-realm.d.ts
+++ b/types/hapi/v17/definitions/server/server-realm.d.ts
@@ -1,4 +1,4 @@
-import {PluginsStates} from "../plugin/plugin";
+import {PluginsStates} from "hapi";
 
 /**
  * The realm object contains sandboxed server settings specific to each plugin or authentication strategy. When registering a plugin or an authentication scheme, a server object reference is provided with a new server.realm container specific to that registration. It allows each plugin to maintain its own settings without leaking and affecting other plugins.
diff --git a/types/hapi/v17/definitions/server/server-route.d.ts b/types/hapi/v17/definitions/server/server-route.d.ts
index efcc910f57..c2d972c631 100644
--- a/types/hapi/v17/definitions/server/server-route.d.ts
+++ b/types/hapi/v17/definitions/server/server-route.d.ts
@@ -1,4 +1,4 @@
-import {Util, Lifecycle, Server} from "hapi";
+import {Lifecycle, Server, Util} from "hapi";
 
 /**
  * A route configuration object or an array of configuration objects where each object contains:
diff --git a/types/hapi/v17/definitions/server/server-state-options.d.ts b/types/hapi/v17/definitions/server/server-state-options.d.ts
index e650309d95..55f749792f 100644
--- a/types/hapi/v17/definitions/server/server-state-options.d.ts
+++ b/types/hapi/v17/definitions/server/server-state-options.d.ts
@@ -1,4 +1,4 @@
-import {Request} from "../request/request";
+import {Request} from "hapi";
 
 /**
  * Optional cookie settings
diff --git a/types/hapi/v17/definitions/server/server-state.d.ts b/types/hapi/v17/definitions/server/server-state.d.ts
index bfc9568c51..e09937f32e 100644
--- a/types/hapi/v17/definitions/server/server-state.d.ts
+++ b/types/hapi/v17/definitions/server/server-state.d.ts
@@ -1,5 +1,4 @@
 import {ServerStateCookieOptions} from "hapi";
-import {Util} from "hapi";
 
 /**
  * A single object or an array of object where each contains:
diff --git a/types/hapi/v17/definitions/util/lifecycle.d.ts b/types/hapi/v17/definitions/util/lifecycle.d.ts
index 583fdf3c28..87dcf8ff1a 100644
--- a/types/hapi/v17/definitions/util/lifecycle.d.ts
+++ b/types/hapi/v17/definitions/util/lifecycle.d.ts
@@ -1,6 +1,6 @@
-import * as Boom from "../../../../boom/index";
+import * as Boom from "boom";
 import * as stream from "stream";
-import {ResponseToolkit, Request} from "hapi";
+import {Request, ResponseToolkit} from "hapi";
 
 export namespace Lifecycle {