fix(nsorg): Namespace ordering

Author: khaled basbous

code/src/com/sixsq/nuvla/auth/utils/timestamp.clj

@@ -2,8 +2,8 @@
   "Utilities for creating expiration times for token claims and for formatting
    them correctly for the cookie 'expires' field."
   (:require
-    [java-time.api :as t]
-    [com.sixsq.nuvla.server.util.time :as time]))
+    [com.sixsq.nuvla.server.util.time :as time]
+    [java-time.api :as t]))
 
 
 (def default-ttl-minutes 10080)                             ;; 1 week

code/src/com/sixsq/nuvla/db/duratom/loader.clj

@@ -1,9 +1,9 @@
 (ns com.sixsq.nuvla.db.duratom.loader
   (:refer-clojure :exclude [load])
   (:require
+    [com.sixsq.nuvla.db.atom.binding :as atom]
     [duratom.core :as duratom]
-    [environ.core :as env]
-    [com.sixsq.nuvla.db.atom.binding :as atom]))
+    [environ.core :as env]))
 
 
 (defn load

code/src/com/sixsq/nuvla/db/es/binding.clj

@@ -2,7 +2,6 @@
   "Binding protocol implemented for an Elasticsearch database that makes use
    of the Elasticsearch REST API."
   (:require [clojure.tools.logging :as log]
-            [qbits.spandex :as spandex]
             [com.sixsq.nuvla.auth.utils.acl :as acl-utils]
             [com.sixsq.nuvla.db.binding :refer [Binding]]
             [com.sixsq.nuvla.db.es.acl :as acl]
@@ -16,7 +15,8 @@
             [com.sixsq.nuvla.db.es.select :as select]
             [com.sixsq.nuvla.db.es.utils :as esu]
             [com.sixsq.nuvla.db.utils.common :as cu]
-            [com.sixsq.nuvla.server.util.response :as r])
+            [com.sixsq.nuvla.server.util.response :as r]
+            [qbits.spandex :as spandex])
   (:import (java.io Closeable)))
 
 (defn create-index

code/src/com/sixsq/nuvla/db/es/filter.clj

@@ -3,11 +3,11 @@
   (:require
     [clojure.data.json :as json]
     [clojure.string :as str]
-    [geo.io :as gio]
-    [instaparse.transform :as insta-transform]
     [com.sixsq.nuvla.db.es.query :as query]
     [com.sixsq.nuvla.server.util.log :as logu]
-    [com.sixsq.nuvla.server.util.time :as time]))
+    [com.sixsq.nuvla.server.util.time :as time]
+    [geo.io :as gio]
+    [instaparse.transform :as insta-transform]))
 
 (defn- strip-quotes
   [s]

code/src/com/sixsq/nuvla/db/es/utils.clj

@@ -2,9 +2,9 @@
   (:require
     [clojure.string :as str]
     [clojure.tools.logging :as log]
+    [com.sixsq.nuvla.utils.env :as eu]
     [environ.core :as env]
-    [qbits.spandex :as spandex]
-    [com.sixsq.nuvla.utils.env :as eu]))
+    [qbits.spandex :as spandex]))
 
 (def ^:const status-yellow "yellow")
 (def ^:const status-green "green")

code/src/com/sixsq/nuvla/server/app/routes.clj

@@ -1,13 +1,13 @@
 (ns com.sixsq.nuvla.server.app.routes
   (:require
-    [compojure.core :refer [ANY DELETE GET let-routes OPTIONS PATCH POST PUT routes]]
-    [compojure.route :as route]
-    [ring.middleware.head :refer [wrap-head]]
     [com.sixsq.nuvla.server.app.params :as p]
     [com.sixsq.nuvla.server.resources.common.crud :as crud]
     [com.sixsq.nuvla.server.resources.common.dynamic-load :as dyn]
     [com.sixsq.nuvla.server.resources.common.event-context :as ec]
-    [com.sixsq.nuvla.server.util.response :as r]))
+    [com.sixsq.nuvla.server.util.response :as r]
+    [compojure.core :refer [ANY DELETE GET let-routes OPTIONS PATCH POST PUT routes]]
+    [compojure.route :as route]
+    [ring.middleware.head :refer [wrap-head]]))
 
 
 (def collection-routes

code/src/com/sixsq/nuvla/server/app/server.clj

@@ -1,15 +1,6 @@
 (ns com.sixsq.nuvla.server.app.server
   (:require
     [clojure.tools.logging :as log]
-    [compojure.core :as compojure]
-    [environ.core :as env]
-    [nrepl.server :as nrepl]
-    [nrepl.transport :as transport]
-    [ring.middleware.cookies :refer [wrap-cookies]]
-    [ring.middleware.json :refer [wrap-json-body wrap-json-response]]
-    [ring.middleware.keyword-params :refer [wrap-keyword-params]]
-    [ring.middleware.nested-params :refer [wrap-nested-params]]
-    [ring.middleware.params :refer [wrap-params]]
     [com.sixsq.nuvla.db.impl :as db]
     [com.sixsq.nuvla.db.loader :as db-loader]
     [com.sixsq.nuvla.server.app.routes :as routes]
@@ -24,7 +15,16 @@
     [com.sixsq.nuvla.server.middleware.redirect-cep :refer [redirect-cep]]
     [com.sixsq.nuvla.server.resources.common.dynamic-load :as resources]
     [com.sixsq.nuvla.server.util.kafka :as kafka]
-    [com.sixsq.nuvla.server.util.zookeeper :as zku]))
+    [com.sixsq.nuvla.server.util.zookeeper :as zku]
+    [compojure.core :as compojure]
+    [environ.core :as env]
+    [nrepl.server :as nrepl]
+    [nrepl.transport :as transport]
+    [ring.middleware.cookies :refer [wrap-cookies]]
+    [ring.middleware.json :refer [wrap-json-body wrap-json-response]]
+    [ring.middleware.keyword-params :refer [wrap-keyword-params]]
+    [ring.middleware.nested-params :refer [wrap-nested-params]]
+    [ring.middleware.params :refer [wrap-params]]))
 
 
 (def default-db-binding-ns "com.sixsq.nuvla.db.es.loader")

code/src/com/sixsq/nuvla/server/middleware/cimi_params/utils.clj

@@ -3,8 +3,8 @@
    formatted values for further processing."
   (:require
     [clojure.string :as str]
-    [instaparse.core :as insta]
-    [com.sixsq.nuvla.server.util.response :as r]))
+    [com.sixsq.nuvla.server.util.response :as r]
+    [instaparse.core :as insta]))
 
 (defn as-vector
   "Ensures that the given argument is a vector, coercing the given value if

code/src/com/sixsq/nuvla/server/resources/cloud_entry_point.clj

@@ -293,8 +293,6 @@ include aggregating values over a collection of resources.
 "
   (:require
     [clojure.tools.logging :as log]
-    [compojure.core :refer [ANY defroutes GET PUT]]
-    [ring.util.response :as r]
     [com.sixsq.nuvla.auth.acl-resource :as a]
     [com.sixsq.nuvla.db.impl :as db]
     [com.sixsq.nuvla.server.app.params :as p]
@@ -305,7 +303,9 @@ include aggregating values over a collection of resources.
     [com.sixsq.nuvla.server.resources.resource-metadata :as md]
     [com.sixsq.nuvla.server.resources.spec.cloud-entry-point :as cep]
     [com.sixsq.nuvla.server.util.metadata :as gen-md]
-    [com.sixsq.nuvla.server.util.response :as sr]))
+    [com.sixsq.nuvla.server.util.response :as sr]
+    [compojure.core :refer [ANY defroutes GET PUT]]
+    [ring.util.response :as r]))
 
 ;;
 ;; utilities

code/src/com/sixsq/nuvla/server/resources/common/utils.clj

@@ -4,12 +4,12 @@
     [clojure.spec.alpha :as s]
     [clojure.string :as str]
     [clojure.walk :as walk]
-    [expound.alpha :as expound]
     [com.sixsq.nuvla.auth.acl-resource :as a]
     [com.sixsq.nuvla.auth.utils :as auth]
     [com.sixsq.nuvla.server.util.log :as logu]
     [com.sixsq.nuvla.server.util.response :as r]
-    [com.sixsq.nuvla.server.util.time :as time])
+    [com.sixsq.nuvla.server.util.time :as time]
+    [expound.alpha :as expound])
   (:import
     (java.security MessageDigest SecureRandom)
     (java.util UUID)))