(maint) use schema/maybe instead of schema/pred nil?

puppetlabs · Jun 4, 2015 · 1813197 · 1813197
1 parent ef931c9
commit 1813197
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/clj/puppetlabs/services/jruby/jruby_puppet_core.clj b/src/clj/puppetlabs/services/jruby/jruby_puppet_core.clj
@@ -185,7 +185,7 @@
         argv (into-array String (concat ["-rjar-dependencies"] args))]
     (.run main argv)))
 
-(schema/defn ^:always-validate cli-run! :- jruby-schemas/JRubyMainStatusOrNil
+(schema/defn ^:always-validate cli-run! :- (schema/maybe jruby-schemas/JRubyMainStatus)
   "Run a JRuby CLI command, e.g. gem, irb, etc..."
   [config :- {schema/Keyword schema/Any}
    command :- schema/Str

diff --git a/src/clj/puppetlabs/services/jruby/jruby_puppet_schemas.clj b/src/clj/puppetlabs/services/jruby/jruby_puppet_schemas.clj
@@ -186,7 +186,3 @@
 
 (def JRubyMainStatus
   (schema/pred jruby-main-status-instance?))
-
-(def JRubyMainStatusOrNil
-  (schema/either JRubyMainStatus
-    (schema/pred nil? 'nil?)))