replace validate_* calls with datatypes
This commit is contained in:
@@ -46,22 +46,16 @@
|
|||||||
# Sample Usage:
|
# Sample Usage:
|
||||||
#
|
#
|
||||||
class java(
|
class java(
|
||||||
$distribution = 'jdk',
|
String $distribution = 'jdk',
|
||||||
$version = 'present',
|
Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/] $version = 'present',
|
||||||
$package = undef,
|
$package = undef,
|
||||||
$package_options = undef,
|
Optional[Array] $package_options = undef,
|
||||||
$java_alternative = undef,
|
$java_alternative = undef,
|
||||||
$java_alternative_path = undef,
|
$java_alternative_path = undef,
|
||||||
$java_home = undef
|
$java_home = undef
|
||||||
) {
|
) {
|
||||||
include java::params
|
include java::params
|
||||||
|
|
||||||
validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:~-]+$')
|
|
||||||
|
|
||||||
if $package_options != undef {
|
|
||||||
validate_array($package_options)
|
|
||||||
}
|
|
||||||
|
|
||||||
if has_key($java::params::java, $distribution) {
|
if has_key($java::params::java, $distribution) {
|
||||||
$default_package_name = $java::params::java[$distribution]['package']
|
$default_package_name = $java::params::java[$distribution]['package']
|
||||||
$default_alternative = $java::params::java[$distribution]['alternative']
|
$default_alternative = $java::params::java[$distribution]['alternative']
|
||||||
|
|||||||
Reference in New Issue
Block a user